4 files changed, 14 insertions, 281 deletions
diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index fd94c0f41b97..a5ffc486a6be 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.201 2014/01/12 13:16:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.202 2014/02/07 20:56:15 radhermit Exp $
+
+  07 Feb 2014; Tim Harder <radhermit@gentoo.org> -links-2.7.ebuild,
+  -links-2.8.ebuild:
+  Remove insecure versions.
 
   12 Jan 2014; Agostino Sarubbo <ago@gentoo.org> links-2.8-r1.ebuild:
   Stable for ia64, wrt bug #493138
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index eeb4815721ef..e9cc5b92905a 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,29 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST links-2.7.tar.bz2 3884511 SHA256 0c182b1cbcdfd5cdcd2f75a6032d1a4b660d07c1225c1e07757cec81d3302130 SHA512 b70d3984b34e795c4c08608a9b66e6b1f60503585a38dda18f1556c579df2ba542fb508adc97e82977dec9d94f29d0b367e79d20264918c36c5e5bdd6b4a67e4 WHIRLPOOL 916ed628f4951c33832ec5ec1a3dea3a121ceca6a6eb3e53c5ea1c6fb5193d25a73ccdbfdc09ad4bd0a1e8e3d6e17384bb5a284ba0a40b659187442f84d65dce
 DIST links-2.8.tar.bz2 4102643 SHA256 7950da386fa2014d75edc23abfaeed1b1f171ebc73bf0f557352948f12390096 SHA512 e6325be0bb81a9f4dc602f9c05150ebc3c4e16373767c284c02a87bd6b89b9a28ff409c175695542277faa361b71151c5c619135f36a59a04558fc3426c4b30a WHIRLPOOL d5233857bb057279b54883fc9026b5a35e22116ba9f9bb00971872d8a4a658c9fc20b765abd50328c5f1e835ab03e32f9432115671a74c729510d46b53f5d0eb
-DIST links2_2.7-1.debian.tar.gz 12430 SHA256 87955ae64b20beeb5abbfc7223eb8e7f8a8f6343bb511d7bc954a5f8085d8a8a SHA512 7a9a13dd9fcaf76e7692a82c6bd480846b7adf23d9b81b2ba2bfdd15c4fcb3fbff44f0443dbca484237c53fffc07749e23cbe828eb1d656c5823b9491d47a0ae WHIRLPOOL e9889825d923420d50af990a324d0befff4f79738eb67fbc479287fc2a23155ecae6d6100b9a2bc4ae262e9e547913caaf7bddc73eadaffbdc5fdc0f8e87294a
 DIST links2_2.8-1.debian.tar.gz 12121 SHA256 878529c4f93c934c1821edc3576ca6219bc4018f4e29866d6ffa469681a0bd80 SHA512 134fb292c88ec4d36529886d0e5d12083b773f38b89cb90b471b5f6b11d7f8d990de0a57ade5eb5f887cf1c4398687a6e81aed4a660959e81219c675c1de6af2 WHIRLPOOL e9c362de5874ca8de96a2ef184c81e40fa365e9d4e20c4a902845749946a438060ef2784e87972d40c459d4979e0e0ffc8158a5dcab1e02fc3980413c79edfc4
-EBUILD links-2.7.ebuild 3554 SHA256 4139625acdcd42cb91884d28e8a891d2897815535d875e8fbec38ff17f76398c SHA512 4741238a5601496a3a4ff88387e574757bf0d22c6d653e1f36961138bc90645ba9b3c251b9d2b13faf72b565ae6db83fb5526b3a9e1551e70fbd22eccf3518a3 WHIRLPOOL ce8a695aaa6d26138befcccc141878ca58f99e051d070456037cb1f8340738b8837aa55e6665e762900d8142ff98b25c82e6fa5b18e7d1ef15bd6e84d7de172c
 EBUILD links-2.8-r1.ebuild 3305 SHA256 0e15e4c34cf63d13710b459f8718d5073d38abdbed7ad2d27b823d54f5b4fc63 SHA512 8814b35559576fa7a6065a5d3f421387a807de649028411bf82098f67b775f8c1075bddb3dab8078d912062df1b9030669faee01b31f6cad20dc4bf0f9e2fdac WHIRLPOOL 08b4c69b5149579b7a6a56d90c310f09c5ff4d059d144ada30c9065949361bda5da50910d4f58010dd2104f8e7bebf330dd81ea85373647c321c26a3324dbc01
-EBUILD links-2.8.ebuild 3143 SHA256 958b7f5bd8f0070e769bdfbeed48b479a74d555cae45d17345a00fbf53fd16f5 SHA512 e6d35614f8b35802fcc4e5df14f429f585eadf8070f7add18b68e9ec0f600cb98b0a904def3adf538ffb618aceb598f9151653df2b754b8a61f4e603c978a3d3 WHIRLPOOL 38c7ff86afc898207857c480633bea5ebab1fe05a054baacd8caa09ec1cfb2bf8f312d86663cec0ccf6ca453111637b697f233e77d8b8ba00f0355b58fa829c5
-MISC ChangeLog 36856 SHA256 24a3a4632ee3f910ff6c86dbe2d926e087c974c02e6f67e52319fe489d423526 SHA512 48dcd86ed2285015aeede4b340f1cfba447f5893785ea2f64b7a076740d926d1e5e7ca67e8e86048ab0f228b9c2ba478cae7c1c455ebdf5234136612a26376ef WHIRLPOOL dfc6d1608d3aac2f8f88172a9b460f8e287ab3840cb6140834d6c7375f7c432d33132d7fbf2871d78b4db4d139da10e2bc3ed3d7dc604da9f40a58044cfc6977
+MISC ChangeLog 36980 SHA256 fe88fdb1e2f4d9e33ea3b05fc6705de077b82e701dee30370f8f5e999abe6f85 SHA512 448f0e1fefd7ba3b6232274363f84c89138e5cda23faeac76c07783e7532e16246c389944cab5bfb3361e3851bfd6fcea65b372b2d357c92653df97a27065c20 WHIRLPOOL 21f9cbec35f7ce6927362632a423260785eca295e423980ac465bdbb69dbc00fb04cc502ab4cf84b5fa221b1e90039f97b00b73f34216a3c575ce2f0be9e1b4a
 MISC metadata.xml 475 SHA256 47cdac116651eba8a04d0e7a0560d5013bc967ce3aa2d86f61ee8688649a3916 SHA512 f2708fbdcbcdadb6dcc11945e84a72d5371e1ddb50c85d51c42d554d11e9f6c4ab5178e90d516442a68b3f49e11ca171abebc6842f7920b75ac9151253ab2dd9 WHIRLPOOL e1dc8232c53e4585c4cc2258722217f242349c0de12a2b67f005eb5ef7bf79f227263d50adedb34fc6c6f6597f4e8b95be5baf1a94c206d33f781e77af7168fb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCgAGBQJS0pSgAAoJELp701BxlEWfH0gP/1GzX4uab8Mj8VwfRuI7wK4r
-SaL0UXZIOMGfQ7PDRlo4M9FS8fO1OFULBCHZGuDjgwjoJTf6pB2k1tioisReTA2O
-wB9crbv+XeG5YQOs2qxoZqjEChi/2oT3ZwDoLFCuyHoReTomrlgDNPEmYRXBPfdU
-DvVJtrT5Vr8Oo1QVFG56VNNT5ts1LfqJHN397UTDsKsaIIvenUHnbBbPmstZzF7M
-iv4oV4LcZMrFfs6qELqwNgKVf9lVBeKxYw+rz4nbN5/fRHOEA9D4X6ug03Ug7+rz
-DcdXfcw8za5VLjgOwcu52B0E34aObdmSlBTCbJjj5mzazVviHTZ9x8W9PecFeLg5
-kqK7Yzu1YYCY3NCdxGHwW2aowE1dwmDAcChQoV0ijUe7uvnqMypfiwu2tjQqFWEq
-f3bMEd39LwRyuMfJb5gGTFBVGropg8CAmq23f0YqDLBPYKpXLQEwrlvx9K6dTr1O
-+u+j/9NOg0X01u/BjOtLuWdFD35Onz+1LwWVrFsSjC82pSYnyjeHgX4/x+yylnJj
-Q+QiEcHhS53NHAMyM8IIT49qQvYRsZ0jjF4zAdTu/T1NLqTVbscv/SRGwDtxYV8E
-JB5rJ4lkjGQZlPiTcGjjenmkawL3H9HKf5jaZbuXI58UeZ4SLNWNvCOwJRJDOZq3
-q94/4QfzmW8zJzJl8l0j
-=qG+x
+iQEcBAEBCAAGBQJS9Uh0AAoJEEqz6FtPBkyj3T8H/3gy7WW3pPktCcif/J9jYxvU
++ukpDEbiXhUPkqQMK7ClQWuUJSXDbR34dluy3IuxN6h6rXMxVoV91FgYxGcoYTUz
+Gh9TA5I8XgHDLaCBqqllDjzZeyGkvbJoIE4+JXS1xZFUuJEpyRxXA8xm+VzX0JjD
+GIu18C284Lua+ZKZhkQXv6wgAtqyTTqgx3II/Mi6tfYULvuxBDe65d/3cU4lxITa
+AlurJWAQSMGaf6BnBF3zL48l4Udwi7G1ytWu5H1wP4OtnwRYtcprF6rlxKgKBfTj
+Vte7LEzHWJxMxt4J+ru7ZcHS0jT+1NXYYbHvWZNbx5YtWLeMuNuUzeICxebZh3o=
+=TYg1
 -----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.7.ebuild b/www-client/links/links-2.7.ebuild
deleted file mode 100644
index 56e9b79cfb9d..000000000000
--- a/www-client/links/links-2.7.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.7.ebuild,v 1.13 2013/08/27 15:09:06 kensington Exp $
-
-EAPI=5
-inherit autotools eutils fdo-mime
-
-DEBIAN_REVISION=2.7-1
-
-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/${PN:0:1}/${PN}2/${PN}2_${DEBIAN_REVISION}.debian.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~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 +deprecated directfb fbcon gpm jpeg livecd lzma ssl suid svga tiff unicode X zlib"
-
-GRAPHICS_DEPEND="media-libs/libpng:0="
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7
-	bzip2? ( app-arch/bzip2 )
-	directfb? (
-		${GRAPHICS_DEPEND}
-		dev-libs/DirectFB
-		)
-	fbcon? ( ${GRAPHICS_DEPEND} )
-	gpm? ( sys-libs/gpm )
-	jpeg? ( virtual/jpeg:0 )
-	livecd? (
-		${GRAPHICS_DEPEND}
-		sys-libs/gpm
-		virtual/jpeg:0
-		)
-	lzma? ( app-arch/xz-utils )
-	ssl? ( dev-libs/openssl:0 )
-	svga? (
-		${GRAPHICS_DEPEND}
-		media-libs/svgalib
-		)
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		${GRAPHICS_DEPEND}
-		x11-libs/libXext
-		)
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	fbcon? ( virtual/os-headers )
-	livecd? ( virtual/os-headers )"
-
-REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
-
-src_prepare() {
-	epatch "${WORKDIR}"/debian/patches/verify-ssl-certs-510417.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:#::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.in || die #467020
-
-	# This image file has bogus distance in IDAT information wrt #466190#c12
-	# Fixed in upstream, remove this in next version bump like 2.7.1 or 2.8
-	rm -f graphics/font/century_school-medium-roman-serif-vari/045e.png
-
-	# Upstream configure produced by broken autoconf-2.13. This also fixes
-	# toolchain detection.
-	eautoreconf #131440 and #103483#c23
-}
-
-src_configure() {
-	local myconf
-
-	if use livecd; then
-		export ac_cv_lib_gpm_Gpm_Open=yes
-		myconf+=' --with-fb --with-libjpeg'
-	else
-		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
-	fi
-
-	if use X || use fbcon || use directfb || use svga || use livecd; then
-		myconf+=' --enable-graphics'
-	fi
-
-	econf \
-		$(use_with ssl) \
-		$(use_with zlib) \
-		$(use_with bzip2) \
-		$(use_with lzma) \
-		$(use_with svga svgalib) \
-		$(use_with X x) \
-		$(use_with fbcon fb) \
-		$(use_with directfb) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	if use X; then
-		newicon Links_logo.png links.png
-		make_desktop_entry 'links -g %u' Links links '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
-
-	nonfatal dohtml doc/links_cal/*
-	use deprecated && 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
-}
diff --git a/www-client/links/links-2.8.ebuild b/www-client/links/links-2.8.ebuild
deleted file mode 100644
index 1ea79ee79e93..000000000000
--- a/www-client/links/links-2.8.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.8.ebuild,v 1.1 2013/09/23 09:45:58 ssuominen Exp $
-
-EAPI=5
-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"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~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 ipv6 jpeg livecd lzma ssl suid svga tiff unicode X zlib"
-
-GRAPHICS_DEPEND="media-libs/libpng:0="
-
-RDEPEND=">=sys-libs/ncurses-5.7-r7
-	bzip2? ( app-arch/bzip2 )
-	directfb? (
-		${GRAPHICS_DEPEND}
-		dev-libs/DirectFB
-		)
-	fbcon? ( ${GRAPHICS_DEPEND} )
-	gpm? ( sys-libs/gpm )
-	jpeg? ( virtual/jpeg:0 )
-	livecd? (
-		${GRAPHICS_DEPEND}
-		sys-libs/gpm
-		virtual/jpeg:0
-		)
-	lzma? ( app-arch/xz-utils )
-	ssl? ( dev-libs/openssl:0 )
-	svga? (
-		${GRAPHICS_DEPEND}
-		media-libs/svgalib
-		)
-	tiff? ( media-libs/tiff:0 )
-	X? (
-		${GRAPHICS_DEPEND}
-		x11-libs/libXext
-		)
-	zlib? ( sys-libs/zlib )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	fbcon? ( virtual/os-headers )
-	livecd? ( virtual/os-headers )"
-
-REQUIRED_USE="!livecd? ( fbcon? ( gpm ) )
-	svga? ( suid )"
-
-DOCS=( AUTHORS BRAILLE_HOWTO ChangeLog KEYS NEWS README SITES )
-
-src_prepare() {
-	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:dnl ::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.in || die #467020
-
-	# Upstream configure produced by broken autoconf-2.13. This also fixes
-	# toolchain detection.
-	eautoreconf #131440 and #103483#c23
-}
-
-src_configure() {
-	local myconf
-
-	if use livecd; then
-		export ac_cv_lib_gpm_Gpm_Open=yes
-		myconf+=' --with-fb --with-libjpeg'
-	else
-		export ac_cv_lib_gpm_Gpm_Open=$(usex gpm)
-	fi
-
-	if use X || use fbcon || use directfb || use svga || use livecd; then
-		myconf+=' --enable-graphics'
-	fi
-
-	econf \
-		$(use_with ipv6) \
-		$(use_with ssl) \
-		$(use_with zlib) \
-		$(use_with bzip2) \
-		$(use_with lzma) \
-		$(use_with svga svgalib) \
-		$(use_with X x) \
-		$(use_with fbcon fb) \
-		$(use_with directfb) \
-		$(use_with jpeg libjpeg) \
-		$(use_with tiff libtiff) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	if use X; then
-		newicon Links_logo.png links.png
-		make_desktop_entry 'links -g %u' Links links '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
-
-	nonfatal dohtml doc/links_cal/*
-	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
-}