Mark 2.1_pre19 x86 stable and 2.1_pre20 version bump

Package-Manager: portage-2.0.53

5 files changed, 157 insertions, 8 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index a7e49410b1cd..c1d3bf6b2829 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/links
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.45 2005/12/03 16:52:47 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.46 2005/12/10 02:48:53 vanquirius Exp $
+
+*links-2.1_pre20 (10 Dec 2005)
+
+  10 Dec 2005; Marcelo Goes <vanquirius@gentoo.org> links-2.1_pre19.ebuild,
+  +links-2.1_pre20.ebuild:
+  Mark 2.1_pre19 x86 stable and 2.1_pre20 version bump.
 
   03 Dec 2005; Tom Gall <tgall@gentoo.org> links-2.1_pre18.ebuild:
   stable on ppc64
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index a0a09c35ed44..5952b4e5302b 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,9 +1,11 @@
-MD5 10363cf61aa63d70bd0287ecb9274984 ChangeLog 16835
-MD5 3d928fe8443461d83773ee90297c9e71 links-2.1_pre17-r1.ebuild 3515
-MD5 92204280c7e09b03c3e124e7facae2c4 links-2.1_pre18.ebuild 3707
-MD5 5000e03f099332ccc8872a517f979c8a links-2.1_pre19.ebuild 3638
-MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498
+MD5 c31377a790eba03158300d59161c7a04 ChangeLog 17032
 MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17-r1 139
 MD5 4ecf3369d346051658758f76dbd89eb5 files/digest-links-2.1_pre18 139
 MD5 6fd45df1f15b1f0ba4d72ec4d6011611 files/digest-links-2.1_pre19 139
+MD5 2e769a55cec4cc09246d5130bb8ec02a files/digest-links-2.1_pre20 139
 MD5 5b8b5b21da5582f7c332b2a2d6afafcd files/links-2.1pre18-no-javascript-fix.patch 575
+MD5 3d928fe8443461d83773ee90297c9e71 links-2.1_pre17-r1.ebuild 3515
+MD5 92204280c7e09b03c3e124e7facae2c4 links-2.1_pre18.ebuild 3707
+MD5 80d4331e2ffcd3ad28ebfd1190531a3f links-2.1_pre19.ebuild 3637
+MD5 7276a98c7d33b41edec2f22f4308a571 links-2.1_pre20.ebuild 3708
+MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498
diff --git a/www-client/links/files/digest-links-2.1_pre20 b/www-client/links/files/digest-links-2.1_pre20
new file mode 100644
index 000000000000..006001361290
--- /dev/null
+++ b/www-client/links/files/digest-links-2.1_pre20
@@ -0,0 +1,2 @@
+MD5 7f22bb1ef43f7069e488ba734bdc46bd links-2.1pre20-utf8.diff.bz2 4103
+MD5 5bdee0eb06cf3fb1cf2b6cd73def47bf links-2.1pre20.tar.bz2 3855058
diff --git a/www-client/links/links-2.1_pre19.ebuild b/www-client/links/links-2.1_pre19.ebuild
index 7c3ef244c57f..b25fce14352e 100644
--- a/www-client/links/links-2.1_pre19.ebuild
+++ b/www-client/links/links-2.1_pre19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre19.ebuild,v 1.1 2005/10/26 20:07:20 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre19.ebuild,v 1.2 2005/12/10 02:48:53 vanquirius Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,7 +14,7 @@ SRC_URI="http://links.twibright.com/download/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc x86"
 IUSE="directfb ssl javascript png X gpm tiff fbcon svga jpeg unicode livecd"
 
 # Note: if X or fbcon usegflag are enabled, links will be built in graphic
diff --git a/www-client/links/links-2.1_pre20.ebuild b/www-client/links/links-2.1_pre20.ebuild
new file mode 100644
index 000000000000..195fa13b44ce
--- /dev/null
+++ b/www-client/links/links-2.1_pre20.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre20.ebuild,v 1.1 2005/12/10 02:48:53 vanquirius Exp $
+
+inherit eutils toolchain-funcs
+
+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.1pre20-utf8.diff.bz2
+	http://dev.gentoo.org/~vanquirius/files/${PN}-2.1pre20-utf8.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="directfb ssl javascript png X gpm tiff fbcon svga jpeg unicode livecd"
+
+# 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 )
+	javascript? ( >=sys-devel/flex-2.5.4a )
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	svga? ( >=media-libs/svgalib-1.4.3
+		>=media-libs/libpng-1.2.1 )
+	X? ( virtual/x11
+		>=media-libs/libpng-1.2.1 )
+	directfb? ( dev-libs/DirectFB )
+	fbcon? ( >=media-libs/libpng-1.2.1
+		sys-libs/gpm )
+	!ppc-macos? ( livecd?
+		( >=media-libs/jpeg-6b
+		>=media-libs/libpng-1.2.1
+		sys-libs/gpm ) )
+	sys-libs/zlib
+	virtual/libc
+	sys-libs/ncurses"
+
+DEPEND="${RDEPEND}
+	sys-devel/automake
+	sys-devel/autoconf
+	sys-devel/gcc
+	dev-util/pkgconfig"
+
+PROVIDE="virtual/textbrowser"
+
+pkg_setup (){
+	if ! use gpm && use fbcon ; then
+		einfo
+		einfo "gpm has been installed since you have included fbcon in your USE flags."
+		einfo "The links framebuffer driver requires gpm in order to compile."
+		einfo
+	fi
+}
+
+src_unpack (){
+	unpack ${A}; cd "${S}"
+
+	if use unicode ; then
+		epatch "${WORKDIR}/${PN}-2.1pre20-utf8.diff"
+		export LANG=C
+		cd "${S}/intl" && ./gen-intl && cd .. || die "gen-intl filed"
+	fi
+}
+
+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_enable javascript) \
+		${myconf} || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install (){
+	einstall
+
+	# 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
+		einfo "You had the svga USE flag enabled, but for security reasons"
+		einfo "the links2 binary is NOT setuid by default. In order to"
+		einfo "enable links2 to work in SVGA, please change the permissions"
+		einfo "of /usr/bin/links2 to enable suid."
+	fi
+}