Version bump to 1.8_rc1, fixes #381117 and #384431

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

3 files changed, 33 insertions, 25 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index c2158c53989a..e3207c825b3d 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.211 2011/09/11 13:36:08 vostorga Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.212 2011/09/26 15:19:32 vostorga Exp $
+
+*liferea-1.8_rc1 (26 Sep 2011)
+
+  26 Sep 2011; Víctor Ostorga <vostorga@gentoo.org> -liferea-1.7.4.ebuild,
+  +liferea-1.8_rc1.ebuild:
+  Version bump to 1.8_rc1, fixes #381117 and #384431
 
 *liferea-1.7.6-r1 (11 Sep 2011)
 
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index ddd36ac30225..cfca288e3a80 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,5 +1,5 @@
 -----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 2399 RMD160 4e60b2f5d9182a6e12d83408bc6f51e74bc09184 SHA1 7a82a72e56ca081b6e7fc7410bc36d1af8ff3205 SHA256 4f06994dff55154715ebf5500bb604ec4c8489cf166b6e4efd7cd2685f35d6fc
@@ -7,20 +7,18 @@ AUX liferea-1.7.4-libnotify-0.7.patch 2111 RMD160 ec050f5139747862e30f72992a2112
 AUX liferea-1.7.6-unread-feeds.patch 2837 RMD160 218d706dba4063d6eeaa34cfac253f673d07c95f SHA1 fd097691839ea97a218f82576902eea173913234 SHA256 33545060f6043b67138e72783fce4dfec0f8a2ca7d0570aa1e65e3a0b8b04d87
 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
 DIST liferea-1.7.6.tar.gz 1833906 RMD160 30d6ec6033184dccbfdfd49bf4c482bd3835790f SHA1 083d99c4fc7d4ebbbb0857e397f8a5936a3de5d5 SHA256 8bd4eda206bfeccc766a15e015e5c4a7f9d1872e4dd06d3523d342a21b095275
+DIST liferea-1.8-RC1.tar.gz 1834639 RMD160 3ce88d29665a4a9c5a71e491a743b4d4f19379ef SHA1 98df082c70767f0b10832475d0dbf519a6e0a353 SHA256 38fba07fe59fb7b8e55482e0a004eb0277b60f185886ed2079448a1d8770feaf
 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
 EBUILD liferea-1.7.6-r1.ebuild 1695 RMD160 ef8f6f2b263f70cd34cfffca2e54f131e1c94a4d SHA1 863960fecdc6fe08d162e0fcfd23ff41839be138 SHA256 9cb3463ccda6eba44c7e6c7738c1f3f5192a25ae8597ed0f52c2d26f47972f04
-MISC ChangeLog 56054 RMD160 8d424d084bca99feb2795c3d7c73e65ad447b379 SHA1 c52ba609b048714c5b84505a0bb92a64c13ab4b1 SHA256 09a67bc47556914ca70cd6ee7e15a62be7956f7ee447616250276c50a9de7a66
+EBUILD liferea-1.8_rc1.ebuild 1666 RMD160 f58785c86821204ef52ef107412c8edf5ca575ec SHA1 fcc72fce5898601716a7a044f02d6bf88883de7e SHA256 6e9f84372d0530d3b93c2685d116d42609806bad1bac863b243ad17e6915d7a7
+MISC ChangeLog 56243 RMD160 b272775c70b8ab9975e4c868706337c7285bf1ed SHA1 322bc28906cd04e93a244a8ca134d42988cb32d8 SHA256 c7fb65ea978ad752ecdcefbc572d13b7abc0c6a9e14302e9e63719ee6ffbb5e4
 MISC metadata.xml 723 RMD160 03d9f492301159db51e686f3e6fdf18a2dcf4d56 SHA1 e6d6c44e49620635ae1660963d8b6ea8b940f811 SHA256 0c923b2d00e1984e5310aaf71ba8a0d8cfaf6cc0f7a936c5f3fa17438f9d79ea
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk59reUACgkQfXuS5UK5QB10GwP/aa0z7ImCBAX/F84NePAFamAz
-6yg3QXY/ewtrCqpIeQm0+1QgJuRHy0Z0gSIhOVJlHHB1oQJRgOA3dcsjzIZysgIm
-jaoH/LCeGJ8H8hiTG3wCN2PL8d9JUJMkbbBmX/RoG9Qgb80uKDn7qTtwBkhth3uO
-6PS1V5cJNRU/1mr0WQ8=
-=9O0T
+iEYEARECAAYFAk6AmAoACgkQKQaZ7OJe4zYQMACggC+hEUNzKOPIUSIKqnSbW4Bx
+BdwAn1eH/IoFFN+D3QAvetwFHJOtGphv
+=NYfY
 -----END PGP SIGNATURE-----
diff --git a/net-news/liferea/liferea-1.7.4.ebuild b/net-news/liferea/liferea-1.8_rc1.ebuild
index 98ecf5bc8b36..371ff30a7808 100644
--- a/net-news/liferea/liferea-1.7.4.ebuild
+++ b/net-news/liferea/liferea-1.8_rc1.ebuild
@@ -1,36 +1,37 @@
 # 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.7.4.ebuild,v 1.6 2011/03/21 22:19:52 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.8_rc1.ebuild,v 1.1 2011/09/26 15:19:32 vostorga Exp $
 
-EAPI=2
+EAPI=4
 
 GCONF_DEBUG=no
 
 inherit eutils gnome2 pax-utils
 
-MY_P=${P/_/-}
+MY_PV="1.8-RC1"
+MY_P=${PN}-${MY_PV}
 
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
+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="dbus libnotify networkmanager"
+IUSE="ayatana libnotify"
 
 RDEPEND=">=x11-libs/gtk+-2.18.0:2
-	>=dev-libs/glib-2.16.0:2
+	>=dev-libs/glib-2.24.0:2
 	>=x11-libs/pango-1.4.0
-	gnome-base/gconf:2
+	>=gnome-base/gconf-1.1.9:2
+	dev-libs/json-glib
 	dev-libs/libunique:1
 	>=dev-libs/libxml2-2.6.27:2
 	>=dev-libs/libxslt-1.1.19
 	>=dev-db/sqlite-3.6.10:3
 	>=net-libs/libsoup-2.28.2:2.4
-	>=net-libs/webkit-gtk-1.1.11:2
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib )"
+	>=net-libs/webkit-gtk-1.2.2:2
+	ayatana? ( dev-libs/libindicate[gtk] )
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
 DEPEND="${RDEPEND}
 	dev-util/intltool
 	dev-util/pkgconfig"
@@ -43,13 +44,11 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--enable-sm
 		--disable-schemas-install
-		$(use_enable dbus)
-		$(use_enable networkmanager nm)
+		$(use_enable ayatana libindicate)
 		$(use_enable libnotify)"
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
 	gnome2_src_prepare
 }
 
@@ -60,4 +59,9 @@ src_install() {
 	# 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"
 }