Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/arm-elf-binutils/PKGBUILD
	community/bird/PKGBUILD
	community/cantata/PKGBUILD
	community/dbmail/PKGBUILD
	community/ekg2/PKGBUILD
	community/ffmpeg-compat/PKGBUILD
	community/gigedit/PKGBUILD
	community/gimp-refocus/PKGBUILD
	community/gmime24/PKGBUILD
	community/gmpc/PKGBUILD
	community/gnash/PKGBUILD
	community/id3lib-rcc/PKGBUILD
	community/linuxsampler/PKGBUILD
	community/lwm/PKGBUILD
	community/midori/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mtpaint/PKGBUILD
	community/nestopia/PKGBUILD
	community/preload/PKGBUILD
	community/projectm/PKGBUILD
	community/rusxmms/PKGBUILD
	community/taglib-rcc/PKGBUILD
	community/the_silver_searcher/PKGBUILD
	community/xnee/PKGBUILD
	core/libgcrypt/PKGBUILD
	core/libusbx/PKGBUILD
	core/mkinitcpio-busybox/PKGBUILD
	extra/a2ps/PKGBUILD
	extra/a52dec/PKGBUILD
	extra/abook/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cln/PKGBUILD
	extra/exempi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/fluxter/PKGBUILD
	extra/fontforge/PKGBUILD
	extra/glib/PKGBUILD
	extra/gnet/PKGBUILD
	extra/gnome-vfs/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk/PKGBUILD
	extra/idnkit/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/imake/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/libdatrie/PKGBUILD
	extra/libmbim/PKGBUILD
	extra/libmp3splt/PKGBUILD
	extra/libqmi/PKGBUILD
	extra/libtxc_dxtn/PKGBUILD
	extra/libxfont/PKGBUILD
	extra/mesa/PKGBUILD
	extra/modemmanager/PKGBUILD
	extra/nedit/PKGBUILD
	extra/nmap/PKGBUILD
	extra/openexr/PKGBUILD
	extra/purple-plugin-pack/PKGBUILD
	extra/qemu/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/subversion/PKGBUILD
	extra/transmission/PKGBUILD
	extra/truecrypt/PKGBUILD
	extra/vigra/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/vlc/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/wxmaxima/PKGBUILD
	extra/x264/PKGBUILD
	extra/xorg-iceauth/PKGBUILD
	extra/xorg-mkfontscale/PKGBUILD
	extra/xorg-xfd/PKGBUILD
	libre/abuse-libre/PKGBUILD
	libre/clementine-libre/PKGBUILD
	libre/linux-libre/PKGBUILD

1 files changed, 15 insertions, 14 deletions

diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index a5a75d2e4..c59e1d08a 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 188905 2013-06-25 03:54:44Z eric $
+# $Id: PKGBUILD 191729 2013-07-29 18:51:12Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 # Contributor (Parabola): bitlord
 # Contributor (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.8.15
+pkgver=1.10.1.a
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,28 +14,29 @@ provides=("liferea=$pkgver")
 replaces=('liferea')
 conflicts=('liferea')
 license=('GPL')
-depends=('gconf' 'webkitgtk2' 'libnotify' 'libunique' 'json-glib' 'hicolor-icon-theme'
-         'desktop-file-utils')
+depends=('webkitgtk' 'libnotify' 'json-glib' 'libpeas' 'python2-gobject' 
+         'gnome-icon-theme' 'desktop-file-utils')
 makedepends=('intltool')
+optdepends=('gnome-keyring: for keyring plugin support'
+            'libgnome-keyring: for keyring plugin support'
+	    'gst-plugins-base: for media player plugin support'
+	    'gst-plugins-good: for media player plugin support'
+	    'gst-plugins-bad-libre: for media player plugin support')
 options=('!libtool' '!emptydirs')
 install=liferea.install
-source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver}.tar.bz2
+source=(http://downloads.sourceforge.net/sourceforge/liferea/liferea-${pkgver%*.*}a.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('9a86773996d61d03c03e9a5137a2c0a3e2539f4f'
-          '0d68c567c3d37932a49709c58c37c3f138fd19cb')
+sha1sums=('c0c8508adb6ccfda46453b6a213c15ab78ad5d2c'
+          '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
 
 build() {
-  cd liferea-${pkgver}
+  cd liferea-${pkgver%*.*}a
   patch -Np1 -i "$srcdir/remove-non-free-suggestions.patch"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-install
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-schemas-compile
   make
 }
 
 package() {
-  cd liferea-${pkgver}
+  cd liferea-${pkgver%*.*}a
   make DESTDIR="${pkgdir}" install
-  
-  install -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${_pkgname}.schemas" "${pkgdir}"/etc/gconf/schemas/*.schemas
-  rm -f "${pkgdir}"/etc/gconf/schemas/*.schemas
 }