Bump to 1.4.21b; clean up old versions

(Portage version: 2.2_rc12/cvs/Linux 2.6.27-gentoo-r2 x86_64)

3 files changed, 46 insertions, 159 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 4c527015516e..724583c9b2bc 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.162 2008/10/14 02:04:04 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.163 2008/11/01 17:24:06 dang Exp $
+
+*liferea-1.4.21b (01 Nov 2008)
+
+  01 Nov 2008; Daniel Gryniewicz <dang@gentoo.org> +liferea-1.4.21b.ebuild:
+  Bump to liferea-1.4.21b
+
+  * Fixes compile issue with XulRunner 1.9 cause by
+    applying patch SF #2186087 twice (reported by Sven Hartge)
+  * Fixes for French translation (Vincent Lefevre)
+  * Merges patch SF #2186087: Corrected XPCOM clue
+    handling for XulRunner 1.9 (derived from Fedora
+    patch created by Marc Wiriadisastra)
+  * Removes gray colouring of updated item titles.
+    This often confused users to believe the item
+    state was unread.
+  * Performance optimization: huge cache drops are now
+    splitted over several feed updates (each time only
+    50 items are dropped).
+  * Performance optimization: during item set merging the
+    new items are only checked against as many items as
+    were downloaded. The assumption is that feeds are
+    always correctly ordered (almost always true).
 
 *liferea-1.4.20 (14 Oct 2008)
 
@@ -8,50 +30,28 @@
   Bump to liferea-1.4.20
 
   * Fixes SF #2042420: "Toggle Read Status" item list
-
-  popup menu option (reported by Jeff Fortin)
-
+    popup menu option (reported by Jeff Fortin)
   * Fixes SF #2027445: Incorrect invalid encoding errors.
-
-  (reported by Roman Beslik)
-
+    (reported by Roman Beslik)
   * Fixes "lost" views. View in the cache database that
-
-  are not used anymore will be dropped on startup.
-
+    are not used anymore will be dropped on startup.
   * Added new Slovakian translation (Pavol Klacansky)
-
   * Fixes a cache limit bug when merging items of
-
-  feeds with more items than the cache allows.
-
-  (reported by Dennis Nezic)
-
+    feeds with more items than the cache allows.
+    (reported by Dennis Nezic)
   * Fixes po/LINGUAS which missed "hu".
-
   * Fixes a bug introduced with 1.4.18 which caused
-
-  news bins to drop everything on startup.
-
-  (reported by tsukasa)
-
+    news bins to drop everything on startup.
+    (reported by tsukasa)
   * Workaround for SF #1995329: Next-Unread item
-
-  selection doesn't always work (reported by
-
-  several users).
-
+    selection doesn't always work (reported by
+    several users).
   * Removing broken 'updated' state handling.
-
-  Manually resetting update states didn't work
-
-  persistently. Also many users confused the
-
-  'updated' flag with the read status.
-
+    Manually resetting update states didn't work
+    persistently. Also many users confused the
+    'updated' flag with the read status.
   * Added pownce.com social bookmarking support.
-
-  (patch by zodmaner, SF #2090554)
+    (patch by zodmaner, SF #2090554)
 
 *liferea-1.4.18 (04 Aug 2008)
 
@@ -59,24 +59,15 @@
   Bump to liferea-1.4.18
 
   * Fixes SF #1800030: Fix date format problem in non
-
-  UTF-8 locale for date strings representing dates
-
-  older one week. (patch by Micky Hatya)
-
+    UTF-8 locale for date strings representing dates
+    older one week. (patch by Micky Hatya)
   * Fixes a bug that causes the single item removal
-
-  to have no effect at all. This also can cause 
-
-  reappearing of old items and wrong unread counts.
-
+    to have no effect at all. This also can cause 
+    reappearing of old items and wrong unread counts.
   * Fixes the 100% CPU usage of the previous versions
-
-  that was cost by exorbitant merging costs due to
-
-  the cache dropping not working anymore due to the
-
-  item removal issue mentioned above.
+    that was cost by exorbitant merging costs due to
+    the cache dropping not working anymore due to the
+    item removal issue mentioned above.
 
   30 Jul 2008; Gilles Dartiguelongue <eva@gentoo.org> liferea-1.4.17.ebuild:
   fix package generated with intltool-0.40.
diff --git a/net-news/liferea/liferea-1.4.16b.ebuild b/net-news/liferea/liferea-1.4.16b.ebuild
deleted file mode 100644
index 94e72b0be558..000000000000
--- a/net-news/liferea/liferea-1.4.16b.ebuild
+++ /dev/null
@@ -1,104 +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.16b.ebuild,v 1.1 2008/06/20 15:50:00 dang Exp $
-
-WANT_AUTOMAKE=1.7
-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 ~sparc ~x86"
-# Can't add webkit until there's a masked use flag for it's keyworded
-# webkit
-IUSE="dbus gtkhtml gnutls libnotify lua networkmanager seamonkey xulrunner"
-
-#	!xulrunner? ( webkit? ( net-libs/webkit-gtk ) )
-#	!xulrunner? ( !webkit? ( seamonkey? ( =www-client/seamonkey-1* ) ) )
-#	!amd64? ( !xulrunner? ( !webkit? ( ( !seamonkey? ( gtkhtml? ( gnome-extra/gtkhtml:2 ) ) ) ) ) )
-RDEPEND="
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	lua? ( >=dev-lang/lua-5.1 )
-	xulrunner? ( net-libs/xulrunner:1.9 )
-	!xulrunner? ( ( seamonkey? ( =www-client/seamonkey-1* ) ) )
-	!amd64? ( !xulrunner? ( !seamonkey? ( 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 seamonkey ; then
-		G2CONF="${G2CONF} --enable-gecko=seamonkey"
-		G2CONF="${G2CONF} --disable-xulrunner"
-		G2CONF="${G2CONF} --disable-webkit"
-		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 one of the gecko backends to use liferea.  "
-			elog "Preference is: xulrunner, webkit, then seamonkey."
-			die "You must enable one of the gecko backends or webkit on amd64"
-		fi
-	else
-		elog ""
-		elog "You must choose one backend for liferea to work.  Preference is:"
-		elog "xulrunner, webkit, seamonkey, 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}"/${P}-xulrunner-1.9.patch
-	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.17.ebuild b/net-news/liferea/liferea-1.4.21b.ebuild
index 4015d338a91a..6b516bf705b9 100644
--- a/net-news/liferea/liferea-1.4.17.ebuild
+++ b/net-news/liferea/liferea-1.4.21b.ebuild
@@ -1,8 +1,8 @@
 # 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.17.ebuild,v 1.2 2008/07/30 22:39:41 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.21b.ebuild,v 1.1 2008/11/01 17:24:06 dang Exp $
 
-WANT_AUTOMAKE=1.7
+WANT_AUTOMAKE=1.9
 inherit gnome2 eutils autotools
 
 DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc feeds"
@@ -85,7 +85,7 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
-	epatch "${FILESDIR}"/${P}-xulrunner-1.9.patch
+	epatch "${FILESDIR}"/${PN}-1.4.17-xulrunner-1.9.patch
 
 	intltoolize --force || die "intltoolize failed"
 	eautoreconf