Remove old ebuild, mark 2.1_pre18 x86 stable.

Package-Manager: portage-2.0.52-r1

5 files changed, 9 insertions, 131 deletions

diff --git a/www-client/links/ChangeLog b/www-client/links/ChangeLog
index a24a0d9935a3..77e8cf6abcca 100644
--- a/www-client/links/ChangeLog
+++ b/www-client/links/ChangeLog
@@ -1,6 +1,10 @@
 # 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.34 2005/09/19 19:08:30 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/ChangeLog,v 1.35 2005/10/02 16:49:45 vanquirius Exp $
+
+  02 Oct 2005; Marcelo Goes <vanquirius@gentoo.org> -links-2.1_pre15.ebuild,
+  links-2.1_pre18.ebuild:
+  Remove old ebuild, mark 2.1_pre18 x86 stable.
 
   19 Sep 2005; Marcelo Goes <vanquirius@gentoo.org> links-2.1_pre15.ebuild,
   links-2.1_pre17-r1.ebuild:
diff --git a/www-client/links/Manifest b/www-client/links/Manifest
index e6f5d1fb0ff8..025408975d96 100644
--- a/www-client/links/Manifest
+++ b/www-client/links/Manifest
@@ -1,9 +1,7 @@
-MD5 85552c56165d437874c86a2220221a03 links-2.1_pre15.ebuild 3171
 MD5 3d928fe8443461d83773ee90297c9e71 links-2.1_pre17-r1.ebuild 3515
-MD5 c63b8c73fd2338dc20cd6ca2269f9c71 links-2.1_pre18.ebuild 3703
-MD5 ab3470644d7bc6cd2ffc82c79d1206c9 ChangeLog 15474
+MD5 d13d4a40a37fd00b1e886476e89b7f79 links-2.1_pre18.ebuild 3702
+MD5 f2d255cb6af49b4193267aeb54994f4a ChangeLog 15626
 MD5 82cf55f144e0f9e258fd08a572852147 metadata.xml 498
 MD5 f2c353a99f6cbaaa4af971adf5c95c0d files/digest-links-2.1_pre17-r1 139
 MD5 5b8b5b21da5582f7c332b2a2d6afafcd files/links-2.1pre18-no-javascript-fix.patch 575
-MD5 9573f2a9cbff0c7dc9b33b4efe22971c files/digest-links-2.1_pre15 139
 MD5 4ecf3369d346051658758f76dbd89eb5 files/digest-links-2.1_pre18 139
diff --git a/www-client/links/files/digest-links-2.1_pre15 b/www-client/links/files/digest-links-2.1_pre15
deleted file mode 100644
index 9026d9e39bce..000000000000
--- a/www-client/links/files/digest-links-2.1_pre15
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 d70a0ad41fba921f04d222d3546827de links-2.1pre15.tar.bz2 3789080
-MD5 85b8ee32c98ab5a596d1d1b6ca3d68eb links-2.1pre15-utf8.diff.bz2 4670
diff --git a/www-client/links/links-2.1_pre15.ebuild b/www-client/links/links-2.1_pre15.ebuild
deleted file mode 100644
index 9d3bc1371d23..000000000000
--- a/www-client/links/links-2.1_pre15.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# 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.3 2005/09/19 19:08:30 vanquirius Exp $
-
-inherit eutils
-
-DESCRIPTION="links is a fast lightweight text tand graphic web-browser"
-HOMEPAGE="http://links.twibright.com/"
-# To handle pre-version ...
-MY_P="${P/_/}"
-S="${WORKDIR}/${MY_P}"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/${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}
-
-	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 if
-	# sys-libs/gpm is on your system, links will compile with gpm support
-
-	export LANG=C
-	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"
-}
-
-src_install (){
-	einstall
-
-	if [ ! -f /usr/bin/links ]
-	then
-		dosym links2 /usr/bin/links
-	fi
-
-	# 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/*
-}
-
-
-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/links-2.1_pre18.ebuild b/www-client/links/links-2.1_pre18.ebuild
index 6aaac3d66bb1..966cdbfdcd78 100644
--- a/www-client/links/links-2.1_pre18.ebuild
+++ b/www-client/links/links-2.1_pre18.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_pre18.ebuild,v 1.4 2005/09/17 21:48:59 vanquirius Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/links/links-2.1_pre18.ebuild,v 1.5 2005/10/02 16:49:45 vanquirius Exp $
 
 inherit eutils toolchain-funcs
 
@@ -14,7 +14,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/links/${MY_P}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc ~x86 ~sh"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~ppc-macos ~s390 ~sparc x86 ~sh"
 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