Fri Jun 22 00:01:45 UTC 2012

5 files changed, 31 insertions, 30 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 c2cec2e13..b6bc8ce2f 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')
 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
 }
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 402d1c7fd..e4326a2e1 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,7 +1,7 @@
 # $Id$
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 # Changes:
 # * Adapt to linux-libre
 # * virtualbox-{archlinux,parabola}-*
@@ -11,7 +11,7 @@
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 pkgbase=virtualbox-libre
 pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.16
+pkgver=4.1.18
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
@@ -194,7 +194,7 @@ package_virtualbox-parabola-additions(){
     # install sample config
     install -D -m644 "$srcdir/vbox-service.conf" "$pkgdir/etc/conf.d/vbox-service"
 }
-md5sums=('eacfb802ecdd6d3435228eb3d3488719'
+md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '5f85710e0b8606de967716ded7b2d351'
          '755ab0dd9bcacf2c00d2275b1ca69547'
          'a1ff1d1b4423556887e48a32978226a6'
diff --git a/libre/virtualbox-modules-lts/PKGBUILD b/libre/virtualbox-modules-lts/PKGBUILD
index 8ff59d712..d3b44d748 100644
--- a/libre/virtualbox-modules-lts/PKGBUILD
+++ b/libre/virtualbox-modules-lts/PKGBUILD
@@ -1,12 +1,12 @@
 # $Id$
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 # Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-modules-lts' 'virtualbox-parabola-modules-lts')
-pkgver=4.1.14
+pkgver=4.1.18
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
@@ -15,7 +15,7 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
          LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('f8baa04e6d589bc6b1fb4e7079fbe414'
+md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '4c88bd122677a35f68abd76eb01b378b'
          'ed1341881437455d9735875ddf455fbe')
 
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index e14bf347c..2e747105a 100644
--- a/libre/virtualbox-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -1,12 +1,12 @@
 # $Id$
 #Maintainer: Ionut Biru <ibiru@archlinux.org>
 #Maintainer (Parabola): Jorge López <jorginho@adinet.com.uy>
-#Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+#Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
-pkgver=4.1.16
-pkgrel=2
+pkgver=4.1.18
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -14,7 +14,7 @@ makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'l
 [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
 source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
         LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('eacfb802ecdd6d3435228eb3d3488719'
+md5sums=('38db0a87cba659b484af868b0c2bd3ac'
          '4c88bd122677a35f68abd76eb01b378b'
          'ed1341881437455d9735875ddf455fbe')