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

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

9 files changed, 152 insertions, 248 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/Manifest b/net-news/liferea/Manifest
index d1d28ee650ed..31bb35a29f15 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,30 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX liferea-1.6.5-libnotify-0.7.patch 1265 SHA256 128b8d9147a87f0f6b4105182375b8f6af11669ef30038b6a17a605d6512857e SHA512 4b1885f8f0955f01e2fd2cc86068bac6e91f0950827de34dbb6117e8182731b1b0387d4e29c51c7c2314eccdc4ea17d9e59c8395265910f02227271e466d6f60 WHIRLPOOL 4021bdcdaf9bdb82a13b053e81e427d5ac35ac457029647baadccca236846c80d2adbc3aef13e938446ed016b38a375074498fff6011e18280ddcaba3aeb654c
-AUX liferea-1.6.6b-libnotify-0.7.patch 2399 SHA256 4f06994dff55154715ebf5500bb604ec4c8489cf166b6e4efd7cd2685f35d6fc SHA512 fc33deb72c70c0235cbe4481483828d8c3f8e34cacb9261767ad2146b7aa9cde44aa605bd3cd556d59632673187287d158f920256a22f5eecb30e86565c5371f WHIRLPOOL d43e4d6c9287ee9b4fda9450827628377f53a471338d8921c601ecd17b2f5de2b0899f4224804a693ac3f5af93501b0a4ad8ad0f2456da1a3df42085f8a53893
 AUX liferea-1.7.4-libnotify-0.7.patch 2111 SHA256 38e0c25f33dba1a41d71fc19af29b3c7e1ca7e9b429187a4e996e5aa6e70b270 SHA512 c78e64cc98db013dc6a6dfaa03fa4a342db5e485a39c84a61f892100c658e7cfb2a96ac5b0246444bd1f211d52272ae1e70c934a4d7909cc129e87d125e7bb53 WHIRLPOOL 2a9e3f6548d2f0887dc7b35ca8b0cb403181e7325214e353f00d51c9c05211763bead27f294650ae925107879e00d78ed46039cdab32792c489cc5c55f605054
 AUX liferea-1.7.6-unread-feeds.patch 2837 SHA256 33545060f6043b67138e72783fce4dfec0f8a2ca7d0570aa1e65e3a0b8b04d87 SHA512 6be30015dc60682149641e9a0f2135e538324319e5fabd5f849a737069ad4fa3b766a2ac046bcef7cfe0952eaccd2020837ec99c5d6f86b7c6a8f4bf0a49014a WHIRLPOOL 887f434ee4822f4548dbec0c973415890a6dfeb7367f88ca5fafe63da18a3006fe39c3bffbc1dfc387ad0ee19d13e3869e75ce760a7d7d07267bde76de0010d8
-DIST liferea-1.6.5.tar.gz 1784724 SHA256 3a594bd8acbdcbc236f629f2bee63ffba0ddcc38fb406f8ba89629963a877ebd SHA512 9f19a1229a00399e0a89043168e93c178262c2d3a75c272d985b46487d9a30fb79e1b1d751ea634648ca4c0b8ef8801c91a1d6f4e0feff56012ed7c2375fd906 WHIRLPOOL 6427da841d0ae9eb975ea33c483325879a7db3f5f2ac107093629fac1ae2fb3bb4c5da3135979112dd8c53489ecefef0e60290cfb769cce4684c03103e0b2e8e
-DIST liferea-1.6.6b.tar.gz 1866016 SHA256 98474f0deff2143e1bb2fddecaf038c15bc9a21b0f32c570f395f03ad6b9c07b SHA512 1ee364016717b8ef8463d81b1df5ea7e1b2216444f7b1f3e8fa878bf94330efea80e2b446aa27ea141e1012b1eb28102fa676a8f8b783f4abf3e8c6e0c993bcd WHIRLPOOL 833541cb4e17b6a0986267b3378fd04c7132bf321b29fa8cba6a65170d5ea6c28bdeda8b95ca858610f32c200a89b0c4cde26d5fdec9b699d17add7b7450fd9d
 DIST liferea-1.8.0.tar.gz 1870394 SHA256 0b5f4afa0cf5b9b93ce5e069747646b674ee414e6e0e637d975c09acf798ee37 SHA512 c5a487559522afd335db9afd334544b6d68ba043ae6bd56b2d8bfcaa781c8d9104b092be7482b6f6af382df2bb5edd828f219a33e3618864863fb5898df477e0 WHIRLPOOL 605159a8472ae90516b9fba157beb87a24675fe75933df41a50643b0161f0a7240a58320478c023bdcbc449c3aaf48d851bfa5b2e4a3fa00d6bebcc474172552
 DIST liferea-1.8.4.tar.gz 1865230 SHA256 568a565d12e73e125e3af116e3b23a2074f88b8b949cc81758eacab3a4d1b2d9 SHA512 fe52dde072445617d012e9eb9f6b47f1aec0459a6bb8db5135b79051bb24d802e33fb9e0822ec20efd00f0bfc83d947d3f3a21470850ebf7965f5ed6d7332447 WHIRLPOOL 17772f1e19745c7d841292e3af6dfc03ed3d72d647648c3b64460d36b007f5ddb2369e4cbcbaf05f8a7f8cd9c04ac534be05149d480f6d521b5ffa749a46519f
 DIST liferea-1.8.5.tar.gz 1864937 SHA256 d59ec17d3d10129d3c99fafb8a61aabdc06b610d578f05c01d7b7df0046e1fe8 SHA512 dd0650932d730883ca1744400dee0d23d85dfe7cd05f4826467e20c1624fa562b8e4b2ffc320aef66de50ef29d2aec97c153d554485c048443d16827b08580c9 WHIRLPOOL c01d14a04c5c4267d78bb3c665cfa05decbceebfe01548c6f8df7f2ac30602fbd24930289f6145b52fb8b01f46c653e569bd5ee67285df59dca00eab461a2ba9
-EBUILD liferea-1.6.5.ebuild 1381 SHA256 c48942c9f7f21b34d3c89cf19b6804fae2dcb258032f4c06ae0a4078ea46d9db SHA512 d2bbbef492f193f11a8212118522cd3444e53f1aea4a6cda34c550cc1fe9b853a91a238d5741aff78a9f6971181e95d5822fee67b37f641f1819add9ea768ff2 WHIRLPOOL 75bfc84e80ee425d1848eac53a604592cf802a58af6c470c2535afb8f57f0d84d32774c04895d5cd7908390a4349f4e509bd5a75fbdd0ade5d020a3093781488
-EBUILD liferea-1.6.6b.ebuild 1405 SHA256 69543f133060e2d5eb0c5090856a0d5df438cc3e851e08139157b0abe5d99c5c SHA512 741cd5c739b30c3c6359df815adeba026e886055b9cbe9ccb64b8467ffb81cdf84ef76bf2354ce5b3065d0fb7af5dccb3dda7fb998eba3e9a78740ab5475f9c1 WHIRLPOOL e22e76a62754c3123c4ccd80abe5390b66dad236c74000c53afb12276f5cd9dab7888b7966837ee9482cfb7c4e017109b1d947a14c7de180f01ef18280c543d2
+DIST liferea-1.8.7.tar.gz 1873613 SHA256 49cc2c39b64a3302fdfbbeb401f0b357ffaf1e316307c582b18108d0604b2c5f SHA512 06f93b155c4a73194bf2c70d169adf1a1c5bef0839e8a876501019d8fd2b1efaafa61fdc08f17df25da7b02229109db9b9096b47188cdef2525159225b7000c8 WHIRLPOOL 55575946a09fa7303c0b6b2526469ba5a46672247a0cc781380cc427f0a47f4f0112dd4e930461ae6f006d7b516cf762149e891a13c1914569b02962b7829db6
+DIST liferea-1.9.4_p20120821.tar.bz2 1032276 SHA256 66524b85268beadfd735463a2a09a29c10081110adbfa288e5aa38fc5e6dcd8a SHA512 f25c76334a0f8621847763ff71d9705ef9dfd3566d8b8df23717b9052eb160bd1dff8f64ab1123e81601f7efb8dc36190fce505f1d0a3884433b02c4a3e1ec7a WHIRLPOOL 3576f46ab516622695c1c52022b9a2dd2ab772107934682393b97a5d8a5722c17ecd9f5cbc4a26f9eb81e2d30511d7fde2c6d912bbd0256bb3f54459f285cfa0
 EBUILD liferea-1.8.0.ebuild 1634 SHA256 65126d72afc526569ad79a835962127dce8a8f9ba87c83c99486cc8589d43efb SHA512 785179ff76cf406924e4127fe80ffca6bfcd2a5276c2550dd5cf33c0b9746036f1f7584421223c11996a7a705055703e99373a6789774c9595f5ef627cd0358c WHIRLPOOL 449a948714c337fd9b2ababba04c29e10b6d5df771360d05fe42012cc97ef40c95a9a3c5046178df29ffb87203cdfef9d0065ab27f28c1e3cd3664a14d95f8f0
 EBUILD liferea-1.8.4.ebuild 1633 SHA256 0f974ea678708664cc421d27c951bc3f5644ee2d2564bdf0e33bcdaef08182dd SHA512 3262300a09d7ee8702005d281ad36f6d5b13a1b7e92e7f4cafee650d1f1e7a8e21111340b679d6d11f2a120f7e5f5f0bb66c6382e4719432b4b4562863151939 WHIRLPOOL b684727b61b8a138fd274898018261147b233b22446270a4b9b505017f4c47abc10bad9667c8663199e1bdd8d4e4f26ed70f2cb9690e505a7adc3833968cea93
 EBUILD liferea-1.8.5.ebuild 1627 SHA256 8ad23652fa51cd1edccc1216acab9a4a8dd73020e81300e0aa45ffcce4137daf SHA512 61b7191e27eeab467841293f5a22304bef0acf4797bb4f0e138db03124aa137ebb8360b7350bf78351922af13a29e52003bb7bc0ff7e50dd8f61d46d5006d5a7 WHIRLPOOL 71300e707a764cc10d2690189a786fa1413609e644da55f3b4565deff1f901a4c29e6d1c27da30dc3e56e22393a2d7bb0126369a6527d9e8bed62469f53af316
-MISC ChangeLog 58282 SHA256 5d45fff9635a53e547dd0566a26b50501c1e481659d6000759ca56033905576c SHA512 9a9e2ccdb890a5c6f1c677ffa73539dfeff7aa715fd7f9ba2e568aa3911a9aaad2bf9b98510017709755775332ed1a5e1b04f124cb6dd15a233e49334296eb1d WHIRLPOOL 4c3e687d5ddaad9573b958a96b53c6cb245c2fc4915abfb9acaa2fe72fa648de13d55f201c9729ae0fc41841c24b9289ec0f20e990397b6291cb0c1775acbef8
-MISC metadata.xml 614 SHA256 4b3c51feb7527b307d451ba4b0371c6e292b92d577e5daef44fb056b95e5b19c SHA512 2195d36aa9668b8d65a2b3d847458dbfabce50d8b5c2df1c87d66a1949f495ece8c450c06013c7387c923c5b4c4180a0e43245b3ec5fcd4c21104e92aece4378 WHIRLPOOL 0f4bcaf8d4270a410d2af719210f53b2dd270b9cbb92b978a30b798c4fdd50b786bd499b9d82cdd1ef093722850a6e10443e0a1157bfd354eb7a8da97bf81519
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBAgAGBQJP9fm5AAoJEPUd7O0j6ekAjw4H/0xmbnSjrmhQ1Uf13m74yeBM
-/WLsvl7D3p2m/MAJFgehDgdoEJ/Of0whe7ewBJXbxAkoDmncKNB9Lfy42VW8k/Eu
-pnCihFtQgGM35v7fjHbbq5rxew0OlXnhYJoi3tLkBju6XdEeiVsjChAuReCpLeh8
-Mwf6uk4gx1GANB2yoOwfrKYgxGcRAQWHGkikA+tJUpQU4Wv231C7zQQPyEK33LHw
-B8auZockPwKin2lq9hrjADKuchg35TTD0dLIFzghLMNR24wNfR+oEGLyvlzfPSOD
-suCOdIClHS0qcD0HFDTcSNtIvOJ8mGKksO2ZmhcbYCV/89niJ4AzmGqYVs8G+hM=
-=aFSK
------END PGP SIGNATURE-----
+EBUILD liferea-1.8.7.ebuild 1635 SHA256 f44ef30e546471b6a9efc51e25b1554b96a290854c7985c3b76f1a9c8e0c70ba SHA512 32088b350541bf407f3ece99c4468130972d73c5d5d0bba755753b1313c64a53cc6102c548f667d61b0898ac57723181eeb25b177febc228e219c67466d8215d WHIRLPOOL 19479229f07d11adfccf8b37584cbdeb5d0f2d7e50381a6f6f441ea714423224d4d2e75bcb03b94cdcbc357a26e548f3728d808819baf60eddecf100db40f708
+EBUILD liferea-1.9.4_p20120821.ebuild 1721 SHA256 299611b731059517be5e5b69d6fc99020034b0e265d78e244bf2cc9fbdcb3785 SHA512 330233d942f62cfbdd9d3de8e93cc981a1810e90c315a72fe2a4a2a06a7acff93c20cf9172859b0d11dc18217f3edbf31d9790cd6dc43c8f8f0a5a17ab2786b6 WHIRLPOOL 88cb53a425b01377c3d985973d980abb276a2449ead104b91311ef9ed9afaa17973e96b3508d83b5b8e416299cf0f4e49fdf8d630b978d892fc3086aa8e05487
+MISC ChangeLog 58726 SHA256 608abd435929d526aa0362d9f078ab0b024dc79c61591c058b7209d5151045f0 SHA512 5a5333dde644cb275659f3d90a998aca96fa0422fe914b00f3d6924e6f13d676ce4647c9eb66655f67253c60e64f7669dc126dc4f4a25c91ecb1a8bc51a89997 WHIRLPOOL b0550588266134c44c38b58e12165bf83cb03f47bff67e7e678c5b40ecc1c34a55959788ad15e5c1fd050925a76a8c48d1a249b1ea7665106e3fe17d7f7219d2
+MISC metadata.xml 560 SHA256 cdf04c108bc610dc698e48cbf3b84e489b6e9461dfd3d16f28d8cd1f772e5d1e SHA512 8f286592835f93c77796838f92bc7edd008128e4e16efb30bf8037572867f34ae61ce871768a9244ac2b62b1c44ce81546996d6ae667b36b8c8bff2cdf6e19b3 WHIRLPOOL fed5ec40950dfb68090a43ed695614b8993ec872b43c39ff185483cb4b69718a66f0f6bd1b259bc1aa8841157380b4cdc054d1855e9d2dd86ec9c20da8adad7d
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>