Added new version 0.5.3b, marked 0.5.3 x86, and removed old versions that incorrectly handled the gtkhtml/mozilla USEing

10 files changed, 27 insertions, 72 deletions

diff --git a/net-www/liferea/ChangeLog b/net-www/liferea/ChangeLog
index 6f88fe89bbd1..02be75ebd542 100644
--- a/net-www/liferea/ChangeLog
+++ b/net-www/liferea/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/liferea
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/liferea/ChangeLog,v 1.9 2004/08/18 10:17:05 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/liferea/ChangeLog,v 1.10 2004/08/22 07:59:54 obz Exp $
+
+*liferea-0.5.3b (22 Aug 2004)
+
+  22 Aug 2004; Mike Gardiner <obz@gentoo.org> -liferea-0.4.6b.ebuild,
+  -liferea-0.4.8.ebuild, -liferea-0.4.9.ebuild, liferea-0.5.3.ebuild,
+  +liferea-0.5.3b.ebuild:
+  Added new version 0.5.3b, marked 0.5.3 x86, and removed old versions that
+  incorrectly handled the gtkhtml/mozilla USEing
 
 *liferea-0.5.3 (18 Aug 2004)
 
diff --git a/net-www/liferea/Manifest b/net-www/liferea/Manifest
index 780ed0abf7a7..63c0c5da9f66 100644
--- a/net-www/liferea/Manifest
+++ b/net-www/liferea/Manifest
@@ -1,10 +1,6 @@
-MD5 a88eeaf72615d1b0cb6e42e5af4432de liferea-0.4.8.ebuild 923
-MD5 9a4c1abad8a789a55fc43811ec763804 liferea-0.5.3.ebuild 1018
-MD5 5210c2d1fd868ce1e4bd42d7eda15b68 liferea-0.4.6b.ebuild 642
-MD5 2f2898368218f1e200aeeefc0f7d2c8c liferea-0.4.9.ebuild 923
+MD5 da3842212b0485f3ed437ca7411379a3 liferea-0.5.3.ebuild 1017
+MD5 effbea6712f1f74c4ed2ce3d24a9effa liferea-0.5.3b.ebuild 906
 MD5 8e5b8eff722d44f3ddfb77c939dd9682 ChangeLog 1280
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 ee23292fe0a0697a7bfc1cb7289d7621 files/digest-liferea-0.4.6b 66
-MD5 92bb8536531a2c4a4c053337ac6c52ed files/digest-liferea-0.4.8 65
-MD5 7ce5082dae6f8f23164bf1f733eda13b files/digest-liferea-0.4.9 65
+MD5 41f7e0b1feb9d77d8c797cdeb89fb78e files/digest-liferea-0.5.3b 66
 MD5 97616fa27e5b823f07e295766beeb0b3 files/digest-liferea-0.5.3 65
diff --git a/net-www/liferea/files/digest-liferea-0.4.6b b/net-www/liferea/files/digest-liferea-0.4.6b
deleted file mode 100644
index 416c990d0176..000000000000
--- a/net-www/liferea/files/digest-liferea-0.4.6b
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bce2fd0696cfc4a881cb6a41908cb2d2 liferea-0.4.6b.tar.gz 313879
diff --git a/net-www/liferea/files/digest-liferea-0.4.8 b/net-www/liferea/files/digest-liferea-0.4.8
deleted file mode 100644
index f075c693a2f0..000000000000
--- a/net-www/liferea/files/digest-liferea-0.4.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 df4b1de73c3db23eac9f140da4a4d078 liferea-0.4.8.tar.gz 672944
diff --git a/net-www/liferea/files/digest-liferea-0.4.9 b/net-www/liferea/files/digest-liferea-0.4.9
deleted file mode 100644
index 7b59321b4dd3..000000000000
--- a/net-www/liferea/files/digest-liferea-0.4.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cfaf765d39268a0b71b9e7bb92380285 liferea-0.4.9.tar.gz 749000
diff --git a/net-www/liferea/files/digest-liferea-0.5.3b b/net-www/liferea/files/digest-liferea-0.5.3b
new file mode 100644
index 000000000000..6663041ea97e
--- /dev/null
+++ b/net-www/liferea/files/digest-liferea-0.5.3b
@@ -0,0 +1 @@
+MD5 3c2fa931b8b67cf41677f6e836f9ddda liferea-0.5.3b.tar.gz 942904
diff --git a/net-www/liferea/liferea-0.4.6b.ebuild b/net-www/liferea/liferea-0.4.6b.ebuild
deleted file mode 100644
index a7915630e02c..000000000000
--- a/net-www/liferea/liferea-0.4.6b.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/liferea/liferea-0.4.6b.ebuild,v 1.4 2004/06/25 00:57:18 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc similar to FeedReader."
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~amd64"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.0.0
-	>=dev-libs/libxml2-2.5
-	=gnome-extra/libgtkhtml-2*
-	>=gnome-base/gnome-vfs-2
-	>=gnome-base/gconf-2"
-
-DOCS="README AUTHORS ChangeLog COPYING"
diff --git a/net-www/liferea/liferea-0.4.9.ebuild b/net-www/liferea/liferea-0.4.9.ebuild
deleted file mode 100644
index 298179cdb7d7..000000000000
--- a/net-www/liferea/liferea-0.4.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/liferea/liferea-0.4.9.ebuild,v 1.3 2004/06/25 00:57:18 agriffis Exp $
-
-inherit gnome2
-
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc similar to FeedReader."
-HOMEPAGE="http://liferea.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2*
-	>=dev-libs/libxml2-2.5.10
-	gtkhtml? ( >=gnome-extra/libgtkhtml-2 )
-	mozilla? ( net-www/mozilla )
-	>=gnome-base/gconf-2"
-
-pkg_setup(){
-	ewarn "If you run this version of liferea without backing up your feedlist"
-	ewarn "you might lose it, please export to opml before upgrading to avoid"
-	ewarn "this issue."
-	ewarn "Please ctrl+c now if you'd like to save your feed list."
-	sleep 8
-}
-
-DOCS="README AUTHORS ChangeLog COPYING"
diff --git a/net-www/liferea/liferea-0.5.3.ebuild b/net-www/liferea/liferea-0.5.3.ebuild
index ffd00d6a7245..7a3711e8ac21 100644
--- a/net-www/liferea/liferea-0.5.3.ebuild
+++ b/net-www/liferea/liferea-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/liferea/liferea-0.5.3.ebuild,v 1.1 2004/08/18 10:17:05 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/liferea/liferea-0.5.3.ebuild,v 1.2 2004/08/22 07:59:54 obz Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="mozilla gtkhtml"
 
 RDEPEND=">=x11-libs/gtk+-2
diff --git a/net-www/liferea/liferea-0.4.8.ebuild b/net-www/liferea/liferea-0.5.3b.ebuild
index 5a85ef2dbefe..a61c8396b4fa 100644
--- a/net-www/liferea/liferea-0.4.8.ebuild
+++ b/net-www/liferea/liferea-0.5.3b.ebuild
@@ -1,24 +1,29 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/liferea/liferea-0.4.8.ebuild,v 1.3 2004/06/25 00:57:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/liferea/liferea-0.5.3b.ebuild,v 1.1 2004/08/22 07:59:54 obz Exp $
 
 inherit gnome2
 
-DESCRIPTION="News Aggregator for RDF/RSS/CDF/Atom/Echo/etc similar to FeedReader."
+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="~x86 ~amd64"
-IUSE=""
+IUSE="mozilla gtkhtml"
 
-DEPEND=">=x11-libs/gtk+-2*
+RDEPEND=">=x11-libs/gtk+-2
 	>=dev-libs/libxml2-2.5.10
-	gtkhtml? ( >=gnome-extra/libgtkhtml-2 )
-	mozilla? ( net-www/mozilla )
+	mozilla? ( net-www/mozilla
+		gtkhtml? ( =gnome-extra/libgtkhtml-2* )
+	)
+	!mozilla? ( =gnome-extra/libgtkhtml-2* )
 	>=gnome-base/gconf-2"
 
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
 pkg_setup(){
 	ewarn "If you run this version of liferea without backing up your feedlist"
 	ewarn "you might lose it, please export to opml before upgrading to avoid"