Cleaning up 1.6 series, bumping upstream stable version (1.8.7) #430762 and upstream unstable version (1.9.4) #430764

(Portage version: 2.1.10.65/cvs/Linux x86_64)

8 files changed, 146 insertions, 226 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 6e1b9456a8b9..c73a9ef92f2b 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-news/liferea
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.226 2012/06/07 21:07:19 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.227 2012/08/21 21:08:32 vostorga Exp $
+
+*liferea-1.9.4_p20120821 (21 Aug 2012)
+*liferea-1.8.7 (21 Aug 2012)
+
+  21 Aug 2012; Víctor Ostorga <vostorga@gentoo.org> -liferea-1.6.5.ebuild,
+  -files/liferea-1.6.5-libnotify-0.7.patch, -liferea-1.6.6b.ebuild,
+  -files/liferea-1.6.6b-libnotify-0.7.patch, +liferea-1.8.7.ebuild,
+  +liferea-1.9.4_p20120821.ebuild:
+  Cleaning up 1.6 series, bumping upstream stable version (1.8.7) #430762 and
+  upstream unstable version (1.9.4) #430764
 
   07 Jun 2012; Michael Weber <xmw@gentoo.org> liferea-1.8.5.ebuild:
   ppc stable (bug 416927)
diff --git a/net-news/liferea/files/liferea-1.6.5-libnotify-0.7.patch b/net-news/liferea/files/liferea-1.6.5-libnotify-0.7.patch
deleted file mode 100644
index ba9c0c10a3d0..000000000000
--- a/net-news/liferea/files/liferea-1.6.5-libnotify-0.7.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/notification/libnotify.c
-+++ src/notification/libnotify.c
-@@ -28,6 +28,10 @@
- 
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "common.h"
- #include "conf.h"
- #include "debug.h"
-@@ -150,7 +154,12 @@
- //		notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL);
- //		notify_notification_clear_actions(n);
- 
--		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL);
-+		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+		);
-+#else
-+		, NULL);
-+#endif
- 
- 		notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
- 
-@@ -244,7 +253,12 @@
- 
- 	labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), 
- 	                                  node_get_title (node), item_count);
--	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
-+	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	);
-+#else
-+	, NULL);
-+#endif
- 	g_free(labelSummary_p);
- 
- 	notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
diff --git a/net-news/liferea/files/liferea-1.6.6b-libnotify-0.7.patch b/net-news/liferea/files/liferea-1.6.6b-libnotify-0.7.patch
deleted file mode 100644
index 2cce165ec29d..000000000000
--- a/net-news/liferea/files/liferea-1.6.6b-libnotify-0.7.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-diff -NrU5 liferea-1.6.6b.original/configure.ac liferea-1.6.6b/configure.ac
---- liferea-1.6.6b.original/configure.ac	2011-06-22 09:16:24.000000000 -0600
-+++ liferea-1.6.6b/configure.ac	2011-08-08 09:21:49.000000000 -0600
-@@ -75,11 +75,11 @@
- dnl *********
- dnl libnotify
- dnl *********
- 
- if test "x$enable_libnotify" = "xyes"; then
--   PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.3.2, libnotify <= 0.5],enable_libnotify=yes,enable_libnotify=no)
-+   PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= 0.3.2],enable_libnotify=yes,enable_libnotify=no)
-    AC_SUBST(LIBNOTIFY_CFLAGS)
-    AC_SUBST(LIBNOTIFY_LIBS)
- else
-    enable_libnotify=no
- fi
-diff -NrU5 liferea-1.6.6b.original/src/notification/libnotify.c liferea-1.6.6b/src/notification/libnotify.c
---- liferea-1.6.6b.original/src/notification/libnotify.c	2011-06-22 07:25:40.000000000 -0600
-+++ liferea-1.6.6b/src/notification/libnotify.c	2011-08-08 09:21:11.000000000 -0600
-@@ -26,10 +26,14 @@
- #include <gtk/gtk.h>
- #include <glib.h>
- 
- #include <libnotify/notify.h>
- 
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include "common.h"
- #include "conf.h"
- #include "debug.h"
- #include "node.h"
- #include "item.h"
-@@ -148,11 +152,16 @@
- 	
- 	if(node_p) {
- //		notify_notification_update ( n, node_get_title(node_p), labelText_now_p, NULL);
- //		notify_notification_clear_actions(n);
- 
--		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL, NULL);
-+		n = notify_notification_new (node_get_title(node_p), labelText_now_p, NULL
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+		);
-+#else
-+		, NULL);
-+#endif
- 
- 		notify_notification_set_icon_from_pixbuf (n,node_get_icon(node_p));
- 
- 		notify_notification_set_category (n, "feed");
- 
-@@ -242,11 +251,16 @@
- 	if (item_count == 0)
- 		return;
- 
- 	labelSummary_p = g_strdup_printf (ngettext ("%s has %d new / updated headline\n", "%s has %d new / updated headlines\n", item_count), 
- 	                                  node_get_title (node), item_count);
--	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL, NULL);
-+	n = notify_notification_new ( _("Feed Update"), labelSummary_p, NULL
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+	);
-+#else
-+	, NULL);
-+#endif
- 	g_free(labelSummary_p);
- 
- 	notify_notification_set_icon_from_pixbuf (n, node_get_icon (node));
- 	notify_notification_set_timeout (n, NOTIFY_EXPIRES_DEFAULT);
- 	if (supports_actions) {
diff --git a/net-news/liferea/liferea-1.6.5.ebuild b/net-news/liferea/liferea-1.6.5.ebuild
deleted file mode 100644
index 28a116c5c412..000000000000
--- a/net-news/liferea/liferea-1.6.5.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.6.5.ebuild,v 1.9 2012/05/03 04:28:53 jdhore Exp $
-
-EAPI=2
-GCONF_DEBUG=no
-inherit autotools eutils gnome2
-
-MY_P=${P/_/-}
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE="dbus libnotify lua networkmanager"
-
-RDEPEND=">=x11-libs/gtk+-2.16.0:2
-	>=dev-libs/glib-2.16.0:2
-	>=x11-libs/pango-1.4.0
-	gnome-base/gconf:2
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.19
-	>=dev-db/sqlite-3.6.10:3
-	>=gnome-base/libglade-2:2.0
-	>=net-libs/libsoup-2.26.1:2.4
-	>=net-libs/webkit-gtk-1.1.15:2
-	libnotify? ( >=x11-libs/libnotify-0.4.5 )
-	lua? ( >=dev-lang/lua-5.1 )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-sm
-		--disable-schemas-install
-		$(use_enable dbus)
-		$(use_enable networkmanager nm)
-		$(use_enable libnotify)
-		$(use_enable lua)"
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/net-news/liferea/liferea-1.6.6b.ebuild b/net-news/liferea/liferea-1.6.6b.ebuild
deleted file mode 100644
index 574414bc14b2..000000000000
--- a/net-news/liferea/liferea-1.6.6b.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.6.6b.ebuild,v 1.2 2012/05/03 04:28:53 jdhore Exp $
-
-EAPI=2
-GCONF_DEBUG=no
-inherit autotools eutils gnome2
-
-MY_P=${P/_/-}
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dbus libnotify lua networkmanager"
-
-RDEPEND=">=x11-libs/gtk+-2.16.0:2
-	>=dev-libs/glib-2.16.0:2
-	>=x11-libs/pango-1.4.0
-	gnome-base/gconf:2
-	>=dev-libs/libxml2-2.6.27:2
-	>=dev-libs/libxslt-1.1.19
-	>=dev-db/sqlite-3.6.10:3
-	>=gnome-base/libglade-2:2.0
-	>=net-libs/libsoup-2.26.1:2.4
-	>=net-libs/webkit-gtk-1.1.15:2
-	libnotify? ( >=x11-libs/libnotify-0.4.5 )
-	lua? ( >=dev-lang/lua-5.1 )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-sm
-		--disable-schemas-install
-		$(use_enable dbus)
-		$(use_enable networkmanager nm)
-		$(use_enable libnotify)
-		$(use_enable lua)"
-
-	DOCS="AUTHORS ChangeLog NEWS README"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
-	eautoreconf
-	gnome2_src_prepare
-}
diff --git a/net-news/liferea/liferea-1.8.7.ebuild b/net-news/liferea/liferea-1.8.7.ebuild
new file mode 100644
index 000000000000..6ae82be5117a
--- /dev/null
+++ b/net-news/liferea/liferea-1.8.7.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.8.7.ebuild,v 1.1 2012/08/21 21:08:33 vostorga Exp $
+
+EAPI=4
+
+GCONF_DEBUG=no
+
+inherit eutils gnome2 pax-utils
+
+MY_P=${P/_/-}
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
+HOMEPAGE="http://liferea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="ayatana libnotify"
+
+RDEPEND=">=x11-libs/gtk+-2.18.0:2
+	>=dev-libs/glib-2.24.0:2
+	>=x11-libs/pango-1.4.0
+	>=gnome-base/gconf-1.1.9:2
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.19
+	>=dev-db/sqlite-3.7.0:3
+	>=net-libs/libsoup-2.28.2:2.4
+	dev-libs/libunique:1
+	>=net-libs/webkit-gtk-1.2.2:2
+	dev-libs/json-glib
+	ayatana? ( dev-libs/libindicate )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog README"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-sm
+		--disable-schemas-install
+		$(use_enable ayatana libindicate)
+		$(use_enable libnotify)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	# bug #338213
+	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
+	# MPROTECT policy violation. Will sit here until webkit will
+	# get optional JIT.
+	pax-mark m "${D}"/usr/bin/liferea
+
+	einfo "If you want to enhance funcitonality of this package"
+	einfo "You should consider installing these packages:"
+	einfo "    dev-libs/dbus-glib"
+	einfo "    net-misc/networkmanager"
+}
diff --git a/net-news/liferea/liferea-1.9.4_p20120821.ebuild b/net-news/liferea/liferea-1.9.4_p20120821.ebuild
new file mode 100644
index 000000000000..9eac6ff645b9
--- /dev/null
+++ b/net-news/liferea/liferea-1.9.4_p20120821.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.9.4_p20120821.ebuild,v 1.1 2012/08/21 21:08:32 vostorga Exp $
+
+EAPI=4
+
+GCONF_DEBUG=no
+
+inherit eutils gnome2 pax-utils
+
+MY_P=${PN}
+S=${WORKDIR}/${MY_P}
+
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo feeds"
+HOMEPAGE="http://liferea.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~vostorga/distfiles/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="ayatana libnotify"
+
+RDEPEND=">=x11-libs/gtk+-2.91.4:3
+	>=dev-libs/glib-2.26.0:2
+	>=x11-libs/pango-1.4.0
+	>=gnome-base/gconf-1.1.9:2
+	>=dev-libs/libxml2-2.6.27:2
+	>=dev-libs/libxslt-1.1.19
+	>=dev-db/sqlite-3.7.0:3
+	>=net-libs/libsoup-2.28.2:2.4
+	dev-libs/libunique:3
+	>=net-libs/webkit-gtk-1.6.1:3
+	dev-libs/json-glib
+	ayatana? ( dev-libs/libindicate )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	>=dev-libs/libpeas-1.0.0[gtk]"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog README"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--enable-sm
+		--disable-schemas-install
+		$(use_enable ayatana libindicate)
+		$(use_enable libnotify)"
+}
+
+src_prepare() {
+	./autogen.sh || die
+	gnome2_src_prepare
+}
+
+src_install() {
+	gnome2_src_install
+	# bug #338213
+	# Uses webkit's JIT. Needs mmap('rwx') to generate code in runtime.
+	# MPROTECT policy violation. Will sit here until webkit will
+	# get optional JIT.
+	pax-mark m "${D}"/usr/bin/liferea
+
+	einfo "If you want to enhance funcitonality of this package"
+	einfo "You should consider installing these packages:"
+	einfo "    dev-libs/dbus-glib"
+	einfo "    net-misc/networkmanager"
+}
diff --git a/net-news/liferea/metadata.xml b/net-news/liferea/metadata.xml
index 29f25864d814..11a5b0f4f2dc 100644
--- a/net-news/liferea/metadata.xml
+++ b/net-news/liferea/metadata.xml
@@ -17,8 +17,5 @@
 		<flag name='libnotify'>
 			Enable popup notifications
 		</flag>
-		<flag name='lua'>
-			Enable lua scripting
-		</flag>
 	</use>
 </pkgmetadata>