Version bump.

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

3 files changed, 137 insertions, 12 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index e756cb8f0ebd..175c81821a8d 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/links
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.146 2011/12/31 10:56:37 ago Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.147 2012/01/03 09:41:23 ssuominen Exp $
+
+*links-2.5 (03 Jan 2012)
+
+  03 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +links-2.5.ebuild:
+  Version bump.
 
   31 Dec 2011; Agostino Sarubbo <ago@gentoo.org> links-2.4-r2.ebuild:
   Stable for AMD64, wrt bug #396519
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index b2540a8254e8..76bd79e5a95f 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,23 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX links-2.3_pre1-libpng-1.5.patch 1232 RMD160 999358a40826d30d55eb4222358f71a7f30af9a1 SHA1 13018fbd6e89d3d64bfe436f1e681dec03b5cb15 SHA256 9109075a010ffe68f5b295a70adf573f5ec77d2ff204a7768b8f78e64eb6256a
 AUX links-2.3_pre1-verify-ssl-certs.patch 1840 RMD160 7f38e7ddb1af06fc55cd23a749c02a7afbc0f8c3 SHA1 4726405578261027c3d28177eae02d4d808c480f SHA256 5fb7df573de849a2bfa7ad9b7c6ce150afe3f2c42a862945fabd57ca5ae66c34
 DIST links-2.3pre1.tar.bz2 3832651 RMD160 f0cfc8c48c7d5fb759ac58b7f7a00275480ac3de SHA1 6d420a5c4514b45ee245fd3933d2a8cfa6eae76d SHA256 21ab49f2f24359ef2d0e634a7926f76419084bd792af28746323b2f16c229bde
 DIST links-2.4.tar.bz2 3843247 RMD160 9ede914cba25925356e3f69a3f40794821326235 SHA1 c09fcb03874b1d0586f582f73833bb2f4c9ed7ac SHA256 bebb6ccafaaabf1d251ccd79ff5cda07078a11bf7d15e775d6f3a0a89d4dd125
+DIST links-2.5.tar.bz2 3849259 RMD160 ec0c2fbf239289d757fd12526495bdcb3c08a588 SHA1 fe4bc37be8aebd9196c35ffef724435cea94349c SHA256 f5c7f23f31d71d073b7b6ad2f123f3f93b07b787912b7b01b4fff565349295f2
 DIST links2_2.4-1.debian.tar.gz 20808 RMD160 cedde06aa161c9f429531e3a045230cf9e0b46ee SHA1 2caa1602dcbac0d9c0092b2eae99e0f7ae64379c SHA256 5f092ec2eef39048cee2114d9f6c32d18778e244b0217b5e38b4f92e805d235d
+DIST links2_2.5-1.debian.tar.gz 20869 RMD160 997338fd263a9519f105d24ced17caba65181caf SHA1 82a2f23c12dca937c29e8f4cd83b7527a7e374e8 SHA256 28fb3fe213b3ba2a2274353a810bcd23d4fd39d949d8cb608c3a366f09651b7e
 EBUILD links-2.3_pre1-r1.ebuild 3475 RMD160 8352313b0b496d876ebc3cea692c295b0fca1ada SHA1 12af946a7668405bd1f5e0de751c99d1d39d8622 SHA256 80f53c0db696f15084013fd9f6db351f77fcf4d5609fba77def9b84ce0ebd8dc
 EBUILD links-2.4-r2.ebuild 3179 RMD160 026caa176768f00edadea78068e6c061c21cbd41 SHA1 dd162ee2b02953e5311f8bb232d5b17a4a01938a SHA256 ddabd12bca60b5a9e33cdf2834286caf0a0008f030694c88d586025a3e7536ac
-MISC ChangeLog 30006 RMD160 1c2f8ac261cd00c5aed692d9c8fca6e864dd0690 SHA1 0c9078b0daa594397e6a738b41c667e9760080c3 SHA256 e763e73ede5e4886758cf2690d6826e051b775265ca0176015034ec35566d0df
+EBUILD links-2.5.ebuild 3090 RMD160 5dc7183a67fc32e5fdf4629abf876d44dba8ff33 SHA1 863bf0686c59b6c9c2e55fd2325cc0a463ad623e SHA256 d762a70279f488fc0624b63065c326456b53f29137a77834e2f9fb5a217b4ff8
+MISC ChangeLog 30128 RMD160 361e4be3470210baeb0286da21c0e7384972dba1 SHA1 00f167c55a75d46e840166189a9aab8357bbbe96 SHA256 3b3620ef59c0f48cb1a109af8d3cb062ded3693570a40d4935127f68cef12871
 MISC metadata.xml 342 RMD160 f48da44e2ff7ef33505a66744713dde872654bf5 SHA1 09f4631fef863d70a152eec29c2455243413c9ee SHA256 264e605d3878a9b815b642d43c413afd628f1945e9a875fc31eaf7e2cef0a085
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO/uprAAoJEOTDgjZ80txdDugIAJwy/j2AmtDsk+NO6b4mnrsH
-sBoVgOboHw9xIYxk66gRmiEomI2KYcB1bJeUi1M63snbA03psfWDNn6lCuKqT6T3
-i2m/M1+3ElK9lomseLeSm4/HzcMoxxC4ci00+brOpNY8+dCm5/bWaKYvyOUibzvx
-QNXAUc/BjVI6bc4oDeiWTS1oMPZvLLQBJR/Gw6Wfyh1tUgUIPzV7dCUbdHhJdj86
-nxbpGJKyA2RpT/OlGYZZdL/poIkByr48TTbryaCQjoNKRFSd/YVPaFlPRNI9TST3
-8Iuyw0af4mA7lnWCJhRJsIsSl9aAPgWsgzTrT2f0xZT/wO0nu6lEhZx/zh8/PIY=
-=wSsg
+iQEcBAEBAgAGBQJPAszUAAoJEEdUh39IaPFNa4gH/2Jt770bzoswepPsaRYMykyv
+TCLNan0Wlz6wLAlCh+ZgRJvFwD2hZXCHP0fva0laaGn1+6EdXbQjjtcfKVE7kHwT
+gIdoi2XP3W4l9e8D3mdvOO9e6aLrM4VLUxub4ea+/Pph1ZYMoGELf3B041iu/dQD
+M9psQxZt3zxjW55PCFPCxQbIdW6gmL7UuR6tUFjw35US/Z6VESUmCzEkMCHsRsaw
+gicdN5BxVAkrekTu/zwqiuNCpvvdrfS/zVPPyzBZVyjuJM/lTDwFXUOa/iRGKgQe
+VoltnSMstE0YPyjsm8zUF8IrTWmdUhYNyUjNb6wh3K+unZEBYq/GHlSiPGBjmSs=
+=2kYU
 -----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.5.ebuild b/www-client/links/links-2.5.ebuild
new file mode 100644
index 000000000000..70806bb10588
--- /dev/null
+++ b/www-client/links/links-2.5.ebuild
@@ -0,0 +1,117 @@
+# 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.1 2012/01/03 09:41:23 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils
+
+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}
+		sys-libs/gpm
+		)
+	gpm? ( sys-libs/gpm )
+	jpeg? ( virtual/jpeg )
+	livecd? (
+		${PNG_DEPEND}
+		sys-libs/gpm
+		)
+	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}
+	dev-util/pkgconfig"
+
+REQUIRED_USE="fbcon? ( jpeg )
+	livecd? ( jpeg )
+	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() {
+	local myconf
+
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf="${myconf} --enable-graphics"
+	fi
+
+	( use gpm || use fbcon || use livecd ) || export ac_cv_lib_gpm_Gpm_Open=no
+
+	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"
+	fi
+
+	dohtml doc/links_cal/*
+
+	dosym links /usr/bin/links2
+
+	use suid && fperms 4755 /usr/bin/links
+}