Bump to 1.2.6b

	* Fixes SF #1654989 that caused crashes when marking duplicate
	  items as read/unread (reported by turminal)
	* Merged patch SF #1646186 by mooonz that improves LUA build
	  support and allows compilation against LUA 5.0 and 5.1
	* Update of French translation (Vincent Lefevre)
	* Update of Japanese translation (Takeshi AIHANA)

(Portage version: 2.1.2-r9)

4 files changed, 108 insertions, 3 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 67c587e11c41..402ffac9c69c 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,18 @@
 # 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.85 2007/02/12 20:09:31 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.86 2007/02/12 20:50:37 dang Exp $
+
+*liferea-1.2.6b (12 Feb 2007)
+
+  12 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> liferea-1.2.5.ebuild,
+  +liferea-1.2.6b.ebuild:
+  Bump to 1.2.6b
+  	* Fixes SF #1654989 that caused crashes when marking duplicate
+  	  items as read/unread (reported by turminal)
+  	* Merged patch SF #1646186 by mooonz that improves LUA build
+  	  support and allows compilation against LUA 5.0 and 5.1
+  	* Update of French translation (Vincent Lefevre)
+  	* Update of Japanese translation (Takeshi AIHANA)
 
   12 Feb 2007; Daniel Gryniewicz <dang@gentoo.org> -liferea-1.2_rc5.ebuild,
   -liferea-1.2.0.ebuild, -liferea-1.2.2.ebuild:
diff --git a/net-news/liferea/files/digest-liferea-1.2.6b b/net-news/liferea/files/digest-liferea-1.2.6b
new file mode 100644
index 000000000000..1418ada54a84
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.2.6b
@@ -0,0 +1,3 @@
+MD5 0ec6000cf3e63a2aed341a69bb3b0367 liferea-1.2.6b.tar.gz 1379968
+RMD160 d9ee68b554d660839468d6e35dadc22a08f3742c liferea-1.2.6b.tar.gz 1379968
+SHA256 008eb2e8bba471693421ac409da6f826b0df3fe2c2c68b53ad8ad9bcc29dcbce liferea-1.2.6b.tar.gz 1379968
diff --git a/net-news/liferea/liferea-1.2.5.ebuild b/net-news/liferea/liferea-1.2.5.ebuild
index aa2e60af569e..dc9eb9d0087b 100644
--- a/net-news/liferea/liferea-1.2.5.ebuild
+++ b/net-news/liferea/liferea-1.2.5.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.5.ebuild,v 1.1 2007/02/04 21:18:42 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.5.ebuild,v 1.2 2007/02/12 20:50:37 dang Exp $
 
 WANT_AUTOMAKE=1.7
 WANT_AUTOCONF=latest
@@ -55,7 +55,7 @@ pkg_setup() {
 		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 && ! amd64 ; then
diff --git a/net-news/liferea/liferea-1.2.6b.ebuild b/net-news/liferea/liferea-1.2.6b.ebuild
new file mode 100644
index 000000000000..6404fe500ac3
--- /dev/null
+++ b/net-news/liferea/liferea-1.2.6b.ebuild
@@ -0,0 +1,90 @@
+# 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.6b.ebuild,v 1.1 2007/02/12 20:50:37 dang 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 ~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 && ! 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}
+}