Remove 1.4.15 which uses vulnerable xulrunner:1.8 (bug 324953). BSD keywords were dropped to do this, bug 279241

Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 7 insertions, 89 deletions

diff --git a/net-news/liferea/ChangeLog b/net-news/liferea/ChangeLog
index 54e39e77ee28..d4545df95d9e 100644
--- a/net-news/liferea/ChangeLog
+++ b/net-news/liferea/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-news/liferea
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.190 2010/06/26 14:25:45 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/ChangeLog,v 1.191 2010/06/26 22:11:58 nirbheek Exp $
+
+  26 Jun 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -liferea-1.4.15.ebuild:
+  Remove 1.4.15 which uses vulnerable xulrunner:1.8 (bug 324953). BSD
+  keywords were dropped to do this, bug 279241
 
   26 Jun 2010; Raúl Porcel <armin76@gentoo.org> liferea-1.6.3.ebuild:
   sparc stable wrt #321565
diff --git a/net-news/liferea/Manifest b/net-news/liferea/Manifest
index 414dbdd83cf3..a7d7aae7b4a4 100644
--- a/net-news/liferea/Manifest
+++ b/net-news/liferea/Manifest
@@ -1,4 +1,3 @@
-DIST liferea-1.4.15.tar.gz 1637046 RMD160 05119e171762c8261c6e15585f09e8467a81ae8c SHA1 8ff9ed78b03c89a8bc2ff4f8070e665a5cb496c5 SHA256 e6f780027e0a4576ca4784fb248dd14c1c7f75489a825d8e79d5812f7ea77189
 DIST liferea-1.4.28.tar.gz 1697036 RMD160 044d0f771ea06c7d35fb70afc2ebe8d64bd96ef0 SHA1 5c40c9a20eb94d5e0bc5e9b41af51389bc364daf SHA256 d39abe7d9651783f4ecd59a0f6c5e2650f32df834e0e742a6b5d003795913fd6
 DIST liferea-1.6.2.tar.gz 1779422 RMD160 d5ae9774c1ca42bf0da0685e67a9fd0c920954b8 SHA1 df3f48a2ebef780a9428c790d8fa6db885c14fe4 SHA256 3db7fa41ce156433e1e4222521e835142f6a8983000736d16cc5aca77148bce1
 DIST liferea-1.6.3.tar.gz 1743574 RMD160 6c67f396823dab5379bbae707aea366f9a8f31db SHA1 ed88a4216f4fb6f7b678044dd7f1b8748c550193 SHA256 bcfc83be8089b4cd6f80cd9086b36db961b74e38751c445602d335dafca88ed4
@@ -6,7 +5,6 @@ DIST liferea-1.7.1.tar.gz 1552448 RMD160 ba401dd53fb5738196782cfcaa7a110f6b496c9
 DIST liferea-1.7.2.tar.gz 1732643 RMD160 83d63904c7a568f4c0a384760dcf01c8a29edf9b SHA1 1625107565b61957f188baacaee5a2318d4f4da9 SHA256 2f668adfd92fe94024c94f8bc87d1d273ef12bcad9730963abfdf0e17dae2528
 DIST liferea-1.7.3.tar.gz 1758998 RMD160 2b61653321634adbde8987a666f7a165d1b8fac9 SHA1 8195926787ce32b1837bf14ab10723f3ef0f8e93 SHA256 c791d88bf72a7a69028d005b72f52ff1f7466184972434f55583c87f3d22cbe7
 DIST liferea-1.7.4.tar.gz 1682434 RMD160 69103730b26a28e350c6acc65f22561527b45ae8 SHA1 2607aad81b2ada9a932eccd326ad8bbcf1c16986 SHA256 fc91c7453242358fd837da0df591bc7f5d7f3fc99809bf9bf662e8b03dc6f548
-EBUILD liferea-1.4.15.ebuild 2536 RMD160 e3a3da3d8b99b3877e98c3cdb3afb962c75a6f04 SHA1 78d951be1f99f455aa0c42cf6a7c0da2b4439a1b SHA256 e480568664c8377a6c020dcd955efdc2b2e073b825350c5e7a2c5adb4367977f
 EBUILD liferea-1.4.28-r1.ebuild 2667 RMD160 1e31907b86bc0e81705630f77793fc987cbc6425 SHA1 9cd22f55eab11afe25db450a05a3c4c2854ca234 SHA256 ebe057a295313389be07dbed79efb2dc6f22717d34e93a159e7c2cd94d5c0916
 EBUILD liferea-1.6.2.ebuild 1342 RMD160 1b3fbece686be50ba3dc639f60a5a5d92d36c009 SHA1 b4abc58ac2e69b973246768bba992d525d318029 SHA256 874e8aec68f929fd0d2dc0651cffd49f6092a3a11154c0bb0508c4145c521c8e
 EBUILD liferea-1.6.3.ebuild 1355 RMD160 196e87944c4cc3b9159dc97818f7bb175456d982 SHA1 54ff739068f0b97e889db0310ea785149ecb3a60 SHA256 3ba891c43611a99fde0d923b5bc119a2ac74131430200a162f048707d17666e2
@@ -14,5 +12,5 @@ EBUILD liferea-1.7.1.ebuild 1291 RMD160 1bd7f81002dc3e86c713c7dcf9ecd7fe486b0566
 EBUILD liferea-1.7.2.ebuild 1288 RMD160 bff205a10f32ace43cb2553d82bea69036ad7705 SHA1 a1866e1729f4f1b99ad0ebb40a38aba99b648c63 SHA256 8f3e883af1d5b8d8c6a1c4ffa4113d7ed2dbb974bda53ad995cea3ffc2376865
 EBUILD liferea-1.7.3.ebuild 1263 RMD160 d101fc2775eb77d00b3468c3d324f5ece19c191e SHA1 38a6c046cc67acc299e32e6f8d685528837b4a8f SHA256 f77dea6ad239e709f1b979afee38838b9cfa8a08b6fdb726b3100b2ef8c2669e
 EBUILD liferea-1.7.4.ebuild 1227 RMD160 526efe249f337faf89010f4c0cb7464caf8db8c1 SHA1 8bb82875c4ae6b0eb1a02e576ca4dd640764146d SHA256 cc3b6b0973ff77bed2872161e1e2944c808ad93d5c99a2f32d0c74de5acbdc02
-MISC ChangeLog 52737 RMD160 d40440e01fe701028249d608e4e558f97dd1071f SHA1 937d45f972872ae5844a0ec171aa42978ab12b8a SHA256 c63dab22669cee16ff212ae991e1fa8dde1dc3871aacddc5b8f804604242f702
+MISC ChangeLog 52936 RMD160 6e98112c0bc4b3183e5930cad1c700a7c23fa709 SHA1 859384b031a389150eafeb8bfc828a0e540c3842 SHA256 e9dcf1997bcef4878aae5668267e68f7a3ac836051b81e8a4448693e57d1a362
 MISC metadata.xml 1272 RMD160 35afb8fe241625e789d19ee694df0e99d476e3ea SHA1 a983d292c2cf34e647b001447237224cf636740f SHA256 a932a3b88d6f8a92771ad727a632f9520c4ee529b1cf2b63e456617cce77483e
diff --git a/net-news/liferea/liferea-1.4.15.ebuild b/net-news/liferea/liferea-1.4.15.ebuild
deleted file mode 100644
index ec681be77735..000000000000
--- a/net-news/liferea/liferea-1.4.15.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/liferea/liferea-1.4.15.ebuild,v 1.8 2010/03/05 04:56:02 vostorga Exp $
-
-EAPI="1"
-WANT_AUTOMAKE=1.7
-inherit gnome2 eutils
-
-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 ~x86-fbsd"
-IUSE="dbus firefox gtkhtml gnutls libnotify lua networkmanager xulrunner"
-
-RDEPEND="
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )
-	lua? ( >=dev-lang/lua-5.1 )
-	xulrunner? ( =net-libs/xulrunner-1.8* )
-	!xulrunner? ( firefox? ( =www-client/mozilla-firefox-2* ) )
-	!amd64? ( !xulrunner? ( !firefox? ( 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 firefox over gtkhtml
-	if use xulrunner ; then
-		G2CONF="${G2CONF} --enable-xulrunner"
-		G2CONF="${G2CONF} --disable-gecko"
-		G2CONF="${G2CONF} --disable-gtkhtml2"
-	elif use firefox ; then
-		G2CONF="${G2CONF} --enable-gecko=firefox"
-		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"
-		else
-			elog ""
-			elog "gtkhtml is no longer supported on amd64; you will need to "
-			elog "select one of the gecko backends to use liferea.  "
-			elog "Preference is: xulrunner then firefox."
-			die "You must enable on of the gecko backends on amd64"
-		fi
-	else
-		elog ""
-		elog "You must choose one backend for liferea to work.  Preference is:"
-		elog "xulrunner, firefox then gtkhtml."
-		die "You must enable on of the backends"
-	fi
-
-	G2CONF="${G2CONF} \
-		--disable-webkit \
-		$(use_enable dbus) \
-		$(use_enable gnutls) \
-		$(use_enable libnotify) \
-		$(use_enable lua) \
-		$(use_enable networkmanager nm)"
-}
-
-src_install() {
-	gnome2_src_install
-	rm -f "${D}/usr/bin/${PN}"
-	mv "${D}/usr/bin/${PN}-bin" "${D}/usr/bin/${PN}"
-}