version bumps, major ebuild cleanups, no forced gpm support, less big of a package directory, and maintenance handing over to vanquirius and probably iFlame as well

Package-Manager: portage-1.585-cvs

7 files changed, 190 insertions, 66 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index a5a217cd1a14..f507a17cf668 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,22 @@
 # 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.2 2005/03/14 20:26:25 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.3 2005/03/25 13:53:38 seemant Exp $
+
+*links-2.1_pre17 (23 Mar 2005)
+
+  23 Mar 2005; Seemant Kulleen <seemant@gentoo.org> links-2.1_pre15.ebuild,
+  +links-2.1_pre17.ebuild:
+  version bump thanks to: Alessandro Lepore <legion@birra.it> in bug #80401.
+  The utf8 patch was adjusted to work with this version by the lovely Marcelo
+  Goes <vanquirius@gentoo.org> in the same bug.  Additionally, the patch for
+  pre15 was moved onto the mirrors.  And finally, FlameEyes and iFlame (Diego
+  Petteno <dgp85@users.sourceforge.net>) submitted massive ebuild cleanups in
+  bug #86596.  Not only are use_{enable,with} liberally employed, bug gpm
+  autodetection is disabled as well.  Oh, the final thing is links will now
+  install a links binary (and for a while, a links2 symlink).  Thanks to
+  everyone over the past years, especially Ingo, for helping me maintain this
+  package in Gentoo.  This is my last bug as official maintainer, because
+  Marcelo Goes <vanquiris@gentoo.org> is now the new maintainer.
 
 *links-2.1_pre15 (14 Mar 2005)
 
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index 83198e6b2f45..287360bc3a95 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,15 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b700dd3fabe2af07a2554ec20419bb60 links-2.1_pre15.ebuild 3734
-MD5 27f31bbe7662e8869631e9d886d4e741 ChangeLog 10401
-MD5 56d78ea6a5d49e31ea36cdc98b0b48ad metadata.xml 352
-MD5 c41fc5981244d82657e4a2dac584b264 files/digest-links-2.1_pre15 68
+MD5 23210c68197b9588f90f4f89cefa2ded links-2.1_pre15.ebuild 3164
+MD5 62adeb51ab8a3df0bb9de82cd4ad426e metadata.xml 484
+MD5 4295ec0449ba2b09439362306e5058eb links-2.1_pre17.ebuild 3539
+MD5 127357d33b48639f136c30ac05fa080b ChangeLog 11364
+MD5 9573f2a9cbff0c7dc9b33b4efe22971c files/digest-links-2.1_pre15 139
 MD5 85b8ee32c98ab5a596d1d1b6ca3d68eb files/links-2.1pre15-utf8.diff.bz2 4670
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCNw0SI1lqEGTUzyQRAgo8AKCYr7qXrjQTZ9HO9aBwx4JnAyA7qACfV/hQ
-yxfevdoYX9uOfBIZFuThzXU=
-=OXNb
------END PGP SIGNATURE-----
+MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17 139
diff --git a/www-client/links/files/digest-links-2.1_pre15 b/www-client/links/files/digest-links-2.1_pre15
index aa85a2fe9148..9026d9e39bce 100644
--- a/www-client/links/files/digest-links-2.1_pre15
+++ b/www-client/links/files/digest-links-2.1_pre15
@@ -1 +1,2 @@
 MD5 d70a0ad41fba921f04d222d3546827de links-2.1pre15.tar.bz2 3789080
+MD5 85b8ee32c98ab5a596d1d1b6ca3d68eb links-2.1pre15-utf8.diff.bz2 4670
diff --git a/www-client/links/files/digest-links-2.1_pre17 b/www-client/links/files/digest-links-2.1_pre17
new file mode 100644
index 000000000000..7ed0613440cb
--- /dev/null
+++ b/www-client/links/files/digest-links-2.1_pre17
@@ -0,0 +1,2 @@
+MD5 94315d9ba68bbb543d93b3b3b4f07582 links-2.1pre17.tar.bz2 3829168
+MD5 5f8700ad2fc388bc3bd7d7a73bb0e987 links-2.1pre17-utf8.diff.bz2 4151
diff --git a/www-client/links/links-2.1_pre15.ebuild b/www-client/links/links-2.1_pre15.ebuild
index c0549a8deb3e..fd658cb0c2bc 100644
--- a/www-client/links/links-2.1_pre15.ebuild
+++ b/www-client/links/links-2.1_pre15.ebuild
@@ -1,15 +1,16 @@
 # 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_pre15.ebuild,v 1.1 2005/03/14 17:20:56 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre15.ebuild,v 1.2 2005/03/25 13:53:38 seemant Exp $
 
 inherit eutils
 
 DESCRIPTION="links is a fast lightweight text tand graphic web-browser"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
 # To handle pre-version ...
-MYP="${P/_/}"
-S="${WORKDIR}/${MYP}"
-SRC_URI="${HOMEPAGE}/download/${MYP}.tar.bz2"
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="${HOMEPAGE}/download/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-utf8.diff.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
@@ -26,10 +27,13 @@ RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6c )
 	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 )
+	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 )
+	fbcon? ( >=media-libs/libpng-1.2.1
+		sys-libs/gpm )
 	sys-libs/zlib
 	virtual/libc
 	sys-libs/ncurses"
@@ -57,62 +61,36 @@ src_unpack (){
 	unpack ${A}
 
 	if use unicode ; then
-		epatch ${FILESDIR}/${MYP}-utf8.diff.bz2
+		epatch ${WORKDIR}/${MY_P}-utf8.diff
 		export LANG=C
 		cd ${S}/intl && ./gen-intl && cd .. || die "gen-intl filed"
 	fi
 }
 
 src_compile (){
-
 	local myconf
-	myconf="--program-suffix=2"
-
-	use X \
-		&& myconf="${myconf} --enable-graphics --with-x" \
-		|| myconf="${myconf} --without-x"
-
-	use png \
-		&& myconf="${myconf} --with-libpng" \
-		|| myconf="${myconf} --without-libpng"
-
-	use jpeg \
-		&& myconf="${myconf} --with-libjpeg" \
-		|| myconf="${myconf} --without-libjpeg"
-
-	use tiff \
-		&& myconf="${myconf} --with-libtiff" \
-		|| myconf="${myconf} --without-libtiff"
-
-	use svga \
-		&& myconf="${myconf} --enable-graphics --with-svgalib" \
-		|| myconf="${myconf} --without-svgalib"
 
-	use fbcon \
-		&& myconf="${myconf} --enable-graphics --with-fb" \
-		|| myconf="${myconf} --without-fb"
-
-	use directfb \
-		&& myconf="${myconf} --enable-graphics --with-directfb" \
-		|| myconf="${myconf} --without-directfb"
-
-	use ssl \
-		&& myconf="${myconf} --with-ssl" \
-		|| myconf="${myconf} --without-ssl"
-
-	use javascript \
-		&& myconf="${myconf} --enable-javascript" \
-		|| myconf="${myconf} --disable-javascript"
+	if use X || use fbcon || use directfb || use svga; then
+		myconf="${myconf} --enable-graphics"
+	fi
 
 	# Note: --enable-static breaks.
 
 	# Note: ./configure only support 'gpm' features auto-detection, so if
-	# 'sys-libs/gpm' is compiled on your system, you'll compile links
-	# with gpm support ...
+	# sys-libs/gpm is on your system, links will compile with gpm support
 
 	export LANG=C
-
-	econf ${myconf} || die "configure failed"
+	econf --program-suffix=2 \
+		$(use_with X x) \
+		$(use_with png libpng) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with svga svgalib) \
+		$(use_with fbcon fb) \
+		$(use_with directfb) \
+		$(use_with ssl) \
+		$(use_enable javascript) \
+		${myconf} || die "configure failed"
 	emake || die "make failed"
 }
 
diff --git a/www-client/links/links-2.1_pre17.ebuild b/www-client/links/links-2.1_pre17.ebuild
new file mode 100644
index 000000000000..20b8164f1983
--- /dev/null
+++ b/www-client/links/links-2.1_pre17.ebuild
@@ -0,0 +1,132 @@
+# 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_pre17.ebuild,v 1.1 2005/03/25 13:53:38 seemant Exp $
+
+inherit eutils
+
+DESCRIPTION="links is a fast lightweight text tand graphic web-browser"
+HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~clock/twibright/links/"
+# To handle pre-version ...
+MY_P="${P/_/}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="${HOMEPAGE}/download/${MY_P}.tar.bz2
+	mirror://gentoo/${MY_P}-utf8.diff.bz2"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86"
+IUSE="directfb ssl javascript png X gpm tiff fbcon svga jpeg unicode"
+
+# 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?
+
+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 )
+	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}/${MY_P}-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; 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 ) || export ac_cv_lib_gpm_Gpm_Open="no"
+
+	export LANG=C
+
+	econf \
+		$(use_with X x) \
+		$(use_with png libpng) \
+		$(use_with jpeg libjpeg) \
+		$(use_with tiff libtiff) \
+		$(use_with svga svgalib) \
+		$(use_with fbcon fb) \
+		$(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 && { insinto /usr/share/pixmaps ;	doins graphics/links.xpm ; }
+
+	dodoc AUTHORS BUGS ChangeLog INSTALL NEWS README SITES TODO
+	dohtml doc/links_cal/*
+
+	# Install a compatibility symlink links2:
+	dosym links /usr/bin/links2
+}
+
+
+#pkg_preinst() {
+	# Check if the live filesystem has /usr/bin/links -> /usr/bin/links2
+	# From now on this will be reversed (and links2 will only symlink for
+	# the next couple of iterations, because this package is no longer SLOTted
+#	if [ "`${ROOT}/usr/bin/readlink ${ROOT}/usr/bin/links`" = link2 ]
+#	then
+#		rm ${ROOT}/usr/bin/links{,2}
+#	fi
+#}
+
+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
+}
diff --git a/www-client/links/metadata.xml b/www-client/links/metadata.xml
index d587fabae417..23a272ae3f45 100644
--- a/www-client/links/metadata.xml
+++ b/www-client/links/metadata.xml
@@ -5,7 +5,10 @@
 <maintainer>
 	<email>las0mbra@ig.com.br</email>
 	<name>Ingo -LaSombra- Hoffmann</name>
-	<description>Ingo is the third party maintainer through
-	seemant@gentoo.org</description>
+    <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>
 </pkgmetadata>