Links 2.10 includes LibreSSL support.

We don't need to keep the patches for other unstable versions.

4 files changed, 6 insertions, 273 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index f0334f1..9b86228 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.207 2015/06/04 14:46:56 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.208 2015/07/22 14:58:36 monsieurp Exp $
+
+*links-2.10 (22 Jul 2015)
+
+  22 Jul 2015; Patrice Clement <monsieurp@gentoo.org> +links-2.10.ebuild:
+  Version bump.
 
   04 Jun 2015; Tim Harder <radhermit@gentoo.org> metadata.xml:
   Remove myself as a maintainer.
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 4502888..d7830b0 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,4 +1,2 @@
 DIST links-2.8.tar.bz2 4102643 SHA256 7950da386fa2014d75edc23abfaeed1b1f171ebc73bf0f557352948f12390096 SHA512 e6325be0bb81a9f4dc602f9c05150ebc3c4e16373767c284c02a87bd6b89b9a28ff409c175695542277faa361b71151c5c619135f36a59a04558fc3426c4b30a WHIRLPOOL d5233857bb057279b54883fc9026b5a35e22116ba9f9bb00971872d8a4a658c9fc20b765abd50328c5f1e835ab03e32f9432115671a74c729510d46b53f5d0eb
-DIST links-2.9.tar.bz2 4111393 SHA256 4360ead54d5f41da16b2f4c0033317ca775f40c1e658a29e9e7f8ce4bc23878f SHA512 386f53e8a8eac78b5f1a85277d449f2cc23e96dbc505c776fa5123c3c4ee34916c9da867766849fb71ff7701df161bd1906a34468bd9c31183abdce1d03819a7 WHIRLPOOL b3f4e88df0df05c20c8915ebb30b81aa0aef519ef09fff0f6528c787174adcd003b68b2374851b7b37d4329ea6b4766f6a2a6145703a1d8ce338dbaf1a57dab6
 DIST links2_2.8-1.debian.tar.gz 12121 SHA256 878529c4f93c934c1821edc3576ca6219bc4018f4e29866d6ffa469681a0bd80 SHA512 134fb292c88ec4d36529886d0e5d12083b773f38b89cb90b471b5f6b11d7f8d990de0a57ade5eb5f887cf1c4398687a6e81aed4a660959e81219c675c1de6af2 WHIRLPOOL e9c362de5874ca8de96a2ef184c81e40fa365e9d4e20c4a902845749946a438060ef2784e87972d40c459d4979e0e0ffc8158a5dcab1e02fc3980413c79edfc4
-DIST links2_2.9-2.debian.tar.xz 12708 SHA256 ec074c302da1cd7410a8af3414e2b600653e89ad874937deb37f00dd98428a55 SHA512 9663145a1ec5de7b17b6805d2051a6259c2a80502b7c9742d265863a961dba76caff170af9088bbc9ff4b0353a8d2fba3e87f67d7c99df2e91ff7d919d3c9964 WHIRLPOOL 505a8c6e9af35161ef4430f5b7f73027d615e9d87b575ea382ed2ab235388bc6df29771be1b0d736d1d91e99e2e17a461923e6415cf63fe9688ab376afc9d281
diff --git a/www-client/links/links-2.9-r1.ebuild b/www-client/links/links-2.9-r1.ebuild
deleted file mode 100644
index afb2596..0000000
--- a/www-client/links/links-2.9-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.9-r1.ebuild,v 1.1 2015/06/04 14:39:54 monsieurp Exp $
-
-EAPI=5
-inherit autotools eutils fdo-mime
-
-DEBIAN_REVISION=2.9-2
-
-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.xz"
-
-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 libressl 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? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl:= )
-	)
-	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 "${FILESDIR}"/${PN}-libressl.diff
-	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: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
-
-	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
-}
diff --git a/www-client/links/links-2.9.ebuild b/www-client/links/links-2.9.ebuild
deleted file mode 100644
index 5ace78a..0000000
--- a/www-client/links/links-2.9.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.9.ebuild,v 1.1 2015/01/06 16:11:29 radhermit Exp $
-
-EAPI=5
-inherit autotools eutils fdo-mime
-
-DEBIAN_REVISION=2.9-2
-
-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.xz"
-
-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 libressl 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? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl:= )
-	)
-	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 "${FILESDIR}"/${PN}-libressl.diff
-	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: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
-}