Bump to 1.2.15

	* Better update result processing timer, should cause
	  less CPU usage. (patch from Arjan van de Ven)
	* Increased security: disallowing clicking on file://
	  links in the rendering widget, as well as preventing
	  from opening such links using the context menu.
	* Fixes unresolved symbol in LUA binding.
	  (SF #1720462, reported by Jonathan Cristoforetti)
	* Fixes broken base URL when selecting items in 3 pane
	  mode from folders.

Package-Manager: portage-2.1.2.7

7 files changed, 35 insertions, 125 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index c15673c2009f..a91851e8d4c1 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,21 @@
 # ChangeLog for net-news/liferea
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.102 2007/05/15 15:38:54 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.103 2007/05/17 19:49:05 dang Exp $
+
+*liferea-1.2.15 (17 May 2007)
+
+  17 May 2007; Daniel Gryniewicz <dang@gentoo.org> -liferea-1.2.10c.ebuild,
+  -liferea-1.2.12b.ebuild, +liferea-1.2.15.ebuild:
+  Bump to 1.2.15
+  	* Better update result processing timer, should cause
+  	  less CPU usage. (patch from Arjan van de Ven)
+  	* Increased security: disallowing clicking on file://
+  	  links in the rendering widget, as well as preventing
+  	  from opening such links using the context menu.
+  	* Fixes unresolved symbol in LUA binding.
+  	  (SF #1720462, reported by Jonathan Cristoforetti)
+  	* Fixes broken base URL when selecting items in 3 pane
+  	  mode from folders.
 
 *liferea-1.2.14 (15 May 2007)
 
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 4cfd161831d3..dbbda45db3da 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -15,10 +15,9 @@ RMD160 0bf67b33913e08ed5528b86813aae30649123304 files/liferea-1.1.0-libnotify.pa
 SHA256 73a54e020b045ee261f9444464a68f4f1aba831182498b8a103886b7c0108bab files/liferea-1.1.0-libnotify.patch 552
 DIST liferea-1.0.16.tar.gz 1575690 RMD160 c5ba8aed414c333a9e12d950a821042216cee310 SHA1 6a134e12cad915dd85f0fb467f39397400a69614 SHA256 591d7d6b6ea6d8c0a90c68418d1e65076bbfe32976f00d229357f45176e3ebe4
 DIST liferea-1.0.24.tar.gz 1572698 RMD160 53d4e332373563b1a813f342d690f28722a5d867 SHA1 1c486d559796ab921dd4dd858ba03ab0c46f62f1 SHA256 00218636ddae880d7e409435332a754316ead94f2af3aad53c9e5f2106f05964
-DIST liferea-1.2.10c.tar.gz 1402817 RMD160 b54023166255d28b3b7b0bf85504de31db7519a9 SHA1 2fe1a0cbe9f791f074ac3d5528f00537f208267e SHA256 ffb72efdc11ccb13fb784f82c4e0b62f2932a0e3316730df41f9f60db9ffc732
-DIST liferea-1.2.12b.tar.gz 1424496 RMD160 3690eb4ae338e29633e4381e50c4b5f09d1fd53a SHA1 b96db455e9c7646d9df0fda69f2edba772e7832e SHA256 b3750a0f96cd2ab62b1ac6ffa3b30d27d62d10b7d77ade3b00f180a9b3e0f032
 DIST liferea-1.2.13.tar.gz 1426401 RMD160 851667673afa00d9b9b89abe0ade124db1641948 SHA1 02410243faf550bb2276cbfd3c6c4fd06556a855 SHA256 c5b136b314337792d57a31dcbf53d74c4d06bf52e73a5c3e359c91e8c1dc3a49
 DIST liferea-1.2.14.tar.gz 1427654 RMD160 fea71483463a931cb61fa815f271aef8190ac688 SHA1 794dbb81a50e61f7e370dd7ea72f278996785349 SHA256 1c88a6c53a13da1d8077d558babedb2a81d53c3f0f7a05dc703815cb992d122e
+DIST liferea-1.2.15.tar.gz 1428829 RMD160 8eb5425f455d48346a07a585b37d0362bbac8e78 SHA1 90be28353aa44684991e0b48e44b363a14237d9c SHA256 9cf1359bf49e47d56f11be76bc320e43b397889c495f71d00f25b034dfedf466
 EBUILD liferea-1.0.16.ebuild 1781 RMD160 37f9ac79e37c9ce76f0a396e04a71f083ea09239 SHA1 e39eaab188ef5cf800339fc7ecb224f6a5d98a5e SHA256 7f1821ca36162fc7f437716fa5c4f0980b45a0e1daa8ce8d40a9060dd36f5cc9
 MD5 63379fdc2f15c36a3961adc442c7f63d liferea-1.0.16.ebuild 1781
 RMD160 37f9ac79e37c9ce76f0a396e04a71f083ea09239 liferea-1.0.16.ebuild 1781
@@ -27,14 +26,6 @@ EBUILD liferea-1.0.24.ebuild 1832 RMD160 fd6342b40484d0d99286268d38de7dacde73318
 MD5 63b89c4c37961fc7b7803a7a85c42a6a liferea-1.0.24.ebuild 1832
 RMD160 fd6342b40484d0d99286268d38de7dacde73318a liferea-1.0.24.ebuild 1832
 SHA256 b272f4b1ffe385615b3c1c801c4dff2eab90bd3e6015652f79ea93540ed6e597 liferea-1.0.24.ebuild 1832
-EBUILD liferea-1.2.10c.ebuild 2766 RMD160 4ec9fe50f6953a5a69ff7c0a4a72eba8de58e67a SHA1 a61edaccb48c004497541f70c0e1a6fc931790fe SHA256 02f8b8b70a79294df25100d5afde29d71d5a8779c455c83bc0d924a9af5e97c4
-MD5 29f672de1a0eea29155f2a6d24ec9561 liferea-1.2.10c.ebuild 2766
-RMD160 4ec9fe50f6953a5a69ff7c0a4a72eba8de58e67a liferea-1.2.10c.ebuild 2766
-SHA256 02f8b8b70a79294df25100d5afde29d71d5a8779c455c83bc0d924a9af5e97c4 liferea-1.2.10c.ebuild 2766
-EBUILD liferea-1.2.12b.ebuild 2745 RMD160 5f4ea92f547342272b5844d52a4c6c05640855b9 SHA1 25d90148570a70915d9fbdbaf9925f9f8ed2c244 SHA256 be1c48b5f4d0db55374bfe98411b336ac467df88b8ee5c5bfab5cdb246d7f52d
-MD5 9be81322fce69f820af503c76fbd2773 liferea-1.2.12b.ebuild 2745
-RMD160 5f4ea92f547342272b5844d52a4c6c05640855b9 liferea-1.2.12b.ebuild 2745
-SHA256 be1c48b5f4d0db55374bfe98411b336ac467df88b8ee5c5bfab5cdb246d7f52d liferea-1.2.12b.ebuild 2745
 EBUILD liferea-1.2.13.ebuild 2714 RMD160 e6d997c79281b5a66ce899b91a990c8097914bda SHA1 6a8a37ab52636696ac2ac0f23223939217da9fea SHA256 23651a7e60392e17ca4a9e0e6c7a946754210b2c19bf0e29fce470371eca1e50
 MD5 33f6aca4f9a74ac34f2f38df1e7c1970 liferea-1.2.13.ebuild 2714
 RMD160 e6d997c79281b5a66ce899b91a990c8097914bda liferea-1.2.13.ebuild 2714
@@ -43,10 +34,14 @@ EBUILD liferea-1.2.14.ebuild 2714 RMD160 d9b6b6f68bab47619039479efb916f4c61f5d36
 MD5 80762003ad0ea0af9b8e0c834698310d liferea-1.2.14.ebuild 2714
 RMD160 d9b6b6f68bab47619039479efb916f4c61f5d368 liferea-1.2.14.ebuild 2714
 SHA256 240c621b6404434a8de8413266a987486f904b62f9bd707fbffe1c3f2bffe165 liferea-1.2.14.ebuild 2714
-MISC ChangeLog 24457 RMD160 59c6e6c55e278b8f0362bf85630657e2fa8947fa SHA1 cece349af760235509204b33161f23b10c11f69c SHA256 b28cb2c6baef8b5f113676f0f751472bedf21f70cdf9d988e64d4ea85b961673
-MD5 25d0fa416ad8f9ddc2e99f9e1fc34b44 ChangeLog 24457
-RMD160 59c6e6c55e278b8f0362bf85630657e2fa8947fa ChangeLog 24457
-SHA256 b28cb2c6baef8b5f113676f0f751472bedf21f70cdf9d988e64d4ea85b961673 ChangeLog 24457
+EBUILD liferea-1.2.15.ebuild 2714 RMD160 1bf72ad5c8e199b61243acb2329557b47f35935b SHA1 f0f10f9272adc3605c55a4a766eef87d416e9585 SHA256 f2ef0c3398585ab64e3c170fd2eaea3b8b2c1db39f25684292631c2a6db51dde
+MD5 d2b2c40da4da7eae2acd057384cca19e liferea-1.2.15.ebuild 2714
+RMD160 1bf72ad5c8e199b61243acb2329557b47f35935b liferea-1.2.15.ebuild 2714
+SHA256 f2ef0c3398585ab64e3c170fd2eaea3b8b2c1db39f25684292631c2a6db51dde liferea-1.2.15.ebuild 2714
+MISC ChangeLog 25091 RMD160 9af9f94deeebb69d36bd81eb49e8365b9aad04ed SHA1 e5b24d57e22739059573d454c92d4777338670d8 SHA256 9cd1da7aad978baf77ce4cdeba73980fc91d669a5f072a62b992c51702b3542c
+MD5 415d24c611d14c4f670f60b1ea8de893 ChangeLog 25091
+RMD160 9af9f94deeebb69d36bd81eb49e8365b9aad04ed ChangeLog 25091
+SHA256 9cd1da7aad978baf77ce4cdeba73980fc91d669a5f072a62b992c51702b3542c ChangeLog 25091
 MISC metadata.xml 255 RMD160 562a797d1896f67d305d0ed9a14e92b0b5f9e3d1 SHA1 05283cb82ca2afd01e086dd2de39efb2cdca548d SHA256 f7c60a684ebde7e8464e55aed08cf2ac2f536d175e426997630cb1f2e106f33b
 MD5 7325d066d55ddb06f563afb94bef8fbc metadata.xml 255
 RMD160 562a797d1896f67d305d0ed9a14e92b0b5f9e3d1 metadata.xml 255
@@ -57,22 +52,19 @@ SHA256 665ce96de96f78e6071d90c65196782710a5f736e599ae3cc61cf1ec70dc8d24 files/di
 MD5 0466adafefcf633997604b59182915d2 files/digest-liferea-1.0.24 247
 RMD160 f05de6c55ee2573c7a04ed45afb380a106c30732 files/digest-liferea-1.0.24 247
 SHA256 9de48950eb66e768e3163a3fd128a197198bc47c4b041d0afc77679765dd1bf6 files/digest-liferea-1.0.24 247
-MD5 05436fcad1d0a8a9ca2107b5c7fb3ef3 files/digest-liferea-1.2.10c 250
-RMD160 feb66bd9ad352d42a7ce487f1752e4fd5ad1335a files/digest-liferea-1.2.10c 250
-SHA256 f6270c7590735c66eae83278fb0e016913b0649d8ae9ef22e9c25059d608c6a4 files/digest-liferea-1.2.10c 250
-MD5 18aa5d5737c13fff5a38333b493e9b24 files/digest-liferea-1.2.12b 250
-RMD160 bdc823bb612df57fa705450c49dba45942961a30 files/digest-liferea-1.2.12b 250
-SHA256 85f553f1d2138f0b93679afcb8cf8d69e27ad8cf6d00d875a0d3b12ae956f20b files/digest-liferea-1.2.12b 250
 MD5 f7fd52e2e63401c766bfd7d91426fd8d files/digest-liferea-1.2.13 247
 RMD160 c2f51fc97ce28379314aedc9fbb824a6ad193102 files/digest-liferea-1.2.13 247
 SHA256 8e2b70672f5ccaaf005a32ed187e591e748a8d7c3d39e363d766e2d939a50aa6 files/digest-liferea-1.2.13 247
 MD5 c201693e56ea0a9d6969a92b838c9d69 files/digest-liferea-1.2.14 247
 RMD160 1a83355da68bca4d40698a4f08eb5a61f2ab4058 files/digest-liferea-1.2.14 247
 SHA256 c95d800a1c5c43359ef2dd5ad5d81ad9fca45e3e254eb737b7721f9c056e52e2 files/digest-liferea-1.2.14 247
+MD5 1f47b661ee0b28f81c41264618120e26 files/digest-liferea-1.2.15 247
+RMD160 46ffb5015708010bfca9cb242aa574c26191621f files/digest-liferea-1.2.15 247
+SHA256 ca132bec9c055f8584d8678ff6807edfc07d44e74134cf22745888da2b2dd9f3 files/digest-liferea-1.2.15 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGSdQeomPajV0RnrERApdSAJ4mluKo90V+xEWU4weoMkk6lAEyaACcC08b
-WzgJeifxvw48S3ONhzOCf+g=
-=sR0g
+iD8DBQFGTLHBomPajV0RnrERAkplAJ0aum/StG+ttMuoVcswUDX5cQroLwCfV3o6
+oI8waIDfq1uYUDlDCl5HEiU=
+=RXpp
 -----END PGP SIGNATURE-----
diff --git a/net-news/liferea/files/digest-liferea-1.2.10c b/net-news/liferea/files/digest-liferea-1.2.10c
deleted file mode 100644
index 04bfe2b45b29..000000000000
--- a/net-news/liferea/files/digest-liferea-1.2.10c
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 aaa1f8ec09944a269d2f1fedecd27375 liferea-1.2.10c.tar.gz 1402817
-RMD160 b54023166255d28b3b7b0bf85504de31db7519a9 liferea-1.2.10c.tar.gz 1402817
-SHA256 ffb72efdc11ccb13fb784f82c4e0b62f2932a0e3316730df41f9f60db9ffc732 liferea-1.2.10c.tar.gz 1402817
diff --git a/net-news/liferea/files/digest-liferea-1.2.12b b/net-news/liferea/files/digest-liferea-1.2.12b
deleted file mode 100644
index 3c7e5816ab9a..000000000000
--- a/net-news/liferea/files/digest-liferea-1.2.12b
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 87bf926986f4fc6dcd7fd2310c60a7ac liferea-1.2.12b.tar.gz 1424496
-RMD160 3690eb4ae338e29633e4381e50c4b5f09d1fd53a liferea-1.2.12b.tar.gz 1424496
-SHA256 b3750a0f96cd2ab62b1ac6ffa3b30d27d62d10b7d77ade3b00f180a9b3e0f032 liferea-1.2.12b.tar.gz 1424496
diff --git a/net-news/liferea/files/digest-liferea-1.2.15 b/net-news/liferea/files/digest-liferea-1.2.15
new file mode 100644
index 000000000000..06d64c418d2f
--- /dev/null
+++ b/net-news/liferea/files/digest-liferea-1.2.15
@@ -0,0 +1,3 @@
+MD5 e9bc17e6bfe11986204c0dc1d3aedfa7 liferea-1.2.15.tar.gz 1428829
+RMD160 8eb5425f455d48346a07a585b37d0362bbac8e78 liferea-1.2.15.tar.gz 1428829
+SHA256 9cf1359bf49e47d56f11be76bc320e43b397889c495f71d00f25b034dfedf466 liferea-1.2.15.tar.gz 1428829
diff --git a/net-news/liferea/liferea-1.2.10c.ebuild b/net-news/liferea/liferea-1.2.10c.ebuild
deleted file mode 100644
index eb7f5fe35231..000000000000
--- a/net-news/liferea/liferea-1.2.10c.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.10c.ebuild,v 1.1 2007/04/15 19:56:03 dang Exp $
-
-WANT_AUTOMAKE=1.7
-WANT_AUTOCONF=latest
-inherit gnome2 flag-o-matic 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 libnotify gnutls xulrunner"
-
-RDEPEND=">=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-libs/glib-2
-	xulrunner? ( net-libs/xulrunner )
-	!xulrunner? ( firefox? ( www-client/mozilla-firefox ) )
-	!xulrunner? ( !firefox? ( seamonkey? ( www-client/seamonkey ) ) )
-	!amd64? ( !xulrunner? ( !firefox? ( !seamonkey? ( =gnome-extra/gtkhtml-2* ) ) ) )
-	!amd64? ( gtkhtml? ( =gnome-extra/gtkhtml-2* ) )
-	dbus? ( || ( >=dev-libs/dbus-glib-0.71
-		( <sys-apps/dbus-0.90 >=sys-apps/dbus-0.36 ) )
-	)
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	gnutls? ( net-libs/gnutls )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-
-src_unpack() {
-	unpack ${A}
-	# XXX DFG Why can't the directory names be consistent?
-	mv "${PN}-1.2.10" ${S} || die
-
-	cd ${S}
-
-	epatch "${FILESDIR}/${PN}-1.1.0-libnotify.patch"
-
-	eautoreconf || die "Autoreconf failed"
-}
-
-pkg_setup() {
-	# On amd64, gtkhtml isn't supported.  You need one of the gecko use flags
-	if use amd64 && ! use firefox && ! use seamonkey && ! use xulrunner; then
-		elog "gtkhtml is no longer supported on amd64; you will need to select"
-		elog "one of the gecko backends to use liferea"
-		die "You must enable on of the gecko backends on amd64"
-	fi
-
-	# if you don't choose a gecko to use, we will automatically
-	# use gtkhtml2 as the backend except on amd64 (where we failed above)
-	if ! use seamonkey && ! use firefox && ! use xulrunner && ! use amd64 ; then
-		G2CONF="${G2CONF} --enable-gtkhtml2"
-	elif ! use amd64 && use gtkhtml ; then
-		G2CONF="${G2CONF} --enable-gtkhtml2"
-	else
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	fi
-
-	# we prefer xulrunner over firefox over seamonkey
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --enable-xulrunner"
-	elif 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) \
-		$(use_enable gnutls) \
-		$(use_enable libnotify)"
-}
-
-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.2.12b.ebuild b/net-news/liferea/liferea-1.2.15.ebuild
index 5c8f8f534de1..0c4b24099cb7 100644
--- a/net-news/liferea/liferea-1.2.12b.ebuild
+++ b/net-news/liferea/liferea-1.2.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.12b.ebuild,v 1.1 2007/04/28 01:20:54 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.2.15.ebuild,v 1.1 2007/05/17 19:49:05 dang Exp $
 
 WANT_AUTOMAKE=1.7
 WANT_AUTOCONF=latest
@@ -37,7 +37,6 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-S="${WORKDIR}/liferea-1.2.12"
 src_unpack() {
 	gnome2_src_unpack