2.3_pre1 version bump for bug 304861, thanks to hitachi <mail at konstantinhansen dot de> for

reporting. The UTF-8 patch is no longer applied since UTF-8 text mode terminal support is now present
in upstream - if you have problems, please report.
Package-Manager: portage-2.1.7.17/cvs/Linux i686

4 files changed, 142 insertions, 9 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index da33cf5b9bf7..495c9fd16b45 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-client/links
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.123 2010/02/26 16:29:33 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.124 2010/04/11 20:31:14 vanquirius Exp $
+
+*links-2.3_pre1 (11 Apr 2010)
+
+  11 Apr 2010; Marcelo Goes <vanquirius@gentoo.org> +links-2.3_pre1.ebuild,
+  metadata.xml:
+  2.3_pre1 version bump for bug 304861, thanks to hitachi <mail at
+  konstantinhansen dot de> for reporting. The UTF-8 patch is no longer
+  applied since UTF-8 text mode terminal support is now present in upstream
+  - if you have problems, please report.
 
   26 Feb 2010; Fabian Groffen <grobian@gentoo.org> links-2.2.ebuild:
   Marked ~x64-macos, thanks Ramon van Alteren, bug #305367
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 275dd673ddc8..858ff2114416 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,6 +1,8 @@
 AUX configure-LANG.patch 2052 RMD160 91f5b90600dfccb10c4e2308a5a1485275fdfeee SHA1 56ecd1d6f2e4bd0b35ac108be72a4f6f60212c38 SHA256 63de6d2dcfe14f21d147abeb1390405b9220c03f8e968f482d4b4c1cf279c88b
 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
 EBUILD links-2.2.ebuild 3741 RMD160 21f328beb43676a7375850b1956b4a2579d75df9 SHA1 d74b60af13e164f831c2c758e078208a57a7825d SHA256 7b4cc65d76f4610755491fe10bc74d90b0ed22e9928b72fc68828f6e71602f6a
-MISC ChangeLog 26723 RMD160 45f1f6a5931de6c11616683d57fc42043d4b02f2 SHA1 9ce225b4491b09034d1b10b2b3e2e47629684b69 SHA256 5a01acc5c9f6ccd935da9d806496efd1ca4522e41a3a15247d800e964c409af2
-MISC metadata.xml 498 RMD160 5cc5739e4f206a0eb7a2cf7f474b1dd9c6d23191 SHA1 0f94d243b86fb246928091718bf0be69b49c035d SHA256 2f7d9178e22068e1b35bf6b452d8b818de533c97779c3a89ed71c70a36fecfcb
+EBUILD links-2.3_pre1.ebuild 3666 RMD160 c5ebce8b6868a8ab7281e5fd2a4b7aec4155cf84 SHA1 67b669cbe0287b1a70a4bd862c7416eea1bb116e SHA256 ef22296f2c907ec0cfbb1e4dac8df9168af4b1b857a2e37e46e2b92f6709ae05
+MISC ChangeLog 27105 RMD160 8564cab4c7f2e084dfb29c3d4579b2becc9b9d70 SHA1 024be46dc0911e3cf233f4144b3b4f86a2ff2ed1 SHA256 d15fad4138f09cda86d057d9471eedca54a6983040674a746188360fba1170df
+MISC metadata.xml 258 RMD160 0b90768495f1b1c9526868f42acb9d57a7755f8a SHA1 832935fff75730ec522cf03fb8f9b349f5cf2be0 SHA256 8d2e5dab18805dccb701c1d05eddedc6b16233bf3dd3d0b2fbd05321359e56e3
diff --git a/www-client/links/links-2.3_pre1.ebuild b/www-client/links/links-2.3_pre1.ebuild
new file mode 100644
index 000000000000..c4ed3dba5297
--- /dev/null
+++ b/www-client/links/links-2.3_pre1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.3_pre1.ebuild,v 1.1 2010/04/11 20:31:14 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"
+
+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 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
+		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
+}
diff --git a/www-client/links/metadata.xml b/www-client/links/metadata.xml
index 5ad3840dbed3..fe240adddc2c 100644
--- a/www-client/links/metadata.xml
+++ b/www-client/links/metadata.xml
@@ -3,13 +3,7 @@
 <pkgmetadata>
 <herd>no-herd</herd>
 <maintainer>
-	<email>las0mbra@ig.com.br</email>
-	<name>Ingo -LaSombra- Hoffmann</name>
-    <description>Ingo is the third party maintainer</description>
-</maintainer>
-<maintainer>
     <email>vanquirius@gentoo.org</email>
     <name>Marcelo Goes</name>
-    <description>Marcelo is the official Gentoo maintainer</description>
 </maintainer>
 </pkgmetadata>