Missing commits

7 files changed, 41 insertions, 43 deletions

diff --git a/libre/cups-libre/PKGBUILD b/libre/cups-libre/PKGBUILD
index e46b5d356..105bea193 100644
--- a/libre/cups-libre/PKGBUILD
+++ b/libre/cups-libre/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 159509 2012-05-25 16:34:34Z andyrtr $
+# $Id: PKGBUILD 160055 2012-05-28 16:48:32Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups-libre')
 pkgver=1.5.3
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
              'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-avahi-1-config.patch
@@ -22,8 +22,8 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
 md5sums=('e1ad15257aa6f162414ea3beae0c5df8'
-         '8ec0d9d4b6fe3a8902042ed2432fb8b4'
-         'c80bd1ff8d342cdf379ce5f445b9e944'
+         '12c8af5bcd3b8f84240280b3dfaf9e89'
+         'cdc1322c8014297ae349e2db78a03c5a'
          '1a5112f63958643f2888abc9418dbcac'
          'c37d1bf1bb76acc3fe93362c80d91b7c'
          '5d302860559960042f3b47a91b97c5fe'
@@ -119,11 +119,8 @@ backup=(etc/cups/cupsd.conf
         etc/logrotate.d/cups
         etc/pam.d/cups
         etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb' 'dbus-core' 'hicolor-icon-theme')
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'hicolor-icon-theme')
 optdepends=('php: for included phpcups.so module'
-            'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
-	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
-	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'xdg-utils: xdg .desktop file support')
 
   cd ${srcdir}/${pkgbase}-${pkgver}
@@ -143,14 +140,10 @@ optdepends=('php: for included phpcups.so module'
   chmod 755 ${pkgdir}/var/spool
   chmod 755 ${pkgdir}/etc
   
-  # serial backend needs to run as root (http://bugs.archlinux.org/task/20396)
-  chmod 700 ${pkgdir}/usr/lib/cups/backend/serial
-
   # install ssl directory where to store the certs, solves some samba issues
   install -dm700 -g lp ${pkgdir}/etc/cups/ssl
   # remove directory from package, we create it in cups rc.d file
   rm -rf ${pkgdir}/var/run
-#  install -dm511 -g lp ${pkgdir}/var/run/cups/certs 
 
   # install some more configuration files that will get filled by cupsd
   touch ${pkgdir}/etc/cups/printers.conf
@@ -166,4 +159,10 @@ optdepends=('php: for included phpcups.so module'
   
   # remove client.conf man page
   rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
+  
+  # remove files now part of cups-filters
+  rm -v ${pkgdir}/usr/lib/cups/backend/{parallel,serial}
+  rm -v ${pkgdir}/usr/lib/cups/filter/{commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
+  rm -v ${pkgdir}/usr/share/cups/banners/{classified,confidential,secret,standard,topsecret,unclassified}
+  rm -v ${pkgdir}/usr/share/cups/data/testprint
 }
diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install
index 963713bee..557faafe4 100644
--- a/libre/initscripts/initscripts.install
+++ b/libre/initscripts/initscripts.install
@@ -16,4 +16,11 @@ post_upgrade() {
     echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf,"
     echo "as LOCALE in /etc/rc.conf no longer works."
   fi
+  if [ "$(vercmp $2 2012.08.1)" -lt 0 ]; then
+    echo "----"
+    echo "> initscripts now ships a compatibility layer to make systemd use MODULES and"
+    echo "> DAEMONS from rc.conf; and run rc.local and rc.local.shutdown on boot and"
+    echo "> shutdown, respectively. Refer to arch-modules-load(8) and arch-daemons(8)."
+    echo "----"
+  fi
 }
diff --git a/libre/lame-libre/PKGBUILD b/libre/lame-libre/PKGBUILD
index 65ec64426..2dac12636 100644
--- a/libre/lame-libre/PKGBUILD
+++ b/libre/lame-libre/PKGBUILD
@@ -35,7 +35,6 @@ package() {
   cd "$srcdir/$_pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
-  rm -rf ${pkgdir}/usr/share/man
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/~fauno/afew/PKGBUILD b/~fauno/afew/PKGBUILD
index c03ccc7c8..1256ad4d3 100644
--- a/~fauno/afew/PKGBUILD
+++ b/~fauno/afew/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
 pkgname=afew
-pkgver=2011.12.1
-_gitver=20111222
+pkgver=2012.07.11
+_gitver=20120711
 pkgrel=1
 pkgdesc="afew is an initial tagging script for notmuch mail"
 arch=(any)
@@ -25,5 +25,5 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('e99de6dc7390e22701fa60cfed1a52b8'
+md5sums=('99e501fb8f99ec58eccf8c08d572dab2'
          '295b245540aa61538f9a3556c4be846c')
diff --git a/~fauno/afew/SRCBUILD b/~fauno/afew/SRCBUILD
index eea293021..0ac3b5d75 100644
--- a/~fauno/afew/SRCBUILD
+++ b/~fauno/afew/SRCBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
 pkgname=afew
-pkgver=20111222
+pkgver=20120711
 pkgrel=1
 pkgdesc="afew is an initial tagging script for notmuch mail"
 arch=(any)
diff --git a/~fauno/haskell-zip-archive/PKGBUILD b/~fauno/haskell-zip-archive/PKGBUILD
index ace343317..0d0d91a11 100644
--- a/~fauno/haskell-zip-archive/PKGBUILD
+++ b/~fauno/haskell-zip-archive/PKGBUILD
@@ -5,27 +5,19 @@ _licensefile=LICENSE
 # PKGBUILD options/directives
 pkgname=haskell-zip-archive
 pkgver=0.1.1.7
-pkgrel=18
+pkgrel=20
 pkgdesc="Library for creating and modifying zip archives."
 url="http://github.com/jgm/zip-archive"
 license=("GPL")
 arch=('i686' 'x86_64')
 makedepends=()
 depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-array=0.3.0.2"
-         "haskell-binary=0.5.0.2"
-         "haskell-bytestring=0.9.1.10"
-         "haskell-containers=0.4.0.0"
-         "haskell-digest=0.0.0.9"
-         "haskell-directory=1.1.0.0"
-         "haskell-filepath=1.2.0.0"
-         "haskell-mtl=2.0.1.0"
-         "haskell-old-time=1.0.0.6"
-         "haskell-pretty=1.0.1.2"
-         "haskell-unix=2.4.2.0"
-         "haskell-utf8-string=0.3.6"
-         "haskell-zlib=0.5.3.1")
+         "haskell-binary=0.5.0.2-8"
+         "haskell-digest=0.0.1.0-1"
+         "haskell-mtl=2.0.1.0-3.1"
+         "haskell-unix=2.4.2.0-2"
+         "haskell-utf8-string=0.3.6-7.2"
+         "haskell-zlib=0.5.3.1-2.1")
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install="${pkgname}.install"
diff --git a/~fauno/ruby-mustache/PKGBUILD b/~fauno/ruby-mustache/PKGBUILD
index 7b396434c..8c8d924c1 100644
--- a/~fauno/ruby-mustache/PKGBUILD
+++ b/~fauno/ruby-mustache/PKGBUILD
@@ -1,29 +1,30 @@
 # Maintainer: David Campbell <davekong@archlinux.us>
 pkgname=ruby-mustache
 pkgver=0.99.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework-agnostic way to render logic-free views."
 arch=('any')
 url="http://github.com/defunkt/mustache"
 license=(MIT)
 depends=('ruby')
 makedepends=('rubygems')
-source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem")
+source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem"
+        "https://raw.github.com/defunkt/mustache/master/LICENSE")
+md5sums=('650194ec2c166feb087377647414b9dc'
+         'fbbd010314b3f1554733123ecde55a52')
 noextract=("mustache-${pkgver}.gem")
 
 build() {
   cd $srcdir
   local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies -i "$pkgdir$_gemdir" mustache-$pkgver.gem \
-  -n "$pkgdir/usr/bin"
+  gem install \
+      --ignore-dependencies \
+      -i "$pkgdir$_gemdir" mustache-$pkgver.gem \
+      -n "$pkgdir/usr/bin"
 
-  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/LICENSE \
+  install -Dm644 $srcdir/LICENSE \
                  $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/man/mustache.1 \
-                 $pkgdir/usr/share/man/man1/mustache.1
-  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/man/mustache.5 \
-                 $pkgdir/usr/share/man/man5/mustache.5
+
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('650194ec2c166feb087377647414b9dc')