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

Conflicts:
	community/collectd/PKGBUILD
	community/exim/PKGBUILD
	community/nsd/PKGBUILD
	extra/phonon-vlc/PKGBUILD

4 files changed, 49 insertions, 19 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 94d5390ab..d77f392b6 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 158070 2012-05-02 11:53:48Z tomegun $
+# $Id: PKGBUILD 160716 2012-06-04 15:02:22Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 pkgname=filesystem
-pkgver=2012.2
-pkgrel=5
+pkgver=2012.6
+pkgrel=1
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
@@ -17,8 +17,8 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc
         'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd' 'etc/nsswitch.conf'
         'etc/shells' 'etc/host.conf' 'etc/securetty' 'etc/profile' 'etc/issue')
 source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
-        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells'
-        'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
+        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release' 'resolv.conf'
+        'shells' 'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
 md5sums=('772fe869b921698cc3e6fde73c4ac85a'
          '6be47d893fd49b2e4a8c0e811b350861'
          '13753e4e0964f3652b0cc60a28528bdf'
@@ -31,6 +31,7 @@ md5sums=('772fe869b921698cc3e6fde73c4ac85a'
          'e5d8323a4dbee7a6d0d2a19cbf4b819f'
          '7bc65f234dfb6abf24e7c3b03e86f4ff'
          'd41d8cd98f00b204e9800998ecf8427e'
+         '0e145e18fea8fd190b30d45764f5707c'
          '6f48288b6fcaf0065fcb7b0e525413e0'
          '22518e922891f9359f971f4f5b4e793c'
          'd2dc4e39dbdea75b107f91789e3274ab'
@@ -43,10 +44,11 @@ package() {
 	#
 	# setup root filesystem
 	#
-	for d in bin boot dev etc home media mnt sbin usr var opt srv/http sys run; do
+	for d in boot dev etc home media mnt usr var opt srv/http run; do
 		install -d -m755 ${d}
 	done
 	install -d -m555 proc
+	install -d -m555 sys
 	install -d -m0750 root
 	install -d -m1777 tmp
 	# vsftpd won't run with write perms on /srv/ftp
@@ -54,7 +56,7 @@ package() {
 
 	# setup /etc
 	install -d etc/{ld.so.conf.d,skel,profile.d}
-	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf passwd resolv.conf securetty shells profile; do
+	for f in fstab group host.conf hosts issue ld.so.conf motd nsswitch.conf os-release passwd resolv.conf securetty shells profile; do
 		install -m644 ${srcdir}/${f} etc/
 	done
 	ln -s /proc/self/mounts etc/mtab
@@ -65,17 +67,15 @@ package() {
 	install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first usr/lib/modprobe.d/usb-load-ehci-first.conf
 
 	# setup /var
-	for d in cache/man local opt log/old lib/misc empty run; do
+	for d in cache/man local opt log/old lib/misc empty; do
 		install -d -m755 var/${d}
 	done
-	install -d -m1777 var/{tmp,spool/mail,lock}
+	install -d -m1777 var/{tmp,spool/mail}
 	# allow setgid games to write scores
 	install -d -m775 -g games var/games
 	ln -s spool/mail var/mail
-	# not ready yet, needs possible change in pacman or other magic
-	# is fixed by initscripts on next boot
-#	ln -s ../run var/run
-#	ln -s ../run/lock var/lock
+	ln -s ../run var/run
+	ln -s ../run/lock var/lock
 
 	#
 	# setup /usr hierarchy
diff --git a/libre/filesystem/os-release b/libre/filesystem/os-release
new file mode 100644
index 000000000..fe5f20b4f
--- /dev/null
+++ b/libre/filesystem/os-release
@@ -0,0 +1,8 @@
+NAME="Parabola"
+ID=parabola
+ID_LIKE=arch
+PRETTY_NAME="Parabola GNU/Linux-libre"
+ANSI_COLOR="1;35"
+HOME_URL="https://parabolagnulinux.org/"
+BUG_REPORT_URL="https://labs.parabola.nu/"
+
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index 81b24e100..c2cec2e13 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,4 +1,5 @@
 # $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $
+# 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>
@@ -6,7 +7,7 @@
 _pkgname=hplip
 pkgname=hplip-libre
 pkgver=3.12.4
-pkgrel=1
+pkgrel=4
 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
 arch=('i686' 'x86_64')
 url="http://hplipopensource.com"
@@ -28,24 +29,39 @@ provides=("${_pkgname}=${pkgver}")
 options=('!libtool')
 install=hplip.install
 source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc})
+md5sums=('a063f76aa47edab55a3f31ff2558df07'
+         '2fe18f4091afb3dec200271dc7836128')
 
 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
+
  export AUTOMAKE='automake --foreign'
  autoreconf --force --install
 
  ./configure --prefix=/usr \
              --enable-qt4 \
-             --enable-foomatic-rip-hplip-install \
+             --disable-foomatic-rip-hplip-install \
              --enable-foomatic-ppd-install \
              --enable-hpcups-install \
              --enable-new-hpcups \
@@ -70,5 +86,3 @@ package() {
  mv "$pkgdir"/lib/udev "$pkgdir"/usr/lib/
  rm "$pkgdir"/lib -r
 }
-md5sums=('a063f76aa47edab55a3f31ff2558df07'
-         '2fe18f4091afb3dec200271dc7836128')
diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install
index cb0eaf8e8..74532cde3 100644
--- a/libre/hplip-libre/hplip.install
+++ b/libre/hplip-libre/hplip.install
@@ -8,3 +8,11 @@ NOTE
 
 EOF
 }
+
+post_upgrade() {
+  if [ "`vercmp $2 3.12.4-2`" -lt 0 ]; then
+    # important upgrade notice
+    echo "> Please remove your printer in cups, then add it"
+    echo "> back and reconfigure it to make it work again!"
+  fi
+}