Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

2 files changed, 6 insertions, 31 deletions

diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index b6bc8ce2f..d8ce703b2 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -7,7 +7,7 @@
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.12.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet (without hplip-plugin binary blobs recommendation)"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -36,16 +36,17 @@ md5sums=('5303938e8630775ea6fb383af85775e5'
 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|' setup.py makeuri.py 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
@@ -56,7 +57,7 @@ build() {
 			gzip > ${i}.temp || return 1
 		mv ${i}.temp ${i}
 	done
-   
+
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 
diff --git a/libre/hplip-libre/rePKGBUILD b/libre/hplip-libre/rePKGBUILD
deleted file mode 100644
index 753b348e3..000000000
--- a/libre/hplip-libre/rePKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# This is an example rePKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-CARCH=x86_64
-unset build package md5sums source check
-_repo=extra
-options=(!strip)
-source=(PKGBUILD
-	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${_pkgname}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-	# files for pkg modifications
-    )
-
-build() {
-  cd "${srcdir}/"
-  rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT || true
-  # put actions for package modifications below this line
-}
-
-package() {
-  find ${srcdir} -type l -maxdepth 1 -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}