Cleaning out old ebuilds, Version bump of upstream stable 1.6.2 and unstable 1.7.2

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

11 files changed, 79 insertions, 465 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 70a3a0514e1d..bd320f9f757a 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-news/liferea
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.182 2009/12/25 13:00:10 armin76 Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.183 2010/01/23 23:41:16 vostorga Exp $
+
+*liferea-1.7.2 (23 Jan 2010)
+*liferea-1.6.2 (23 Jan 2010)
+
+  23 Jan 2010; Víctor Ostorga <vostorga@gentoo.org>
+  -files/liferea-1.1.0-libnotify.patch, -liferea-1.2.23-r1.ebuild,
+  -files/liferea-1.2.23-backup-perms.patch, -liferea-1.4.23.ebuild,
+  -files/liferea-1.4.23-gecko.patch, -liferea-1.4.24.ebuild,
+  -liferea-1.4.28.ebuild, -liferea-1.6.0.ebuild, +liferea-1.6.2.ebuild,
+  +liferea-1.7.2.ebuild:
+  Cleaning out old ebuilds, Version bump of upstream stable 1.6.2 and
+  unstable 1.7.2
 
   25 Dec 2009; Raúl Porcel <armin76@gentoo.org> liferea-1.6.0.ebuild,
   liferea-1.7.1.ebuild:
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index b54d78aa9db4..495206c712c6 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,20 +1,12 @@
-AUX liferea-1.1.0-libnotify.patch 552 RMD160 0bf67b33913e08ed5528b86813aae30649123304 SHA1 9aa754c47fb483d1c4bcbdbe4bfd12e55cc0bcb2 SHA256 73a54e020b045ee261f9444464a68f4f1aba831182498b8a103886b7c0108bab
-AUX liferea-1.2.23-backup-perms.patch 1211 RMD160 7ad9f9476f6b9bd3b0b47e982386d08ca096ba32 SHA1 16a9ca26887311066020312cdc2a5adb688a7793 SHA256 b409b32fbc3569ed5836e11439727038b5e9f522ced32f895f1401976fd15e06
-AUX liferea-1.4.23-gecko.patch 1455 RMD160 f3e42b1e16f18e67f7caab0ffbd0dc29a80e4d5e SHA1 9d8cb8d4c14cd0454ddaa24aef28320122d5adaf SHA256 e2cd5c62b8e0af5d3dec24d88f55036a2db39f6e783b99049f1893009d5a1fdc
-DIST liferea-1.2.23.tar.gz 1517098 RMD160 26a9eee1bd760c1e7f7a3fbdebb98880417b26eb SHA1 270a20b59925cc083ab17f3028bae4a296255df2 SHA256 136dee87c7156d7fb20233b6ba597e194bcaafbce4f132bd3b002148b2982a67
 DIST liferea-1.4.15.tar.gz 1637046 RMD160 05119e171762c8261c6e15585f09e8467a81ae8c SHA1 8ff9ed78b03c89a8bc2ff4f8070e665a5cb496c5 SHA256 e6f780027e0a4576ca4784fb248dd14c1c7f75489a825d8e79d5812f7ea77189
-DIST liferea-1.4.23.tar.gz 1655446 RMD160 1da59d457364efcbf99fa138d4e9bb3e800a0243 SHA1 cf2cfc61ec92f9b183e3cd75d8280ab273214175 SHA256 d30dd398185d7ce14d9d28fcc190a074221b0c18c35f7ad9ccd56d0523d332b1
-DIST liferea-1.4.24.tar.gz 1670117 RMD160 8a0b747bf75f2f952018a4fcae9d7b55cdc3f331 SHA1 a3a547e0f317dcc912c9408d59e9a58410386d5f SHA256 bddb38e2ce8845f2a50f8443b454f2b585dd9a17cde49dee914577aabf9a9f28
 DIST liferea-1.4.28.tar.gz 1697036 RMD160 044d0f771ea06c7d35fb70afc2ebe8d64bd96ef0 SHA1 5c40c9a20eb94d5e0bc5e9b41af51389bc364daf SHA256 d39abe7d9651783f4ecd59a0f6c5e2650f32df834e0e742a6b5d003795913fd6
-DIST liferea-1.6.0.tar.gz 1743248 RMD160 62db1f1a2373966abcc89226c793bcfe54163be1 SHA1 1adbcc29c43070e03a941d150efc805bed97cc99 SHA256 abf5f8e9b4a405c4fcc7a281e31b2492efadc066cf92980b7d537f96e5ae9c20
+DIST liferea-1.6.2.tar.gz 1779422 RMD160 d5ae9774c1ca42bf0da0685e67a9fd0c920954b8 SHA1 df3f48a2ebef780a9428c790d8fa6db885c14fe4 SHA256 3db7fa41ce156433e1e4222521e835142f6a8983000736d16cc5aca77148bce1
 DIST liferea-1.7.1.tar.gz 1552448 RMD160 ba401dd53fb5738196782cfcaa7a110f6b496c99 SHA1 f6a368d0127bea22ace7051215b414984d617384 SHA256 788895dd584d9aa69d6d43ad60d4e8b9a10a9d6af21c6d84ad32cabbc45b664d
-EBUILD liferea-1.2.23-r1.ebuild 2830 RMD160 94e022a836b4bfd4dfbd3ef4ef30edefaf512abc SHA1 c470586e8b8076a25cd82bab0297673afd0084cc SHA256 23842401cc86b9978d3264d61577d3f53206b10cb45ff5c95f39f715af1e144b
+DIST liferea-1.7.2.tar.gz 1732643 RMD160 83d63904c7a568f4c0a384760dcf01c8a29edf9b SHA1 1625107565b61957f188baacaee5a2318d4f4da9 SHA256 2f668adfd92fe94024c94f8bc87d1d273ef12bcad9730963abfdf0e17dae2528
 EBUILD liferea-1.4.15.ebuild 2822 RMD160 4dc64c71df980cd3d60dabfcce354a20134abebd SHA1 ca215327fe158cc0c8466e08b22bfdc134fdcf77 SHA256 72046639f870a0e6a06ebb3a580455c43a26d81929fb58dd9fced8723c17c254
-EBUILD liferea-1.4.23.ebuild 2698 RMD160 7a7d346315cca5e8149010fa118c0fb2ae130d19 SHA1 599b8a1ced2a48a63bacc75895aee1b7f46f6f51 SHA256 4351b09b1440e12c41106a184198c4ffdceefbb8b97d1f443086b4321261dda7
-EBUILD liferea-1.4.24.ebuild 2707 RMD160 64d1ed145da2ea9e944d3783b9101ab80b6a3379 SHA1 750a57997df2a1a6f2b9d6ceb8bb4e5b74f814f7 SHA256 c8b5bd48acd9358979a21b482ff25e547bb95f2ba1b7e2e121157c8ded1a8eed
 EBUILD liferea-1.4.28-r1.ebuild 2683 RMD160 f7f79fa5c94ffd84df93e9aebd02c4dd8b6fddc5 SHA1 22676cb1e420f0ddea2779fbcfe532478f5b655d SHA256 cdf8ad017ef0a3b10c61688b986ee55eb5309b958534f7076b5eacefe4159b1f
-EBUILD liferea-1.4.28.ebuild 2452 RMD160 b8222249ed280aeda7126434de7c36ce66844a61 SHA1 bf0c269991c290d32d8b2d6a2fd1c41a61538b8f SHA256 d3a9a815282ac0e8e56053fc355292dcd08c224ab8674d8e47993d22f4320995
-EBUILD liferea-1.6.0.ebuild 1252 RMD160 f3579d1f78300b0e17f28e8a61c996b84fe5262b SHA1 61b592de3fec1786dc43e2b188384f88dffceef2 SHA256 c6928a10a366f98d6c89e629df40f0b29b9a2973d8f0184ce36af31312366bd6
+EBUILD liferea-1.6.2.ebuild 1342 RMD160 1b3fbece686be50ba3dc639f60a5a5d92d36c009 SHA1 b4abc58ac2e69b973246768bba992d525d318029 SHA256 874e8aec68f929fd0d2dc0651cffd49f6092a3a11154c0bb0508c4145c521c8e
 EBUILD liferea-1.7.1.ebuild 1291 RMD160 1bd7f81002dc3e86c713c7dcf9ecd7fe486b0566 SHA1 418c025640e0736f991a4f4de8a5295ac25ed42b SHA256 08cc264898bde4bc12ab642c534f6a9116d2a6d516b6a9cac8c3f89e7a8d55a2
-MISC ChangeLog 51151 RMD160 93a7952a273935aaf932f383ca85aaa7616c0e43 SHA1 2656e260ec29be62d5000eaad1564d1998fbb9b9 SHA256 c1dbf1cf78f71015fcdcdd4cc559344b271c23542947def3cafda0d542e9a21f
+EBUILD liferea-1.7.2.ebuild 1288 RMD160 bff205a10f32ace43cb2553d82bea69036ad7705 SHA1 a1866e1729f4f1b99ad0ebb40a38aba99b648c63 SHA256 8f3e883af1d5b8d8c6a1c4ffa4113d7ed2dbb974bda53ad995cea3ffc2376865
+MISC ChangeLog 51645 RMD160 7573e024646e1f08bed20109832f9d99f379903e SHA1 d0ca655b17b846dd07d7a41c09b0c0eebfd34615 SHA256 50c9bbc091f5a87dff792a1056485e6dd93187dc71fea67f8aa1c233abd17f80
 MISC metadata.xml 1157 RMD160 2929984e0b84993fb34af7f39af3ac38442443a5 SHA1 acf61682f28a12529d70e6e7149629e675f76433 SHA256 d7f1104485bf9015bbdffe322322ac3030a39c6bafaf1ceb68381010250c6c7e
diff --git a/net-news/liferea/files/liferea-1.1.0-libnotify.patch b/net-news/liferea/files/liferea-1.1.0-libnotify.patch
deleted file mode 100644
index 96f290d399ea..000000000000
--- a/net-news/liferea/files/liferea-1.1.0-libnotify.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: src/notification/Makefile.am
-===================================================================
---- src/notification/Makefile.am	(révision 2353)
-+++ src/notification/Makefile.am	(copie de travail)
-@@ -27,8 +27,7 @@
- liblinotiflibnotify_la_CFLAGS = $(PACKAGE_CFLAGS) $(LIBNOTIFY_CFLAGS)
- liblinotiflibnotify_la_SOURCES = notif_libnotify.c notif_libnotify.h notif_plugin.h 
- 
--pkglib_LTLIBRARIES =	liblinotifpopup.la \
--			liblinotiflibnotify.la
-+pkglib_LTLIBRARIES =	liblinotiflibnotify.la
- else
- pkglib_LTLIBRARIES =	liblinotifpopup.la
- endif
diff --git a/net-news/liferea/files/liferea-1.2.23-backup-perms.patch b/net-news/liferea/files/liferea-1.2.23-backup-perms.patch
deleted file mode 100644
index c0c2464e822a..000000000000
--- a/net-news/liferea/files/liferea-1.2.23-backup-perms.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.2.23.orig/src/common.c liferea-1.2.23/src/common.c
---- liferea-1.2.23.orig/src/common.c	2007-08-19 13:17:58.000000000 -0400
-+++ liferea-1.2.23/src/common.c	2007-10-31 22:42:36.000000000 -0400
-@@ -908,6 +908,9 @@ static void common_init_cache_path(void)
- 
- 	g_free(cachePath);
- 	/* lifereaUserPath reused globally */
-+	
-+	/* ensure reasonable default umask */
-+	umask (077);
- }
- 
- const gchar * common_get_cache_path(void) {
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.2.23.orig/src/export.c liferea-1.2.23/src/export.c
---- liferea-1.2.23.orig/src/export.c	2007-06-20 18:22:10.000000000 -0400
-+++ liferea-1.2.23/src/export.c	2007-10-31 22:43:35.000000000 -0400
-@@ -126,15 +126,15 @@ gboolean export_OPML_feedlist(const gcha
- 			error = TRUE;
- 		}
- 		
--		if(trusted)
--			old_umask = umask(077);
-+		if(!trusted)
-+			old_umask = umask(022);	/* give read permissions for other, per-default we wouldn't give it... */
- 			
- 		if(-1 == common_save_xml(doc, backupFilename)) {
- 			g_warning("Could not export to OPML file!!");
- 			error = TRUE;
- 		}
- 		
--		if(trusted)
-+		if(!trusted)
- 			umask(old_umask);
- 			
- 		xmlFreeDoc(doc);
diff --git a/net-news/liferea/files/liferea-1.4.23-gecko.patch b/net-news/liferea/files/liferea-1.4.23-gecko.patch
deleted file mode 100644
index 3789ff091a3f..000000000000
--- a/net-news/liferea/files/liferea-1.4.23-gecko.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.23.orig/configure.ac liferea-1.4.23/configure.ac
---- liferea-1.4.23.orig/configure.ac	2008-11-29 16:43:57.000000000 -0500
-+++ liferea-1.4.23/configure.ac	2008-12-23 11:59:59.000000000 -0500
-@@ -23,6 +23,8 @@ AC_ISC_POSIX
- AC_PROG_CC
- AM_PROG_CC_STDC
- AM_PROG_CC_C_O
-+dnl Mozilla needs C++; don't make conditional, or autoconf fails
-+AC_PROG_CXX
- AC_HEADER_STDC
- AC_PROG_INSTALL
- AC_PROG_LN_S
-@@ -181,6 +183,7 @@ case "$GECKO" in
- xulrunner) gecko_min_version=1.8; is_xulrunner=yes ;;
- libxul*) gecko_min_version=1.9; is_xulrunner=yes ;;
- *firefox) gecko_min_version=1.5; is_mozilla=yes ;;
-+no) no_gecko=yes;;
- *) AC_MSG_ERROR([$gecko_cv_gecko is not supported])
- esac
- 
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.23.orig/m4/gecko.m4 liferea-1.4.23/m4/gecko.m4
---- liferea-1.4.23.orig/m4/gecko.m4	2008-10-26 16:55:39.000000000 -0400
-+++ liferea-1.4.23/m4/gecko.m4	2008-12-23 11:56:13.000000000 -0500
-@@ -76,7 +76,9 @@ fi
- 
- AC_MSG_RESULT([$gecko_cv_gecko])
- 
--if test "x$gecko_cv_gecko" = "x"; then
-+if test "x$gecko_cv_gecko" = "xno"; then
-+	gecko_cv_have_gecko=no
-+elif test "x$gecko_cv_gecko" = "x"; then
- 	ifelse([$3],,[AC_MSG_ERROR([No gecko found; you may need to adjust PKG_CONFIG_PATH or install a mozilla/firefox/xulrunner -devel package])],[$3])
- 	gecko_cv_have_gecko=no
- elif ! ( echo "$_geckos" | egrep "(^| )$gecko_cv_gecko(\$| )" > /dev/null); then
diff --git a/net-news/liferea/liferea-1.2.23-r1.ebuild b/net-news/liferea/liferea-1.2.23-r1.ebuild
deleted file mode 100644
index 90698bcb36b8..000000000000
--- a/net-news/liferea/liferea-1.2.23-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.23-r1.ebuild,v 1.8 2009/08/26 13:14:20 dang Exp $
-
-WANT_AUTOMAKE=1.7
-inherit gnome2 flag-o-matic eutils autotools
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="dbus firefox gtkhtml gnutls libnotify lua networkmanager seamonkey xulrunner"
-
-RDEPEND=">=x11-libs/gtk+-2.8
-	x11-libs/pango
-	>=gnome-base/gconf-2
-	>=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.19
-	>=dev-libs/glib-2
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
-	!xulrunner? ( !firefox? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
-	!amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) ) )
-	!amd64? ( gtkhtml? ( =gnome-extra/gtkhtml-2* ) )
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	networkmanager? ( net-misc/networkmanager )
-	lua? ( >=dev-lang/lua-5.1 )
-	gnutls? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
-	epatch "${FILESDIR}/${PN}-1.2.23-backup-perms.patch"
-
-	eautoreconf || die "Autoreconf failed"
-}
-
-pkg_setup() {
-	# On amd64, gtkhtml isn't supported.  You need one of the gecko use flags
-	if use amd64 && ! use firefox && ! use seamonkey && ! use xulrunner; then
-		elog "gtkhtml is no longer supported on amd64; you will need to select"
-		elog "one of the gecko backends to use liferea"
-		die "You must enable on of the gecko backends on amd64"
-	fi
-
-	# if you don't choose a gecko to use, we will automatically
-	# use gtkhtml2 as the backend except on amd64 (where we failed above)
-	if ! use seamonkey && ! use firefox && ! use xulrunner && ! use amd64 ; then
-		G2CONF="${G2CONF} --enable-gtkhtml2"
-	elif ! use amd64 && use gtkhtml ; then
-		G2CONF="${G2CONF} --enable-gtkhtml2"
-	else
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	fi
-
-	# we prefer xulrunner over firefox over seamonkey
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --enable-xulrunner"
-	elif use firefox ; then
-		G2CONF="${G2CONF} --enable-gecko=firefox"
-	elif use seamonkey ; then
-		G2CONF="${G2CONF} --enable-gecko=seamonkey"
-	else
-		G2CONF="${G2CONF} --disable-gecko"
-	fi
-
-	G2CONF="${G2CONF} \
-		$(use_enable dbus) \
-		$(use_enable gnutls) \
-		$(use_enable libnotify) \
-		$(use_enable lua) \
-		$(use_enable networkmanager nm)"
-}
-
-src_install() {
-	gnome2_src_install
-	rm -f "${D}/usr/bin/${PN}"
-	mv "${D}/usr/bin/${PN}-bin" "${D}/usr/bin/${PN}"
-}
diff --git a/net-news/liferea/liferea-1.4.23.ebuild b/net-news/liferea/liferea-1.4.23.ebuild
deleted file mode 100644
index 8800e8374c3a..000000000000
--- a/net-news/liferea/liferea-1.4.23.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.23.ebuild,v 1.3 2009/08/26 13:14:20 dang Exp $
-
-EAPI="1"
-WANT_AUTOMAKE=1.9
-inherit gnome2 eutils autotools
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# Can't add webkit until there's a masked use flag for it's keyworded
-# webkit
-IUSE="dbus gtkhtml gnutls libnotify lua networkmanager webkit +xulrunner"
-
-RDEPEND="
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	lua? ( >=dev-lang/lua-5.1 )
-	xulrunner? ( net-libs/xulrunner:1.9 )
-	!xulrunner? ( webkit? ( net-libs/webkit-gtk ) )
-	!amd64? ( !xulrunner? ( !webkit? ( gtkhtml? ( gnome-extra/gtkhtml:2 ) ) ) )
-	>=x11-libs/gtk+-2.8
-	x11-libs/pango
-	>=gnome-base/gconf-2
-	>=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.19
-	>=dev-db/sqlite-3.3
-	>=dev-libs/glib-2
-	>=gnome-base/libglade-2
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	networkmanager? ( net-misc/networkmanager )
-	gnutls? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# Backends are now mutually exclusive.
-	# we prefer xulrunner over webkit over seamonkey over gtkhtml
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --with-gecko=libxul"
-		G2CONF="${G2CONF} --disable-webkit"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use webkit ; then
-		G2CONF="${G2CONF} --enable-webkit"
-		G2CONF="${G2CONF} --without-gecko"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use gtkhtml ; then
-		if ! use amd64 ; then
-			G2CONF="${G2CONF} --enable-gtkhtml2"
-			G2CONF="${G2CONF} --without-gecko"
-			G2CONF="${G2CONF} --disable-webkit"
-		else
-			elog ""
-			elog "gtkhtml is no longer supported on amd64; you will need to "
-			elog "select either xulrunner or webkit to use liferea."
-			elog "Preference is: xulrunner, then webkit."
-			die "You must enable xulrunner or webkit on amd64"
-		fi
-	else
-		elog ""
-		elog "You must choose one backend for liferea to work.  Preference is:"
-		elog "xulrunner, webkit, then gtkhtml."
-		die "You must enable on of the backends"
-	fi
-
-	G2CONF="${G2CONF}
-		$(use_enable dbus)
-		$(use_enable gnutls)
-		$(use_enable libnotify)
-		$(use_enable lua)
-		$(use_enable networkmanager nm)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}"/${P}-gecko.patch
-
-	intltoolize --force || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	rm -f "${D}/usr/bin/${PN}"
-	mv "${D}/usr/bin/${PN}-bin" "${D}/usr/bin/${PN}"
-}
diff --git a/net-news/liferea/liferea-1.4.24.ebuild b/net-news/liferea/liferea-1.4.24.ebuild
deleted file mode 100644
index 964b69c838d0..000000000000
--- a/net-news/liferea/liferea-1.4.24.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.24.ebuild,v 1.5 2009/08/26 13:14:20 dang Exp $
-
-EAPI="1"
-WANT_AUTOMAKE=1.9
-inherit gnome2 eutils autotools
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-# Can't add webkit until there's a masked use flag for it's keyworded
-# webkit
-IUSE="dbus gtkhtml +gnutls libnotify lua networkmanager webkit +xulrunner"
-
-RDEPEND="
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	lua? ( >=dev-lang/lua-5.1 )
-	xulrunner? ( net-libs/xulrunner:1.9 )
-	!xulrunner? ( webkit? ( net-libs/webkit-gtk ) )
-	!amd64? ( !xulrunner? ( !webkit? ( gtkhtml? ( gnome-extra/gtkhtml:2 ) ) ) )
-	>=x11-libs/gtk+-2.8
-	x11-libs/pango
-	>=gnome-base/gconf-2
-	>=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.19
-	>=dev-db/sqlite-3.3
-	>=dev-libs/glib-2
-	>=gnome-base/libglade-2
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	networkmanager? ( net-misc/networkmanager )
-	gnutls? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# Backends are now mutually exclusive.
-	# we prefer xulrunner over webkit over seamonkey over gtkhtml
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --with-gecko=libxul"
-		G2CONF="${G2CONF} --disable-webkit"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use webkit ; then
-		G2CONF="${G2CONF} --enable-webkit"
-		G2CONF="${G2CONF} --without-gecko"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use gtkhtml ; then
-		if ! use amd64 ; then
-			G2CONF="${G2CONF} --enable-gtkhtml2"
-			G2CONF="${G2CONF} --without-gecko"
-			G2CONF="${G2CONF} --disable-webkit"
-		else
-			elog ""
-			elog "gtkhtml is no longer supported on amd64; you will need to "
-			elog "select either xulrunner or webkit to use liferea."
-			elog "Preference is: xulrunner, then webkit."
-			die "You must enable xulrunner or webkit on amd64"
-		fi
-	else
-		elog ""
-		elog "You must choose one backend for liferea to work.  Preference is:"
-		elog "xulrunner, webkit, then gtkhtml."
-		die "You must enable on of the backends"
-	fi
-
-	G2CONF="${G2CONF}
-		$(use_enable dbus)
-		$(use_enable gnutls)
-		$(use_enable libnotify)
-		$(use_enable lua)
-		$(use_enable networkmanager nm)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	epatch "${FILESDIR}"/${PN}-1.4.23-gecko.patch
-
-	intltoolize --force || die "intltoolize failed"
-	eautoreconf
-}
-
-src_install() {
-	gnome2_src_install
-	rm -f "${D}/usr/bin/${PN}"
-	mv "${D}/usr/bin/${PN}-bin" "${D}/usr/bin/${PN}"
-}
diff --git a/net-news/liferea/liferea-1.4.28.ebuild b/net-news/liferea/liferea-1.4.28.ebuild
deleted file mode 100644
index a76e5baa826b..000000000000
--- a/net-news/liferea/liferea-1.4.28.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.28.ebuild,v 1.2 2009/08/26 13:14:20 dang Exp $
-
-EAPI="1"
-inherit gnome2 eutils
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="dbus gtkhtml +gnutls libnotify lua networkmanager webkit +xulrunner"
-
-RDEPEND="
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	lua? ( >=dev-lang/lua-5.1 )
-	xulrunner? ( net-libs/xulrunner:1.9 )
-	!xulrunner? ( webkit? ( net-libs/webkit-gtk ) )
-	!amd64? ( !xulrunner? ( !webkit? ( gtkhtml? ( gnome-extra/gtkhtml:2 ) ) ) )
-	>=x11-libs/gtk+-2.8
-	x11-libs/pango
-	>=gnome-base/gconf-2
-	>=dev-libs/libxml2-2.6.27
-	>=dev-libs/libxslt-1.1.19
-	>=dev-db/sqlite-3.3
-	>=dev-libs/glib-2
-	>=gnome-base/libglade-2
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	networkmanager? ( net-misc/networkmanager )
-	gnutls? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-	# Backends are now mutually exclusive.
-	# we prefer xulrunner over webkit over seamonkey over gtkhtml
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --with-gecko=libxul"
-		G2CONF="${G2CONF} --disable-webkit"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use webkit ; then
-		G2CONF="${G2CONF} --enable-webkit"
-		G2CONF="${G2CONF} --without-gecko"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use gtkhtml ; then
-		if ! use amd64 ; then
-			G2CONF="${G2CONF} --enable-gtkhtml2"
-			G2CONF="${G2CONF} --without-gecko"
-			G2CONF="${G2CONF} --disable-webkit"
-		else
-			elog ""
-			elog "gtkhtml is no longer supported on amd64; you will need to "
-			elog "select either xulrunner or webkit to use liferea."
-			elog "Preference is: xulrunner, then webkit."
-			die "You must enable xulrunner or webkit on amd64"
-		fi
-	else
-		elog ""
-		elog "You must choose one backend for liferea to work.  Preference is:"
-		elog "xulrunner, webkit, then gtkhtml."
-		die "You must enable on of the backends"
-	fi
-
-	G2CONF="${G2CONF}
-		$(use_enable dbus)
-		$(use_enable gnutls)
-		$(use_enable libnotify)
-		$(use_enable lua)
-		$(use_enable networkmanager nm)"
-}
-
-src_install() {
-	gnome2_src_install
-	rm -f "${D}/usr/bin/${PN}"
-	mv "${D}/usr/bin/${PN}-bin" "${D}/usr/bin/${PN}"
-}
diff --git a/net-news/liferea/liferea-1.6.0.ebuild b/net-news/liferea/liferea-1.6.2.ebuild
index ee333e8e016c..2423e418cbff 100644
--- a/net-news/liferea/liferea-1.6.0.ebuild
+++ b/net-news/liferea/liferea-1.6.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.6.0.ebuild,v 1.4 2009/12/25 13:00:10 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.6.2.ebuild,v 1.1 2010/01/23 23:41:16 vostorga Exp $
 
 EAPI="2"
 
-inherit gnome2
+inherit gnome2 autotools
 
 MY_P="${P/_/-}"
 
@@ -25,7 +25,7 @@ RDEPEND=">=x11-libs/gtk+-2.16.0:2
 	>=dev-db/sqlite-3.6.10:3
 	>=gnome-base/libglade-2
 	>=net-libs/libsoup-2.26.1:2.4
-	>=net-libs/webkit-gtk-1.1.7
+	>=net-libs/webkit-gtk-1.1.15
 	libnotify? ( >=x11-libs/libnotify-0.3.2 )
 	lua? ( >=dev-lang/lua-5.1 )
 	dbus? ( >=dev-libs/dbus-glib-0.71 )
@@ -46,3 +46,9 @@ pkg_setup() {
 		$(use_enable libnotify)
 		$(use_enable lua)"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	eautoreconf || die "Autoreconf failed"
+}
diff --git a/net-news/liferea/liferea-1.7.2.ebuild b/net-news/liferea/liferea-1.7.2.ebuild
new file mode 100644
index 000000000000..89f506e7615d
--- /dev/null
+++ b/net-news/liferea/liferea-1.7.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.7.2.ebuild,v 1.1 2010/01/23 23:41:16 vostorga Exp $
+
+EAPI="2"
+
+inherit 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 ~sparc ~x86"
+IUSE="dbus libnotify lua networkmanager"
+
+RDEPEND=">=x11-libs/gtk+-2.18.0:2
+	>=dev-libs/glib-2.16.0:2
+	>=x11-libs/pango-1.4.0
+	gnome-base/gconf:2
+	dev-libs/libunique
+	>=dev-libs/libxml2-2.6.27
+	>=dev-libs/libxslt-1.1.19
+	>=dev-db/sqlite-3.6.10:3
+	>=gnome-base/libglade-2
+	>=net-libs/libsoup-2.26.1:2.4
+	>=net-libs/webkit-gtk-1.1.11
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	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/intltool
+	dev-util/pkgconfig"
+
+DOCS="AUTHORS ChangeLog README"
+
+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)"
+}