Remove old version, add new version with seamonkey patch upstream

(Portage version: 2.1.1_pre4-r4)
 (Signed Manifest commit)

3 files changed, 15 insertions, 84 deletions

diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 6c5b3ba631ae..7ad15c7cec5f 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -11,8 +11,8 @@ RMD160 be1665b141ba561a7936a4cab60e7503f8f24f92 files/liferea-1.0.18-amd64.patch
 SHA256 cbe565f023d6f2857b77890e139b739b623c43b892e4b522eb65f69b04113dc6 files/liferea-1.0.18-amd64.patch 1836
 DIST liferea-0.9.6.tar.gz 1207768 RMD160 1fc2fcee3deafb904c36b26b43f521b69a329a48 SHA1 a4737b488e8af7821497da736a8f4e60a54cbd71 SHA256 ace3af7d06de4c7a143e7c85ecac1aff8e1e7c6c0cc1961d66db1bdd1dad6d3b
 DIST liferea-1.0.16.tar.gz 1575690 RMD160 c5ba8aed414c333a9e12d950a821042216cee310 SHA1 6a134e12cad915dd85f0fb467f39397400a69614 SHA256 591d7d6b6ea6d8c0a90c68418d1e65076bbfe32976f00d229357f45176e3ebe4
-DIST liferea-1.0.18.tar.gz 1577667 RMD160 a3d606ad191a010cee9425757bd8ae5d0fe6bd87 SHA1 02f2f0b9f4957e731ee89d3747cab4a0da1a46cc SHA256 cf643ef4b32cfc10abe42bee8acd9899141236e2054e9b7f60083e6bbf99901e
 DIST liferea-1.0.20.tar.gz 1576926 RMD160 125729a726fceb675eedbe3b87df01fd18030b81 SHA1 28d311710e210198f4fe8b6e49bd977088e4d573 SHA256 2cb846e4775bbedc51fa40f4589fbd6eca6dbe35cd5d4fecadd2d1b9a7641bef
+DIST liferea-1.0.21.tar.gz 1578056 RMD160 45837fa911dedd3f3e5dcc9a708983c72d7cd2c6 SHA1 c0b28777789414fc0557ca516c41158eb5e83262 SHA256 785be806f3270754be7bb854321e0decfb8c85997f6d9456a6ba25cd19a84371
 EBUILD liferea-0.9.6.ebuild 752 RMD160 f4e290b17824d986f8dff02a553e9614853b53b7 SHA1 14c49a4e68a03e2edd60185c3713b38c056e178c SHA256 5167d8b69bdb7e129c8d409b9cc9352d66aac28ccb118393c27930b96eca5da7
 MD5 f8fa8fc1fff6535718e844d514f3fe12 liferea-0.9.6.ebuild 752
 RMD160 f4e290b17824d986f8dff02a553e9614853b53b7 liferea-0.9.6.ebuild 752
@@ -21,18 +21,18 @@ EBUILD liferea-1.0.16.ebuild 1697 RMD160 574ca499c180277b31a858f8ab2afdd46283f01
 MD5 1912d978730e3c62e38e5793f31af578 liferea-1.0.16.ebuild 1697
 RMD160 574ca499c180277b31a858f8ab2afdd46283f01a liferea-1.0.16.ebuild 1697
 SHA256 29a187a13af6ae069f61ce910c53e6a0eaabd7bccdfd2e8c93cf5ad9a55ceecc liferea-1.0.16.ebuild 1697
-EBUILD liferea-1.0.18.ebuild 1708 RMD160 a5fdaf20ffa94ccfc119ad8e44b75d0953ee8097 SHA1 b2a1d98f5f283a2555de083b50a2c427d1ef3b1d SHA256 b555766eb3e88b7b573cb3bca479c69060118a850bb6c204720892ef1a946385
-MD5 656e7e3be333c086b60562467d41f55b liferea-1.0.18.ebuild 1708
-RMD160 a5fdaf20ffa94ccfc119ad8e44b75d0953ee8097 liferea-1.0.18.ebuild 1708
-SHA256 b555766eb3e88b7b573cb3bca479c69060118a850bb6c204720892ef1a946385 liferea-1.0.18.ebuild 1708
 EBUILD liferea-1.0.20.ebuild 1669 RMD160 42772ec3f732cfbc990df9941bef2721642091ad SHA1 a7ad3d06a7413c8f75e65e9ec3168c06a25a0338 SHA256 f0643179071280a5cf22d834b193615dbfac26446754697bee0610539c93f9ca
 MD5 f1cb7256efed9c739fdf660d729c575e liferea-1.0.20.ebuild 1669
 RMD160 42772ec3f732cfbc990df9941bef2721642091ad liferea-1.0.20.ebuild 1669
 SHA256 f0643179071280a5cf22d834b193615dbfac26446754697bee0610539c93f9ca liferea-1.0.20.ebuild 1669
-MISC ChangeLog 11072 RMD160 24884e220554606ce9697c20f0eaedc7d5c6e488 SHA1 aa1a2bbc02bdf272babf00c9f3dfb56b9cb22882 SHA256 8680beeef3c2b9536f784d609ceec198f5ee307d3b6bc2682b3bc6e49a6c6555
-MD5 baac48399d855ee65c4fc8c5f636b5c4 ChangeLog 11072
-RMD160 24884e220554606ce9697c20f0eaedc7d5c6e488 ChangeLog 11072
-SHA256 8680beeef3c2b9536f784d609ceec198f5ee307d3b6bc2682b3bc6e49a6c6555 ChangeLog 11072
+EBUILD liferea-1.0.21.ebuild 1528 RMD160 7a9fa4d8c744b5f06d3f4ff0fe0bd3eb90436532 SHA1 d8725020c0d62d7d00f3e98f9d2c8af0a0c61a1d SHA256 c6b5a9c00402b1ec46797740cdfc22e4d212aa601579d0ab59e247c5a4cd6381
+MD5 3f4eb251af176904f1ccc571cca9f3c0 liferea-1.0.21.ebuild 1528
+RMD160 7a9fa4d8c744b5f06d3f4ff0fe0bd3eb90436532 liferea-1.0.21.ebuild 1528
+SHA256 c6b5a9c00402b1ec46797740cdfc22e4d212aa601579d0ab59e247c5a4cd6381 liferea-1.0.21.ebuild 1528
+MISC ChangeLog 11273 RMD160 bcf5653900ae80c6c6729103bbd01e0f12f87cd0 SHA1 aa4847bfdd0915f6f5260a1aa220fa08498cae32 SHA256 5a49d349511e29e1c6c459b18399883539e7b6df69747fe97fd29a2af558d983
+MD5 7c0e020df85b2dfadbcfa1566f7e265b ChangeLog 11273
+RMD160 bcf5653900ae80c6c6729103bbd01e0f12f87cd0 ChangeLog 11273
+SHA256 5a49d349511e29e1c6c459b18399883539e7b6df69747fe97fd29a2af558d983 ChangeLog 11273
 MISC metadata.xml 234 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d SHA1 f541accc026d4661bfb88d67e90b52688bdd5bb7 SHA256 d591157e9bfeb2310593aed627aeb34ba920b77b253285649a87f7749c39592f
 MD5 4f37ad0cecc87d9509c096e2c59e10fd metadata.xml 234
 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d metadata.xml 234
@@ -43,16 +43,16 @@ SHA256 e9103158954c108b561dee54fc423056cb9315671cd4965c3ce6a966c88950bb files/di
 MD5 1a78a66c9be7d1687ab62c3e50da168a files/digest-liferea-1.0.16 247
 RMD160 03d34654c5f02746f9c39d399df20c19017b3727 files/digest-liferea-1.0.16 247
 SHA256 665ce96de96f78e6071d90c65196782710a5f736e599ae3cc61cf1ec70dc8d24 files/digest-liferea-1.0.16 247
-MD5 2d13feb8e2c12f1e2c10a974241759f6 files/digest-liferea-1.0.18 247
-RMD160 db38a105769bc3a5e1f38f437e6ebe869f5f9ffd files/digest-liferea-1.0.18 247
-SHA256 f6366f39ea60a65fce26cd80574737585060c9c95228058d7f805194844a53f9 files/digest-liferea-1.0.18 247
 MD5 61f0e07956597768266860d3e8846a8b files/digest-liferea-1.0.20 247
 RMD160 a1d25093b18e5d95915b376c492390791d50561e files/digest-liferea-1.0.20 247
 SHA256 1a5bc27bd06d74077d04391cb665adde214d343e7d41450886a0e4ec7c097722 files/digest-liferea-1.0.20 247
+MD5 56e450c319b1d6f59a30fdb2ae29e65d files/digest-liferea-1.0.21 247
+RMD160 6a91a5f7e4d8cf2517b0226bc521f149b052a992 files/digest-liferea-1.0.21 247
+SHA256 6e7840d3c74ed538d86821587723d3adff3e1127995ed810901d9f8962723425 files/digest-liferea-1.0.21 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFE1/8UomPajV0RnrERAkCWAJ9y9R5mp9cCJEuyVtViss1xMWxe5QCbBP9D
-cD0Bi/D3BrS6q2f1/AaYBYc=
-=bmmo
+iD8DBQFE2pVComPajV0RnrERAhTaAJ9V59xHCJNCkKnmEND0aoflRnQvxwCfWqb6
+mG8kw1CuKkklDGAOtf5sQBk=
+=ah+5
 -----END PGP SIGNATURE-----
diff --git a/net-news/liferea/files/digest-liferea-1.0.18 b/net-news/liferea/files/digest-liferea-1.0.18
deleted file mode 100644
index 4c9f194cbb55..000000000000
--- a/net-news/liferea/files/digest-liferea-1.0.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1bedab466eee66e6063e55492d98c37e liferea-1.0.18.tar.gz 1577667
-RMD160 a3d606ad191a010cee9425757bd8ae5d0fe6bd87 liferea-1.0.18.tar.gz 1577667
-SHA256 cf643ef4b32cfc10abe42bee8acd9899141236e2054e9b7f60083e6bbf99901e liferea-1.0.18.tar.gz 1577667
diff --git a/net-news/liferea/liferea-1.0.18.ebuild b/net-news/liferea/liferea-1.0.18.ebuild
deleted file mode 100644
index a7052887c064..000000000000
--- a/net-news/liferea/liferea-1.0.18.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.0.18.ebuild,v 1.1 2006/07/31 01:07:21 dang Exp $
-
-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"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dbus firefox gtkhtml seamonkey"
-
-RDEPEND=">=x11-libs/gtk+-2.4.0
-	>=dev-libs/libxml2-2.5.10
-	firefox? ( www-client/mozilla-firefox )
-	!firefox? ( seamonkey? ( www-client/seamonkey ) )
-	gtkhtml? ( =gnome-extra/gtkhtml-2* )
-	!seamonkey? ( !firefox? ( =gnome-extra/gtkhtml-2* ) )
-	>=gnome-base/gconf-2
-	dbus? ( >=sys-apps/dbus-0.30 )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-pkg_setup() {
-
-	# if you don't choose a gecko to use, we will automatically
-	# use gtkhtml2 as the backend.
-	if ! use seamonkey && ! use firefox || use gtkhtml ; then
-		G2CONF="${G2CONF} --enable-gtkhtml2"
-	else
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	fi
-
-	# we prefer firefox over seamonkey
-	if 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)"
-}
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch "${FILESDIR}/${PN}-1.0.16-seamonkey.diff"
-	epatch "${FILESDIR}/${P}-amd64.patch"
-
-	eautoreconf || die "Failed running eautoreconf"
-}
-
-src_install() {
-	gnome2_src_install
-	rm -f ${D}/usr/bin/${PN}
-	mv ${D}/usr/bin/${PN}-bin ${D}/usr/bin/${PN}
-}