Bump liferea to 1.4.24

(Portage version: 2.1.6.7/cvs/Linux x86_64)

6 files changed, 18 insertions, 332 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/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