New upstream; includes seamonkey fix

(Portage version: 2.1.1_rc1-r2)
 (Signed Manifest commit)

3 files changed, 22 insertions, 81 deletions

diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 81500f314818..3164195ab30d 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX liferea-1.0.16-seamonkey.diff 1234 RMD160 bfa2fc499f9cdaa1f01f5f45b0e324aac88ce2a5 SHA1 a750d87eb6b19c68838cdb4517a5c64c59d70f92 SHA256 8356a17a81974511d9c2be86d8d7b7fe6a9fbc1321e378b67ffc0c79d519508a
 MD5 9854f1be8bf5919c8ca734cb6899bfc6 files/liferea-1.0.16-seamonkey.diff 1234
 RMD160 bfa2fc499f9cdaa1f01f5f45b0e324aac88ce2a5 files/liferea-1.0.16-seamonkey.diff 1234
@@ -8,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.20.tar.gz 1576926 RMD160 125729a726fceb675eedbe3b87df01fd18030b81 SHA1 28d311710e210198f4fe8b6e49bd977088e4d573 SHA256 2cb846e4775bbedc51fa40f4589fbd6eca6dbe35cd5d4fecadd2d1b9a7641bef
 DIST liferea-1.0.21.tar.gz 1578056 RMD160 45837fa911dedd3f3e5dcc9a708983c72d7cd2c6 SHA1 c0b28777789414fc0557ca516c41158eb5e83262 SHA256 785be806f3270754be7bb854321e0decfb8c85997f6d9456a6ba25cd19a84371
+DIST liferea-1.0.22.tar.gz 1571378 RMD160 1a4fcdad290eb994e27ddcce29da99617f9fad81 SHA1 0a8f7674d93808f45a07e305f81f96d69fc6aca6 SHA256 30b54efb7da7863f5363014cc17c9b4b583fc4835c78e1b5540f50612f4362b8
 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
@@ -18,18 +21,18 @@ EBUILD liferea-1.0.16.ebuild 1698 RMD160 a9f10f17ad289a1d8ea4626608e78a577ac6d3e
 MD5 5dea717cdee8608f616eee96d9cb37c3 liferea-1.0.16.ebuild 1698
 RMD160 a9f10f17ad289a1d8ea4626608e78a577ac6d3e0 liferea-1.0.16.ebuild 1698
 SHA256 0043aa9965a1137c3959789ddd4d6b92a6f10614ee15b263cfc2959f2f72ce34 liferea-1.0.16.ebuild 1698
-EBUILD liferea-1.0.20.ebuild 1690 RMD160 39722ab2a73f844eb64d64a991830707b92c6aff SHA1 65903f31b8e028dc13cd0ea71bec8a97f8cdb579 SHA256 006145b4a41a3d3b148c8a452b6331f3a53012ba44def653f7852c31877953b7
-MD5 330f0981969de4cc5c94a1813b8a36a1 liferea-1.0.20.ebuild 1690
-RMD160 39722ab2a73f844eb64d64a991830707b92c6aff liferea-1.0.20.ebuild 1690
-SHA256 006145b4a41a3d3b148c8a452b6331f3a53012ba44def653f7852c31877953b7 liferea-1.0.20.ebuild 1690
 EBUILD liferea-1.0.21.ebuild 1549 RMD160 21cdcfa3cf1938342180248cd76af885fa582670 SHA1 2963d90262191bb4ab3644e4efcc4b86eb07542d SHA256 d76216e0f1926c4f898549fdf15c58136111ed07199e3b7ebc7e4e567981a3e1
 MD5 3003f3a68727866e234c5ee5bbe335f7 liferea-1.0.21.ebuild 1549
 RMD160 21cdcfa3cf1938342180248cd76af885fa582670 liferea-1.0.21.ebuild 1549
 SHA256 d76216e0f1926c4f898549fdf15c58136111ed07199e3b7ebc7e4e567981a3e1 liferea-1.0.21.ebuild 1549
-MISC ChangeLog 11531 RMD160 38769a748d7d41cf1e4b26275dac6132817e99af SHA1 b782ba8b28a9f93fc118318bf07702ecf24135e5 SHA256 286edc7023140e060f2a80f23faaa29165bc088ca848b6eb874e80b6c9ce10f0
-MD5 16764cfb856d95d34094112d423d598f ChangeLog 11531
-RMD160 38769a748d7d41cf1e4b26275dac6132817e99af ChangeLog 11531
-SHA256 286edc7023140e060f2a80f23faaa29165bc088ca848b6eb874e80b6c9ce10f0 ChangeLog 11531
+EBUILD liferea-1.0.22.ebuild 1625 RMD160 c1c805537ab49f837ef991253e54ceeb7229f4e5 SHA1 b09f7c888abc15b41273b5852010ca1679bf7f19 SHA256 97435a3b934048c7c1ab5618e6fed2550aba36ff94ab7460ab198b659b474033
+MD5 938caac6a3e7ce933695887f7d086bc9 liferea-1.0.22.ebuild 1625
+RMD160 c1c805537ab49f837ef991253e54ceeb7229f4e5 liferea-1.0.22.ebuild 1625
+SHA256 97435a3b934048c7c1ab5618e6fed2550aba36ff94ab7460ab198b659b474033 liferea-1.0.22.ebuild 1625
+MISC ChangeLog 11819 RMD160 957eca0b24ab005879822cc867015d43a299b758 SHA1 491ed60a709dacd6da936fdee5123de2bfd3dec3 SHA256 4b583c614fb1be27195d3b0d78b68ec1371ea373f02a16853ab6a4c558103964
+MD5 10e7555cf9724fd6b07a7214ff475662 ChangeLog 11819
+RMD160 957eca0b24ab005879822cc867015d43a299b758 ChangeLog 11819
+SHA256 4b583c614fb1be27195d3b0d78b68ec1371ea373f02a16853ab6a4c558103964 ChangeLog 11819
 MISC metadata.xml 234 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d SHA1 f541accc026d4661bfb88d67e90b52688bdd5bb7 SHA256 d591157e9bfeb2310593aed627aeb34ba920b77b253285649a87f7749c39592f
 MD5 4f37ad0cecc87d9509c096e2c59e10fd metadata.xml 234
 RMD160 954ece01a5bc70e69cb71b24b4c9129e1b7ef60d metadata.xml 234
@@ -40,9 +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 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
+MD5 41e9fc9ca80976fd54fa0d089e9ab5d6 files/digest-liferea-1.0.22 247
+RMD160 98ef81236dc3f28f3c66e5facc4c1fe27a4faff2 files/digest-liferea-1.0.22 247
+SHA256 4952db563bc4fda3ac1981b97be44d85bb6af85bdf324e930543b4917478543c files/digest-liferea-1.0.22 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFE+Mr/omPajV0RnrERAh97AJwK8CMOtYURgd/GkZOB0YWky8E8UgCaApI+
+5XnCQnx6el9+HSwsxPhZOc8=
+=874A
+-----END PGP SIGNATURE-----
diff --git a/net-news/liferea/files/digest-liferea-1.0.20 b/net-news/liferea/files/digest-liferea-1.0.20
deleted file mode 100644
index f134d6209f28..000000000000
--- a/net-news/liferea/files/digest-liferea-1.0.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 88e5e4f587b047d744b6a93e4dd7ddb1 liferea-1.0.20.tar.gz 1576926
-RMD160 125729a726fceb675eedbe3b87df01fd18030b81 liferea-1.0.20.tar.gz 1576926
-SHA256 2cb846e4775bbedc51fa40f4589fbd6eca6dbe35cd5d4fecadd2d1b9a7641bef liferea-1.0.20.tar.gz 1576926
diff --git a/net-news/liferea/liferea-1.0.20.ebuild b/net-news/liferea/liferea-1.0.20.ebuild
deleted file mode 100644
index 736bc5f7af33..000000000000
--- a/net-news/liferea/liferea-1.0.20.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.20.ebuild,v 1.2 2006/08/11 19:19:19 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
-	gnome-base/libgnome
-	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"
-
-	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}
-}