Bump to 1.2.12b

(Portage version: 2.1.2.5)

6 files changed, 22 insertions, 106 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 4bc18735f3de..435f529741da 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.95 2007/04/23 16:11:47 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.96 2007/04/28 01:20:53 dang Exp $
+
+*liferea-1.2.12b (28 Apr 2007)
+
+  28 Apr 2007; Daniel Gryniewicz <dang@gentoo.org> -liferea-1.2.7.ebuild,
+  -liferea-1.2.10.ebuild, +liferea-1.2.12b.ebuild:
+  Bump to 1.2.12b
+
+  23 Apr 2007; Daniel Gryniewicz <dang@gentoo.org> -liferea-1.2.7.ebuild,
+  -liferea-1.2.10.ebuild:
+  Remove some old versions
 
 *liferea-1.2.12 (23 Apr 2007)
 
diff --git a/net-news/liferea/files/digest-liferea-1.2.10 b/net-news/liferea/files/digest-liferea-1.2.10
deleted file mode 100644
index 2c81ab68e179..000000000000
--- a/net-news/liferea/files/digest-liferea-1.2.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 963eb68814ead684d295afadd08298f4 liferea-1.2.10.tar.gz 1400950
-RMD160 32dece0769c6a417c83ddb5e135152cd6e989c01 liferea-1.2.10.tar.gz 1400950
-SHA256 456f478a015b68652f48375729341e884822e0db95b6d7d8945c25ca557e2359 liferea-1.2.10.tar.gz 1400950
diff --git a/net-news/liferea/files/digest-liferea-1.2.12b b/net-news/liferea/files/digest-liferea-1.2.12b
new file mode 100644
index 000000000000..3c7e5816ab9a
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.2.12b
@@ -0,0 +1,3 @@
+MD5 87bf926986f4fc6dcd7fd2310c60a7ac liferea-1.2.12b.tar.gz 1424496
+RMD160 3690eb4ae338e29633e4381e50c4b5f09d1fd53a liferea-1.2.12b.tar.gz 1424496
+SHA256 b3750a0f96cd2ab62b1ac6ffa3b30d27d62d10b7d77ade3b00f180a9b3e0f032 liferea-1.2.12b.tar.gz 1424496
diff --git a/net-news/liferea/files/digest-liferea-1.2.7 b/net-news/liferea/files/digest-liferea-1.2.7
deleted file mode 100644
index 9cb5731d4065..000000000000
--- a/net-news/liferea/files/digest-liferea-1.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e15b37b9f96606581c941431a38fd933 liferea-1.2.7.tar.gz 1380329
-RMD160 a73924fd8b95f37d8377b340a71aafb72567dbda liferea-1.2.7.tar.gz 1380329
-SHA256 f97d61c0b9ce4d0d79f259a84db82135ee80c524dbc24c83a7bd7dd928151a6a liferea-1.2.7.tar.gz 1380329
diff --git a/net-news/liferea/liferea-1.2.10.ebuild b/net-news/liferea/liferea-1.2.12b.ebuild
index babee2783f36..5c8f8f534de1 100644
--- a/net-news/liferea/liferea-1.2.10.ebuild
+++ b/net-news/liferea/liferea-1.2.12b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.10.ebuild,v 1.1 2007/03/28 03:12:25 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.12b.ebuild,v 1.1 2007/04/28 01:20:54 dang Exp $
 
 WANT_AUTOMAKE=1.7
 WANT_AUTOCONF=latest
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus firefox gtkhtml seamonkey libnotify gnutls xulrunner"
+IUSE="dbus firefox gtkhtml gnutls libnotify networkmanager seamonkey xulrunner"
 
 RDEPEND=">=x11-libs/gtk+-2.8
 	x11-libs/pango
@@ -26,10 +26,9 @@ RDEPEND=">=x11-libs/gtk+-2.8
 	!xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
 	!amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) ) )
 	!amd64? ( gtkhtml? ( =gnome-extra/gtkhtml-2* ) )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
-	)
+	dbus? ( >=dev-libs/dbus-glib-0.71 )
 	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	networkmanager? ( net-misc/networkmanager )
 	gnutls? ( net-libs/gnutls )"
 
 DEPEND="${RDEPEND}
@@ -38,10 +37,9 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
+S="${WORKDIR}/liferea-1.2.12"
 src_unpack() {
-	unpack ${A}
-
-	cd ${S}
+	gnome2_src_unpack
 
 	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
 
@@ -80,7 +78,8 @@ pkg_setup() {
 	G2CONF="${G2CONF} \
 		$(use_enable dbus) \
 		$(use_enable gnutls) \
-		$(use_enable libnotify)"
+		$(use_enable libnotify) \
+		$(use_enable networkmanager nm)"
 }
 
 src_install() {
diff --git a/net-news/liferea/liferea-1.2.7.ebuild b/net-news/liferea/liferea-1.2.7.ebuild
deleted file mode 100644
index 9a75df74033e..000000000000
--- a/net-news/liferea/liferea-1.2.7.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.7.ebuild,v 1.2 2007/03/07 19:12:29 corsair Exp $
-
-WANT_AUTOMAKE=1.7
-WANT_AUTOCONF=latest
-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 xulrunner"
-
-RDEPEND=">=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-libs/glib-2
-	xulrunner? ( net-libs/xulrunner )
-	!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
-	!xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
-	!amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) ) )
-	!amd64? ( 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"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-
-	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
-
-	eautoreconf || die "Autoreconf failed"
-}
-
-pkg_setup() {
-	# On amd64, gtkhtml isn't supported.  You need one of the gecko use flags
-	if use amd64 && ! use firefox && ! use seamonkey && ! use xulrunner; then
-		elog "gtkhtml is no longer supported on amd64; you will need to select"
-		elog "one of the gecko backends to use liferea"
-		die "You must enable on of the gecko backends on amd64"
-	fi
-
-	# if you don't choose a gecko to use, we will automatically
-	# use gtkhtml2 as the backend except on amd64 (where we failed above)
-	if ! use seamonkey && ! use firefox && ! use xulrunner && ! use amd64 ; then
-		G2CONF="${G2CONF} --enable-gtkhtml2"
-	elif ! use amd64 && 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-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}
-}