5 files changed, 43 insertions, 36 deletions
diff --git a/extra/fltk/PKGBUILD b/extra/fltk/PKGBUILD
index d93e624fe..f704e76f4 100644
--- a/extra/fltk/PKGBUILD
+++ b/extra/fltk/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 148718 2012-02-05 11:48:05Z ibiru $
+# $Id: PKGBUILD 170534 2012-11-07 23:38:03Z eric $
 # Maintainer:
 
 pkgbase=fltk
 pkgname=('fltk' 'fltk-docs' 'fltk-games')
-pkgver=1.3.0
-pkgrel=3
+pkgver=1.3.1
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('custom:LGPL')
 url="http://www.fltk.org/"
 makedepends=('mesa' 'doxygen' 'libjpeg' 'libpng' 'libxft' 'libxinerama' \
              'alsa-lib' 'desktop-file-utils')
 source=(http://ftp.easysw.com/pub/$pkgbase/$pkgver/$pkgbase-$pkgver-source.tar.gz)
-md5sums=('44d5d7ba06afdd36ea17da6b4b703ca3')
+md5sums=('b5b84ed63751ab3f76aa8d36cccf59e7')
 
 build() {
   cd "$srcdir/$pkgbase-$pkgver"
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index 2799ac0d9..45a40216f 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 168460 2012-10-12 06:35:15Z tpowa $
+# $Id: PKGBUILD 170405 2012-11-07 10:31:11Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
-pkgver="${_pkgver}r"
+pkgver="${_pkgver}s"
 pkgrel="1"
 pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
@@ -77,3 +77,5 @@ package() {
 }
 md5sums=('c5081850414bec34d3e254e8e970811b'
          '4b5428c51af1981d3eb158d924d6bf85')
+md5sums=('11f63d52071f7382f56c9e81d0aece91'
+         '4b5428c51af1981d3eb158d924d6bf85')
diff --git a/extra/icedtea-web-java7/PKGBUILD b/extra/icedtea-web-java7/PKGBUILD
index 39bd6c1cb..756c16915 100644
--- a/extra/icedtea-web-java7/PKGBUILD
+++ b/extra/icedtea-web-java7/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=icedtea-web-java7
 pkgname=('icedtea-web-java7' 'icedtea-web-java7-doc')
-pkgver=1.3
+pkgver=1.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
@@ -11,7 +11,7 @@ license=('GPL2')
 makedepends=('jdk7-openjdk' 'zip' 'gtk2' 'libxtst' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
 noextract=${pkgbase/-java7/}-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
 source=(http://icedtea.classpath.org/download/source/${pkgbase/-java7/}-$pkgver.tar.gz)
-sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f')
+sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56')
 
 _javaver=7
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -45,6 +45,7 @@ package_icedtea-web-java7() {
 
   pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
   depends=('jre7-openjdk' 'gtk2' 'desktop-file-utils')
+  provides=('java-web-start=7')
   install=${pkgname}.install
 
   cd "${srcdir}"/icedtea-web* #${pkgname}-${_date}"
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
index 0d1537aba..1e1eaa593 100644
--- a/extra/icedtea-web/PKGBUILD
+++ b/extra/icedtea-web/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 166335 2012-09-06 15:46:37Z andyrtr $
+# $Id: PKGBUILD 170458 2012-11-07 20:07:26Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=icedtea-web
 pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.3
+pkgver=1.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/wiki/IcedTea-Web"
@@ -11,7 +11,7 @@ license=('GPL2')
 makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
 noextract=$pkgname-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
 source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-sha256sums=('d46ec10700732cea103da2aae64ff01e717cb1281b83e1797ce48cc53280b49f')
+sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56')
 
 _javaver=6
 _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
@@ -44,6 +44,7 @@ package_icedtea-web() {
 
   pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
   depends=('openjdk6' 'gtk2' 'desktop-file-utils')
+  provides=('java-web-start=6')
   install=$pkgname.install
 
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libcanberra/PKGBUILD b/extra/libcanberra/PKGBUILD
index c9897a6ab..d78abcbba 100644
--- a/extra/libcanberra/PKGBUILD
+++ b/extra/libcanberra/PKGBUILD
@@ -1,28 +1,34 @@
-# $Id: PKGBUILD 170059 2012-10-31 10:33:15Z jgc $
+# $Id: PKGBUILD 170401 2012-11-07 07:11:35Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=libcanberra
 pkgname=(libcanberra libcanberra-pulse libcanberra-gstreamer)
 pkgver=0.30
-pkgrel=1
+pkgrel=2
 pkgdesc="A small and lightweight implementation of the XDG Sound Theme Specification"
 arch=(i686 x86_64)
-license=('LGPL')
-depends=('libvorbis' 'libltdl' 'alsa-lib' 'tdb')
-makedepends=('gtk-doc' 'libpulse' 'gstreamer' 'gtk2' 'gtk3')
+license=(LGPL)
+depends=(libvorbis libltdl alsa-lib tdb)
+makedepends=(gtk-doc libpulse gstreamer gtk2 gtk3)
 options=(!emptydirs)
 url=http://0pointer.de/lennart/projects/libcanberra
-source=(http://0pointer.de/lennart/projects/${pkgbase}/${pkgbase}-${pkgver}.tar.xz
+source=("$url/$pkgbase-$pkgver.tar.xz"
         libcanberra.xinit)
 sha256sums=('c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72'
             '68a68d66b7491f99d5aa09fe7c6ef4eb38352a2a8ff7997d184d1cbc5e80c0d3')
 
+_plugindir=usr/lib/$pkgbase-$pkgver
+
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd $pkgbase-$pkgver
   ./configure --sysconfdir=/etc --prefix=/usr --localstatedir=/var \
       --disable-static --with-builtin=dso --enable-null --disable-oss \
       --enable-alsa --enable-gstreamer --enable-pulse \
       --with-systemdsystemunitdir=/usr/lib/systemd/system
+
+  # Fight unused direct deps
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
   make
 }
 
@@ -31,37 +37,34 @@ package_libcanberra() {
   optdepends=("$pkgbase-pulse: PulseAudio driver"
               "$pkgbase-gstreamer: GStreamer driver")
 
-  cd "${srcdir}/${pkgbase}-${pkgver}"
-  make -j1 DESTDIR="${pkgdir}" install
-  rm -f "${pkgdir}"/usr/lib/libcanberra-gtk*.la
-  rm -f "${pkgdir}"/usr/lib/gtk-{2,3}.0/modules/*.la
+  cd $pkgbase-$pkgver
 
-  install -D "${srcdir}/libcanberra.xinit" \
-    "${pkgdir}/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
+  make -j1 DESTDIR="$pkgdir" install
+  rm "$pkgdir"/usr/lib/libcanberra-gtk*.la
+  rm "$pkgdir"/usr/lib/gtk-{2,3}.0/modules/*.la
+
+  install -D "$srcdir/libcanberra.xinit" \
+    "$pkgdir/etc/X11/xinit/xinitrc.d/40-libcanberra-gtk-module"
 
   # Split plugins
   for _p in pulse gstreamer; do
-    mkdir $_p-plugin
-    mv "${pkgdir}"/usr/lib/${pkgbase}-${pkgver}/${pkgbase}-$_p.* $_p-plugin
+    mkdir ../$_p-plugin
+    mv "$pkgdir/$_plugindir"/libcanberra-$_p.* ../$_p-plugin
   done
 }
 
 package_libcanberra-pulse() {
   pkgdesc="PulseAudio plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'libpulse')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  depends=("$pkgbase=$pkgver-$pkgrel" libpulse)
 
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv pulse-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
+  install -d "$pkgdir/$_plugindir"
+  mv pulse-plugin/* "$pkgdir/$_plugindir"
 }
 
 package_libcanberra-gstreamer() {
   pkgdesc="GStreamer plugin for libcanberra"
-  depends=("$pkgbase=$pkgver-$pkgrel" 'gstreamer')
-
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  depends=("$pkgbase=$pkgver-$pkgrel" gstreamer)
 
-  mkdir -p "${pkgdir}/usr/lib/${pkgbase}-${pkgver}"
-  mv gstreamer-plugin/* "${pkgdir}/usr/lib/${pkgbase}-${pkgver}" 
+  install -d "$pkgdir/$_plugindir"
+  mv gstreamer-plugin/* "$pkgdir/$_plugindir"
 }