Stable on amd64 and ppc wrt bug #168596

Package-Manager: portage-2.1.2-r11

5 files changed, 25 insertions, 101 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/Manifest b/www-client/lynx/Manifest
index 87e4500dc07e..17b48ab38553 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lynx-2.8.5-darwin.patch 687 RMD160 24a53a2c71595b92e16286585994d1dd262d6904 SHA1 b4b5b003f5d62ea8a3ea5f79c952fa8b1cce4f18 SHA256 6b22b9cdecb584102a16d92a3884ddc296daece98b38a0f42f75d7a2d618763a
 MD5 a041d139e8868dac8d23fd879f31809a files/lynx-2.8.5-darwin.patch 687
 RMD160 24a53a2c71595b92e16286585994d1dd262d6904 files/lynx-2.8.5-darwin.patch 687
@@ -18,22 +21,18 @@ EBUILD lynx-2.8.5-r3.ebuild 1930 RMD160 65579625341db6334a0973bd96497cede1e621a1
 MD5 07527e3d0bbbed3947d11ce5e11dcac9 lynx-2.8.5-r3.ebuild 1930
 RMD160 65579625341db6334a0973bd96497cede1e621a1 lynx-2.8.5-r3.ebuild 1930
 SHA256 df0c2c01fe60ab504b113fe991c1e9490d11cfed6fae61b29e58fc33ac187f80 lynx-2.8.5-r3.ebuild 1930
-EBUILD lynx-2.8.5-r4.ebuild 1984 RMD160 6a8e7d7f627a05e289ef03a3a68bd1dd475e4e3f SHA1 91ee1624e69b4d5168e7835e702a587b9609b7b6 SHA256 11fa0cce588ce5f31327061331e6ae9ee148d04ffb93d1df90e59cdfeb796139
-MD5 4229394e3245418f566fcb785bb24c76 lynx-2.8.5-r4.ebuild 1984
-RMD160 6a8e7d7f627a05e289ef03a3a68bd1dd475e4e3f lynx-2.8.5-r4.ebuild 1984
-SHA256 11fa0cce588ce5f31327061331e6ae9ee148d04ffb93d1df90e59cdfeb796139 lynx-2.8.5-r4.ebuild 1984
 EBUILD lynx-2.8.6-r1.ebuild 2058 RMD160 84389909a88e7bacb50dcd2b36d67e77bf426a7e SHA1 c490566a1dab309686ee7ce940884e2912ee2378 SHA256 915cdd2761efdbef7f58e03b73e6ffded03cdd3035cb8192923c88da15de3f8b
 MD5 7d8e9b6fcb881858860926c1f9a20526 lynx-2.8.6-r1.ebuild 2058
 RMD160 84389909a88e7bacb50dcd2b36d67e77bf426a7e lynx-2.8.6-r1.ebuild 2058
 SHA256 915cdd2761efdbef7f58e03b73e6ffded03cdd3035cb8192923c88da15de3f8b lynx-2.8.6-r1.ebuild 2058
-EBUILD lynx-2.8.6-r2.ebuild 2042 RMD160 df18648af610b85ade523e6f4e009f36a506320d SHA1 44a1d2da49244b3b5eb2da0860e7550af66ba2e9 SHA256 56a1b89cbf6943a53a505301d434de73ca043822c087b38005f64c7d3ea6813e
-MD5 f0192178ebdbf2c0c47c0ae14b2d066e lynx-2.8.6-r2.ebuild 2042
-RMD160 df18648af610b85ade523e6f4e009f36a506320d lynx-2.8.6-r2.ebuild 2042
-SHA256 56a1b89cbf6943a53a505301d434de73ca043822c087b38005f64c7d3ea6813e lynx-2.8.6-r2.ebuild 2042
-MISC ChangeLog 13369 RMD160 ab8e91cc723ef92ad9453ca2e1fb6de9c0305413 SHA1 bcff6e637325ee08ca10216d541b5b06a0c6872a SHA256 84735b1d3ed21e2ab224acda60ed7d7aa7a9fc06532112fddca8b62a9b878a58
-MD5 15d20fb26f6499802a82150c39cfc492 ChangeLog 13369
-RMD160 ab8e91cc723ef92ad9453ca2e1fb6de9c0305413 ChangeLog 13369
-SHA256 84735b1d3ed21e2ab224acda60ed7d7aa7a9fc06532112fddca8b62a9b878a58 ChangeLog 13369
+EBUILD lynx-2.8.6-r2.ebuild 2039 RMD160 f9709ea14acefea6a45e1654de0dacb6288f420d SHA1 ba79b3dbd10dc4223ff36b53eb54ee93cde44b23 SHA256 bcd8dffc2265bb2e6855509c6aaff228442ace4649d3710501150e8e74428eff
+MD5 34cbbaf142ea0a8fe1efce0fc11a957b lynx-2.8.6-r2.ebuild 2039
+RMD160 f9709ea14acefea6a45e1654de0dacb6288f420d lynx-2.8.6-r2.ebuild 2039
+SHA256 bcd8dffc2265bb2e6855509c6aaff228442ace4649d3710501150e8e74428eff lynx-2.8.6-r2.ebuild 2039
+MISC ChangeLog 13510 RMD160 9e573a1bdbde0846e67e0d75d36b22284b06571b SHA1 37fbd7af156b6897a308f34fce9fb00e477d7464 SHA256 1dca951483f47d4d9b5f50128af1f0cbb367190fd7dc804e0679b65e42cb4e83
+MD5 916d5adf1465716f5b80dcdfb8a0c81c ChangeLog 13510
+RMD160 9e573a1bdbde0846e67e0d75d36b22284b06571b ChangeLog 13510
+SHA256 1dca951483f47d4d9b5f50128af1f0cbb367190fd7dc804e0679b65e42cb4e83 ChangeLog 13510
 MISC metadata.xml 222 RMD160 c0fe8198bb72a6bed198a1dd7005ed607711db2a SHA1 a3b2631fffe918fa2b814a269297dfc9e6c355cb SHA256 35319607d0186f4c2b026c636392c56bafa68c71a17a67364e5c530156eb22b4
 MD5 99cf1c24b27d2fe42b99b95fadff0290 metadata.xml 222
 RMD160 c0fe8198bb72a6bed198a1dd7005ed607711db2a metadata.xml 222
@@ -41,12 +40,16 @@ SHA256 35319607d0186f4c2b026c636392c56bafa68c71a17a67364e5c530156eb22b4 metadata
 MD5 7887b8d7d6c91fd477215c7b588e3951 files/digest-lynx-2.8.5-r3 485
 RMD160 a490d53a822fb24770185a489de04d7c95dc535f files/digest-lynx-2.8.5-r3 485
 SHA256 db5e05540a0aafd5f58d09a9501678f96bb2206c327af0676d89e253ee7b305f files/digest-lynx-2.8.5-r3 485
-MD5 7887b8d7d6c91fd477215c7b588e3951 files/digest-lynx-2.8.5-r4 485
-RMD160 a490d53a822fb24770185a489de04d7c95dc535f files/digest-lynx-2.8.5-r4 485
-SHA256 db5e05540a0aafd5f58d09a9501678f96bb2206c327af0676d89e253ee7b305f files/digest-lynx-2.8.5-r4 485
 MD5 5da1fdf6bdfd928f390b8cc821982b3c files/digest-lynx-2.8.6-r1 250
 RMD160 62dbf22d2617086524806c6c1c910a9756aa5058 files/digest-lynx-2.8.6-r1 250
 SHA256 7c80546de3613cb226744ee20d29d480c3ed72d19b25807955ff9a2c71fee31c files/digest-lynx-2.8.6-r1 250
 MD5 82a890fa64ebe74c5c98102463ce75ba files/digest-lynx-2.8.6-r2 250
 RMD160 8f120091b9fc7ca39967a5430186cbf4a6f0b5bd files/digest-lynx-2.8.6-r2 250
 SHA256 c1b86c6b097ec8162491e9c9dce8f71c165eb623e33a4234c8f5d2276da57414 files/digest-lynx-2.8.6-r2 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF5GLJGDyatLGpTbYRAt9wAJ0cA8WwrJ0eI/6aQwZ5LZRsDNtU5gCgiAU0
+AHGQhbpcvEMWy/unoA/xYEw=
+=9ExR
+-----END PGP SIGNATURE-----
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