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

Conflicts:
	community-staging/motion/PKGBUILD
	community-testing/tor/PKGBUILD
	community/icecast/PKGBUILD
	libre/hplip-libre/PKGBUILD
	libre/virtualbox-modules/PKGBUILD

2 files changed, 21 insertions, 20 deletions

diff --git a/libre/hplip-libre/.hplip.install.swp b/libre/hplip-libre/.hplip.install.swp
new file mode 100644
index 000000000..819e785c6
--- /dev/null
+++ b/libre/hplip-libre/.hplip.install.swp
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 7523a2120..0f120e287 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -2,19 +2,19 @@
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer : Rémy Oudompheng <remy@archlinux.org>
 # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
-# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy>
+# Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
 
 _pkgname=hplip
 pkgname=hplip-libre
-pkgver=3.12.4
-pkgrel=4
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
+pkgver=3.12.6
+pkgrel=1
+pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://hplipopensource.com"
 license=('GPL')
 depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
 	 'net-snmp>=5.7.1')
-makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
+makedepends=('python2-pyqt' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusbx')
 optdepends=('cups: for printing support'
             'dbus-python: for dbus support'
             'sane: for scanner support'
@@ -22,40 +22,41 @@ optdepends=('cups: for printing support'
             'python-notify: for Desktop notification support'
             'rpcbind: for network support'
             'python2-pyqt: for running hp-toolbox'
-            'python2-gobject2: for running hp-toolbox')
-replaces=('hpijs' "${_pkgname}")
+            'python2-gobject2: for running hp-toolbox'
+            'libusbx: for advanced usb support')
+replaces=("${_pkgname}")
 conflicts=("${_pkgname}")
 provides=("${_pkgname}=${pkgver}")
 options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
-         '2fe18f4091afb3dec200271dc7836128')
+md5sums=('5303938e8630775ea6fb383af85775e5'
+         'b562457e4c713d8609b3d6dd2be10baf')
 
 build() {
  cd "$srcdir/$_pkgname-$pkgver"
  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
  sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' ui/upgradeform.py uninstall.py upgrade.py config_usb_printer.py
  sed -i 's|python ./print.py|python2 ./print.py|' scan.py
  sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
+ sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py 
  sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
  sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
 
  # https://bugs.archlinux.org/task/30085 - hack found in Gentoo
  # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
  # The hpcups driver does not use foomatic-rip
-        local i
-        for i in ppd/hpijs/*.ppd.gz ; do
-                rm -f ${i}.temp
-                gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-                        gzip > ${i}.temp || return 1
-                mv ${i}.temp ${i}
-        done
-
+	local i
+	for i in ppd/hpijs/*.ppd.gz ; do
+		rm -f ${i}.temp
+		gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+			gzip > ${i}.temp || return 1
+		mv ${i}.temp ${i}
+	done
+   
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 
@@ -70,7 +71,7 @@ build() {
              --enable-hpijs-install \
              --enable-foomatic-drv-install \
              --enable-pp-build \
-             --enable-udev-acl-rules
+             --enable-udev-acl-rules #--help
 
  make
 }