Bump to 1.2_rc3; both with and without xulrunner

Package-Manager: portage-2.1.2_rc2-r2

8 files changed, 208 insertions, 20 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 4533c2def14d..98341b42dfca 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.68 2006/11/28 19:04:43 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.69 2006/11/28 20:51:54 dang Exp $
+
+*liferea-1.2_rc3-r1 (28 Nov 2006)
+*liferea-1.2_rc3 (28 Nov 2006)
+
+  28 Nov 2006; Daniel Gryniewicz <dang@gentoo.org> liferea-1.2_rc1.ebuild,
+  liferea-1.2_rc1-r1.ebuild, +liferea-1.2_rc3.ebuild,
+  +liferea-1.2_rc3-r1.ebuild:
+  Bump to 1.2_rc3; both with and without xulrunner
 
   28 Nov 2006; Daniel Gryniewicz <dang@gentoo.org> +liferea-1.2_rc1.ebuild:
   Oops, just noticed that non-xulrunner version was removed
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 69dbf007be3c..2db60cc1a10a 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -16,6 +16,7 @@ SHA256 73a54e020b045ee261f9444464a68f4f1aba831182498b8a103886b7c0108bab files/li
 DIST liferea-1.0.16.tar.gz 1575690 RMD160 c5ba8aed414c333a9e12d950a821042216cee310 SHA1 6a134e12cad915dd85f0fb467f39397400a69614 SHA256 591d7d6b6ea6d8c0a90c68418d1e65076bbfe32976f00d229357f45176e3ebe4
 DIST liferea-1.0.24.tar.gz 1572698 RMD160 53d4e332373563b1a813f342d690f28722a5d867 SHA1 1c486d559796ab921dd4dd858ba03ab0c46f62f1 SHA256 00218636ddae880d7e409435332a754316ead94f2af3aad53c9e5f2106f05964
 DIST liferea-1.2-RC1.tar.gz 1226770 RMD160 e7edd8ee63600babc5c4a01a9b72941b22254567 SHA1 583eba352e7fac25b2675cfa56ba8c8bbe1c5e2c SHA256 f9bcd9e31c3d6bebfaf5114d422cba19a7be31b054c6074193a7ee55f715d6bb
+DIST liferea-1.2-RC3.tar.gz 1282608 RMD160 d0d11aa18384fb1bc0d5cb8a317f1011c39ac92e SHA1 1a264a37a6e8334f8dcd6d6d48a1642fab8587fc SHA256 5e4028a655bb9f5912662e47b69c125646b3222d64125160929856c5d7aab53a
 EBUILD liferea-1.0.16.ebuild 1781 RMD160 37f9ac79e37c9ce76f0a396e04a71f083ea09239 SHA1 e39eaab188ef5cf800339fc7ecb224f6a5d98a5e SHA256 7f1821ca36162fc7f437716fa5c4f0980b45a0e1daa8ce8d40a9060dd36f5cc9
 MD5 63379fdc2f15c36a3961adc442c7f63d liferea-1.0.16.ebuild 1781
 RMD160 37f9ac79e37c9ce76f0a396e04a71f083ea09239 liferea-1.0.16.ebuild 1781
@@ -24,18 +25,26 @@ EBUILD liferea-1.0.24.ebuild 1834 RMD160 1f56217ece005a54a6d63a501390d9bea5e8744
 MD5 769ce59241a126cac70b05210d88c070 liferea-1.0.24.ebuild 1834
 RMD160 1f56217ece005a54a6d63a501390d9bea5e87448 liferea-1.0.24.ebuild 1834
 SHA256 ee30e1ebb6abad6fdf415725d85f2809bd64c1157fd1261b58f4cdccf47a830f liferea-1.0.24.ebuild 1834
-EBUILD liferea-1.2_rc1-r1.ebuild 2191 RMD160 44e9e8d8cc16c63fd40d1072a77dc24886cc75e0 SHA1 07dafbc4c4578a4087d4a9eccf186e96fa2da4d0 SHA256 deeadfda45e147bc9f5893236474bc28fea3fe6b99b603024ce5950d75c31c2b
-MD5 c6e1425b5b518b38eedf5eebdd373c7d liferea-1.2_rc1-r1.ebuild 2191
-RMD160 44e9e8d8cc16c63fd40d1072a77dc24886cc75e0 liferea-1.2_rc1-r1.ebuild 2191
-SHA256 deeadfda45e147bc9f5893236474bc28fea3fe6b99b603024ce5950d75c31c2b liferea-1.2_rc1-r1.ebuild 2191
-EBUILD liferea-1.2_rc1.ebuild 1972 RMD160 cb04d65597396d9c9483d20f03e4c8224695c111 SHA1 ffab7e0a1f19b59caf127b76d6f5fea1a4210a81 SHA256 65b126b13426b31558ef3acabe9ccc27ddeaba1a606fb81bc48a99c4ed138d59
-MD5 77a1f681b98eaa2c1b4bf36379801577 liferea-1.2_rc1.ebuild 1972
-RMD160 cb04d65597396d9c9483d20f03e4c8224695c111 liferea-1.2_rc1.ebuild 1972
-SHA256 65b126b13426b31558ef3acabe9ccc27ddeaba1a606fb81bc48a99c4ed138d59 liferea-1.2_rc1.ebuild 1972
-MISC ChangeLog 15067 RMD160 dd9c6d019172e5177f856801f7f97b9f8f29d17d SHA1 0e015da3f3cb6ff5992a2d9bbe419751e2754ce8 SHA256 9469b21ac2e317143d3f752bfcb5fd47b690d540086084ab136e5ba62bd4fa9e
-MD5 9fed2592d8f82528db9441a7340f67b2 ChangeLog 15067
-RMD160 dd9c6d019172e5177f856801f7f97b9f8f29d17d ChangeLog 15067
-SHA256 9469b21ac2e317143d3f752bfcb5fd47b690d540086084ab136e5ba62bd4fa9e ChangeLog 15067
+EBUILD liferea-1.2_rc1-r1.ebuild 2190 RMD160 f79228d5cdc8a51a1669454450603e88dbb12cfe SHA1 55f805bce68b0cea152b5121ce1e5f0c781fa165 SHA256 d49de12249baad16744da345740961225a8ec7a4a1ea84cc63073b5f50f66b94
+MD5 91b4d3c0ea64b92120c2a9d8b051cd6f liferea-1.2_rc1-r1.ebuild 2190
+RMD160 f79228d5cdc8a51a1669454450603e88dbb12cfe liferea-1.2_rc1-r1.ebuild 2190
+SHA256 d49de12249baad16744da345740961225a8ec7a4a1ea84cc63073b5f50f66b94 liferea-1.2_rc1-r1.ebuild 2190
+EBUILD liferea-1.2_rc1.ebuild 1965 RMD160 80ccfab2e9ae7a72eb0c801656ad474177a073f5 SHA1 22a8689fbe4faa217ee902ad1c48a5e2f92a7f21 SHA256 5de3ef47319614cb3fef1865040a89bd684b3b7dc6e848b200a10d77f1a2edd8
+MD5 56501fc4a9dc6728ed8659ec9fb5eba3 liferea-1.2_rc1.ebuild 1965
+RMD160 80ccfab2e9ae7a72eb0c801656ad474177a073f5 liferea-1.2_rc1.ebuild 1965
+SHA256 5de3ef47319614cb3fef1865040a89bd684b3b7dc6e848b200a10d77f1a2edd8 liferea-1.2_rc1.ebuild 1965
+EBUILD liferea-1.2_rc3-r1.ebuild 2195 RMD160 254b298877716440eda6826f20b7712f6a198988 SHA1 42ce020190732524375bc7cdc5d41e7d3d17f439 SHA256 fb254536c42b608431bb95a76539e74e561f72e023314c4983d77502295b3533
+MD5 76a3c81c4e74b33475f626ab2a52a36a liferea-1.2_rc3-r1.ebuild 2195
+RMD160 254b298877716440eda6826f20b7712f6a198988 liferea-1.2_rc3-r1.ebuild 2195
+SHA256 fb254536c42b608431bb95a76539e74e561f72e023314c4983d77502295b3533 liferea-1.2_rc3-r1.ebuild 2195
+EBUILD liferea-1.2_rc3.ebuild 1965 RMD160 03e31bd11d18c2d3d0dee9493c0f1f45bc2ef4fd SHA1 2204002be333cfaf3f4b6d7c40f8e7adc503f30e SHA256 06cb432b6277212097fb6b50c645d3c5d60aef40b7a4d657932d5a0580109075
+MD5 bfc2834791271a861c63dc0f40d38ac7 liferea-1.2_rc3.ebuild 1965
+RMD160 03e31bd11d18c2d3d0dee9493c0f1f45bc2ef4fd liferea-1.2_rc3.ebuild 1965
+SHA256 06cb432b6277212097fb6b50c645d3c5d60aef40b7a4d657932d5a0580109075 liferea-1.2_rc3.ebuild 1965
+MISC ChangeLog 15344 RMD160 b6234c36dcb4ededd96089a93682e8110e8a8118 SHA1 86debef2f1298520f38a24d29d8db112e3b6c479 SHA256 424897dec3d6ac715fd6356b8bab60b483a68ebb8d4b44e55146d149e7566f33
+MD5 597cca1e0ad14ad75b1f20fc8466c59d ChangeLog 15344
+RMD160 b6234c36dcb4ededd96089a93682e8110e8a8118 ChangeLog 15344
+SHA256 424897dec3d6ac715fd6356b8bab60b483a68ebb8d4b44e55146d149e7566f33 ChangeLog 15344
 MISC metadata.xml 234 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d SHA1 f541accc026d4661bfb88d67e90b52688bdd5bb7 SHA256 d591157e9bfeb2310593aed627aeb34ba920b77b253285649a87f7749c39592f
 MD5 4f37ad0cecc87d9509c096e2c59e10fd metadata.xml 234
 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d metadata.xml 234
@@ -52,10 +61,16 @@ SHA256 0e2b5e17f6073d48d14067334cb45d2c6ee4e802ee14ff27d63847bad5d5bf3a files/di
 MD5 f5e7bf64c98cec2afeadc2856a569aa3 files/digest-liferea-1.2_rc1-r1 250
 RMD160 8c593975578e396422b9ab143014bcbd9575742a files/digest-liferea-1.2_rc1-r1 250
 SHA256 0e2b5e17f6073d48d14067334cb45d2c6ee4e802ee14ff27d63847bad5d5bf3a files/digest-liferea-1.2_rc1-r1 250
+MD5 f0f7c5084e443f5b633aae4d26f880b6 files/digest-liferea-1.2_rc3 250
+RMD160 f61b087cd793ab456128c8c941d9f07ff38c4a26 files/digest-liferea-1.2_rc3 250
+SHA256 edef6ff908d45f3a02242df4aff2de0b7904870be4ce08b649ee28027cb91e37 files/digest-liferea-1.2_rc3 250
+MD5 f0f7c5084e443f5b633aae4d26f880b6 files/digest-liferea-1.2_rc3-r1 250
+RMD160 f61b087cd793ab456128c8c941d9f07ff38c4a26 files/digest-liferea-1.2_rc3-r1 250
+SHA256 edef6ff908d45f3a02242df4aff2de0b7904870be4ce08b649ee28027cb91e37 files/digest-liferea-1.2_rc3-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFFbIhcomPajV0RnrERAi6wAJ9G1XEx3SpqTGOFgKFmllZmpwjKtwCfUIJo
-0MpBQVp1r/hnnIiRBRYeszg=
-=Lmbm
+iD8DBQFFbKFzomPajV0RnrERAhM8AJ4neWIFUQnJ4qj++4UyrAnb97y1PgCbBCFK
+LpTTdVe4oFFKgUW1bJpBrHk=
+=hEUU
 -----END PGP SIGNATURE-----
diff --git a/net-news/liferea/files/digest-liferea-1.2_rc3 b/net-news/liferea/files/digest-liferea-1.2_rc3
new file mode 100644
index 000000000000..7d7630f3970d
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.2_rc3
@@ -0,0 +1,3 @@
+MD5 30542c315370db12cc9598d3b809b2d5 liferea-1.2-RC3.tar.gz 1282608
+RMD160 d0d11aa18384fb1bc0d5cb8a317f1011c39ac92e liferea-1.2-RC3.tar.gz 1282608
+SHA256 5e4028a655bb9f5912662e47b69c125646b3222d64125160929856c5d7aab53a liferea-1.2-RC3.tar.gz 1282608
diff --git a/net-news/liferea/files/digest-liferea-1.2_rc3-r1 b/net-news/liferea/files/digest-liferea-1.2_rc3-r1
new file mode 100644
index 000000000000..7d7630f3970d
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.2_rc3-r1
@@ -0,0 +1,3 @@
+MD5 30542c315370db12cc9598d3b809b2d5 liferea-1.2-RC3.tar.gz 1282608
+RMD160 d0d11aa18384fb1bc0d5cb8a317f1011c39ac92e liferea-1.2-RC3.tar.gz 1282608
+SHA256 5e4028a655bb9f5912662e47b69c125646b3222d64125160929856c5d7aab53a liferea-1.2-RC3.tar.gz 1282608
diff --git a/net-news/liferea/liferea-1.2_rc1-r1.ebuild b/net-news/liferea/liferea-1.2_rc1-r1.ebuild
index 1a5eed54a9f6..668702cb6362 100644
--- a/net-news/liferea/liferea-1.2_rc1-r1.ebuild
+++ b/net-news/liferea/liferea-1.2_rc1-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2_rc1-r1.ebuild,v 1.2 2006/11/20 23:07:24 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2_rc1-r1.ebuild,v 1.3 2006/11/28 20:51:54 dang Exp $
 
 inherit gnome2 flag-o-matic eutils autotools
 
-MY_P=${PN}-1.2-RC1
+MY_P=${P/_rc/-RC}
 DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
 HOMEPAGE="http://liferea.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
diff --git a/net-news/liferea/liferea-1.2_rc1.ebuild b/net-news/liferea/liferea-1.2_rc1.ebuild
index 297fa87ea2d8..1736beae4085 100644
--- a/net-news/liferea/liferea-1.2_rc1.ebuild
+++ b/net-news/liferea/liferea-1.2_rc1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2_rc1.ebuild,v 1.4 2006/11/28 19:04:43 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2_rc1.ebuild,v 1.5 2006/11/28 20:51:54 dang Exp $
 
 inherit gnome2 flag-o-matic eutils autotools
 
-MY_P=${PN}-1.2-RC1
+MY_P=${P/_rc/-RC}
 DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
 HOMEPAGE="http://liferea.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
diff --git a/net-news/liferea/liferea-1.2_rc3-r1.ebuild b/net-news/liferea/liferea-1.2_rc3-r1.ebuild
new file mode 100644
index 000000000000..ba3178f4cffb
--- /dev/null
+++ b/net-news/liferea/liferea-1.2_rc3-r1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2_rc3-r1.ebuild,v 1.1 2006/11/28 20:51:54 dang Exp $
+
+inherit gnome2 flag-o-matic eutils autotools
+
+MY_P=${P/_rc/-RC}
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
+HOMEPAGE="http://liferea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls xulrunner"
+
+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 )
+	!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
+	!xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
+	!xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) )
+	gtkhtml? ( =gnome-extra/gtkhtml-2* )
+	dbus? ( || ( >=dev-libs/dbus-glib-0.71
+		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
+	)
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	gnutls? ( net-libs/gnutls )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=dev-util/intltool-0.35
+	=sys-devel/automake-1.7*"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+S=${WORKDIR}/${MY_P}
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.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 xulrunner over firefox over seamonkey
+	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"
+	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.2_rc3.ebuild b/net-news/liferea/liferea-1.2_rc3.ebuild
new file mode 100644
index 000000000000..122ba4c9707c
--- /dev/null
+++ b/net-news/liferea/liferea-1.2_rc3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2_rc3.ebuild,v 1.1 2006/11/28 20:51:54 dang Exp $
+
+inherit gnome2 flag-o-matic eutils autotools
+
+MY_P=${P/_rc/-RC}
+DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
+HOMEPAGE="http://liferea.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_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.8
+	x11-libs/pango
+	>=gnome-base/gconf-2
+	>=dev-libs/libxml2-2.5.10
+	dev-libs/libxslt
+	>=dev-libs/glib-2
+	firefox? ( www-client/mozilla-firefox )
+	!firefox? ( seamonkey? ( www-client/seamonkey ) )
+	!firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) )
+	gtkhtml? ( =gnome-extra/gtkhtml-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/intltool-0.35
+	=sys-devel/automake-1.7*"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+S=${WORKDIR}/${MY_P}
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+
+	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.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}
+}