Bump liferea to 1.4.24

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

7 files changed, 24 insertions, 344 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 2091c4e33d73..2152ee9f36ad 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.165 2009/01/13 14:52:42 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.166 2009/02/09 14:45:31 dang Exp $
+
+*liferea-1.4.24 (09 Feb 2009)
+
+  09 Feb 2009; Daniel Gryniewicz <dang@gentoo.org>
+  -files/liferea-1.4.16b-xulrunner-1.9.patch,
+  -files/liferea-1.4.17-xulrunner-1.9.patch, -liferea-1.4.18.ebuild,
+  -liferea-1.4.20.ebuild, -liferea-1.4.21b.ebuild, +liferea-1.4.24.ebuild:
+  Bump to 1.4.23
+
+    Note: flash is disabled by default now. There's an option to enable it.
 
   13 Jan 2009; Daniel Gryniewicz <dang@gentoo.org> liferea-1.4.23.ebuild:
   Default to xulrunner. Bug #254754
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index eccb68b0350f..1eee09aa16ac 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -3,27 +3,21 @@ Hash: SHA1
 
 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.16b-xulrunner-1.9.patch 2273 RMD160 6d0aa784ea311f323f3d8020779105ed37d94c71 SHA1 6adc9d8e4fdf0597631affeafbd21b06606595d5 SHA256 61f540a71c37526ae2dcd0cd26cd3e42f48475d2d66700483747621513755f79
-AUX liferea-1.4.17-xulrunner-1.9.patch 2564 RMD160 ebecc109daf4ad481c930f57ccadf9bd5710597d SHA1 17eb5ee13f8e56e1437ba44920db821b5a4316d0 SHA256 7407a7c48e5c3e183858f17a7b1d321bf8c18b4096725967deb547566bb66e5e
 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.18.tar.gz 1613286 RMD160 f5b90e92e1598f8f60fc2c9e10266a0d4db3218e SHA1 b122069ae838fde4968453b77e1c0b2927bb3bc7 SHA256 0ce77ac6cb5477d969bb2af1f70ed624f916b40a943e265b268e1c3ba1eee3e4
-DIST liferea-1.4.20.tar.gz 1646998 RMD160 0b2f2744a534f1da942cb6456e0675e871d8f23e SHA1 794e52e692c135b52b28c6f2c6cc8bba2db4f078 SHA256 6f360b9a9096cc8b3c4ffb1550187e34b609061668057855cb63468a9341685d
-DIST liferea-1.4.21b.tar.gz 1649611 RMD160 0a83c929ce3aad4b7afdacf592ffa16e082df899 SHA1 37142c460ce9d9e6b5874b0bf518d982fb8767cd SHA256 f7ad9c021a7e6023679d6edaa72c120c82ef4737ff21f573b5ab2be2784b3af8
 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
 EBUILD liferea-1.2.23-r1.ebuild 2854 RMD160 caed5b4b30b45087db2c0bcd53e1d9bf49cc10a8 SHA1 35ab5a89d9f47d70af6dc8dae67f4ba79f6360f7 SHA256 f3018c2af0a2fd89b2bd44a2638d37de087fe065903101632a87dcc0e28e1113
 EBUILD liferea-1.4.15.ebuild 2846 RMD160 21b12fb5193687fe03fbc5cbf3ce161bc9861ded SHA1 fd39cfebaf967740cd62e5ec336b415677d4b3ff SHA256 a402cb18cddd8f16f17030ddf31b70b238597d94c7f69be9b613dcc69d025a82
-EBUILD liferea-1.4.18.ebuild 2832 RMD160 36dbff64fe537cabfff6aa978fbb3a30f9588934 SHA1 fbefcf69e27a650c824a3479ed0b26672758478a SHA256 45aab17564fc3055e2bc996aad4521430b88f565bee8aea246e74faa994bce08
-EBUILD liferea-1.4.20.ebuild 2832 RMD160 5b2b805724d9c679203e9d82c30abbd801ce660d SHA1 8afc3d475c41eb330ca02f3bbda9f5a359a928cd SHA256 a63448c41682e58523573f8fb98cccc79ee24a41da32cdc08c788e0dbad79432
-EBUILD liferea-1.4.21b.ebuild 2833 RMD160 901725b89ba434051cac6582359c703e6db14274 SHA1 11d7980fd58074e037dc2323679501ddb0cc69d0 SHA256 786b2d4097a822e6ef5650d92a992b4c7b9a7eaff67675a2dce7f0811c6e827e
 EBUILD liferea-1.4.23.ebuild 2698 RMD160 90b80d2bf45b5cf7a56fdd695c6de596f5b7a830 SHA1 3fb73026dde7bb1054a733e3853de46277d0a52d SHA256 cc274bdfcd8278fd43733f97128011d87f17c32c3437af66324ca5ff297e0cd3
-MISC ChangeLog 48589 RMD160 ecd69cda516abb381d3fb2247c127a8832bdacef SHA1 a4873a85ad3efad18c923dfe2ddac482d7fab473 SHA256 1e53f9960279323c73c4952ec5c7df554f8254242db58eed6d0354444ac24607
+EBUILD liferea-1.4.24.ebuild 2707 RMD160 aa89bcddf139753f126d327c2dbc28d5ba868791 SHA1 693b59b78876fe90fad0ce7c2d9fa0bab078a5db SHA256 17915712669928558f891ef2f4dee0ea8fb5f780bcfc625659ea3eab1eaed96c
+MISC ChangeLog 48956 RMD160 56658c9079f60688a5ddcd41c873e904de9383de SHA1 04b2c48dc7cc7764fda2bc7489be60301037d441 SHA256 099b82c27724014dfed05b6d1825564e54ec79a8f4206b3aec208962e75c0c84
 MISC metadata.xml 1177 RMD160 45b920ca3d4f4d3aea00b5932c3a09fdb970828a SHA1 4060937fb45d9d49e333779aabef44d1e06ff220 SHA256 12db9a0dafe3a6715f367e74aa43566e0b0804e794ec1f5f42dc38c75e48440c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFJbKrHomPajV0RnrERAl92AJ9Eug7ou0AxE3555KguW1elHQ5QMQCfUg82
-/eX1dQdCC1aCZkVl1ieOToo=
-=5jiK
+iD8DBQFJkEGRomPajV0RnrERAsJmAJwONe75Grlg03/Nz9jH2Y1+uMfHqgCfQrrw
+MWvRTivDhAzoWjgcDZRfCDY=
+=GeDQ
 -----END PGP SIGNATURE-----
diff --git a/net-news/liferea/files/liferea-1.4.16b-xulrunner-1.9.patch b/net-news/liferea/files/liferea-1.4.16b-xulrunner-1.9.patch
deleted file mode 100644
index fc6764661042..000000000000
--- a/net-news/liferea/files/liferea-1.4.16b-xulrunner-1.9.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Files liferea-1.4.16b.orig/.aclocal.m4.swp and liferea-1.4.16b/.aclocal.m4.swp differ
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.16b.orig/configure.ac liferea-1.4.16b/configure.ac
---- liferea-1.4.16b.orig/configure.ac	2008-06-11 18:08:41.000000000 -0400
-+++ liferea-1.4.16b/configure.ac	2008-06-20 10:59:28.000000000 -0400
-@@ -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
-@@ -168,7 +170,7 @@ dnl *********
- if test "x$enable_xulrunner" = "xyes" ; then
-  
-    AC_MSG_CHECKING([for XulRunner 1.9+ support])  
--   PKG_CHECK_MODULES(XULRUNNER, libxul-embedding, XULRUNNER_PROVIDER=libxul-embedding, XULRUNNER_PROVIDER=)
-+   PKG_CHECK_MODULES(XULRUNNER, libxul-embedding-unstable, XULRUNNER_PROVIDER=libxul-embedding-unstable, XULRUNNER_PROVIDER=)
-    
-    if test "x$XULRUNNER_PROVIDER" = "x" ; then
-       AC_MSG_CHECKING([for XulRunner 1.8 support])  
-@@ -186,9 +188,6 @@ if test "x$enable_xulrunner" = "xyes" ; 
-       AC_SUBST(XULRUNNER_LIBS)
- 
-       MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' |  cut -c 3-`
--   
--      dnl the Mozilla XPCOM access means C++
--      AC_PROG_CXX
-    fi
- fi
- 
-@@ -248,9 +247,6 @@ if test "x$enable_mozilla" = "xyes" ; th
- 
-    dnl AC_MSG_RESULT([$gecko_provider found!])
- 
--   dnl the Mozilla XPCOM access means C++
--   AC_PROG_CXX
--   
-    dnl Note: with the infos from mozilla-gtkmozembed.pc
-    dnl we got all includes and libraries for the C interface
-    dnl to Mozilla, but not the XPCOM headers we also need.
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.16b.orig/src/mozilla/xulrunner.c liferea-1.4.16b/src/mozilla/xulrunner.c
---- liferea-1.4.16b.orig/src/mozilla/xulrunner.c	2007-07-23 13:56:53.000000000 -0400
-+++ liferea-1.4.16b/src/mozilla/xulrunner.c	2008-06-20 10:50:59.000000000 -0400
-@@ -30,10 +30,12 @@
- 
- static void xulrunner_init(void) {
- 	
-+#ifndef XPCOM_GLUE
- 	/* gtk_moz_embed_set_comp_path() must not be called
- 	   without a component path for XulRunner. Passing
- 	   NULL will crash Liferea. */
- 	gtk_moz_embed_set_comp_path(XULRUNNER_HOME);
-+#endif
- 
- 	mozembed_init();	
- }
diff --git a/net-news/liferea/files/liferea-1.4.17-xulrunner-1.9.patch b/net-news/liferea/files/liferea-1.4.17-xulrunner-1.9.patch
deleted file mode 100644
index e1215e89b795..000000000000
--- a/net-news/liferea/files/liferea-1.4.17-xulrunner-1.9.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.17.orig/configure.ac liferea-1.4.17/configure.ac
---- liferea-1.4.17.orig/configure.ac	2008-07-22 12:41:09.000000000 -0400
-+++ liferea-1.4.17/configure.ac	2008-07-25 10:21:52.000000000 -0400
-@@ -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
-@@ -168,7 +170,7 @@ dnl *********
- if test "x$enable_xulrunner" = "xyes" ; then
-  
-    AC_MSG_CHECKING([for XulRunner 1.9+ support])  
--   PKG_CHECK_MODULES(XULRUNNER, libxul-embedding, XULRUNNER_PROVIDER=libxul-embedding, XULRUNNER_PROVIDER=)
-+   PKG_CHECK_MODULES(XULRUNNER, libxul-embedding-unstable, XULRUNNER_PROVIDER=libxul-embedding-unstable, XULRUNNER_PROVIDER=)
-    
-    if test "x$XULRUNNER_PROVIDER" = "x" ; then
-       AC_MSG_CHECKING([for XulRunner 1.8 support])  
-@@ -181,6 +183,9 @@ if test "x$enable_xulrunner" = "xyes" ; 
-       enable_xulrunner=yes
-       
-       XULRUNNER_HOME="`$PKG_CONFIG --variable=libdir $XULRUNNER_PROVIDER`"
-+      if test "x$XULRUNNER_HOME" = "x" ; then
-+      	XULRUNNER_HOME="`$PKG_CONFIG --variable=sdkdir $XULRUNNER_PROVIDER`"
-+      fi
-       AC_SUBST([XULRUNNER_HOME])
-       AC_SUBST(XULRUNNER_CFLAGS)
-       AC_SUBST(XULRUNNER_LIBS)
-@@ -191,9 +196,6 @@ if test "x$enable_xulrunner" = "xyes" ; 
-       fi
- 
-       MOZILLA_LIB_ROOT=`$PKG_CONFIG --libs-only-L $XULRUNNER_PROVIDER | awk '{print $1}' |  cut -c 3-`
--   
--      dnl the Mozilla XPCOM access means C++
--      AC_PROG_CXX
-    fi
- fi
- 
-@@ -253,9 +255,6 @@ if test "x$enable_mozilla" = "xyes" ; th
- 
-    dnl AC_MSG_RESULT([$gecko_provider found!])
- 
--   dnl the Mozilla XPCOM access means C++
--   AC_PROG_CXX
--   
-    dnl Note: with the infos from mozilla-gtkmozembed.pc
-    dnl we got all includes and libraries for the C interface
-    dnl to Mozilla, but not the XPCOM headers we also need.
-diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN liferea-1.4.17.orig/src/mozilla/xulrunner.c liferea-1.4.17/src/mozilla/xulrunner.c
---- liferea-1.4.17.orig/src/mozilla/xulrunner.c	2008-07-01 13:04:55.000000000 -0400
-+++ liferea-1.4.17/src/mozilla/xulrunner.c	2008-07-25 10:21:00.000000000 -0400
-@@ -30,10 +30,12 @@
- 
- static void xulrunner_init(void) {
- 	
-+#ifndef XPCOM_GLUE
- 	/* gtk_moz_embed_set_comp_path() must not be called
- 	   without a component path for XulRunner. Passing
- 	   NULL will crash Liferea. */
- 	gtk_moz_embed_set_comp_path(XULRUNNER_HOME);
-+#endif
- 
- 	mozembed_init();	
- }
diff --git a/net-news/liferea/liferea-1.4.20.ebuild b/net-news/liferea/liferea-1.4.20.ebuild
deleted file mode 100644
index ca823cd926bc..000000000000
--- a/net-news/liferea/liferea-1.4.20.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.20.ebuild,v 1.2 2008/12/23 17:11:45 dang Exp $
-
-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"
-
-EAPI="1"
-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} --enable-xulrunner"
-		G2CONF="${G2CONF} --disable-webkit"
-		G2CONF="${G2CONF} --disable-gecko"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use webkit ; then
-		G2CONF="${G2CONF} --enable-webkit"
-		G2CONF="${G2CONF} --disable-gecko"
-		G2CONF="${G2CONF} --disable-xulrunner"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use gtkhtml ; then
-		if ! use amd64 ; then
-			G2CONF="${G2CONF} --enable-gtkhtml2"
-			G2CONF="${G2CONF} --disable-gecko"
-			G2CONF="${G2CONF} --disable-xulrunner"
-			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.17-xulrunner-1.9.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.21b.ebuild b/net-news/liferea/liferea-1.4.21b.ebuild
deleted file mode 100644
index d1ab481587a2..000000000000
--- a/net-news/liferea/liferea-1.4.21b.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.21b.ebuild,v 1.2 2008/12/23 17:11:45 dang Exp $
-
-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"
-
-EAPI="1"
-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} --enable-xulrunner"
-		G2CONF="${G2CONF} --disable-webkit"
-		G2CONF="${G2CONF} --disable-gecko"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use webkit ; then
-		G2CONF="${G2CONF} --enable-webkit"
-		G2CONF="${G2CONF} --disable-gecko"
-		G2CONF="${G2CONF} --disable-xulrunner"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use gtkhtml ; then
-		if ! use amd64 ; then
-			G2CONF="${G2CONF} --enable-gtkhtml2"
-			G2CONF="${G2CONF} --disable-gecko"
-			G2CONF="${G2CONF} --disable-xulrunner"
-			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.17-xulrunner-1.9.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.18.ebuild b/net-news/liferea/liferea-1.4.24.ebuild
index 59ebc39b9d16..a3815d7df979 100644
--- a/net-news/liferea/liferea-1.4.18.ebuild
+++ b/net-news/liferea/liferea-1.4.24.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.18.ebuild,v 1.2 2008/12/23 17:11:45 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.24.ebuild,v 1.1 2009/02/09 14:45:31 dang Exp $
 
 WANT_AUTOMAKE=1.9
 inherit gnome2 eutils autotools
@@ -15,7 +15,7 @@ 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"
+IUSE="dbus gtkhtml +gnutls libnotify lua networkmanager webkit +xulrunner"
 
 RDEPEND="
 	libnotify? ( >=x11-libs/libnotify-0.3.2 )
@@ -45,20 +45,17 @@ pkg_setup() {
 	# Backends are now mutually exclusive.
 	# we prefer xulrunner over webkit over seamonkey over gtkhtml
 	if use xulrunner ; then
-		G2CONF="${G2CONF} --enable-xulrunner"
+		G2CONF="${G2CONF} --with-gecko=libxul"
 		G2CONF="${G2CONF} --disable-webkit"
-		G2CONF="${G2CONF} --disable-gecko"
 		G2CONF="${G2CONF} --disable-gtkhtml2"
 	elif use webkit ; then
 		G2CONF="${G2CONF} --enable-webkit"
-		G2CONF="${G2CONF} --disable-gecko"
-		G2CONF="${G2CONF} --disable-xulrunner"
+		G2CONF="${G2CONF} --without-gecko"
 		G2CONF="${G2CONF} --disable-gtkhtml2"
 	elif use gtkhtml ; then
 		if ! use amd64 ; then
 			G2CONF="${G2CONF} --enable-gtkhtml2"
-			G2CONF="${G2CONF} --disable-gecko"
-			G2CONF="${G2CONF} --disable-xulrunner"
+			G2CONF="${G2CONF} --without-gecko"
 			G2CONF="${G2CONF} --disable-webkit"
 		else
 			elog ""
@@ -85,7 +82,7 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
-	epatch "${FILESDIR}"/${PN}-1.4.17-xulrunner-1.9.patch
+	epatch "${FILESDIR}"/${PN}-1.4.23-gecko.patch
 
 	intltoolize --force || die "intltoolize failed"
 	eautoreconf