Version bump.

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

3 files changed, 139 insertions, 6 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index 5b713f5bd17b..6345496dbe26 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.135 2011/11/22 18:23:13 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.136 2011/11/24 19:25:58 ssuominen Exp $
+
+*links-2.4 (24 Nov 2011)
+
+  24 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> +links-2.4.ebuild:
+  Version bump.
 
   22 Nov 2011; Pacho Ramos <pacho@gentoo.org> -links-2.3_pre1.ebuild,
   metadata.xml:
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 17ae8aa8f7ab..013fdf38041e 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -7,14 +7,20 @@ AUX links-2.3_pre1-verify-ssl-certs.patch 1840 RMD160 7f38e7ddb1af06fc55cd23a749
 DIST links-2.1pre33-utf8.diff.bz2 4793 RMD160 e946efd34031bd1176b39278ef19b6536214738a SHA1 bc6800c89d5a33caffdb69f20e14126885eee7bc SHA256 a34de30b787e6bab984cd5000c7a576f157437f622e9fe3a076808769a56db75
 DIST links-2.2.tar.bz2 3832115 RMD160 fe051b2655a67e004fdf682045349664611a3101 SHA1 7588c151e98057f83a2e0b81b3f467e7eee9f824 SHA256 d3c60ff425bec5aacd1b15578a643c03090ad73fbb404f6ce8ee8c6219bdbc6d
 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
 EBUILD links-2.2.ebuild 3709 RMD160 dc6be1dee2fd49038e38b774268ded2b2ab33038 SHA1 1b38bbc5b54204bdbcb93727da8f7a1cc4705949 SHA256 16643bf5c60048806cd586960a4bac7a7fc70c1c2700bd976fa00bb921bc6ae1
 EBUILD links-2.3_pre1-r1.ebuild 3475 RMD160 8352313b0b496d876ebc3cea692c295b0fca1ada SHA1 12af946a7668405bd1f5e0de751c99d1d39d8622 SHA256 80f53c0db696f15084013fd9f6db351f77fcf4d5609fba77def9b84ce0ebd8dc
-MISC ChangeLog 28794 RMD160 6887f3deacd069df59911915c3bdd492a6c3d949 SHA1 83a2a77ed91c6115c06fc43c3dd9e8b7d13d73e3 SHA256 072388c0b97cd44d7397e4da0975e051453e317b523749efec4f22d0bff2bfd7
+EBUILD links-2.4.ebuild 3265 RMD160 26e77d23c7f35f9d4610ff07868d2e016a43fe0b SHA1 f413882ac525290be16a76979c5b7c6c6bb77b42 SHA256 bc5976dce56e4ebfd620860acc4bbddcaa5c4515c775ce2732112637086742ab
+MISC ChangeLog 28914 RMD160 eeba9854d19e0270a3ac7172f32a034ff4614c3e SHA1 969741f7fa621a76532c1665f1166b80fd67739d SHA256 74bbc6aa42bddaa55826399032b0d4045f85fddc63f7b15153c2e9fe11c447ac
 MISC metadata.xml 214 RMD160 f3b412951b1e98002d62dd48fb26af94135eea85 SHA1 47d79b4782d2f4604ae36d052781c23adce7b871 SHA256 3d9a6315cd555fa1da462d3bbae17237d0bb19633ee6141b16fd4dbdec63ada3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7L6JYACgkQCaWpQKGI+9QKVQCeJupcoUNJDmy+SU9konYfZrTr
-zOYAnj1Ouo8Ik0KUbtP0ENTnrPN0t5Xz
-=ywhL
+iQEcBAEBAgAGBQJOzpnJAAoJEEdUh39IaPFNZV0H/3ymO4cq4wYEVNj6a7093V4U
+696Y03jnlnSV8daKQg2hFCGAC3gCa78wleFI2xNwVrn/LmJ10/VenTUr7BA+5xNV
+FB140ZhdIuJsmyNHgg50WcOej4yOebOM84fktwiFaUWYsblbZ8n+bp3dlolBDMtw
+iNYdEhnwYBACktLtkHxs29vAMYv9rOjpbbw3aksAbLlWE1SROmSr0rpzGW+iVwbb
+jYhm0032/noANa7z9WFaHyDofQTQqCHJCXaQsxrc7oSxeazdWVAPIge4T8npH37G
+3QgQCAWh9c16guEW2n0e29b8tnM/8sJn60So78bdTezs//siL3dlPzxrjlKlzII=
+=taMw
 -----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.4.ebuild b/www-client/links/links-2.4.ebuild
new file mode 100644
index 000000000000..745a9decf922
--- /dev/null
+++ b/www-client/links/links-2.4.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.4.ebuild,v 1.1 2011/11/24 19:25:58 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="links is a fast lightweight text and graphic web-browser"
+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 ~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 ssl 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.
+
+# 2.3_pre1: SDL support is disabled in this version by upstream: sdl? ( >=media-libs/libsdl-1.2.0 )
+RDEPEND="ssl? ( dev-libs/openssl:0 )
+	gpm? ( sys-libs/gpm )
+	jpeg? ( virtual/jpeg )
+	fbcon? (
+		media-libs/libpng:0
+		virtual/jpeg
+		sys-libs/gpm
+		)
+	tiff? ( media-libs/tiff:0 )
+	svga? (
+		>=media-libs/svgalib-1.4.3
+		media-libs/libpng:0
+		)
+	X? (
+		x11-libs/libXext
+		media-libs/libpng:0
+		)
+	directfb? ( dev-libs/DirectFB )
+	sys-libs/ncurses
+	livecd? (
+		media-libs/libpng:0
+		virtual/jpeg
+		sys-libs/gpm
+		)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+DOCS=( AUTHORS BRAILLE_HOWTO BUGS ChangeLog KEYS NEWS README SITES TODO )
+
+src_prepare() {
+	if use unicode ; then
+		pushd intl >/dev/null
+		./gen-intl || die
+		./synclang || die
+		popd >/dev/null
+	fi
+
+	# Upstream configure produced by broken autoconf-2.13.  See #131440 and
+	# #103483#c23.  This also fixes toolchain detection.
+	eautoconf
+}
+
+src_configure() {
+	local myconf
+
+	if use X || use fbcon || use directfb || use svga || use livecd; then
+		myconf="${myconf} --enable-graphics"
+	fi
+
+	# Note: --enable-static breaks.
+
+	# Note: ./configure only support 'gpm' features auto-detection, so
+	# we use the autoconf trick
+	( 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
+
+	# force --with-libjpeg if livecd flag is set
+	if use livecd ; then
+		myconf="${myconf} --with-libjpeg"
+	fi
+
+	#	$(use_with sdl)
+	econf \
+		$(use_with X x) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with svga svgalib) \
+		$(use_with directfb) \
+		$(use_with ssl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	# Only install links icon if X driver was compiled in ...
+	use X && doicon graphics/links.xpm
+
+	dohtml doc/links_cal/*
+
+	# Install a compatibility symlink links2:
+	dosym links /usr/bin/links2
+}
+
+pkg_postinst() {
+	if use svga; then
+		elog "You had the svga USE flag enabled, but for security reasons"
+		elog "the links2 binary is NOT setuid by default. In order to"
+		elog "enable links2 to work in SVGA, please change the permissions"
+		elog "of /usr/bin/links2 to enable suid."
+	fi
+}