Update to rel.2. Cleanup.

(Portage version: 2.1.2_pre2-r9)
 (Unsigned Manifest commit)

5 files changed, 12 insertions, 178 deletions

diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index ec97388254d6..5f6bc44f5012 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -12,8 +12,7 @@ RMD160 3374d9ff8488275b077ccb9287f23e678602b59c files/lynx-2.8.5-tab_to.patch 43
 SHA256 33f4a6a3293c095e825faf50e525c415c63d9a6b7622aa2a1207adcc56e18b3c files/lynx-2.8.5-tab_to.patch 433
 DIST lynx-2.8.5-rel5.patch.bz2 6907 RMD160 9e843f4c235c1de17a4ebe62ad1511dd9ed1f620 SHA1 4c7fd779d36005c21735406dc89387981a26b119 SHA256 a6997212e7a36c109f57856d1ce185c074b598f2fb1b1d3d9c57fe38df5d6ccb
 DIST lynx2.8.5.tar.bz2 2177287 RMD160 80d20261ac6eaebe1d940fb5de485daaad7bb3b7 SHA1 c70866f67c1365b55e0c9c0c569190f5919d28d4 SHA256 37607008086933c869be26b4db687f61a768c51ddefa741e77225069b880bc63
-DIST lynx2.8.6.tar.bz2 2277552 RMD160 3733e48d4da2a199bd7ba2c67c2de5eeead05317 SHA1 5ffb528a24a13a4419101217a59794119ca66fe3 SHA256 7692772348d93d68fab9494a3755bb3413f96af786d015e740e2efe6cf2f5b20
-DIST lynx2.8.6pre.5.tar.bz2 2287359 RMD160 2b76566b51eebe1be2e8922c46d4866055d3b60b SHA1 00ef55d0d4ce5266b3aa17669f53014218a494cf SHA256 703fe288440f3d4fff55183d2ad4bb5c9776ebf5a4257898e1509baab112933b
+DIST lynx2.8.6rel.2.tar.bz2 2277550 RMD160 a675fa8d6bcb508b1125ad586770a330d9257ae7 SHA1 ca1242464d25f0b0560ef516a5200da89532b24b SHA256 41dfc33fcc23295810c3141c614427cca7882ab4e0774e58f6aa9bac9c2586f9
 EBUILD lynx-2.8.5-r3.ebuild 1936 RMD160 174e5dd49fe03f265541bb8dea152243a2c0b1b1 SHA1 9f8b7d057f8c8bf6308915d17847937146829162 SHA256 7cdec0feedca77d92e06e9a2448a5898bde3fcefbb3b6c0c079d3d647b20470e
 MD5 4b3a2921b70fb70ba38f0f2ad40159a4 lynx-2.8.5-r3.ebuild 1936
 RMD160 174e5dd49fe03f265541bb8dea152243a2c0b1b1 lynx-2.8.5-r3.ebuild 1936
@@ -22,18 +21,14 @@ EBUILD lynx-2.8.5-r4.ebuild 1994 RMD160 c005dd61e6dafd85f781522df1642ca83ce91b9a
 MD5 96ae3f230cd97dbfd3ceaa86e5a18658 lynx-2.8.5-r4.ebuild 1994
 RMD160 c005dd61e6dafd85f781522df1642ca83ce91b9a lynx-2.8.5-r4.ebuild 1994
 SHA256 e8bb3d4a0f8e609b53fde223e22842109666cd479e74079ba454f0f285595db9 lynx-2.8.5-r4.ebuild 1994
-EBUILD lynx-2.8.6.ebuild 2010 RMD160 b42da0da75bb24652033a970ac2a022ec20582e5 SHA1 f2068ae7877526dca988d0f4e2672e5f54709d1b SHA256 c97bc7150b1bf9697c183e04e60131f2e03fff05ed3928fcbdd81b4bf54f9409
-MD5 f4f9a4a058840fa5e60f7806a4116213 lynx-2.8.6.ebuild 2010
-RMD160 b42da0da75bb24652033a970ac2a022ec20582e5 lynx-2.8.6.ebuild 2010
-SHA256 c97bc7150b1bf9697c183e04e60131f2e03fff05ed3928fcbdd81b4bf54f9409 lynx-2.8.6.ebuild 2010
-EBUILD lynx-2.8.6_rc5.ebuild 2119 RMD160 735945afcaffa955f1ad05870242c711cf3d3f2c SHA1 772f090dcdc0c5cc5565e030173b73f6bad04ee3 SHA256 4dcb2ac432bfa4336a17aa0c7bab9023a26de8804a2bf6eece4190e88376803d
-MD5 d03bc9c0202c927a7785e93982b03ea5 lynx-2.8.6_rc5.ebuild 2119
-RMD160 735945afcaffa955f1ad05870242c711cf3d3f2c lynx-2.8.6_rc5.ebuild 2119
-SHA256 4dcb2ac432bfa4336a17aa0c7bab9023a26de8804a2bf6eece4190e88376803d lynx-2.8.6_rc5.ebuild 2119
-MISC ChangeLog 11549 RMD160 e594ce5d40ec4046ce23dcdacb92bffb0a9c1840 SHA1 cc38e3a1db0140c23e461256ba226385465ffdc9 SHA256 a42de72b304436dea495eb2d7ad6238855be6847353b9864e2d235f64bc4005d
-MD5 a33d27cfa49462dae71b848844cc7916 ChangeLog 11549
-RMD160 e594ce5d40ec4046ce23dcdacb92bffb0a9c1840 ChangeLog 11549
-SHA256 a42de72b304436dea495eb2d7ad6238855be6847353b9864e2d235f64bc4005d ChangeLog 11549
+EBUILD lynx-2.8.6-r1.ebuild 2018 RMD160 f348d1982ad3eded254bca355268795af5adb676 SHA1 7b01dac50b84c7c29d40dc4554a09839287ed6da SHA256 8b5a944274f901c53ff4dd7bdc03fb2b0dd054f0735289ae77552ccaa8db65c4
+MD5 397750e08e2d9499809f667b5c50e49c lynx-2.8.6-r1.ebuild 2018
+RMD160 f348d1982ad3eded254bca355268795af5adb676 lynx-2.8.6-r1.ebuild 2018
+SHA256 8b5a944274f901c53ff4dd7bdc03fb2b0dd054f0735289ae77552ccaa8db65c4 lynx-2.8.6-r1.ebuild 2018
+MISC ChangeLog 11728 RMD160 3a70c92dc37b7820901d23af4341bf082b0b1ab1 SHA1 6ac85afcc94837fc6e3c688319ff50d4a49ad5c0 SHA256 7b8d6bd90b6e3b232e2aabad57ec5a64ab56180d2fd848418e8961d089cd0d2f
+MD5 e6720336811c1528f35c14b3ff5f58ce ChangeLog 11728
+RMD160 3a70c92dc37b7820901d23af4341bf082b0b1ab1 ChangeLog 11728
+SHA256 7b8d6bd90b6e3b232e2aabad57ec5a64ab56180d2fd848418e8961d089cd0d2f ChangeLog 11728
 MISC metadata.xml 219 RMD160 f4e5c27d20fdfedce65aa30b99b37def5d23e8c8 SHA1 8f4c97f3b80298da3db4c865706476f658495e4a SHA256 b99bdb99f36f88c79e300c9fbe9ae405908400d462788a6ac661173d904c8167
 MD5 0105a0859a9fe9050dd3de1aad0f05b5 metadata.xml 219
 RMD160 f4e5c27d20fdfedce65aa30b99b37def5d23e8c8 metadata.xml 219
@@ -44,9 +39,6 @@ SHA256 db5e05540a0aafd5f58d09a9501678f96bb2206c327af0676d89e253ee7b305f files/di
 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 7302b466aecdc46d75b876d997b0554d files/digest-lynx-2.8.6 235
-RMD160 5b9608a28238883bcb3db5d152505d9755986315 files/digest-lynx-2.8.6 235
-SHA256 5daa19beec6f99f01b08e76d1d966170c1170031bbcb8436c6e8efeb63ed6afe files/digest-lynx-2.8.6 235
-MD5 76a1732309b8800f8fe50bc5bbf6753f files/digest-lynx-2.8.6_rc5 250
-RMD160 5021ec655472f9c129da6bbb9e02b13e5d63602d files/digest-lynx-2.8.6_rc5 250
-SHA256 b5b0bdbed0f3d606b9a3667aafc4e1231eeea49cbadf0117471575e086b1f113 files/digest-lynx-2.8.6_rc5 250
+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
diff --git a/www-client/lynx/files/digest-lynx-2.8.6 b/www-client/lynx/files/digest-lynx-2.8.6
deleted file mode 100644
index e8784a553667..000000000000
--- a/www-client/lynx/files/digest-lynx-2.8.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1902d39b9c937658654b29f2c30a02ef lynx2.8.6.tar.bz2 2277552
-RMD160 3733e48d4da2a199bd7ba2c67c2de5eeead05317 lynx2.8.6.tar.bz2 2277552
-SHA256 7692772348d93d68fab9494a3755bb3413f96af786d015e740e2efe6cf2f5b20 lynx2.8.6.tar.bz2 2277552
diff --git a/www-client/lynx/files/digest-lynx-2.8.6_rc5 b/www-client/lynx/files/digest-lynx-2.8.6_rc5
deleted file mode 100644
index d3f18cbc093b..000000000000
--- a/www-client/lynx/files/digest-lynx-2.8.6_rc5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e4bca9cd958bf39d22abd57ce069fb0f lynx2.8.6pre.5.tar.bz2 2287359
-RMD160 2b76566b51eebe1be2e8922c46d4866055d3b60b lynx2.8.6pre.5.tar.bz2 2287359
-SHA256 703fe288440f3d4fff55183d2ad4bb5c9776ebf5a4257898e1509baab112933b lynx2.8.6pre.5.tar.bz2 2287359
diff --git a/www-client/lynx/lynx-2.8.6.ebuild b/www-client/lynx/lynx-2.8.6.ebuild
deleted file mode 100644
index 55811c6caef6..000000000000
--- a/www-client/lynx/lynx-2.8.6.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/10/12 11:00:19 exg Exp $
-
-inherit eutils
-
-MY_P=${PN}${PV}
-S=${WORKDIR}/${MY_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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 cjk ipv6 nls ssl unicode"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	bzip2? ( app-arch/bzip2 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
-		eerror "Installing lynx with the unicode flag requires ncurses be"
-		eerror "built with it as well. Please make sure your /etc/make.conf"
-		eerror "or /etc/portage/package.use enables it, and re-install"
-		eerror "ncurses with \`emerge --oneshot sys-libs/ncurses\`."
-		die "Re-emerge ncurses with the unicode flag"
-	fi
-}
-
-src_compile() {
-	local myconf
-	use unicode && myconf="--with-screen=ncursesw"
-
-	econf \
-		--libdir=/etc/lynx \
-		--enable-cgi-links \
-		--enable-persistent-cookies \
-		--enable-prettysrc \
-		--enable-nsl-fork \
-		--enable-file-upload \
-		--enable-read-eta \
-		--enable-color-style \
-		--enable-scrollbar \
-		--enable-included-msgs \
-		--with-zlib \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable cjk) \
-		$(use_with ssl) \
-		$(use_with bzip2 bzlib) \
-		${myconf} || die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	dosed "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
-			/etc/lynx/lynx.cfg
-	dodoc CHANGES COPYHEADER PROBLEMS README
-	docinto docs
-	dodoc docs/*
-	docinto lynx_help
-	dodoc lynx_help/*.txt
-	dohtml -r lynx_help/*
-}
diff --git a/www-client/lynx/lynx-2.8.6_rc5.ebuild b/www-client/lynx/lynx-2.8.6_rc5.ebuild
deleted file mode 100644
index 344e3872b900..000000000000
--- a/www-client/lynx/lynx-2.8.6_rc5.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2006 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_rc5.ebuild,v 1.1 2006/10/03 11:18:54 exg Exp $
-
-inherit eutils versionator
-
-FIRST=$(get_version_component_range 1-3)
-LAST=$(get_version_component_range 4)
-
-DESCRIPTION="An excellent console-based web browser with ssl support"
-HOMEPAGE="http://lynx.browser.org/"
-SRC_URI="ftp://lynx.isc.org/current/${PN}${FIRST}${LAST/rc/pre.}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 cjk ipv6 nls ssl unicode"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	ssl? ( >=dev-libs/openssl-0.9.6 )
-	bzip2? ( app-arch/bzip2 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}${FIRST//./-}"
-
-pkg_setup() {
-	if use unicode && ! built_with_use sys-libs/ncurses unicode; then
-		eerror "Installing lynx with the unicode flag requires ncurses be"
-		eerror "built with it as well. Please make sure your /etc/make.conf"
-		eerror "or /etc/portage/package.use enables it, and re-install"
-		eerror "ncurses with \`emerge --oneshot sys-libs/ncurses\`."
-		die "Re-emerge ncurses with the unicode flag"
-	fi
-}
-
-src_compile() {
-	local myconf
-	use unicode && myconf="--with-screen=ncursesw"
-
-	econf \
-		--libdir=/etc/lynx \
-		--enable-cgi-links \
-		--enable-persistent-cookies \
-		--enable-prettysrc \
-		--enable-nsl-fork \
-		--enable-file-upload \
-		--enable-read-eta \
-		--enable-color-style \
-		--enable-scrollbar \
-		--enable-included-msgs \
-		--with-zlib \
-		$(use_enable nls) \
-		$(use_enable ipv6) \
-		$(use_enable cjk) \
-		$(use_with ssl) \
-		$(use_with bzip2 bzlib) \
-		${myconf} || die
-
-	emake -j1 || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-
-	dosed "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
-			/etc/lynx/lynx.cfg
-	dodoc CHANGES COPYHEADER PROBLEMS README
-	docinto docs
-	dodoc docs/*
-	docinto lynx_help
-	dodoc lynx_help/*.txt
-	dohtml -r lynx_help/*
-}