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)
	* 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.
	* 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.
Package-Manager: portage-2.2_rc6/cvs/Linux 2.6.26-gentoo x86_64

3 files changed, 130 insertions, 5 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 6e9ba26ae99d..5fd1a7d661ce 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,31 @@
 # 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.160 2008/07/30 22:39:41 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.161 2008/08/04 14:52:15 dang Exp $
+
+*liferea-1.4.18 (04 Aug 2008)
+
+  04 Aug 2008; Daniel Gryniewicz <dang@gentoo.org> +liferea-1.4.18.ebuild:
+  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)
+
+  * 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.
+
+  * 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.
 
   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/Manifest b/net-news/liferea/Manifest
index 44d4b9f4f916..9416aa66cf4a 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -9,16 +9,18 @@ DIST liferea-1.2.23.tar.gz 1517098 RMD160 26a9eee1bd760c1e7f7a3fbdebb98880417b26
 DIST liferea-1.4.15.tar.gz 1637046 RMD160 05119e171762c8261c6e15585f09e8467a81ae8c SHA1 8ff9ed78b03c89a8bc2ff4f8070e665a5cb496c5 SHA256 e6f780027e0a4576ca4784fb248dd14c1c7f75489a825d8e79d5812f7ea77189
 DIST liferea-1.4.16b.tar.gz 1638955 RMD160 78c8fd1d03aa5917b8f401df2a36007857600ace SHA1 cf6264716c7c9a2eebfe776c4113bf2a1bf74f32 SHA256 a50763d0314fd3631b8d34491db5bd613440c164c6cd5b9ac8bb2b8e3676238e
 DIST liferea-1.4.17.tar.gz 1613090 RMD160 5357b03f57293b42428386715f39a53350075f77 SHA1 53cbb971a7a2aaeaf0fdd6bdc11a248ded524cd5 SHA256 6a548b5f5ab63f1efd81a6fcd8b10f7e11f9379f4b7b52b15183037717a4aa36
+DIST liferea-1.4.18.tar.gz 1613286 RMD160 f5b90e92e1598f8f60fc2c9e10266a0d4db3218e SHA1 b122069ae838fde4968453b77e1c0b2927bb3bc7 SHA256 0ce77ac6cb5477d969bb2af1f70ed624f916b40a943e265b268e1c3ba1eee3e4
 EBUILD liferea-1.2.23-r1.ebuild 2854 RMD160 caed5b4b30b45087db2c0bcd53e1d9bf49cc10a8 SHA1 35ab5a89d9f47d70af6dc8dae67f4ba79f6360f7 SHA256 f3018c2af0a2fd89b2bd44a2638d37de087fe065903101632a87dcc0e28e1113
 EBUILD liferea-1.4.15.ebuild 2846 RMD160 21b12fb5193687fe03fbc5cbf3ce161bc9861ded SHA1 fd39cfebaf967740cd62e5ec336b415677d4b3ff SHA256 a402cb18cddd8f16f17030ddf31b70b238597d94c7f69be9b613dcc69d025a82
 EBUILD liferea-1.4.16b.ebuild 3292 RMD160 a4d8bf32d3e4d88ad9e4b36014440e41bb554822 SHA1 a770ee6216d758bf734ffe7e3451f594325866fd SHA256 78ba2b89b323e6238994b31d500f4b71917d8b060c15f5a43fd1148fbb2fc945
 EBUILD liferea-1.4.17.ebuild 2830 RMD160 8916cc150acae32b4f119eed30b5f4afed1d315d SHA1 ac7c0bf0298b2eb830a5efba52058a3b55b93fbf SHA256 5d475dfc5d9ffbcbd007d7761f0b4237621b0a64535938d05cc974b68e8d65ab
-MISC ChangeLog 45585 RMD160 7f42a26708eaf8361bc177ffc7007d32df752214 SHA1 71dbd3111f9b5d8948c92b1fac6ebbcb74afb1d9 SHA256 eed60176d4edf42cf712260ee830f2363efa472e7e69715bddd5546d7bca185b
+EBUILD liferea-1.4.18.ebuild 2839 RMD160 8598e2bd7c6b36471877db8d3899c2a61dd9c368 SHA1 2c8326f1eb6e638b10106dadf04664d12ed6536f SHA256 6645aea3e37a4500b293bd0a495fd2218a4d586d4b503f387ba2efede5cd5d8a
+MISC ChangeLog 46222 RMD160 9f4edd3ba23cb25d783007043db1da7f7b0b4f50 SHA1 5357759520e80ab0b258a940302cf058a232637e SHA256 f7fcea6fe87c81e9768954aeab5e7aa986802703b337d17ee3a25e009eaec5d1
 MISC metadata.xml 1177 RMD160 45b920ca3d4f4d3aea00b5932c3a09fdb970828a SHA1 4060937fb45d9d49e333779aabef44d1e06ff220 SHA256 12db9a0dafe3a6715f367e74aa43566e0b0804e794ec1f5f42dc38c75e48440c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiQ7xYACgkQ1fmVwcYIWAZg/wCgvIL61cQAdL1iiccY0bPm6D4u
-4QoAn2JafFuFMtCwxphR3sDK1O2ANBcT
-=s3B2
+iD8DBQFIlxezomPajV0RnrERArLoAJ9n1mNbN+3CBUgAVE34aXKmWB3exACeKZZp
+nspRR4kowcudOcCoWXy7ttk=
+=uF83
 -----END PGP SIGNATURE-----
diff --git a/net-news/liferea/liferea-1.4.18.ebuild b/net-news/liferea/liferea-1.4.18.ebuild
new file mode 100644
index 000000000000..e59c5ad50465
--- /dev/null
+++ b/net-news/liferea/liferea-1.4.18.ebuild
@@ -0,0 +1,98 @@
+# 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.18.ebuild,v 1.1 2008/08/04 14:52:15 dang Exp $
+
+WANT_AUTOMAKE=1.9
+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 webkit xulrunner"
+
+RDEPEND="
+	libnotify? ( >=x11-libs/libnotify-0.3.2 )
+	lua? ( >=dev-lang/lua-5.1 )
+	xulrunner? ( net-libs/xulrunner:1.9 )
+	!xulrunner? ( webkit? ( net-libs/webkit-gtk ) )
+	!amd64? ( !xulrunner? ( !webkit? ( 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 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 either xulrunner or webkit to use liferea."
+			elog "Preference is: xulrunner, then webkit."
+			die "You must enable xulrunner or webkit on amd64"
+		fi
+	else
+		elog ""
+		elog "You must choose one backend for liferea to work.  Preference is:"
+		elog "xulrunner, webkit, 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}"/${PN}-1.4.17-xulrunner-1.9.patch
+
+	intltoolize --force || die "intltoolize failed"
+	eautoreconf
+}
+
+src_install() {
+	gnome2_src_install
+	rm -f "${D}/usr/bin/${PN}"
+	mv "${D}/usr/bin/${PN}-bin" "${D}/usr/bin/${PN}"
+}