Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

16 files changed, 40 insertions, 257 deletions

diff --git a/abs/core/mkinitcpio/PKGBUILD b/abs/core/mkinitcpio/PKGBUILD
index c5b823d..01645d0 100644
--- a/abs/core/mkinitcpio/PKGBUILD
+++ b/abs/core/mkinitcpio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 131019 2011-07-09 14:04:52Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
+
 pkgname=mkinitcpio
 pkgver=0.7.2
-pkgrel=1
+pkgrel=5
 pkgdesc="Modular initramfs image creation utility"
 arch=(any)
 url="http://www.archlinux.org/"
@@ -17,11 +17,14 @@ optdepends=('xz: Use lzma or xz compression for the initramfs image'
             'mkinitcpio-nfs-utils: Support for root filesystem on NFS')
 replaces=('mkinitrd' 'mkinitramfs' 'klibc' 'klibc-extras' 'klibc-kbd'
           'klibc-module-init-tools' 'klibc-udev')
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz mkinitcpio.conf.patch)
 backup=(etc/mkinitcpio.conf)
-sha256sums=('b7282c78ef3144f5547a4012f334b0beb575b7108a5f6a006289a1e78aa9823d')
 
 package() {
   cd $srcdir/${pkgname}-${pkgver}
+  patch -p0 < $srcdir/mkinitcpio.conf.patch
   make DESTDIR="${pkgdir}" install
 }
+
+md5sums=('e11670a7d4802b2ef20cab4b3815168a'
+         'b697144048288424b2380d044103ec34')
diff --git a/abs/core/mkinitcpio/__changelog b/abs/core/mkinitcpio/__changelog
new file mode 100644
index 0000000..89a1a22
--- /dev/null
+++ b/abs/core/mkinitcpio/__changelog
@@ -0,0 +1,5 @@
+added "usb" and  net to the modules line in mkinitcpio.conf
++HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput"
+
+MODULES="nfs"
+
diff --git a/abs/core/mkinitcpio/mkinitcpio.conf.patch b/abs/core/mkinitcpio/mkinitcpio.conf.patch
new file mode 100644
index 0000000..68ab648
--- /dev/null
+++ b/abs/core/mkinitcpio/mkinitcpio.conf.patch
@@ -0,0 +1,20 @@
+--- mkinitcpio.conf.orig	2011-08-06 00:04:15.991131194 +0000
++++ mkinitcpio.conf	2011-08-06 00:04:02.791130644 +0000
+@@ -4,7 +4,7 @@
+ # run.  Advanced users may wish to specify all system modules
+ # in this array.  For instance:
+ #     MODULES="piix ide_disk reiserfs"
+-MODULES=""
++MODULES="nfs"
+ 
+ # BINARIES
+ # This setting includes any additional binaries a given user may
+@@ -54,7 +54,7 @@
+ #
+ ##   This setup loads an lvm2 volume group on a usb device.
+ #    HOOKS="base udev usb lvm2 filesystems"
+-HOOKS="base udev autodetect pata scsi sata filesystems usbinput"
++HOOKS="base udev usb net autodetect pata scsi sata filesystems usbinput "
+ 
+ # COMPRESSION
+ # Use this to compress the initramfs image. With kernels earlier than
diff --git a/abs/core/perl_modules/perl-extutils-depends/PKGBUILD b/abs/core/perl_modules/perl-extutils-depends/PKGBUILD
deleted file mode 100644
index 5e044d6..0000000
--- a/abs/core/perl_modules/perl-extutils-depends/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 46675 2009-07-19 15:31:27Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@soulfly.nl>
-
-pkgname=perl-extutils-depends
-_realname=ExtUtils-Depends
-pkgver=0.302
-pkgrel=1
-pkgdesc="The Perl depends module"
-arch=('i686' 'x86_64')
-license=('PerlArtistic')
-url="http://gtk2-perl.sourceforge.net/"
-depends=('perl>=5.10.0')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-replaces=('extutils-depends')
-options=('!emptydirs')
-md5sums=('db46426f0599668da95c21b53b532508')
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  perl Makefile.PL INSTALLDIRS=vendor || return 1
-  make  || return 1
-}
-package() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name 'perllocal.pod' -delete
-}
diff --git a/abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD b/abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD
deleted file mode 100644
index 4c575bc..0000000
--- a/abs/core/perl_modules/perl-extutils-pkgconfig/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 28969 2009-03-04 02:50:24Z kevin $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Sarah Hay <sarah@archlinux.org>
-# Contributor: Arjan Timmerman <arjan@soulfly.nl>
-
-pkgname=perl-extutils-pkgconfig
-_realname=ExtUtils-PkgConfig
-pkgver=1.12
-pkgrel=1
-pkgdesc="The Perl Pkgconfig module"
-arch=('i686' 'x86_64')
-license=('LGPL')
-url="http://gtk2-perl.sourceforge.net/"
-depends=('perl>=5.10.0')
-replaces=('extutils-pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/gtk2-perl/${_realname}-${pkgver}.tar.gz)
-options=('!emptydirs')
-md5sums=('8fc5c0b30cfda2048ec87ae418cc3508')
-
-build() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  perl Makefile.PL INSTALLDIRS=vendor || return 1
-  make  || return 1
-}
-package() {
-  cd ${srcdir}/${_realname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-  find ${pkgdir} -name '.packlist' -delete
-  find ${pkgdir} -name 'perllocal.pod' -delete
-}
diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD
index 9c78494..37bb2de 100644
--- a/abs/extra/boost/PKGBUILD
+++ b/abs/extra/boost/PKGBUILD
@@ -11,18 +11,17 @@ _boostver=${pkgver//./_}
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
+makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
 license=('custom')
-md5sums=('ff180a5276bec773a7625cac7e2288e8')
 
 _stagedir="${srcdir}/stagedir"
 
 build() {
   # set python path for bjam
   cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
+  echo "using python : 2.6 : /usr/bin/python2 ;" >> build/v2/user-config.jam
+  #echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
   echo "using mpi ;" >> build/v2/user-config.jam
 
   # build bjam
@@ -74,8 +73,7 @@ build() {
 package_boost() {
     pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
     depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python bindings'
-                'python2: for python2 bindings')
+    optdepends=('python2: for python2 bindings')
 
     install -d "${pkgdir}"/usr/{include,lib,share}
     # headers/source files
@@ -108,3 +106,4 @@ package_boost-libs() {
     install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
         "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
 }
+md5sums=('ff180a5276bec773a7625cac7e2288e8')
diff --git a/abs/extra/boost/__changelog b/abs/extra/boost/__changelog
new file mode 100644
index 0000000..f0c532d
--- /dev/null
+++ b/abs/extra/boost/__changelog
@@ -0,0 +1,3 @@
+* remove 'python' dep (aka python3)
+* change python 2.7 refrence to 2.6
+* remove python optdep for the libs package
diff --git a/abs/extra/libwnck/PKGBUILD b/abs/extra/libwnck/PKGBUILD
deleted file mode 100644
index f7e8baa..0000000
--- a/abs/extra/libwnck/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 99757 2010-11-17 12:00:58Z ibiru $
-# Maintainer: Jan de Groot  <jgc@archlinux.org>
-pkgname=libwnck
-pkgver=2.30.6
-pkgrel=1
-pkgdesc="Window Navigator Construction Kit"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('gtk2>=2.22.0' 'startup-notification>=0.10' 'libxres' 'gdk-pixbuf2')
-makedepends=('libxt>=1.0.6' 'intltool' 'gobject-introspection')
-options=('!libtool')
-url="http://www.gnome.org/"
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('4d25984ed5cfe215eb650f960de634300a6cafc9d98bbc7caea8043b7cd96cc5')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --sysconfdir=/etc \
-      --localstatedir=/var --disable-static
-  make || return 1
-}
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/abs/extra/libxfce4util/PKGBUILD b/abs/extra/libxfce4util/PKGBUILD
deleted file mode 100644
index dea44e6..0000000
--- a/abs/extra/libxfce4util/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 80806 2010-05-22 12:57:44Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=libxfce4util
-pkgver=4.6.2
-pkgrel=1
-pkgdesc="Basic utility non-GUI functions for Xfce"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.xfce.org/"
-depends=("glib2>=2.24.1")
-makedepends=('pkgconfig')
-options=('!libtool')
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9c3129d827d480f0906c575e7a13f1e9')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra/libxfcegui4/PKGBUILD b/abs/extra/libxfcegui4/PKGBUILD
deleted file mode 100644
index c947d2f..0000000
--- a/abs/extra/libxfcegui4/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 80816 2010-05-22 13:17:01Z andyrtr $
-# Maintainer: tobias <tobias funnychar archlinux.org>
-
-pkgname=libxfcegui4
-pkgver=4.6.4
-pkgrel=1
-pkgdesc="Various gtk widgets for Xfce"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.xfce.org/"
-depends=('startup-notification' "xfconf>=4.6.2" "libglade>=2.6.4" 'hicolor-icon-theme')
-makedepends=('pkgconfig' 'intltool')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('88de59b222cb9977f93a4c61011c1e1f')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static # --enable-xinerama
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra/libxfcegui4/libxfcegui4.install b/abs/extra/libxfcegui4/libxfcegui4.install
deleted file mode 100644
index fee9e5d..0000000
--- a/abs/extra/libxfcegui4/libxfcegui4.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
diff --git a/abs/extra/thunar/PKGBUILD b/abs/extra/thunar/PKGBUILD
deleted file mode 100644
index 9f6c5b2..0000000
--- a/abs/extra/thunar/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 80836 2010-05-22 14:19:16Z andyrtr $
-# Maintainer: andyrtr <andyrtr funnychar archlinux.org>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-
-pkgname=thunar
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="new modern file manager for Xfce"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://thunar.xfce.org"
-groups=('xfce4')
-depends=('libexif>=0.6.19' 'hicolor-icon-theme' 'fam' 'gtk2' 'exo>=0.3.107' \
-         'libxfce4util>=4.6.2' 'hal>=0.5.14' 'libpng' 'libjpeg>=8.0.1' \
-         'startup-notification')
-makedepends=('intltool' 'pkgconfig' 'xfce4-panel>=4.6.4')
-optdepends=('gamin:   a fam replacement to make thunar monitor changes to files on the fly'
-            'xfce4-panel: for trash applet')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/1.0/Thunar-${pkgver}.tar.bz2)
-md5sums=('c91073202d373a1f9951a1240083c36d')
-
-build() {
-  cd ${srcdir}/Thunar-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static \
-    --disable-gnome-thumbnailers --enable-exif --enable-pcre
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/Thunar-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-  sed -i 's:x-directory/gnome-default-handler;::' \
-    ${pkgdir}/usr/share/applications/Thunar-folder-handler.desktop
-}
diff --git a/abs/extra/thunar/__changelog b/abs/extra/thunar/__changelog
deleted file mode 100644
index 630ddfa..0000000
--- a/abs/extra/thunar/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-remove dep for desktop-file-utils
diff --git a/abs/extra/thunar/thunar.install b/abs/extra/thunar/thunar.install
deleted file mode 100644
index 28fdb48..0000000
--- a/abs/extra/thunar/thunar.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
diff --git a/abs/extra/xfce4-panel/PKGBUILD b/abs/extra/xfce4-panel/PKGBUILD
deleted file mode 100644
index f11c0b1..0000000
--- a/abs/extra/xfce4-panel/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 80831 2010-05-22 13:45:04Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: tobias <tobias funnychar archlinux.org>
-
-pkgname=xfce4-panel
-pkgver=4.6.4
-pkgrel=1
-pkgdesc="Panel for the Xfce desktop environment"
-arch=('i686' 'x86_64')
-license=('GPL2')
-url="http://www.xfce.org/"
-groups=('xfce4')
-depends=("libxfcegui4>=4.6.4" 'exo>=0.3.107' 'libwnck' 'hicolor-icon-theme')
-makedepends=('pkgconfig' "xfconf>=4.6.2" 'intltool')
-options=('!libtool')
-install=${pkgname}.install
-source=(http://archive.xfce.org/src/xfce/${pkgname}/4.6/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('82f10a42aefca4cc26a6633e7478cc65')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
-    --localstatedir=/var --disable-static
-  make || return 1
-}
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-  make DESTDIR=${pkgdir} install || return 1
-}
diff --git a/abs/extra/xfce4-panel/xfce4-panel.install b/abs/extra/xfce4-panel/xfce4-panel.install
deleted file mode 100644
index 21b79d2..0000000
--- a/abs/extra/xfce4-panel/xfce4-panel.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}