2.1 version bump.

Package-Manager: portage-2.1.4.4

3 files changed, 149 insertions, 2 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index 247b16c5fff6..f30e28c332e0 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.105 2008/05/15 00:50:51 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.106 2008/07/14 02:26:43 vanquirius Exp $
+
+*links-2.1 (14 Jul 2008)
+
+  14 Jul 2008; Marcelo Goes <vanquirius@gentoo.org> +links-2.1.ebuild:
+  2.1 version bump.
 
 *links-2.1_pre36 (14 May 2008)
 
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 658980e308be..bb4f7f66a697 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,11 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
+DIST links-2.1.tar.bz2 3825918 RMD160 9ec9ea6856eafcffdfcc8cddaed1f78efecfcfa8 SHA1 f14617c6bce69a23fd20bd8816e693a789a8c5e4 SHA256 db667bf6bb209e90fe1bf4cafb33df11e7e264524f9cd4d9d6db094e2adb2621
 DIST links-2.1pre22-utf8.diff.bz2 4189 RMD160 fa0c4719aa5ac0244bd165d010b9c303bfead5d3 SHA1 4a09f256a61eba235ae50e6d0b25fd8e8d2d7894 SHA256 42982ee8f605f793226f07da9ed5cb9d5be613d1f8e4bb6270533bbd7cd42b9b
 DIST links-2.1pre28.tar.bz2 3915943 RMD160 42ac2adf24509216bc26629c48ea5362eb53b267 SHA1 c5bda09ca6eeed8304d85e7b14d3a64266c1fd3d SHA256 203531be7c84ebe3a5d53c6d6cda4f4a27626dec620ec5aa8926414d0bee5995
 DIST links-2.1pre33-utf8.diff.bz2 4793 RMD160 e946efd34031bd1176b39278ef19b6536214738a SHA1 bc6800c89d5a33caffdb69f20e14126885eee7bc SHA256 a34de30b787e6bab984cd5000c7a576f157437f622e9fe3a076808769a56db75
 DIST links-2.1pre33.tar.bz2 3817630 RMD160 11b9c0e96e427e1154cbcf8d671ad1c2f3d02529 SHA1 0ac2aa7c45f56692751f5a9ab94f3551c38ba846 SHA256 1f6be6db54eb5fb2947926b5214879c260030da9909c1d189d053d8dc3357f98
 DIST links-2.1pre36.tar.bz2 3824394 RMD160 e34d61aa6db196d897afd4f07c1eb6f3a87dd4eb SHA1 79ff4ff2d663de99ba590e11f42a52435a6e1809 SHA256 1d8963e748e26414b4de2877bdd75f74c6af0b64b1407f26b6131cc92eb58c04
+EBUILD links-2.1.ebuild 3612 RMD160 8ddbce8dd776e40666812ad04208ab729351d997 SHA1 208cc8a0e52240cd3f784183a54b644ad8f27c8a SHA256 2f5ac5bd0981827174db2a4a458bc6fafc2468c71b80a11d92f6e5a42ba6a768
 EBUILD links-2.1_pre28-r1.ebuild 3543 RMD160 187e09098b37a6da8f4f881aa8fa957ef5dfe284 SHA1 b2bfabbde80e3c7fc4a439dce818ab0eb1e276be SHA256 41ae9e787f334c5c7b95dab56e4d3d07af590be4af08a207c1bb2a579f02fc91
 EBUILD links-2.1_pre33.ebuild 3603 RMD160 545c0ee869100d1e38d0f6eba2af465fa45aae47 SHA1 84ba93fc54a283a88dd99800915971d11849fe22 SHA256 dd6a479a077087aa33da587b76da03df878b776b4102526026729e1aa3b1c095
 EBUILD links-2.1_pre36.ebuild 3618 RMD160 493418433b261b99823bbe9f251246cd1ebf1fe5 SHA1 159f85b942462c6423f6a08a114e0a053dd7419d SHA256 63751ddea8fb7841b66e20384434890b86e07a2eeeee944286945abfe9edd8e4
-MISC ChangeLog 24828 RMD160 99e3b23a42be8da39bf176741c00406e05046489 SHA1 c8266a03a72cffb624b2c756fee5bfc171769d5e SHA256 a9f5ba87a67ef5f5f9539935c8d67207a7685b9978c88a9b7fc1945ca7c2518d
+MISC ChangeLog 24946 RMD160 870e6641e57aed594e382f3a03fbf8a8cd06bb39 SHA1 5b144e389da1fb4ab07fee838da8adaa394692dd SHA256 95530b602a35d50fa1ef8eda4aa85e5f3e072ab200956a387b734ca2d4a04343
 MISC metadata.xml 498 RMD160 5cc5739e4f206a0eb7a2cf7f474b1dd9c6d23191 SHA1 0f94d243b86fb246928091718bf0be69b49c035d SHA256 2f7d9178e22068e1b35bf6b452d8b818de533c97779c3a89ed71c70a36fecfcb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkh6uVkACgkQ0axuTq83etpDlQCfdOGXMd5axmzOv9RN60nT+LY9
+T6QAn2KoqzkDhAcgT4r0OaW+Uz/GiHJa
+=/yuj
+-----END PGP SIGNATURE-----
diff --git a/www-client/links/links-2.1.ebuild b/www-client/links/links-2.1.ebuild
new file mode 100644
index 000000000000..6b68421b3bcd
--- /dev/null
+++ b/www-client/links/links-2.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1.ebuild,v 1.1 2008/07/14 02:26:43 vanquirius Exp $
+
+WANT_AUTOCONF=latest
+WANT_AUTOMAKE=none
+
+inherit eutils toolchain-funcs autotools
+
+DESCRIPTION="links is a fast lightweight text and graphic web-browser"
+HOMEPAGE="http://links.twibright.com/"
+# To handle pre-version ...
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="http://links.twibright.com/download/${MY_P}.tar.bz2
+	mirror://gentoo/${PN}-2.1pre33-utf8.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 directfb fbcon gpm jpeg livecd png sdl 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.
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
+	gpm? ( sys-libs/gpm )
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	fbcon? ( >=media-libs/libpng-1.2.1
+		>=media-libs/jpeg-6b
+		sys-libs/gpm )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	svga? ( >=media-libs/svgalib-1.4.3
+		>=media-libs/libpng-1.2.1 )
+	X? ( x11-libs/libXext
+		>=media-libs/libpng-1.2.1 )
+	directfb? ( dev-libs/DirectFB )
+	sdl? ( >=media-libs/libsdl-1.2.0 )
+	sys-libs/ncurses
+	livecd? ( >=media-libs/libpng-1.2.1
+		>=media-libs/jpeg-6b
+		sys-libs/gpm )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_unpack (){
+	unpack ${A}; cd "${S}"
+
+	epatch "${FILESDIR}"/configure-LANG.patch #131440
+
+	if use unicode ; then
+		epatch "${WORKDIR}/${PN}-2.1pre33-utf8.diff"
+		cd "${S}/intl" && ./gen-intl && cd .. || die "gen-intl failed"
+		cd "${S}/intl" && ./synclang && cd .. || die "synclang failed"
+	fi
+	# Upstream configure produced by broken autoconf-2.13. See #131440 and
+	# #103483#c23
+	eautoconf || die "autoconf failed"
+}
+
+src_compile (){
+	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"
+
+	export LANG=C
+
+	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
+
+	# hack to allow cross-compilation
+	export CC="$(tc-getCC)"
+
+	econf \
+		$(use_with X x) \
+		$(use_with png libpng) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with svga svgalib) \
+		$(use_with directfb) \
+		$(use_with ssl) \
+		$(use_with sdl) \
+		$(use_with zlib) \
+		$(use_with bzip2) \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall || die
+
+	# Only install links icon if X driver was compiled in ...
+	use X && doicon graphics/links.xpm
+
+	dodoc AUTHORS BUGS ChangeLog NEWS README SITES TODO
+	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
+}