Bump to 1.4.23

(Portage version: 2.2_rc17/cvs/Linux 2.6.27-gentoo-r6 x86_64)

6 files changed, 142 insertions, 7 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/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}"
+}