Bump to 1.4.23

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r6 x86_64

7 files changed, 152 insertions, 14 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 724583c9b2bc..aad81153e367 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.163 2008/11/01 17:24:06 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.164 2008/12/23 17:11:45 dang Exp $
+
+*liferea-1.4.23 (23 Dec 2008)
+
+  23 Dec 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/liferea-1.4.23-gecko.patch, +liferea-1.4.23.ebuild:
+  Bump to 1.4.23
 
 *liferea-1.4.21b (01 Nov 2008)
 
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index b1bebb318e13..80e4a3f07de8 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -5,22 +5,25 @@ AUX liferea-1.1.0-libnotify.patch 552 RMD160 0bf67b33913e08ed5528b86813aae306491
 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
 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 2839 RMD160 8598e2bd7c6b36471877db8d3899c2a61dd9c368 SHA1 2c8326f1eb6e638b10106dadf04664d12ed6536f SHA256 6645aea3e37a4500b293bd0a495fd2218a4d586d4b503f387ba2efede5cd5d8a
-EBUILD liferea-1.4.20.ebuild 2839 RMD160 a5790a3d0768026a2a0b94d6fecf9bd26b03ec04 SHA1 87dbca87b36d6378a55f26a0997ea69be0ded398 SHA256 5099a5cba6ce4309252bd2ebe7d76d129f76ec67fa3b7f4228a9e925db64308f
-EBUILD liferea-1.4.21b.ebuild 2840 RMD160 88f35b547da5ebc1095f8948ae67a644c9ba55da SHA1 556cbeb3e8af5860cf0adce12ed89c6474c0d510 SHA256 2e496eb8d4cf34dd3a4d0c2d18b2ab255928fd8cc3b534ca59189ed39367793a
-MISC ChangeLog 48317 RMD160 154ad2591f65b93a9b89426faa6bb0329f6c5f41 SHA1 2fca8e437a892370ab211cc8ee8bc30c73cb60f4 SHA256 e4ce802edfde150f6504b74bc44fafedc28b41f087eb73a261cc0f4e868c19a4
+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 2697 RMD160 2f18e026d5f2f2f48450d3b90d6a51bd1e192fad SHA1 0a7abe05f664511037077984386ca40f98f92546 SHA256 70b06b4468242f6efee59e93ee0c47b4a442151485c871f674e2a8e0c239cdeb
+MISC ChangeLog 48478 RMD160 d62120f250e882ce3e6fc26c062e3e2cd6c5189c SHA1 b15ad5bb0cae8c3027021ad7e5634a0c3e485aeb SHA256 bbbd560051a0d99c535ebefe27bf7a30115cb08f4b833308544d334b761d9bca
 MISC metadata.xml 1177 RMD160 45b920ca3d4f4d3aea00b5932c3a09fdb970828a SHA1 4060937fb45d9d49e333779aabef44d1e06ff220 SHA256 12db9a0dafe3a6715f367e74aa43566e0b0804e794ec1f5f42dc38c75e48440c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFJDJDGomPajV0RnrERAuY2AJ9SgyPE5vGBOYHG10+aWDD1RtHbDACbBrPZ
-8raaluB65KfE9Zmg2oSo+pI=
-=JI3H
+iD8DBQFJURveomPajV0RnrERAroLAJ0YOTTyetc780NmIKmY1tpAp/QtHgCbB8Cm
+4AZBJ8NdFfOCF9/41fPlGjA=
+=9xXE
 -----END PGP SIGNATURE-----
diff --git a/net-news/liferea/files/liferea-1.4.23-gecko.patch b/net-news/liferea/files/liferea-1.4.23-gecko.patch
new file mode 100644
index 000000000000..3789ff091a3f
--- /dev/null
+++ b/net-news/liferea/files/liferea-1.4.23-gecko.patch
@@ -0,0 +1,34 @@
+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.4.18.ebuild b/net-news/liferea/liferea-1.4.18.ebuild
index e59c5ad50465..59ebc39b9d16 100644
--- a/net-news/liferea/liferea-1.4.18.ebuild
+++ b/net-news/liferea/liferea-1.4.18.ebuild
@@ -1,6 +1,6 @@
 # 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.18.ebuild,v 1.1 2008/08/04 14:52:15 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.18.ebuild,v 1.2 2008/12/23 17:11:45 dang Exp $
 
 WANT_AUTOMAKE=1.9
 inherit gnome2 eutils autotools
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 EAPI="1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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"
diff --git a/net-news/liferea/liferea-1.4.20.ebuild b/net-news/liferea/liferea-1.4.20.ebuild
index 98b38161c036..ca823cd926bc 100644
--- a/net-news/liferea/liferea-1.4.20.ebuild
+++ b/net-news/liferea/liferea-1.4.20.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2008/10/14 02:04:04 dang Exp $
+# $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
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 EAPI="1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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"
diff --git a/net-news/liferea/liferea-1.4.21b.ebuild b/net-news/liferea/liferea-1.4.21b.ebuild
index 6b516bf705b9..d1ab481587a2 100644
--- a/net-news/liferea/liferea-1.4.21b.ebuild
+++ b/net-news/liferea/liferea-1.4.21b.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2008/11/01 17:24:06 dang Exp $
+# $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
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 
 EAPI="1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+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"
diff --git a/net-news/liferea/liferea-1.4.23.ebuild b/net-news/liferea/liferea-1.4.23.ebuild
new file mode 100644
index 000000000000..dc3d172d5d01
--- /dev/null
+++ b/net-news/liferea/liferea-1.4.23.ebuild
@@ -0,0 +1,95 @@
+# 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.23.ebuild,v 1.1 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} --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}"
+}