1 files changed, 20 insertions, 35 deletions
diff --git a/extra/libsoup/PKGBUILD b/extra/libsoup/PKGBUILD
index 5331e37b5..7e38599ae 100644
--- a/extra/libsoup/PKGBUILD
+++ b/extra/libsoup/PKGBUILD
@@ -1,49 +1,34 @@
-# $Id: PKGBUILD 175189 2013-01-16 10:55:26Z jgc $
+# $Id: PKGBUILD 183439 2013-04-21 22:11:35Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=libsoup
-pkgname=('libsoup' 'libsoup-gnome')
-pkgver=2.40.3
+pkgname=libsoup
+pkgver=2.42.1
 pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('glib2' 'libxml2' 'sqlite' 'libgnome-keyring' 'intltool' 'gobject-introspection' 'glib-networking' 'python2')
+pkgdesc="GNOME HTTP Library"
+arch=(i686 x86_64)
+license=(LGPL)
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver%.*}/$pkgbase-$pkgver.tar.xz)
+depends=(glib2 libxml2 glib-networking sqlite)
+makedepends=(intltool gobject-introspection python2)
+provides=("libsoup-gnome=$pkgver-$pkgrel")
+conflicts=(libsoup-gnome)
+replaces=(libsoup-gnome)
 options=('!libtool' '!emptydirs')
-sha256sums=('82c92f1f6f4cbfd501df783ed87e7de9410b4a12a3bb0b19c64722e185d2bbc9')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('20bd5365bb3e7de70fade91ac82c9dea31636318df90b8c26bc4cde2523a8c91')
 
 build() {
-  cd "$pkgbase-$pkgver"
-  sed -i -e 's/env python/python2/' libsoup/tld-parser.py
+  cd $pkgname-$pkgver
+
+  # Python3 has UnicodeDecodeErrors
+  sed -i -e '1s/python$/&2/' libsoup/tld-parser.py
+
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --disable-static
   make
 }
 
-package_libsoup() {
-  pkgdesc="GNOME HTTP Library - base library"
-  depends=('glib2' 'libxml2' 'glib-networking')
-
-  cd "$pkgbase-$pkgver"
+package() {
+  cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-gnome-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-gnome-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-gnome-2.4"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/SoupGNOME-2.4.typelib"
-}
-
-package_libsoup-gnome() {
-  pkgdesc="GNOME HTTP Library - GNOME libraries"
-  depends=("libsoup=$pkgver" 'libgnome-keyring' 'sqlite')
-
-  cd "$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  rm -f "$pkgdir"/usr/lib/libsoup-2.4.*
-  rm -f "$pkgdir/usr/lib/pkgconfig/libsoup-2.4.pc"
-  rm -rf "$pkgdir/usr/include/libsoup-2.4"
-  rm -rf "$pkgdir/usr/share"
-  rm -f "$pkgdir/usr/lib/girepository-1.0/Soup-2.4.typelib"
 }