Various updates, amd64 keyword

5 files changed, 20 insertions, 93 deletions

diff --git a/net-www/lynx/ChangeLog b/net-www/lynx/ChangeLog
index 20e6f49f5d53..db2a0cae8d95 100644
--- a/net-www/lynx/ChangeLog
+++ b/net-www/lynx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/lynx
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/lynx/ChangeLog,v 1.23 2003/09/18 17:51:59 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/lynx/ChangeLog,v 1.24 2004/01/19 13:14:30 aliz Exp $
+
+  19 Jan 2004; Daniel Ahlberg <aliz@gentoo.org> lynx-2.8.4.1d-r1.ebuild:
+  Various updates, removed an old version so that I could remove an old entry
+  from packages.mask.
 
   18 Sep 2003; Jon Portnoy <avenj@gentoo.org> lynx-2.8.4.1d-r1.ebuild :
   ia64 keywords.
diff --git a/net-www/lynx/Manifest b/net-www/lynx/Manifest
index 86ebf7e149e3..fecafbb16497 100644
--- a/net-www/lynx/Manifest
+++ b/net-www/lynx/Manifest
@@ -1,13 +1,11 @@
-MD5 54c98df27a55fc4529c108be86367bde ChangeLog 3633
-MD5 aa24bbcd7208dd5230d19a3d87da86c1 lynx-2.8.4.1c.ebuild 2179
 MD5 0ba0120e505da4b342f9cbba6916fbd8 lynx-2.8.4.1d.ebuild 2314
-MD5 1c4cc69cc542edc048035f896b28e590 lynx-2.8.4a-r4.ebuild 1866
-MD5 05cc621d3ddef0eedcdc72d9179e3613 lynx-2.8.4.1d-r1.ebuild 2448
+MD5 04f3e679dc446d4c077cf78895617121 lynx-2.8.4.1d-r1.ebuild 2393
+MD5 aa24bbcd7208dd5230d19a3d87da86c1 lynx-2.8.4.1c.ebuild 2179
+MD5 15fb0f6d10cb7ff4afdf01c7b6126600 ChangeLog 3806
 MD5 a5a3cf665f0451dfebbbdc90b2d23a89 files/digest-lynx-2.8.4.1c 260
 MD5 a48ecda8afc164dc0252e8d0ed579d49 files/digest-lynx-2.8.4.1d 324
-MD5 8fbea1f98a60cb262e0a8f1b891af1c3 files/digest-lynx-2.8.4a-r4 63
-MD5 2290b4fe7526899243941069f01d01eb files/lynx-2.8.4.1c-gentoo.patch 196
-MD5 2290b4fe7526899243941069f01d01eb files/lynx-2.8.4.1d-gentoo.patch 196
 MD5 0dacb03b3e82b0069b0b2d8e9706f234 files/lynx-2.8.4a-LYStrings.c-gentoo.patch 188
-MD5 b0b269efc9ff697e40a10f99919599ea files/lynx2.8.4rel.1a.patch 7515
 MD5 a48ecda8afc164dc0252e8d0ed579d49 files/digest-lynx-2.8.4.1d-r1 324
+MD5 b0b269efc9ff697e40a10f99919599ea files/lynx2.8.4rel.1a.patch 7515
+MD5 2290b4fe7526899243941069f01d01eb files/lynx-2.8.4.1d-gentoo.patch 196
+MD5 2290b4fe7526899243941069f01d01eb files/lynx-2.8.4.1c-gentoo.patch 196
diff --git a/net-www/lynx/files/digest-lynx-2.8.4a-r4 b/net-www/lynx/files/digest-lynx-2.8.4a-r4
deleted file mode 100644
index 691a54fa5b52..000000000000
--- a/net-www/lynx/files/digest-lynx-2.8.4a-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6916c0127839f1e454052b683e4691c4 lynx2.8.4.tar.bz2 1940531
diff --git a/net-www/lynx/lynx-2.8.4.1d-r1.ebuild b/net-www/lynx/lynx-2.8.4.1d-r1.ebuild
index e75983a926db..82f3c4fe5a67 100644
--- a/net-www/lynx/lynx-2.8.4.1d-r1.ebuild
+++ b/net-www/lynx/lynx-2.8.4.1d-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/lynx/lynx-2.8.4.1d-r1.ebuild,v 1.4 2003/09/18 17:51:59 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/lynx/lynx-2.8.4.1d-r1.ebuild,v 1.5 2004/01/19 13:14:30 aliz Exp $
 
 IUSE="ssl nls ipv6"
 
@@ -8,12 +8,12 @@ MY_PV=${PV/.1d/rel.1}
 S=${WORKDIR}/${PN}2-8-4
 DESCRIPTION="An excellent console-based web browser with ssl support"
 HOMEPAGE="http://lynx.browser.org/"
-SRC_URI="ftp://lynx.isc.org/${PN}/${PN}2.8.4/${PN}${MY_PV}.tar.bz2
+SRC_URI="ftp://lynx.isc.org/lynx/${PN}2.8.4/${PN}${MY_PV}.tar.bz2
 	ftp://lynx.isc.org/lynx/lynx2.8.4/patches/${PN}${MY_PV}a.patch
 	ftp://lynx.isc.org/lynx/lynx2.8.4/patches/${PN}${MY_PV}b.patch
 	ftp://lynx.isc.org/lynx/lynx2.8.4/patches/${PN}${MY_PV}c.patch
 	ftp://lynx.isc.org/lynx/lynx2.8.4/patches/${PN}${MY_PV}d.patch"
-KEYWORDS="~x86 ppc ~sparc alpha hppa ~mips ia64"
+KEYWORDS="~x86 ppc ~sparc alpha hppa ~mips ia64 ~amd64"
 SLOT="0"
 LICENSE="GPL-2"
 
@@ -28,15 +28,15 @@ src_unpack() {
 	unpack ${PN}${MY_PV}.tar.bz2
 	cd ${S}
 
-	patch -p1 < ${DISTDIR}/${PN}${MY_PV}a.patch || die
-	patch -p1 < ${DISTDIR}/${PN}${MY_PV}b.patch || die
-	patch -p1 < ${DISTDIR}/${PN}${MY_PV}c.patch || die
-	patch -p1 < ${DISTDIR}/${PN}${MY_PV}d.patch || die
+	epatch ${DISTDIR}/${PN}${MY_PV}a.patch
+	epatch ${DISTDIR}/${PN}${MY_PV}b.patch
+	epatch ${DISTDIR}/${PN}${MY_PV}c.patch
+	epatch ${DISTDIR}/${PN}${MY_PV}d.patch
 
 	# GCC3.1 support -- check if it's really needed in
 	# future. Some users report complete success with -r3 --
 	# credit to lostlogix and carpaski. Resolves #3172
-	patch -p0 < ${FILESDIR}/${P}-gentoo.patch || die
+	epatch ${FILESDIR}/${P}-gentoo.patch
 }
 
 src_compile() {
diff --git a/net-www/lynx/lynx-2.8.4a-r4.ebuild b/net-www/lynx/lynx-2.8.4a-r4.ebuild
deleted file mode 100644
index 14239eaf9162..000000000000
--- a/net-www/lynx/lynx-2.8.4a-r4.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/lynx/lynx-2.8.4a-r4.ebuild,v 1.12 2003/09/06 01:54:08 msterret Exp $
-
-IUSE="ssl nls ipv6"
-
-S=${WORKDIR}/lynx2-8-4
-DESCRIPTION="An excellent console-based web browser with ssl support"
-HOMEPAGE="http://lynx.browser.org/"
-SRC_URI="ftp://lynx.isc.org/lynx2.8.4/lynx2.8.4.tar.bz2"
-
-KEYWORDS="x86 ppc sparc "
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=sys-libs/ncurses-5.1
-	>=sys-libs/zlib-1.1.3
-	nls? ( sys-devel/gettext )
-	ssl? ( >=dev-libs/openssl-0.9.6 )"
-
-PROVIDE="virtual/textbrowser"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p1 < ${FILESDIR}/lynx2.8.4rel.1a.patch || die
-
-	# GCC3.1 support -- check if it's really needed in
-	# future. Some users report complete success with -r3 --
-	# credit to lostlogix and carpaski. Resolves #3172
-	cd src
-	patch LYStrings.c < ${FILESDIR}/lynx-2.8.4a-LYStrings.c-gentoo.patch || die
-}
-
-src_compile() {
-	local myconf
-	use nls && myconf="${myconf} --enable-nls"
-	use ssl && myconf="${myconf} --with-ssl=yes"
-	use ipv6 && myconf="${myconf} --enable-ipv6"
-
-	CFLAGS="${CFLAGS} -DANSI_VARARGS"
-
-	econf \
-		--libdir=/etc/lynx \
-		--enable-cgi-links \
-		--enable-prettysrc \
-		--enable-nsl-fork \
-		--enable-file-upload \
-		--enable-read-eta \
-		--enable-libjs \
-		--enable-color-style \
-		--enable-scrollbar \
-		--enable-included-msgs \
-		--with-zlib \
-		${myconf} || die
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	make prefix=${D}/usr datadir=${D}/usr/share mandir=${D}/usr/share/man \
-		libdir=${D}/etc/lynx install || die
-
-	dodoc CHANGES COPYHEADER COPYING INSTALLATION PROBLEMS README
-	docinto docs
-	dodoc docs/*
-	docinto lynx_help
-	dodoc lynx_help/*.txt
-	dohtml -r lynx_help
-
-	# small little manpage glitch
-	rm ${D}/usr/share/man/lynx.1
-	newman lynx.man lynx.1
-}