Bump to 1.4.16b

New world order for liferea:
	- xulrunner is now 1.9
	- No more firefox 2 support
	- webkit support works, and will be committed as soon as there is a
	  maskable use flag for arches that haven't keyworded it.
(Portage version: 2.1.5.6)

3 files changed, 179 insertions, 1 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 67185ece1545..cc4ec56d3e29 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,22 @@
 # 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.152 2008/06/19 17:34:18 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.153 2008/06/20 15:50:00 dang Exp $
+
+*liferea-1.4.16b (20 Jun 2008)
+
+  20 Jun 2008; Daniel Gryniewicz <dang@gentoo.org>
+  +files/liferea-1.4.16b-xulrunner-1.9.patch, +liferea-1.4.16b.ebuild:
+  Bump to 1.4.16b
+
+  New world order for liferea:
+
+  - xulrunner is now 1.9
+
+  - No more firefox 2 support
+
+  - webkit support works, and will be committed as soon as there is a
+
+  maskable use flag for arches that haven't keyworded it.
 
   19 Jun 2008; nixnut <nixnut@gentoo.org> liferea-1.4.15.ebuild:
   Stable on ppc wrt bug 228357
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
new file mode 100644
index 000000000000..fc6764661042
--- /dev/null
+++ b/net-news/liferea/files/liferea-1.4.16b-xulrunner-1.9.patch
@@ -0,0 +1,58 @@
+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/liferea-1.4.16b.ebuild b/net-news/liferea/liferea-1.4.16b.ebuild
new file mode 100644
index 000000000000..94e72b0be558
--- /dev/null
+++ b/net-news/liferea/liferea-1.4.16b.ebuild
@@ -0,0 +1,104 @@
+# 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.16b.ebuild,v 1.1 2008/06/20 15:50:00 dang Exp $
+
+WANT_AUTOMAKE=1.7
+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 ~sparc ~x86"
+# Can't add webkit until there's a masked use flag for it's keyworded
+# webkit
+IUSE="dbus gtkhtml gnutls libnotify lua networkmanager seamonkey xulrunner"
+
+#	!xulrunner? ( webkit? ( net-libs/webkit-gtk ) )
+#	!xulrunner? ( !webkit? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
+#	!amd64? ( !xulrunner? ( !webkit? ( ( !seamonkey? ( gtkhtml? ( gnome-extra/gtkhtml:2 ) ) ) ) ) )
+RDEPEND="
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	lua? ( >=dev-lang/lua-5.1 )
+	xulrunner? ( net-libs/xulrunner:1.9 )
+	!xulrunner? ( ( seamonkey? ( =www-client/seamonkey-1* ) ) )
+	!amd64? ( !xulrunner? ( !seamonkey? ( 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 seamonkey ; then
+		G2CONF="${G2CONF} --enable-gecko=seamonkey"
+		G2CONF="${G2CONF} --disable-xulrunner"
+		G2CONF="${G2CONF} --disable-webkit"
+		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 one of the gecko backends to use liferea.  "
+			elog "Preference is: xulrunner, webkit, then seamonkey."
+			die "You must enable one of the gecko backends or webkit on amd64"
+		fi
+	else
+		elog ""
+		elog "You must choose one backend for liferea to work.  Preference is:"
+		elog "xulrunner, webkit, seamonkey, 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}-xulrunner-1.9.patch
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	rm -f "${D}/usr/bin/${PN}"
+	mv "${D}/usr/bin/${PN}-bin" "${D}/usr/bin/${PN}"
+}