Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/esmtp/PKGBUILD
	community/geany-plugins/PKGBUILD
	community/giggle/PKGBUILD
	community/guichan/PKGBUILD
	community/mxml/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	core/libtool/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	core/udev/PKGBUILD
	extra/audacious/PKGBUILD
	extra/conky/PKGBUILD
	extra/gnome-control-center/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtk3/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/kino/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/poppler/PKGBUILD
	extra/postfix/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/transmission/PKGBUILD
	extra/xfburn/PKGBUILD
	extra/xfce4-xkb-plugin/PKGBUILD
	extra/xorg-server/PKGBUILD
	extra/yelp/PKGBUILD
	kde-unstable/calligra/PKGBUILD
	multilib/lib32-gtk2/PKGBUILD
	multilib/lib32-libpulse/PKGBUILD
	multilib/libtool-multilib/PKGBUILD
	multilib/wine/PKGBUILD
	multilib/wine/wine.install

1 files changed, 18 insertions, 29 deletions

diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD
index 19a5223fe..26916756b 100644
--- a/extra/hplip/PKGBUILD
+++ b/extra/hplip/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 139476 2011-10-02 02:49:32Z eric $
+# $Id: PKGBUILD 140998 2011-10-21 02:57:10Z eric $
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
 
 pkgname=hplip
-pkgver=3.11.7
-pkgrel=2
+pkgver=3.11.10
+pkgrel=1
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
 license=('GPL')
-makedepends=('python2-qt' 'python2-gobject2' 'pkg-config' 'sane' 'rpcbind' 'cups')
 depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
-	'libcups>=1.3.10-3' 'net-snmp>=5.7.1' 'libusb-compat')
+	 'net-snmp>=5.7.1')
+makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
 optdepends=('cups: for printing support'
             'dbus-python: for dbus support'
             'sane: for scanner support'
@@ -19,22 +19,25 @@ optdepends=('cups: for printing support'
             'python-notify: for Desktop notification support'
             'rpcbind: for network support'
             'python2-qt: for running hp-toolbox'
-            'pygobject: for running hp-toolbox'
+            'python2-gobject2: for running hp-toolbox'
             'hplip-plugin: binary blobs for specific devices')
 replaces=('hpijs')
 options=('!libtool')
 install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc}
-        hplip-cups-1.5.0-compatibility.patch)
-md5sums=('5cb89a00b0c680d8bf9bf4b4f1f863b1'
-         'f4422ee0dc842e1a53b75c24f468d65c'
-         'a767000ce920e9f7f6a5b0a8e4392ef9')
+source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('6143f30f3b6905ef22105176a3b80db0'
+         '396bbd8c5cc92aa8295e5bcb508692f3')
 
 build() {
  cd "$srcdir/$pkgname-$pkgver"
- patch -p1 -i "$srcdir/hplip-cups-1.5.0-compatibility.patch"
  export PYTHON=python2
  find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+ sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
+ # fix sysfs rules
+ sed -i -e "s|SYSFS|ATTR|g" \
+        -e "s|sysfs|attr|g" \
+   data/rules/56-hpmud_support.rules
+
  ./configure --prefix=/usr \
              --enable-qt4 \
              --enable-foomatic-rip-hplip-install \
@@ -51,21 +54,7 @@ build() {
 
 package() {
  cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-
- rm -rf "$pkgdir/etc/sane.d"
- # remove autostart of hp-daemon
- rm -r "$pkgdir/etc/xdg"
- # move udev rules to /lib/udev/rules.d
- mkdir -p "$pkgdir/lib/udev/rules.d"
- mv "$pkgdir"/etc/udev/rules.d/* "$pkgdir/lib/udev/rules.d/"
- rm -r "$pkgdir/etc/udev"
- # remove lp user, it's not used on archlinux
- sed -i 's|OWNER="lp", ||g' "$pkgdir/lib/udev/rules.d/40-hplip.rules"
- # fix sysfs rules
- sed -i -e "s|SYSFS|ATTR|g" \
-        -e "s|sysfs|attr|g" \
-        -e 's|"bin/sh|"/bin/sh|g' \
-   "$pkgdir/lib/udev/rules.d/56-hpmud_support.rules"
+ make rulesdir=/lib/udev/rules.d  DESTDIR="$pkgdir/" install
+ # remove config provided by sane and autostart of hp-daemon
+ rm -rf "$pkgdir"/etc/{sane.d,xdg}
 }
-