Sun May 25 03:44:44 UTC 2014

2 files changed, 18 insertions, 35 deletions

diff --git a/extra/sound-juicer/PKGBUILD b/extra/sound-juicer/PKGBUILD
index 33230d96f..2846fc0ef 100644
--- a/extra/sound-juicer/PKGBUILD
+++ b/extra/sound-juicer/PKGBUILD
@@ -1,46 +1,35 @@
-# $Id: PKGBUILD 183458 2013-04-21 22:12:09Z heftig $
+# $Id: PKGBUILD 213425 2014-05-23 22:49:48Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Ben <contrasutra@myrealbox.com>
 
 pkgname=sound-juicer
-pkgver=3.5.0
-pkgrel=2
+pkgver=3.12.0
+pkgrel=1
 pkgdesc="A cd ripper application"
 arch=(i686 x86_64)
 license=(GPL)
-depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero hicolor-icon-theme gconf)
-makedepends=(intltool gnome-doc-utils gnome-common)
+depends=(libmusicbrainz5 libdiscid gtk3 gst-plugins-base gst-plugins-good brasero hicolor-icon-theme iso-codes)
+makedepends=(intltool itstool)
 options=(!emptydirs)
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:4}/$pkgname-$pkgver.tar.xz)
 install=sound-juicer.install
-sha256sums=('ea76703e08e67590af7b8ce5206c343eb01d77cd5023c0bc958a0c2f5a98d2e9')
+sha256sums=('c6f98dc6d453e2890fdc3bb7d2e360318d82dafd0304aa0a23ff6ea10b7aff1f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  sed -e "s/AM_GST_ELEMENT_CHECK/GST_ELEMENT_CHECK/" \
-      -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in
-  autoreconf -f
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-scrollkeeper
+  cd ${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
 
   # drop unneeded direct library deps with --as-needed
   # libtool doesn't make this easy, so we do it the hard way
   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
-  # Remove RPATH
-  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
-  export tagname=CC
-  make AM_CFLAGS=-export-dynamic
+  make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
-  install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain sound-juicer ${pkgdir}/etc/gconf/schemas/*.schemas
-  rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/sound-juicer/sound-juicer.install b/extra/sound-juicer/sound-juicer.install
index 5286a0055..5f83cb495 100644
--- a/extra/sound-juicer/sound-juicer.install
+++ b/extra/sound-juicer/sound-juicer.install
@@ -1,24 +1,18 @@
-pkgname=sound-juicer
-
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  glib-compile-schemas /usr/share/glib-2.0/schemas
   update-desktop-database -q
   gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 pre_upgrade() {
-  pre_remove $1
+  (( $(vercmp $2 3.12.0) < 0 )) && gconfpkg --uninstall sound-juicer
+  return 0
 }
 
 post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  post_install
 }
 
 post_remove() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+  post_install
 }