Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/nsd/PKGBUILD
	community/python-pymongo/PKGBUILD
	core/krb5/PKGBUILD
	extra/pidgin/PKGBUILD

8 files changed, 117 insertions, 47 deletions

diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD
index 65e10d605..9a71587e4 100644
--- a/community/calibre/PKGBUILD
+++ b/community/calibre/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 59984 2011-12-02 22:33:05Z giovanni $
+# $Id: PKGBUILD 60299 2011-12-09 17:18:34Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Petrov Roman <nwhisper@gmail.com>
 # Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
 
 pkgname=calibre
-pkgver=0.8.29
+pkgver=0.8.30
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('i686' 'x86_64' 'mips64el') 
@@ -18,10 +18,10 @@ depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
 makedepends=('python2-pycountry')
 optdepends=('ipython: to use calibre-debug')
 install=calibre.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
+source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.xz"
         'desktop_integration.patch'
         'calibre-mount-helper')
-md5sums=('e51c2b889e0bdfc217000ebba93af8a7'
+md5sums=('0af59b942b6184ce7b9c4247555b68dd'
          '253ce4fe5d01f8ff76b63cd3825755ea'
          '675cd87d41342119827ef706055491e7')
 
diff --git a/community/gnome-commander/PKGBUILD b/community/gnome-commander/PKGBUILD
index db3a22678..ec1bda143 100644
--- a/community/gnome-commander/PKGBUILD
+++ b/community/gnome-commander/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56333 2011-10-05 18:51:32Z ibiru $
+# $Id: PKGBUILD 60311 2011-12-10 09:50:50Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Johannes Sjolund <j.sjolund@gmail.com>
 
 pkgname=gnome-commander
-pkgver=1.2.8.14
+pkgver=1.2.8.15
 pkgrel=1
 pkgdesc="A graphical two-pane filemanager for Gnome"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,10 +15,10 @@ makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool')
 options=(!libtool)
 install=gnome-commander.install
 source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz)
-sha256sums=('3519ff0a6e0b287e9cc700df41c61f4bf29110ad16545a4e2f9445ed9a17df08')
+sha256sums=('d2feecf215db3e0faeb873c559087c2ad9af0a5aac26e2b1b32b28be939da37f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$srcdir/$pkgname-$pkgver"
 
   # python2 fix
   for file in doc/*/gnome-commander.xml; do
@@ -32,11 +32,11 @@ build() {
 }
 
 package() {
-   cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
+   cd "$srcdir/$pkgname-$pkgver"
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
 
-  mkdir -p "${pkgdir}"/usr/share/gconf/schemas
-  gconf-merge-schema "${pkgdir}"/usr/share/gconf/schemas/${pkgname}.schemas \
-    --domain ${pkgname} "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -rf "${pkgdir}"/etc/gconf/schemas/
+  mkdir -p "$pkgdir"/usr/share/gconf/schemas
+  gconf-merge-schema "$pkgdir"/usr/share/gconf/schemas/$pkgname.schemas \
+    --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -rf "$pkgdir"/etc/gconf/schemas/
 }
diff --git a/community/nautilus-actions/PKGBUILD b/community/nautilus-actions/PKGBUILD
index 8c67cf230..47dca2027 100644
--- a/community/nautilus-actions/PKGBUILD
+++ b/community/nautilus-actions/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 56331 2011-10-05 18:42:40Z ibiru $
+# $Id: PKGBUILD 60313 2011-12-10 09:56:53Z ibiru $
 # Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 # Contributor: Tor Krill <tor@krill.nu>
 
 pkgname=nautilus-actions
-pkgver=3.1.4
+pkgver=3.1.5
 pkgrel=1
 pkgdesc="Configures programs to be launched when files are selected in Nautilus"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,20 +15,20 @@ makedepends=('intltool' 'gnome-doc-utils')
 install=nautilus-actions.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/GNOME/sources/nautilus-actions/3.1/$pkgname-$pkgver.tar.xz)
-sha256sums=('071013f1037a2c22875e4c9a5efa6f28a1626965b4d5c8aa4576f319427cd0e3')
+sha256sums=('dc6b7522d04e1ed1505d6cb2e3be7888ffbac3f094ba6204da81a19c92cb230a')
 
 build() {
-    cd ${srcdir}/${pkgname}-${pkgver}
+    cd $srcdir/$pkgname-$pkgver
     ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
         --libexecdir=/usr/lib/nautilus-actions
     make
 }
 
 package(){
-    cd ${srcdir}/${pkgname}-${pkgver}
-    make  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
-    mkdir -p ${pkgdir}/usr/share/gconf/schemas
-    gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas --domain nautilus-actions \
-        ${pkgdir}/etc/gconf/schemas/*.schemas
-    rm -rf ${pkgdir}/etc/gconf/schemas/
+    cd $srcdir/$pkgname-$pkgver
+    make  GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=$pkgdir install
+    mkdir -p $pkgdir/usr/share/gconf/schemas
+    gconf-merge-schema $pkgdir/usr/share/gconf/schemas/$pkgname.schemas --domain nautilus-actions \
+        $pkgdir/etc/gconf/schemas/*.schemas
+    rm -rf $pkgdir/etc/gconf/schemas/
 }
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index 557d160aa..09df8c6d1 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 43285 2011-03-24 13:35:27Z bisson $
+# $Id: PKGBUILD 60316 2011-12-10 11:25:09Z bisson $
 # Maintainer: Kaiting Chen <kaitocracy@gmail.com>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
-pkgver=3.2.8
+pkgver=3.2.9
 pkgrel=1
 pkgdesc='Authoritative only, high performance and simple DNS server'
-arch=('i686' 'x86_64' 'mips64el')
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
 depends=('openssl')
 makedepends=('flex')
-source=("http://www.nlnetlabs.nl/downloads/nsd/nsd-$pkgver.tar.gz")
-sha1sums=('e8db690a09f53152f0dca6e4fbfabcc89003fced')
+arch=('i686' 'x86_64' 'mips64el')
+source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+sha1sums=('66e17e5801e94da1a21f0f2a4dd7a4ab4ffe0dd9')
 
-install=nsd.install
+install=install
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/ --exec-prefix=/usr --datarootdir=/usr/share
 	make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
-	install -d "$pkgdir"/{etc/rc.d,usr/share/{doc,licenses}/"$pkgname"}
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+	install -d "${pkgdir}"/{etc/rc.d,usr/share/{doc,licenses}/"${pkgname}"}
 	rm doc/differences.pdf
-	install -m644 doc/* "$pkgdir"/usr/share/doc/"$pkgname"
-	ln -s ../../doc/"$pkgname"/LICENSE "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
-	ln -s ../../usr/sbin/nsdc "$pkgdir"/etc/rc.d/nsd
+	install -m644 doc/* "${pkgdir}"/usr/share/doc/"${pkgname}"
+	ln -s ../../doc/"${pkgname}"/LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
+	ln -s ../../usr/sbin/nsdc "${pkgdir}"/etc/rc.d/nsd
 }
diff --git a/community/nsd/install b/community/nsd/install
new file mode 100644
index 000000000..d90c83521
--- /dev/null
+++ b/community/nsd/install
@@ -0,0 +1,19 @@
+post_install() {
+	getent group nsd &>/dev/null || groupadd -r nsd >/dev/null
+	getent passwd nsd &>/dev/null || useradd -r -g nsd -d /dev/null -s /bin/false -c nsd nsd >/dev/null
+	chown nsd:nsd /var/db/nsd
+	chmod 700 /var/db/nsd
+	install -o nsd -d /var/run/nsd
+}
+
+post_upgrade() {
+	[[ `vercmp $2 3.2.9` -lt 0 ]] && cat <<\EOF
+==> The database format was updated; please run `nsdc rebuild`.
+EOF
+}
+
+post_remove() {
+	getent passwd nsd &>/dev/null && userdel nsd >/dev/null
+	getent group nsd &>/dev/null && groupdel nsd >/dev/null
+	true
+}
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index 299e07aa5..25bdc0312 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 59902 2011-12-02 11:04:21Z andrea $
-# Maintainer:
+# $Id: PKGBUILD 60320 2011-12-10 12:45:52Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
-
 pkgname=python-pymongo
 pkgver=1.9b1
-pkgrel=2
+pkgrel=3
 pkgdesc="Python driver for MongoDB"
+arch=('x86_64' 'i686' 'mips64el')
 license=("APACHE")
-url="http://pypi.python.org/pypi/pymongo/"
-arch=('i686' 'x86_64' 'mips64el')
+url="http://pypi.python.org/pypi/pymongo3/"
 depends=('python')
 makedepends=('python-distribute')
-source=(http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz)
-md5sums=('6c65dcad8674f37ffc8bc3d6e1fd4155')
+source=("http://pypi.python.org/packages/source/p/pymongo3/pymongo3-$pkgver.tar.gz")
+sha256sums=('dcabaaca2f0067e648c2b081a70564b832de981495ff953597c1e451a7fcac20')
 
 package() {
-  cd $srcdir/pymongo3-$pkgver
-  LANG=en_US.UTF8 python setup.py install --root=$pkgdir --optimize=1
+  cd "$srcdir/pymongo3-$pkgver"
+
+  LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/r8168-lts/PKGBUILD b/community/r8168-lts/PKGBUILD
new file mode 100644
index 000000000..254303c85
--- /dev/null
+++ b/community/r8168-lts/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+
+pkgname=r8168-lts
+_pkgname=r8168
+pkgver=8.027.00
+pkgrel=2
+pkgdesc="A kernel module for Realtek 8168 network cards for kernel26-lts"
+url="http://www.realtek.com.tw"
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('glibc' "kernel26-lts>=2.6.32" "kernel26-lts<2.6.33")
+makedepends=("kernel26-lts-headers>=2.6.32" "kernel26-lts-headers<2.6.33")
+source=(http://r8168.googlecode.com/files/$_pkgname-$pkgver.tar.bz2)
+install=$pkgname.install
+
+_extramodules=extramodules-2.6.32-lts
+_kernver="$(cat /lib/modules/$_extramodules/version || true)"
+
+build() {
+	cd "$srcdir/$_pkgname-$pkgver"
+	make -C /lib/modules/$_kernver/build SUBDIRS="$srcdir/$_pkgname-$pkgver/src" EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" modules
+}
+
+package() {
+	cd "$srcdir/$_pkgname-$pkgver/src"
+	install -D -m644 $_pkgname.ko "$pkgdir/lib/modules/$_extramodules/$_pkgname.ko"
+	find "$pkgdir" -name '*.ko' -exec gzip -9 {} \;
+}
+
+md5sums=('98155ce1ad5c248eeb7a93c9954d8344')
+sha256sums=('5bc3b44bd69a05e45ab13be727256a95adf18a658f726141283046b397dc22e2')
diff --git a/community/r8168-lts/r8168-lts.install b/community/r8168-lts/r8168-lts.install
new file mode 100644
index 000000000..fd4f92f63
--- /dev/null
+++ b/community/r8168-lts/r8168-lts.install
@@ -0,0 +1,17 @@
+rebuild_module_dependencies() {
+	EXTRAMODULES='extramodules-2.6.32-lts'
+	depmod $(cat /lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+  rebuild_module_dependencies
+	echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
+	echo '>>>  `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
+}
+post_upgrade() {
+	rebuild_module_dependencies
+}
+
+post_remove() {
+	rebuild_module_dependencies
+}