Add idn useflag to prevent automatic detection of libidn,

thanks to Stelian Ionescu who reported this and submitted fix (bug #350078)
Able to remove stale ebuilds now that mips took off their stable keyword

Package-Manager: portage-2.1.9.24/cvs/Linux i686

5 files changed, 17 insertions, 177 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index a69c1ee991b7..0d78e45e9a9c 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/lynx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.104 2010/10/17 04:41:00 leio Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.105 2011/01/21 07:03:13 wormo Exp $
+
+  21 Jan 2011; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  -lynx-2.8.6-r2.ebuild, -lynx-2.8.6-r4.ebuild, lynx-2.8.8_pre5.ebuild:
+  Add idn useflag to prevent automatic detection of libidn,
+  thanks to Stelian Ionescu who reported this and submitted fix (bug
+  #350078)
+  Able to remove stale ebuilds now that mips took off their stable keyword
 
   17 Oct 2010; Mart Raudsepp <leio@gentoo.org> lynx-2.8.6-r2.ebuild:
   Drop to ~mips
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 34f9b08af5d9..414863841fb7 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,12 +1,9 @@
 AUX lynx-2.8.6-CVE-2008-4690.patch 1598 RMD160 f54f9a8ddf113e1d57eefbc4a624a4b2b0bca8a9 SHA1 3c6784afa7df360927126e9d49c310c62eb0341e SHA256 c65a04c603611c5e3f02ee2aa5f3a5a27a073cb3632063a50c22602b05d7996a
 AUX lynx-2.8.7-configure-openssl.patch 1222 RMD160 39f979bfad18b63322c91b2dd2762ad9674efd83 SHA1 50a987b46ec1139cf3ee73151b56a41bda04e74c SHA256 1b7e679307a05e92646b9b6ee96f69ddbc5b60d72ad8bd7e3661c07d46abea15
 AUX lynx-2.8.7-include-locale.patch 381 RMD160 25566fffe5f4a0674b5130a44e33facc76252ba6 SHA1 18e9f8e71bbd248e597c7d8755509579c3842c1f SHA256 47bf397918356141dcee2556865032ac75f7ea72252e758246f881785b80992c
-DIST lynx2.8.6rel.4.tar.bz2 2291156 RMD160 47e48e4136df298bf5168bc8d2d49e1ac92a6820 SHA1 b4e37025e99aabaddb219b2f27b1b0ac5db89708 SHA256 c7d876d52d08e4e593e8f3a04ba6d6c86685570828d1b7a16723702c7643c2a3
 DIST lynx2.8.7rel.1.tar.bz2 2432045 RMD160 0969f85b6776c5e426cea4b910271356f9193bf1 SHA1 f5e67a298322b22fe0edcfba326c02eaa5edcb72 SHA256 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
 DIST lynx2.8.8dev.5.tar.bz2 2463677 RMD160 71392a7a8e600419d7d81a0cefe2b677781bfbb2 SHA1 5a8a684849a9898711b6ef87c6eef1693ca8293f SHA256 94afbc5b671d9e4b805cfbb22edbf6b1a619a32ec57c2fba4e4ce6ebad4e2f8e
-EBUILD lynx-2.8.6-r2.ebuild 2151 RMD160 f87317dbbf7ccdbe7a59189e21d9ddd120b1d6b8 SHA1 0d22045c3348c864858da7fb810d56b46f25132b SHA256 8f9c56a62a2bf065f39266d5f73315982f4df9cccdcf5237d09675a9759e08d5
-EBUILD lynx-2.8.6-r4.ebuild 2241 RMD160 a7d0b18ecb42e5e9f8fd2b5f114e66d9a88c7ed8 SHA1 a3e1adfef7976492cd3aeceee6d46e2388d2e84d SHA256 b5e260b022a41c8932a736db3fcf82b6df44504dfd40455c907ee146eb070a88
 EBUILD lynx-2.8.7_p1.ebuild 3258 RMD160 2f19bde44f9c25f5a25baee14fcccfa67de441ec SHA1 47fd1f3fb3b82c56a0aab10636225ca207cf08d8 SHA256 f3e7fa8ebe50bf827fee7c5c999a9ae38277ce4c7c168871d5f07697ad52e772
-EBUILD lynx-2.8.8_pre5.ebuild 3171 RMD160 f709f541df92bb7cebe903717d4edaf4f64408fc SHA1 60ec18de259c910c243c9cf75b247191f49aef05 SHA256 2cacadcf6676028d6b798e0b1cf67178e445dcfcd0560402885dc8f8d33935da
-MISC ChangeLog 19758 RMD160 41271c47cf41214c43f39cedd060be77bed8b5a4 SHA1 b11ade2e340f21d496adfb8e7095eab3fd7dab5d SHA256 001d042ce3ad07d595cefa22f207783c73992f7edd7d525663ac3f7eee2bde53
+EBUILD lynx-2.8.8_pre5.ebuild 3227 RMD160 9db56d3cff2351202a73eba0c72d0fa5c17ca4c6 SHA1 a51581b053862b86588ef7e07888bf530be9f43a SHA256 73b6dee982c98c5b25ae56b3afcd30e570ac3c037287fe6ff4c34ad6d058fb9d
+MISC ChangeLog 20107 RMD160 40d1a53b4659d37b3cca80187cdaacae10bd205b SHA1 e8b1307e9b19dfc620438d5f96e4df05c76b96b5 SHA256 5c933eb9a5d15550bede4d4d3a236db38ee8cdd90821f7f94baaa821585fac32
 MISC metadata.xml 404 RMD160 f0a1810344dee760f35a9d4aa6e404e0e9904a00 SHA1 6e87ab7e46d6e24385a722abcd774c8c82c8fc5c SHA256 703ad7ce52e513f1c0f4c6c3361d20cb07bffe698dc3bdd21f17f66943e3a7e5
diff --git a/www-client/lynx/lynx-2.8.6-r2.ebuild b/www-client/lynx/lynx-2.8.6-r2.ebuild
deleted file mode 100644
index 3e5feb619141..000000000000
--- a/www-client/lynx/lynx-2.8.6-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 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.18 2010/10/17 04:41:00 leio Exp $
-
-inherit eutils
-
-MY_P=${PN}${PV}
-S=${WORKDIR}/${MY_P//./-}
-
-DESCRIPTION="An excellent console-based web browser with ssl support"
-HOMEPAGE="http://lynx.isc.org/"
-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 ~sparc-fbsd ~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 )"
-
-LANGS="ca cs da de et fr hu it ja nl pt_BR ru rw sl sv tr uk vi zh_CN zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-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 \
-		--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_enable linguas_ja japanese-utf8) \
-		$(use_with ssl) \
-		$(use_with bzip2 bzlib) \
-		${myconf} || die
-
-	emake || 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.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-r4.ebuild b/www-client/lynx/lynx-2.8.6-r4.ebuild
deleted file mode 100644
index cfa9631861d3..000000000000
--- a/www-client/lynx/lynx-2.8.6-r4.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2009 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-r4.ebuild,v 1.7 2009/08/02 15:13:15 ranger Exp $
-
-inherit eutils
-
-MY_P=${PN}${PV}
-S=${WORKDIR}/${MY_P//./-}
-
-DESCRIPTION="An excellent console-based web browser with ssl support"
-HOMEPAGE="http://lynx.isc.org/"
-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 ~sparc-fbsd 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 )"
-
-LANGS="ca cs da de et fr hu it ja nl pt_BR ru rw sl sv tr uk vi zh_CN zh_TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-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_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-CVE-2008-4690.patch"
-}
-
-src_compile() {
-	local myconf
-	use unicode && myconf="--with-screen=ncursesw"
-
-	econf \
-		--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_enable linguas_ja japanese-utf8) \
-		$(use_with ssl) \
-		$(use_with bzip2 bzlib) \
-		${myconf} || die
-
-	emake || 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.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.8_pre5.ebuild b/www-client/lynx/lynx-2.8.8_pre5.ebuild
index c1a8f9a0633b..80024b793d8d 100644
--- a/www-client/lynx/lynx-2.8.8_pre5.ebuild
+++ b/www-client/lynx/lynx-2.8.8_pre5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre5.ebuild,v 1.1 2010/09/11 22:01:10 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.8_pre5.ebuild,v 1.2 2011/01/21 07:03:13 wormo Exp $
 
 EAPI=2
 
@@ -33,7 +33,7 @@ SRC_URI="http://lynx.isc.org/current/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE="bzip2 cjk gnutls ipv6 nls ssl unicode"
+IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
 
 RDEPEND="sys-libs/ncurses[unicode?]
 	sys-libs/zlib
@@ -42,7 +42,8 @@ RDEPEND="sys-libs/ncurses[unicode?]
 		!gnutls? ( >=dev-libs/openssl-0.9.8 )
 		gnutls? ( >=net-libs/gnutls-2.6.4 )
 	)
-	bzip2? ( app-arch/bzip2 )"
+	bzip2? ( app-arch/bzip2 )
+	idn? ( net-dns/libidn )"
 
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
@@ -103,6 +104,7 @@ src_configure() {
 		--enable-included-msgs \
 		--with-zlib \
 		$(use_enable nls) \
+		$(use_enable idn idna) \
 		$(use_enable ipv6) \
 		$(use_enable cjk) \
 		$(use_enable unicode japanese-utf8) \