Liferea with xulrunner support

svn path=/maintainer/; revision=14

6 files changed, 27 insertions, 104 deletions

diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index ed5c403..4849203 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -2,19 +2,11 @@ AUX liferea-1.1.0-libnotify.patch 552 RMD160 0bf67b33913e08ed5528b86813aae306491
 MD5 3a20454520ddb0c23157591a24516972 files/liferea-1.1.0-libnotify.patch 552
 RMD160 0bf67b33913e08ed5528b86813aae30649123304 files/liferea-1.1.0-libnotify.patch 552
 SHA256 73a54e020b045ee261f9444464a68f4f1aba831182498b8a103886b7c0108bab files/liferea-1.1.0-libnotify.patch 552
-DIST liferea-1.1.5.tar.gz 1501589 RMD160 7b19cc6682921756de134cc79a1a4f98488022bc SHA1 428e79b1a2ea723c3fc2800710285779e09efd7a SHA256 dac1b1135e62fea06ef3b1b1d9ce17c4a56fbc24a0e5ab55b7c580175aa18c29
-DIST liferea-1.1.6.tar.gz 1164348 RMD160 67f300141c4e790d37771fecf14bd9a9e528a6f9 SHA1 6de729a28177a58561b08da5ea77231bc2f82713 SHA256 d7799e197d65205cedf5be8b6dd6da917ed4f26c1caf7c05c3c2538646fbc46e
-EBUILD liferea-1.1.5.ebuild 1729 RMD160 125df0a9ae7a7cca99db71fd1455a4474a9bf049 SHA1 260ebbfe115a105be1de018bd97b1efe36b61d42 SHA256 bc239612328148f020e8c0b9d1f4b4b3ac39dd4a349b7a553dc76610f95c4e15
-MD5 d1dc2a2e2df990ae26c10e7a902f5a59 liferea-1.1.5.ebuild 1729
-RMD160 125df0a9ae7a7cca99db71fd1455a4474a9bf049 liferea-1.1.5.ebuild 1729
-SHA256 bc239612328148f020e8c0b9d1f4b4b3ac39dd4a349b7a553dc76610f95c4e15 liferea-1.1.5.ebuild 1729
-EBUILD liferea-1.1.6.ebuild 1729 RMD160 125df0a9ae7a7cca99db71fd1455a4474a9bf049 SHA1 260ebbfe115a105be1de018bd97b1efe36b61d42 SHA256 bc239612328148f020e8c0b9d1f4b4b3ac39dd4a349b7a553dc76610f95c4e15
-MD5 d1dc2a2e2df990ae26c10e7a902f5a59 liferea-1.1.6.ebuild 1729
-RMD160 125df0a9ae7a7cca99db71fd1455a4474a9bf049 liferea-1.1.6.ebuild 1729
-SHA256 bc239612328148f020e8c0b9d1f4b4b3ac39dd4a349b7a553dc76610f95c4e15 liferea-1.1.6.ebuild 1729
-MD5 05357116020543d6e743f412543f15f7 files/digest-liferea-1.1.5 244
-RMD160 82adb80a87938a8a14e9cf81df65b1a9630f1321 files/digest-liferea-1.1.5 244
-SHA256 c187e73b6f7841fbd615cc07f9779450c5317c9197f531b7bf5790e2ff7b0cbc files/digest-liferea-1.1.5 244
-MD5 3cd489f9b213c9416032f727202fb002 files/digest-liferea-1.1.6 244
-RMD160 08ad39a22efdd2153b51628e3ee159adb5034577 files/digest-liferea-1.1.6 244
-SHA256 50384d6755929caa901aea2dd575f1a529d7e300e3fa27778c37b26b78cbec6d files/digest-liferea-1.1.6 244
+DIST liferea-1.1.9b.tar.gz 1171943 RMD160 6ef65405f2f322fd17165af058460f06f9a9a6f1 SHA1 c7d45c63145234564e9acbb06aa5dccc567045c6 SHA256 85f2c74a3ecb91b8a975820c3fea20b183780a187303d5f6eaee069f1feb0d74
+EBUILD liferea-1.1.9-r1.ebuild 2012 RMD160 68c13d39e54ef51958d54903838aa0a1083dea62 SHA1 d5be0681f67f88b8f0c5f7e00bb4f6b773d8bbe3 SHA256 e9f062cf706967635d2cee73b41a7a28064212eff0df710369b3c6d2d9a1a8e9
+MD5 ac51ba745449c6ad70e40ab4d5e306fb liferea-1.1.9-r1.ebuild 2012
+RMD160 68c13d39e54ef51958d54903838aa0a1083dea62 liferea-1.1.9-r1.ebuild 2012
+SHA256 e9f062cf706967635d2cee73b41a7a28064212eff0df710369b3c6d2d9a1a8e9 liferea-1.1.9-r1.ebuild 2012
+MD5 1236ef79902564427f63f27765483b72 files/digest-liferea-1.1.9-r1 247
+RMD160 ac5f088433f6b5a0904902ad103ee2425bc38c95 files/digest-liferea-1.1.9-r1 247
+SHA256 ff429e9d8f61c00825102b68dd4c504054e6ed0a9ecad6f9a295acaf6cbc854b files/digest-liferea-1.1.9-r1 247
diff --git a/net-news/liferea/files/digest-liferea-1.1.5 b/net-news/liferea/files/digest-liferea-1.1.5
deleted file mode 100644
index e852de0..0000000
--- a/net-news/liferea/files/digest-liferea-1.1.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 39f32fc4f00493b3281fc77c21595cd9 liferea-1.1.5.tar.gz 1501589
-RMD160 7b19cc6682921756de134cc79a1a4f98488022bc liferea-1.1.5.tar.gz 1501589
-SHA256 dac1b1135e62fea06ef3b1b1d9ce17c4a56fbc24a0e5ab55b7c580175aa18c29 liferea-1.1.5.tar.gz 1501589
diff --git a/net-news/liferea/files/digest-liferea-1.1.6 b/net-news/liferea/files/digest-liferea-1.1.6
deleted file mode 100644
index 56b9c21..0000000
--- a/net-news/liferea/files/digest-liferea-1.1.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2d471d6e5f1aec7f17b63fe6a75fb78f liferea-1.1.6.tar.gz 1164348
-RMD160 67f300141c4e790d37771fecf14bd9a9e528a6f9 liferea-1.1.6.tar.gz 1164348
-SHA256 d7799e197d65205cedf5be8b6dd6da917ed4f26c1caf7c05c3c2538646fbc46e liferea-1.1.6.tar.gz 1164348
diff --git a/net-news/liferea/files/digest-liferea-1.1.9-r1 b/net-news/liferea/files/digest-liferea-1.1.9-r1
new file mode 100644
index 0000000..500fbb6
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.1.9-r1
@@ -0,0 +1,3 @@
+MD5 cb483c08fc1d2d2d9c3da30e95ee2214 liferea-1.1.9b.tar.gz 1171943
+RMD160 6ef65405f2f322fd17165af058460f06f9a9a6f1 liferea-1.1.9b.tar.gz 1171943
+SHA256 85f2c74a3ecb91b8a975820c3fea20b183780a187303d5f6eaee069f1feb0d74 liferea-1.1.9b.tar.gz 1171943
diff --git a/net-news/liferea/liferea-1.1.6.ebuild b/net-news/liferea/liferea-1.1.6.ebuild
deleted file mode 100644
index e7735a1..0000000
--- a/net-news/liferea/liferea-1.1.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit gnome2 flag-o-matic 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"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls"
-
-RDEPEND=">=x11-libs/gtk+-2.4.0
-	>=dev-libs/libxml2-2.5.10
-	|| (
-		firefox? ( www-client/mozilla-firefox )
-		seamonkey? ( www-client/seamonkey )
-		=gnome-extra/gtkhtml-2*
-	)
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-	>=gnome-base/gconf-2
-	dbus? ( >=sys-apps/dbus-0.30 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	gnutls? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
-	#epatch "${FILESDIR}/${P}-iter.patch"
-	
-	eautoreconf || die "Autoreconf failed"
-}
-
-pkg_setup() {
-	# if you don't choose a gecko to use, we will automatically
-	# use gtkhtml2 as the backend.
-	if ! use seamonkey && ! use firefox || use gtkhtml ; then
-		G2CONF="${G2CONF} --enable-gtkhtml2"
-	else
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	fi
-
-	# we prefer firefox over seamonkey
-	if use firefox ; then
-		G2CONF="${G2CONF} --enable-gecko=firefox"
-	elif use seamonkey ; then
-		G2CONF="${G2CONF} --enable-gecko=seamonkey"
-	else
-		G2CONF="${G2CONF} --disable-gecko"
-	fi
-
-	G2CONF="${G2CONF} \
-		$(use_enable dbus) \
-		$(use_enable gnutls) \
-		$(use_enable libnotify)"
-}
-
-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.1.5.ebuild b/net-news/liferea/liferea-1.1.9-r1.ebuild
index e7735a1..77bd6e1 100644
--- a/net-news/liferea/liferea-1.1.5.ebuild
+++ b/net-news/liferea/liferea-1.1.9-r1.ebuild
@@ -1,33 +1,39 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.1.9-r1.ebuild,v 1.1 2006/11/05 03:39:16 dang Exp $
 
 inherit gnome2 flag-o-matic 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"
+SRC_URI="mirror://sourceforge/${PN}/${P}b.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls"
+IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls xulrunner"
 
-RDEPEND=">=x11-libs/gtk+-2.4.0
+RDEPEND=">=x11-libs/gtk+-2.8
+	x11-libs/pango
+	>=gnome-base/gconf-2
 	>=dev-libs/libxml2-2.5.10
+	dev-libs/libxslt
+	>=dev-libs/glib-2
 	|| (
+		xulrunner? ( net-libs/xulrunner )
 		firefox? ( www-client/mozilla-firefox )
 		seamonkey? ( www-client/seamonkey )
 		=gnome-extra/gtkhtml-2*
 	)
 	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-	>=gnome-base/gconf-2
 	dbus? ( >=sys-apps/dbus-0.30 )
 	libnotify? ( >=x11-libs/libnotify-0.3.2 )
 	gnutls? ( net-libs/gnutls )"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35
+	=sys-devel/automake-1.7*"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
@@ -37,8 +43,7 @@ src_unpack() {
 	cd ${S}
 
 	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
-	#epatch "${FILESDIR}/${P}-iter.patch"
-	
+
 	eautoreconf || die "Autoreconf failed"
 }
 
@@ -52,7 +57,9 @@ pkg_setup() {
 	fi
 
 	# we prefer firefox over seamonkey
-	if use firefox ; then
+	if use xulrunner ; then
+		G2CONF="${G2CONF} --enable-gecko=xulrunner"
+	elif use firefox ; then
 		G2CONF="${G2CONF} --enable-gecko=firefox"
 	elif use seamonkey ; then
 		G2CONF="${G2CONF} --enable-gecko=seamonkey"