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

Conflicts:
	extra/cinepaint/PKGBUILD
	extra/cmake/PKGBUILD
	extra/fltk/PKGBUILD
	extra/foomatic/PKGBUILD
	extra/kdegraphics/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libxi/PKGBUILD
	extra/monica/PKGBUILD
	extra/rasqal/PKGBUILD
	extra/soprano/PKGBUILD
	multilib/wine/PKGBUILD
	testing/mesa/PKGBUILD

1 files changed, 19 insertions, 22 deletions

diff --git a/extra/foomatic/PKGBUILD b/extra/foomatic/PKGBUILD
index a3fbd7b69..5354a6c25 100644
--- a/extra/foomatic/PKGBUILD
+++ b/extra/foomatic/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 103148 2010-12-15 21:11:48Z andyrtr $
+# $Id: PKGBUILD 130674 2011-07-07 16:52:03Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
  
 pkgbase="foomatic"
 pkgname=('foomatic-db' 'foomatic-filters' 'foomatic-db-engine' 'foomatic-db-nonfree')
 arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
-_snapdate=20101215
-_relver=4.0.6
+_snapdate=20110707
+_relver=4.0.7
 pkgver=${_relver}_${_snapdate}
 pkgrel=1
-makedepends=('cups>=1.4.2' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
+epoch=1
+makedepends=('cups>=1.4.7' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
 source=(http://www.linuxprinting.org/download/foomatic/$pkgbase-{filters,db-engine}-${_relver}.tar.gz
         http://www.linuxprinting.org/download/foomatic/$pkgbase-db-4.0-${_snapdate}.tar.gz
         http://www.linuxprinting.org/download/foomatic/$pkgbase-db-nonfree-${_snapdate}.tar.gz)
 url="http://www.linuxprinting.org/foomatic.html"
-options=('force' '!emptydirs')
-md5sums=('fd99dac3a36807a47ffa4f9eb15c1b07'
-         '0893a4a9705ffd7305bc50cbb951daf9'
-         'f801fab0b210cc61f217bede1963cd0e'
-         'f51e447404b32949057307a1bc4d1b5e')
-md5sums=('9bca3d3d83192a3741a34bd9b1859b1e'
-         'b34f17b56304b48e3e90c1c6c8f2c287'
-         'f99807cb4d5da437ddf02c843f92eaca'
-         '21040845f5fcb2bbdfa814bae934fd8d')
+options=('!emptydirs')
+md5sums=('20abd25c1c98b2dae68709062a132a7d'
+         'fcfa8eb9ce5494b81b58ae983fc2aeb5'
+         '88d467d9099188b170185564bd33d7b7'
+         'e12969b36dc0b59be6a973ee522d707e')
 
 build() {
  /bin/true
@@ -39,8 +36,8 @@ package_foomatic-db() {
 
    cd ${srcdir}/${pkgname}-${_snapdate}
    ./configure --prefix=/usr
-   make DESTDIR=${pkgdir} install || return 1
-   install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1
+   make DESTDIR=${pkgdir} install
+   install -v -Dm644 ${srcdir}/${pkgname}-${_snapdate}/COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
 }
 
 package_foomatic-filters() {
@@ -56,8 +53,8 @@ package_foomatic-filters() {
 #   cd ${srcdir}/${pkgname}-${pkgver}
    cd ${srcdir}/foomatic-filters-${_relver}
    ./configure --prefix=/usr --sysconfdir=/etc
-   make || return 1
-   make DESTDIR=${pkgdir} install || return 1
+   make
+   make DESTDIR=${pkgdir} install
 }
 
 package_foomatic-db-engine() {
@@ -70,12 +67,12 @@ package_foomatic-db-engine() {
 #   cd ${srcdir}/${pkgname}-${pkgver}
    cd ${srcdir}/foomatic-db-engine-${_relver}
     ./configure --prefix=/usr
-   make || return 1
+   make
    eval `perl -V:archname`
    make DESTDIR=${pkgdir} \
         INSTALLARCHLIB=/usr/lib/perl5/vendor_perl/ \
         INSTALLSITELIB=/usr/lib/perl5/vendor_perl/ \
-        INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install || return 1
+        INSTALLSITEARCH=/usr/lib/perl5/vendor_perl/ install
    /usr/bin/find ${pkgdir} -name '.packlist' -delete
    # fix permissions
    chmod 755 ${pkgdir}/usr/lib{,/perl5,/perl5/vendor_perl}
@@ -91,7 +88,7 @@ package_foomatic-db-nonfree() {
 #   cd ${srcdir}/${pkgname}-${_snapdate}
    cd ${srcdir}/foomatic-db-nonfree-${_snapdate}
    ./configure --prefix=/usr
-   make DESTDIR=${pkgdir} install || return 1
-#   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING || return 1
-   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/foomatic-db-nonfree/COPYING || return 1
+   make DESTDIR=${pkgdir} install
+#   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+   install -Dm644 COPYING ${pkgdir}/usr/share/licenses/foomatic-db-nonfree/COPYING
 }