Version bump upstream stable liferea

Package-Manager: portage-2.1.9.42/cvs/Linux i686

4 files changed, 141 insertions, 6 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 593a6e4ee6a3..0cd60cd5bc53 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-news/liferea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.206 2011/03/29 10:41:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.207 2011/08/08 15:52:53 vostorga Exp $
+
+*liferea-1.6.6b (08 Aug 2011)
+
+  08 Aug 2011; Víctor Ostorga <vostorga@gentoo.org> +liferea-1.6.6b.ebuild,
+  +files/liferea-1.6.6b-libnotify-0.7.patch:
+  Version bump upstream stable liferea
 
   29 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> liferea-1.6.5.ebuild,
   +files/liferea-1.6.5-libnotify-0.7.patch:
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index fc1433476ec7..f235b69553c7 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX liferea-1.6.5-libnotify-0.7.patch 1265 RMD160 dc112ecd4913a5f8af9b4cbaa752230c71109131 SHA1 d35f6e06adcbc656eed70b54643181ff597dcca2 SHA256 128b8d9147a87f0f6b4105182375b8f6af11669ef30038b6a17a605d6512857e
+AUX liferea-1.6.6b-libnotify-0.7.patch 2419 RMD160 bf19336a5edb6570be59cc82f6b9ad9042cacdef SHA1 e06a53d29e0d3bb02a0610ab6a9e426ba8d88aa9 SHA256 e0fa6f4fbbbba8d56cca836af78ee0483feee3bd712b4e30938d6edfeed4c76f
 AUX liferea-1.7.4-libnotify-0.7.patch 2111 RMD160 ec050f5139747862e30f72992a21121e8f9a889f SHA1 0e7e8b273d45ce76e9cb891d72a59ba6daf67516 SHA256 38e0c25f33dba1a41d71fc19af29b3c7e1ca7e9b429187a4e996e5aa6e70b270
 DIST liferea-1.6.5.tar.gz 1784724 RMD160 77b384595a757983ab9d3f8ed91d824628991670 SHA1 f24dbd0e81c5a8309f0d19853211fc02ff818477 SHA256 3a594bd8acbdcbc236f629f2bee63ffba0ddcc38fb406f8ba89629963a877ebd
+DIST liferea-1.6.6b.tar.gz 1866016 RMD160 1e5a0b44fb3ce0cb92a5904c9c98d94e11b60cfc SHA1 e483a1356cc7ff653a178dde520b21faa18a2ce5 SHA256 98474f0deff2143e1bb2fddecaf038c15bc9a21b0f32c570f395f03ad6b9c07b
 DIST liferea-1.7.4.tar.gz 1682434 RMD160 69103730b26a28e350c6acc65f22561527b45ae8 SHA1 2607aad81b2ada9a932eccd326ad8bbcf1c16986 SHA256 fc91c7453242358fd837da0df591bc7f5d7f3fc99809bf9bf662e8b03dc6f548
 EBUILD liferea-1.6.5.ebuild 1385 RMD160 a3fbece0cfefbbb9a2f1d804b31d55cf1efeea20 SHA1 83431b980c5a30a69659fad6bf2e61167cc6d2a1 SHA256 46ef446179bee9970dee12085e682b3e53fe5c45bdc88c4f6cdf0ef7ec3516a0
+EBUILD liferea-1.6.6b.ebuild 1408 RMD160 b3cc7c53c5884deff87569e1f9270697682a929e SHA1 dfb8fa5256abf7b2132dcb618260eedd5655d9d7 SHA256 6043d96609747bbd3bfb76a043a8bdfcdc780ccbce2d745f160b092586bce5b0
 EBUILD liferea-1.7.4.ebuild 1570 RMD160 273062275ca2cc07b85cb8b6f2aef63f531c2e3a SHA1 b61011a631a113afae285ec5e934c2efd9dba444 SHA256 8a9e0e06f685a65b8741f752dfd539ca442dbba3895b38e3ab4410241ce2dd97
-MISC ChangeLog 55115 RMD160 da9cd54328856d844e81d798a76a8bdb74bcef27 SHA1 12ac0a8839fd62f90cb8649530bd0a2aabc0d240 SHA256 e12910f55b06d41eadaaadc226613a6f0bc136ba5da17e501871bb07480a5bcc
+MISC ChangeLog 55307 RMD160 595e9ba05d040f0fbffbee31c8661b617bd33b29 SHA1 c19c5166a3fb1c111d3849855204db6fe67c30e7 SHA256 ab0e77df6381c76415183e2f4d07993cc614fb92d12e507e5cf642aea748fc0c
 MISC metadata.xml 886 RMD160 ba64859374141ad86c37c94fadcbffc16140f22c SHA1 9743843ba7747f03a6f904005fa4a32a4549a70c SHA256 51069594cb18283ad44cece0027f549c91b67ca9ca3f989d668fc81068aece17
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk2Rt4kACgkQXkR9YqOcLPEenwD+JB4oEzJRY/gN6q2Uz/K7VKnB
-Gx0zJrMkdKnF7ndlGyYA/j5fUscrkNTNa/QqaImN+35chBkyS8z+jlfZb0jLjDOK
-=LsHZ
+iEYEARECAAYFAk5ABmYACgkQKQaZ7OJe4zYYTACfe2DZrO19RkBqA8B1z8QQJMJx
+hW8AnAqeCBJT3XvwXZiXDGOOO55ndmQ9
+=LB7t
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..5d08f07f5b85
--- /dev/null
+++ b/net-news/liferea/files/liferea-1.6.6b-libnotify-0.7.patch
@@ -0,0 +1,70 @@
+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, libnotify <= 0.7.3],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.6b.ebuild b/net-news/liferea/liferea-1.6.6b.ebuild
new file mode 100644
index 000000000000..a18fe396eaac
--- /dev/null
+++ b/net-news/liferea/liferea-1.6.6b.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2011 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.1 2011/08/08 15:52:54 vostorga 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}
+	dev-util/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
+}