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

(Portage version: 2.1.9.24/cvs/Linux i686)

4 files changed, 15 insertions, 172 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/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) \