Stable on amd64 and ppc wrt bug #168596

(Portage version: 2.1.2-r11)

4 files changed, 7 insertions, 86 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index 34d76c768c7e..f6564c8a23bb 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/lynx
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.60 2007/02/27 16:45:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.61 2007/02/27 16:56:34 drizzt Exp $
+
+  27 Feb 2007; Timothy Redaelli <drizzt@gentoo.org> -lynx-2.8.5-r4.ebuild,
+  lynx-2.8.6-r2.ebuild:
+  Stable on amd64 and ppc wrt bug #168596
 
   27 Feb 2007; Fabian Groffen <grobian@gentoo.org> lynx-2.8.5-r3.ebuild,
   lynx-2.8.5-r4.ebuild, lynx-2.8.6-r1.ebuild, lynx-2.8.6-r2.ebuild:
diff --git a/www-client/lynx/files/digest-lynx-2.8.5-r4 b/www-client/lynx/files/digest-lynx-2.8.5-r4
deleted file mode 100644
index f7f732972368..000000000000
--- a/www-client/lynx/files/digest-lynx-2.8.5-r4
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 070b1da6098ca1bb8b084713766dfb3a lynx-2.8.5-rel5.patch.bz2 6907
-RMD160 9e843f4c235c1de17a4ebe62ad1511dd9ed1f620 lynx-2.8.5-rel5.patch.bz2 6907
-SHA256 a6997212e7a36c109f57856d1ce185c074b598f2fb1b1d3d9c57fe38df5d6ccb lynx-2.8.5-rel5.patch.bz2 6907
-MD5 d1e5134e5d175f913c16cb6768bc30eb lynx2.8.5.tar.bz2 2177287
-RMD160 80d20261ac6eaebe1d940fb5de485daaad7bb3b7 lynx2.8.5.tar.bz2 2177287
-SHA256 37607008086933c869be26b4db687f61a768c51ddefa741e77225069b880bc63 lynx2.8.5.tar.bz2 2177287
diff --git a/www-client/lynx/lynx-2.8.5-r4.ebuild b/www-client/lynx/lynx-2.8.5-r4.ebuild
deleted file mode 100644
index d2800700f4fc..000000000000
--- a/www-client/lynx/lynx-2.8.5-r4.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.5-r4.ebuild,v 1.3 2007/02/27 16:45:21 grobian Exp $
-
-inherit eutils flag-o-matic
-
-MY_P="${P/-/}"
-DESCRIPTION="An excellent console-based web browser with ssl support"
-HOMEPAGE="http://lynx.browser.org/"
-SRC_URI="ftp://lynx.isc.org/${MY_P}/${MY_P}.tar.bz2
-	mirror://gentoo/${P}-rel5.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 cjk ipv6 nls ssl"
-
-DEPEND="sys-libs/ncurses
-	sys-libs/zlib
-	nls? ( sys-devel/gettext )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	bzip2? ( app-arch/bzip2 )"
-
-S="${WORKDIR}/${PN}${PV//./-}"
-
-src_unpack() {
-	unpack ${A}; cd "${S}"
-	epatch "${DISTDIR}/${P}"-rel5.patch.bz2
-	epatch "${FILESDIR}/${P}"-darwin.patch
-	epatch "${FILESDIR}/${P}"-tab_to.patch
-	epatch "${FILESDIR}/${P}"-embedded-url.patch
-}
-
-src_compile() {
-	local myconf
-	use ssl && myconf="${myconf} --with-ssl=yes"
-	use bzip2 && myconf="${myconf} --with-bzlib"
-
-	append-flags -DANSI_VARARGS
-
-	econf \
-		--libdir=/etc/lynx \
-		--enable-cgi-links \
-		--enable-EXP_PERSISTENT_COOKIES \
-		--enable-prettysrc \
-		--enable-nsl-fork \
-		--enable-file-upload \
-		--enable-read-eta \
-		--enable-libjs \
-		--enable-color-style \
-		--enable-scrollbar \
-		--enable-included-msgs \
-		--with-zlib \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable cjk) \
-		${myconf} || die
-
-	emake -j1 || die "compile problem"
-}
-
-src_install() {
-	einstall libdir="${D}"/etc/lynx || die
-
-	dosed "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help/lynx_help_main.html|" \
-			/etc/lynx/lynx.cfg
-	dodoc CHANGES COPYHEADER 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
-}
diff --git a/www-client/lynx/lynx-2.8.6-r2.ebuild b/www-client/lynx/lynx-2.8.6-r2.ebuild
index e9af48e5708a..43a8570d15a5 100644
--- a/www-client/lynx/lynx-2.8.6-r2.ebuild
+++ b/www-client/lynx/lynx-2.8.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.6-r2.ebuild,v 1.4 2007/02/27 16:45:21 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.6-r2.ebuild,v 1.5 2007/02/27 16:56:34 drizzt Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://lynx.isc.org/${MY_P}/${MY_P}rel.4.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="bzip2 cjk ipv6 linguas_ja nls ssl unicode"
 
 RDEPEND="sys-libs/ncurses