Bump to liferea-1.4.28-r1

	- tarball was generated with broken intltool; bug #266821
	- configure uses *both* --enable-gecko *and* --with-gecko; bug #266549
Package-Manager: portage-2.2_rc30/cvs/Linux x86_64

3 files changed, 108 insertions, 5 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 017e215d31f1..38debcdd7052 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.170 2009/04/16 18:08:13 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.171 2009/04/20 13:27:20 dang Exp $
+
+*liferea-1.4.28-r1 (20 Apr 2009)
+
+  20 Apr 2009; Daniel Gryniewicz <dang@gentoo.org>
+  +liferea-1.4.28-r1.ebuild:
+  Bump to liferea-1.4.28-r1
+
+  - tarball was generated with broken intltool; bug #266821
+
+  - configure uses *both* --enable-gecko *and* --with-gecko; bug #266549
 
 *liferea-1.4.28 (16 Apr 2009)
 
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index a32490f35d16..b5eb4ea7b9f2 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -13,13 +13,14 @@ EBUILD liferea-1.2.23-r1.ebuild 2854 RMD160 caed5b4b30b45087db2c0bcd53e1d9bf49cc
 EBUILD liferea-1.4.15.ebuild 2846 RMD160 21b12fb5193687fe03fbc5cbf3ce161bc9861ded SHA1 fd39cfebaf967740cd62e5ec336b415677d4b3ff SHA256 a402cb18cddd8f16f17030ddf31b70b238597d94c7f69be9b613dcc69d025a82
 EBUILD liferea-1.4.23.ebuild 2698 RMD160 90b80d2bf45b5cf7a56fdd695c6de596f5b7a830 SHA1 3fb73026dde7bb1054a733e3853de46277d0a52d SHA256 cc274bdfcd8278fd43733f97128011d87f17c32c3437af66324ca5ff297e0cd3
 EBUILD liferea-1.4.24.ebuild 2707 RMD160 c74975a9a551ae60b528da98c005b77dab0b5af8 SHA1 7168bc0db0d08338f7562ea748723082a5b9ede5 SHA256 f35147bffb27050a3ba16f693a9c2f0b9da5178bb998a5757dada85213afc3d0
+EBUILD liferea-1.4.28-r1.ebuild 2639 RMD160 c8aa73c6c61cade1b66aff1e109a0be7de21d7c3 SHA1 44fb3d592fc9b22a1c688f1a2bd1add1e3d7103c SHA256 acbfc323960d836b74ab70306768b4020b2ae2b1da6db6f4021431042f0bb590
 EBUILD liferea-1.4.28.ebuild 2480 RMD160 62f2dc8673f9ef8a0174706e0960995867ec1dc6 SHA1 1fba1f3c3253aec9d92293ff0007794535f296ff SHA256 4b218072b7fa6bb8c83f36c623633fa79b366dd7a0d27471ad732f82b39b8559
-MISC ChangeLog 49488 RMD160 d5ca116ee8ba9f0ac08c6432982bf61ed3aaf262 SHA1 d64fa4b29fe78010ba5edb32ad4ef4709fa731b9 SHA256 45d076e92f3bccab7ef2f9de9218215cf005a6d388f5b8929f90fa0bd79a9172
+MISC ChangeLog 49766 RMD160 9d8bd2a44049c81f4fe87ea1a7e682aa87617e75 SHA1 d3fc217989db952fcc1e5c1808219c8170fbd468 SHA256 2db5e98e8384d2854ed2018ca130ca49dc4a051e277265b374c59e32a555969b
 MISC metadata.xml 1177 RMD160 45b920ca3d4f4d3aea00b5932c3a09fdb970828a SHA1 4060937fb45d9d49e333779aabef44d1e06ff220 SHA256 12db9a0dafe3a6715f367e74aa43566e0b0804e794ec1f5f42dc38c75e48440c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFJ53QpomPajV0RnrERAgxwAJ98sJabZ+3eP7AD5IGD7s+sT7vfZACeM409
-pmHRg0U9cFLx9to0DEX+FhE=
-=9JKs
+iD8DBQFJ7HhWomPajV0RnrERAlBJAKCBxXs3jM2dRVOfoIJL+BO4UdDZ2wCaA07a
+d5cwFn7yCUEF9g5lH5/x+Rk=
+=7/m7
 -----END PGP SIGNATURE-----
diff --git a/net-news/liferea/liferea-1.4.28-r1.ebuild b/net-news/liferea/liferea-1.4.28-r1.ebuild
new file mode 100644
index 000000000000..4c318543a879
--- /dev/null
+++ b/net-news/liferea/liferea-1.4.28-r1.ebuild
@@ -0,0 +1,92 @@
+# 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-r1.ebuild,v 1.1 2009/04/20 13:27:20 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="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} --enable-gecko"
+		G2CONF="${G2CONF} --with-gecko=libxul"
+		G2CONF="${G2CONF} --disable-webkit"
+		G2CONF="${G2CONF} --disable-gtkhtml2"
+	elif use webkit ; then
+		G2CONF="${G2CONF} --enable-webkit"
+		G2CONF="${G2CONF} --disable-gecko"
+		G2CONF="${G2CONF} --disable-gtkhtml2"
+	elif use gtkhtml ; then
+		if ! use amd64 ; then
+			G2CONF="${G2CONF} --enable-gtkhtml2"
+			G2CONF="${G2CONF} --disable-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_prepare() {
+	gnome2_src_prepare
+
+	intltoolize --force --copy --automake || 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}"
+}