Backport x11-libs/libnotify >= 0.7 patch to current stable.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 73 insertions, 17 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index bf20f48ada86..593a6e4ee6a3 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,10 @@
 # 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.205 2011/03/21 22:19:52 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.206 2011/03/29 10:41:40 ssuominen Exp $
+
+  29 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> liferea-1.6.5.ebuild,
+  +files/liferea-1.6.5-libnotify-0.7.patch:
+  Backport x11-libs/libnotify >= 0.7 patch to current stable.
 
   21 Mar 2011; Nirbheek Chauhan <nirbheek@gentoo.org> liferea-1.6.5.ebuild,
   liferea-1.7.4.ebuild:
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 42545d97ccb3..fc1433476ec7 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX liferea-1.6.5-libnotify-0.7.patch 1265 RMD160 dc112ecd4913a5f8af9b4cbaa752230c71109131 SHA1 d35f6e06adcbc656eed70b54643181ff597dcca2 SHA256 128b8d9147a87f0f6b4105182375b8f6af11669ef30038b6a17a605d6512857e
 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.7.4.tar.gz 1682434 RMD160 69103730b26a28e350c6acc65f22561527b45ae8 SHA1 2607aad81b2ada9a932eccd326ad8bbcf1c16986 SHA256 fc91c7453242358fd837da0df591bc7f5d7f3fc99809bf9bf662e8b03dc6f548
-EBUILD liferea-1.6.5.ebuild 1360 RMD160 43446358ce599b59f02c439fd3c4b61a55873348 SHA1 5c2bfa7592c00cce5150b5a302c92b424655760d SHA256 08a03ec5a356e1e3a6c919afb3c2bd61fd90514174f562aacb9fec3d0ad0ece8
+EBUILD liferea-1.6.5.ebuild 1385 RMD160 a3fbece0cfefbbb9a2f1d804b31d55cf1efeea20 SHA1 83431b980c5a30a69659fad6bf2e61167cc6d2a1 SHA256 46ef446179bee9970dee12085e682b3e53fe5c45bdc88c4f6cdf0ef7ec3516a0
 EBUILD liferea-1.7.4.ebuild 1570 RMD160 273062275ca2cc07b85cb8b6f2aef63f531c2e3a SHA1 b61011a631a113afae285ec5e934c2efd9dba444 SHA256 8a9e0e06f685a65b8741f752dfd539ca442dbba3895b38e3ab4410241ce2dd97
-MISC ChangeLog 54931 RMD160 11b60aae835c61a39066eb42024858335925dbb4 SHA1 3b6b088543156321f1a3fcceeac704f134f81dfb SHA256 c15e7c5e7f84cc147954984c589ce66b65c583ad1dadc22e73f5f0322037670d
+MISC ChangeLog 55115 RMD160 da9cd54328856d844e81d798a76a8bdb74bcef27 SHA1 12ac0a8839fd62f90cb8649530bd0a2aabc0d240 SHA256 e12910f55b06d41eadaaadc226613a6f0bc136ba5da17e501871bb07480a5bcc
 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
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..ba9c0c10a3d0
--- /dev/null
+++ b/net-news/liferea/files/liferea-1.6.5-libnotify-0.7.patch
@@ -0,0 +1,41 @@
+--- 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/liferea-1.6.5.ebuild b/net-news/liferea/liferea-1.6.5.ebuild
index 164b14ffa686..344d31da572c 100644
--- a/net-news/liferea/liferea-1.6.5.ebuild
+++ b/net-news/liferea/liferea-1.6.5.ebuild
@@ -1,17 +1,17 @@
 # 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.5.ebuild,v 1.7 2011/03/21 22:19:53 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.6.5.ebuild,v 1.8 2011/03/29 10:41:40 ssuominen Exp $
 
-EAPI="2"
-GCONF_DEBUG="no"
+EAPI=2
+GCONF_DEBUG=no
+inherit autotools eutils gnome2
 
-inherit gnome2 autotools
-
-MY_P="${P/_/-}"
+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"
@@ -27,16 +27,14 @@ RDEPEND=">=x11-libs/gtk+-2.16.0:2
 	>=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.7 )
+	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"
 
-DOCS="AUTHORS ChangeLog NEWS README"
-
-S="${WORKDIR}/${MY_P}"
+S=${WORKDIR}/${MY_P}
 
 pkg_setup() {
 	G2CONF="${G2CONF}
@@ -46,10 +44,12 @@ pkg_setup() {
 		$(use_enable networkmanager nm)
 		$(use_enable libnotify)
 		$(use_enable lua)"
-}
 
-src_unpack() {
-	gnome2_src_unpack
+	DOCS="AUTHORS ChangeLog NEWS README"
+}
 
-	eautoreconf || die "Autoreconf failed"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+	eautoreconf
+	gnome2_src_prepare
 }