[arch-commits] Commit in hplip/trunk (PKGBUILD)

[Andreas Radke]

    Date: Thursday, February 5, 2015 @ 21:49:33
  Author: andyrtr
Revision: 230854

upgpkg: hplip 3.15.2-2

build with python3

Modified:
  hplip/trunk/PKGBUILD

----------+
 PKGBUILD |   38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-05 20:39:20 UTC (rev 230853)
+++ PKGBUILD	2015-02-05 20:49:33 UTC (rev 230854)
@@ -6,22 +6,22 @@
 
 pkgname=hplip
 pkgver=3.15.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
 license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 'foomatic-db-engine')
-makedepends=('python2-pyqt4' 'python2-gobject2' 'sane' 'rpcbind' 'cups' 'libusb')
+depends=('python' 'ghostscript>=8.64-6' 'net-snmp>=5.7.1' 'wget' 'foomatic-db-engine')
+makedepends=('python-pyqt4' 'python-gobject2' 'sane' 'rpcbind' 'cups' 'libusb')
 optdepends=('cups: for printing support'
-            'python2-dbus: for dbus support'
+            'python-dbus: for dbus support'
             'sane: for scanner support'
-            'python2-pillow: for commandline scanning support'
-            'python2-notify: for Desktop notification support'
-            'python2-reportlab: for pdf output in hp-scan'
+            'python-pillow: for commandline scanning support'
+            #'python2-notify: for Desktop notification support'
+            'python-reportlab: for pdf output in hp-scan'
             'rpcbind: for network support'
-            'python2-pyqt4: for running GUI and hp-toolbox'
-            'python2-gobject2: for running hp-toolbox'
+            'python-pyqt4: for running GUI and hp-toolbox'
+            'python-gobject2: for running hp-toolbox'
             'hplip-plugin: binary blobs for specific devices (AUR) or run hp-setup to download the plugin'
             'libusb: for advanced usb support')
 install=hplip.install
@@ -35,17 +35,17 @@
 prepare() {
  cd $pkgname-$pkgver
  
- export PYTHON=python2
+# 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|' doctor.py setup.py makeuri.py logcapture.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 %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
- sed -i 's|/usr/bin/python|/usr/bin/python2|' data/rules/hplip-printer at .service
+# find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
+# sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' doctor.py setup.py makeuri.py logcapture.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 %HOME%|python2 %HOME%|' base/utils.py
+# sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
+# sed -i 's|/usr/bin/python|/usr/bin/python2|' data/rules/hplip-printer at .service
  
  # disable insecure update - https://bugs.archlinux.org/task/38083
  patch -Np0 -i ${srcdir}/disable_upgrade.patch