punt vulnerable copy

Package-Manager: portage-2.2.0_alpha101/cvs/Linux x86_64

3 files changed, 13 insertions, 143 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index 6cdd9c20ace4..f92b6ddd3431 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.175 2012/05/06 19:14:33 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.176 2012/05/06 21:00:58 ssuominen Exp $
+
+  06 May 2012; Samuli Suominen <ssuominen@gentoo.org> -links-2.5.ebuild:
+  old
 
   06 May 2012; Mark Loeser <halcy0n@gentoo.org> links-2.6.ebuild:
   Stable for ppc64; bug #411493
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 17e09fe7ccee..a1977eb88aa9 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST links-2.5.tar.bz2 3849259 RMD160 ec0c2fbf239289d757fd12526495bdcb3c08a588 SHA1 fe4bc37be8aebd9196c35ffef724435cea94349c SHA256 f5c7f23f31d71d073b7b6ad2f123f3f93b07b787912b7b01b4fff565349295f2
 DIST links-2.6.tar.bz2 3866614 RMD160 ea13e446903fbeaa8b05b3aa81dcfe5f69224962 SHA1 228bd726c176ea44d35fa12cafd97aa83214d9dc SHA256 df9149f5f50d0b7742f6b3972b0fc0e9ff091ad4ef27153a3362a9ac1033835b
 DIST links2_2.5-1.debian.tar.gz 20869 RMD160 997338fd263a9519f105d24ced17caba65181caf SHA1 82a2f23c12dca937c29e8f4cd83b7527a7e374e8 SHA256 28fb3fe213b3ba2a2274353a810bcd23d4fd39d949d8cb608c3a366f09651b7e
-EBUILD links-2.5.ebuild 3348 RMD160 875873d6bcca54723318858a7e08c3a3458fcd5e SHA1 893345f7d797aae1ab0f43e1f62824598791ea58 SHA256 d377062ade04d4fc8fd8d33e4eaf1a634e1d7dc6fb65493f782f4136ed91ed23
 EBUILD links-2.6.ebuild 3214 RMD160 9e4d8665b89bb87d7939fd1fb2206bd89ca8e032 SHA1 73122ffc12227b850b92a018505c7bc5e75a33cf SHA256 631a1184d23a6ad3de0c2448bc8156c5a235b4bb624dbf9311a0c27ba35f16e0
-MISC ChangeLog 33881 RMD160 d496f441973021ca4d17a1b96a004c7c9d9ccd61 SHA1 d8db749931c68e5bf16512528ed9137160c72cdc SHA256 c4763c7f1a5908cf4d685b9c5eec2a7bbdb057e7b342c829b34bb11ba5562a20
+MISC ChangeLog 33963 RMD160 84f711dc0161d3c066efc3e5718d24efb61fd794 SHA1 8eb556ab09b0261f61bc03cd8169149740b1e18d SHA256 ca03583d3300cce82e1579b5824b2495156a563c7f560de3c65a90851382c87c
 MISC metadata.xml 475 RMD160 8089a45a24128919ea9045afeab78b7f2142224f SHA1 1f7e54ea9eaf0ba842701c75e96ae0d045e42f5e SHA256 47cdac116651eba8a04d0e7a0560d5013bc967ce3aa2d86f61ee8688649a3916
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPps2eAAoJEPTTRK0uRVaNO60P/RxaYURv8wdjleYl3sGxzf1l
-1USpLld/UP6UL7UDOEdTmIKvtzwXS9VnPq1HWquGxzV/Z183qK3Du89feiUVyz1i
-rPQfrKDutgr8M0XEtp3saijQ80QVV4vVWPcf92XpB3pECij43rSrZaA87fXKI6yl
-Vh4LPcLFTsprAuH19fOtuAJKnNc/fceLtRHjP0q50T3O2rjR+Li9bs8yCP91g9i6
-CXG4KUOqZi1K/N/2pBKK8h7vPMX9z62W2T92yl7Kiw/UXAAfuSvIko9L6LEPWoMo
-km0Kx8xSIfeYJcbP2CisSOu5vwnpQFWN2W37TZu+Wg6lNsZp2iu38fxe5XkYo7Da
-FdnN1US+xbSoEgO5Ebt0JSJiwN7WzV+Y7iiuISiBXw4tl8qRae6DOgn0vF+NPI/7
-TeMAV3/39EjrOiV2YB4Zb2fESKkOO7aXmaPc7OA02nyTKpLkryn3tDQt816fsIx8
-3Hx0ZJmoVn8XELUIVIkPLipw+8ub9l3QsGgDdEeAPHoYAsKC0w0M+av2tDuf7BYk
-UcDO6VsAofswDOW8E8wi4+yQCV5/wLSUKYIrzFPRglkaIvnzi5eTA/lGctz1qnVS
-taHL5zycKZgZs6WcWLtRgqzrUJwoC2ACnX7xjKcABOhVvEDxsRD3RpH8gm8zaYNY
-OeCvBZi/4NKc+zL48Jog
-=kmoz
+iQEcBAEBAgAGBQJPpuXvAAoJEEdUh39IaPFNLPwH/1n3lG3VPWVRMOb4RNmjvb5a
+pUMnIOSy+s6QW50nNFRnWMTdxlQ31EG/IpobPBNG2tJY/s617kJRLmfFlWiUwVDu
+Bmu75Uo8dZDLIkKq7zpIxJBi8XeE1LHjSXLByph2+jpNBQOingp+nPVGdPHkHr5l
+PgL8P6RppQGys6gAhGEDTHMF/vbAVGogSPjvNxlLEevraWnpudPM8WDg0vEU9BEg
+1sLSXKsAJiZEcZTL+5MRwildfr0Aa2VNTaGUzar8BSsvvU9BYHHpzMkB509+RIAk
+pWQtFgaYWgisZzF98RypxEFU+WtpijSsCHH4q0JQRpKrpyB1IQQD4NEJZ+xPj4I=
+=Ec1T
 -----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.5.ebuild b/www-client/links/links-2.5.ebuild
deleted file mode 100644
index e367a738fb44..000000000000
--- a/www-client/links/links-2.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.5.ebuild,v 1.14 2012/05/03 06:01:04 jdhore Exp $
-
-EAPI=4
-inherit autotools eutils fdo-mime
-
-DESCRIPTION="A fast and lightweight web browser running in both graphics and text mode"
-HOMEPAGE="http://links.twibright.com/"
-SRC_URI="http://${PN}.twibright.com/download/${P}.tar.bz2
-	mirror://debian/pool/main/l/${PN}2/${PN}2_${PV}-1.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 directfb fbcon gpm jpeg livecd lzma ssl suid svga tiff unicode X zlib"
-
-# Note: if X or fbcon usegflag are enabled, links will be built in graphic
-# mode. libpng is required to compile links in graphic mode
-# (not required in text mode), so let's add libpng for X? and fbcon?
-
-# We've also made USE=livecd compile in graphics mode.  This closes bug #75685.
-PNG_DEPEND=">=media-libs/libpng-1.2:0"
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7
-	bzip2? ( app-arch/bzip2 )
-	directfb? ( dev-libs/DirectFB )
-	fbcon? ( ${PNG_DEPEND} )
-	gpm? ( sys-libs/gpm )
-	jpeg? ( virtual/jpeg )
-	livecd? ( ${PNG_DEPEND} )
-	lzma? ( app-arch/xz-utils )
-	ssl? ( dev-libs/openssl:0 )
-	svga? (
-		${PNG_DEPEND}
-		>=media-libs/svgalib-1.4.3
-		)
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		${PNG_DEPEND}
-		x11-libs/libXext
-		)
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="fbcon? ( jpeg gpm )
-	livecd? ( jpeg gpm )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO BUGS ChangeLog KEYS NEWS README SITES TODO )
-
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/{verify-ssl-certs-510417,ipv6}.diff
-
-	if use unicode; then
-		pushd intl >/dev/null
-		./gen-intl || die
-		./synclang || die
-		popd >/dev/null
-	fi
-
-	# error: conditional "am__fastdepCXX" was never defined (for eautoreconf)
-	sed -i -e '/AC_PROG_CXX/s:#::' configure.in || die
-
-	# Upstream configure produced by broken autoconf-2.13.  See #131440 and
-	# #103483#c23.  This also fixes toolchain detection.
-	eautoreconf
-}
-
-src_configure() {
-	export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
-
-	local myconf
-
-	if use X || use fbcon || use directfb || use svga || use livecd; then
-		myconf="${myconf} --enable-graphics"
-	fi
-
-	if use fbcon || use livecd; then
-		myconf="${myconf} --with-fb"
-	else
-		myconf="${myconf} --without-fb"
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_with zlib) \
-		$(use_with bzip2) \
-		$(use_with lzma) \
-		$(use_with svga svgalib) \
-		$(use_with X x) \
-		$(use_with directfb) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	if use X; then
-		newicon Links_logo.png ${PN}.png
-		make_desktop_entry "${PN} -g" Links ${PN} 'Network;WebBrowser'
-		local d="${ED}"/usr/share/applications
-		echo 'MimeType=x-scheme-handler/http;' >> "${d}"/*.desktop
-		use ssl && sed -i -e 's:x-scheme-handler/http;:&x-scheme-handler/https;:' \
-			"${d}"/*.desktop
-	fi
-
-	dohtml doc/links_cal/*
-
-	dosym links /usr/bin/links2
-
-	use suid && fperms 4755 /usr/bin/links
-}
-
-pkg_postinst() {
-	use X && fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	use X && fdo-mime_desktop_database_update
-}