Version bump (bug #375963). Update to EAPI 4 and add myself as a maintainer.

Package-Manager: portage-2.2.0_alpha55/cvs/Linux x86_64

4 files changed, 145 insertions, 3 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index 3ddcda8a084d..fbd3aefe94fd 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/lynx
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.108 2011/03/15 05:54:49 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.109 2011/09/15 09:26:55 radhermit Exp $
+
+*lynx-2.8.8_pre9 (15 Sep 2011)
+
+  15 Sep 2011; Tim Harder <radhermit@gentoo.org> +lynx-2.8.8_pre9.ebuild,
+  metadata.xml:
+  Version bump (bug #375963). Update to EAPI 4 and add myself as a maintainer.
 
   15 Mar 2011; Stephanie Lockwood-Childs <wormo@gentoo.org>
   lynx-2.8.8_pre5.ebuild:
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 77eb727e10c6..fd2235f80cd1 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX lynx-2.8.6-CVE-2008-4690.patch 1598 RMD160 f54f9a8ddf113e1d57eefbc4a624a4b2b0bca8a9 SHA1 3c6784afa7df360927126e9d49c310c62eb0341e SHA256 c65a04c603611c5e3f02ee2aa5f3a5a27a073cb3632063a50c22602b05d7996a
 AUX lynx-2.8.6-mint.patch 1001 RMD160 11c3a218d0c9b51fa5db9ba644d2da2aae1707bd SHA1 1c631792b0184de69ce8b6e5899b2c4e5224d4ce SHA256 e82ae63b656664563c312c107fff0fe1f1b6c8ae1ec054cad3a2f543f3e7ad96
 AUX lynx-2.8.7-configure-openssl.patch 1222 RMD160 39f979bfad18b63322c91b2dd2762ad9674efd83 SHA1 50a987b46ec1139cf3ee73151b56a41bda04e74c SHA256 1b7e679307a05e92646b9b6ee96f69ddbc5b60d72ad8bd7e3661c07d46abea15
@@ -5,8 +8,21 @@ AUX lynx-2.8.7-include-locale.patch 381 RMD160 25566fffe5f4a0674b5130a44e33facc7
 DIST lynx2.8.7rel.1.tar.bz2 2432045 RMD160 0969f85b6776c5e426cea4b910271356f9193bf1 SHA1 f5e67a298322b22fe0edcfba326c02eaa5edcb72 SHA256 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
 DIST lynx2.8.7rel.2.tar.bz2 2436801 RMD160 553e232aebaa09f88a6a190a1dfe7debb89f0a41 SHA1 a34978f7f83cd46bd857cb957faa5a9120458afa SHA256 301bda96ad3cd5032805e8d5315a42061a11e472e3d3a7baee3a2879517ef627
 DIST lynx2.8.8dev.5.tar.bz2 2463677 RMD160 71392a7a8e600419d7d81a0cefe2b677781bfbb2 SHA1 5a8a684849a9898711b6ef87c6eef1693ca8293f SHA256 94afbc5b671d9e4b805cfbb22edbf6b1a619a32ec57c2fba4e4ce6ebad4e2f8e
+DIST lynx2.8.8dev.9.tar.bz2 2521699 RMD160 6a06842a272da1fa498dae1ed1a988708ef3e224 SHA1 c4fe0cdd80e6b52647f229582e529e13032e1601 SHA256 b3596dc9ddf6b848d996364970df7f371872890d805c8f2ff941010b201605dc
 EBUILD lynx-2.8.7_p1.ebuild 3258 RMD160 2f19bde44f9c25f5a25baee14fcccfa67de441ec SHA1 47fd1f3fb3b82c56a0aab10636225ca207cf08d8 SHA256 f3e7fa8ebe50bf827fee7c5c999a9ae38277ce4c7c168871d5f07697ad52e772
 EBUILD lynx-2.8.7_p2.ebuild 3038 RMD160 181d4eb8bf6bd467187997f7effb5f4424f478c5 SHA1 1d4b3be87638a13e0d862fa5b44e3fba3630d0b3 SHA256 7a65a361afc09886517fbd4d042004094a5fb0b4a9c866f5ed12e70f491cc976
 EBUILD lynx-2.8.8_pre5.ebuild 3397 RMD160 8773aa1f0c9af9be6c9e3dfac5322cad1bcd8ffa SHA1 d0aa6d6034888ccfe39e91cd3f218c3a710968c7 SHA256 fa10800529f5e2996c6a04703604c38f19f5662122cb671367768836e111adca
-MISC ChangeLog 20617 RMD160 cd242605954ed2f47b69303a62437d8f2d1cba68 SHA1 f9472bd888cd313a5cf30c79b5c202c5ee9adf2b SHA256 0c23353253b7cf8221f29bb4ec2a77c6c7de9ed1b739abc9fd62c3a81c35894e
-MISC metadata.xml 404 RMD160 f0a1810344dee760f35a9d4aa6e404e0e9904a00 SHA1 6e87ab7e46d6e24385a722abcd774c8c82c8fc5c SHA256 703ad7ce52e513f1c0f4c6c3361d20cb07bffe698dc3bdd21f17f66943e3a7e5
+EBUILD lynx-2.8.8_pre9.ebuild 3354 RMD160 20402bf4a58c2b43d698ddf2364a0180491bd0c5 SHA1 49a1c422728c50300ae1d6a16352f110202f6d96 SHA256 8b7e0a491e5210c3c411d246b467221b8b4fd2d2e78e1ea791f132a115dc29dd
+MISC ChangeLog 20823 RMD160 0857969840787df59f8be9a142bdb01589880c03 SHA1 1afb6214681b978f9056caa313ccc4537bede41a SHA256 92434b37a43d6d810dcac247ce51b6200f2c1d466c2a888d23e9d81038593e4b
+MISC metadata.xml 497 RMD160 581f43dba68c5aabdca2937796954c08213f2ec0 SHA1 1d802c0548a18daae4d84060b1b10fe062a44958 SHA256 1cc98f4ed470e4b5daeb9fa376b806c3d7220adb6b0bb4876a560a6c52f1bb45
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQEcBAEBCgAGBQJOccTlAAoJEEqz6FtPBkyjq8oH/jrFC7WLuEsClhskPP43IOeA
+wrL94O0xpVbnG24rQ0dWuT2R1r76PieyUPSvhQxYRpOhntQCAQSnFxD5S6/1vxOG
+xsNrzdZZkd/ZmfBnz07vjtUwt8jZckGq9Uxo5Wg0SvK0EdFYZXBhMpTXl7moNWid
+2B774aGdtAIzhHdLq02NjmEA3Bq5vC7BgGoCettnX8hP4bLm+k0+t2zE4SiDI9lv
+L0NrpovNi1R6Hpvl1CbmYoqX8IMK+3p4/eIu/9ag5OUk0lTUgN/GPby+XdCwUABr
+5CsBTnx885xovxrQjgsKzvCx6FG9u8Ya5FgqNe7JiJqY5Hv3PE97Kq77AgsXHfQ=
+=sFkU
+-----END PGP SIGNATURE-----
diff --git a/www-client/lynx/lynx-2.8.8_pre9.ebuild b/www-client/lynx/lynx-2.8.8_pre9.ebuild
new file mode 100644
index 000000000000..f193d01c079b
--- /dev/null
+++ b/www-client/lynx/lynx-2.8.8_pre9.ebuild
@@ -0,0 +1,116 @@
+# 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_pre9.ebuild,v 1.1 2011/09/15 09:26:55 radhermit Exp $
+
+EAPI=4
+
+inherit eutils versionator
+
+# VERSIONING SCHEME TRANSLATION
+# Upstream	:	Gentoo
+# rel.		:	_p
+# pre.		:	_rc
+# dev.		:	_pre
+
+case ${PV} in
+	*_pre*) MY_P="${PN}${PV/_pre/dev.}" ;;
+	*_rc*)  MY_P="${PN}${PV/_rc/pre.}" ;;
+	*_p*|*) MY_P="${PN}${PV/_p/rel.}" ;;
+esac
+
+DESCRIPTION="An excellent console-based web browser with ssl support"
+HOMEPAGE="http://lynx.isc.org/"
+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 ~ppc-aix ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 cjk gnutls idn ipv6 nls ssl unicode"
+
+RDEPEND="sys-libs/ncurses[unicode?]
+	sys-libs/zlib
+	nls? ( virtual/libintl )
+	ssl? (
+		!gnutls? ( >=dev-libs/openssl-0.9.8 )
+		gnutls? ( >=net-libs/gnutls-2.6.4 )
+	)
+	bzip2? ( app-arch/bzip2 )
+	idn? ( net-dns/libidn )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	>=dev-util/pkgconfig-0.23"
+
+S="${WORKDIR}/${PN}$(replace_all_version_separators - $(get_version_component_range 1-3))"
+
+pkg_setup() {
+	! use ssl && elog "SSL support disabled; you will not be able to access secure websites."
+}
+
+src_prepare() {
+	# fix up toplevel makefile to enable parallel make (bug #262972)
+	#
+	# add '+' prefix to lines using $(MAKE_RECUR),
+	# making sure '+' comes after leading whitespace
+	sed -i -e '/$(MAKE_RECUR)/ s/\([[:blank:]]\)/\1+/' makefile.in || \
+	    die "failed to update makefile.in"
+
+	# fix configure for openssl compiled with kerberos (bug #267749)
+	epatch "${FILESDIR}/lynx-2.8.7-configure-openssl.patch"
+	epatch "${FILESDIR}"/${PN}-2.8.6-mint.patch
+}
+
+src_configure() {
+	local myargs
+
+	if use ssl ; then
+		# --with-gnutls and --with-ssl are alternatives,
+		# the latter enabling openssl support so it should be
+		# _not_ be used if gnutls ssl implementation is desired
+		if use gnutls ; then
+			myargs+=" --with-gnutls" # ssl implementation = gnutls
+		else
+			myargs+=" --with-ssl"    # ssl implementation = openssl
+		fi
+	fi
+
+	use unicode && myargs+=" --with-screen=ncursesw"
+
+	econf \
+		--enable-nested-tables \
+		--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 \
+		--enable-externs \
+		--with-zlib \
+		$(use_enable nls) \
+		$(use_enable idn idna) \
+		$(use_enable ipv6) \
+		$(use_enable cjk) \
+		$(use_enable unicode japanese-utf8) \
+		$(use_with bzip2 bzlib) \
+		$myargs
+}
+
+src_install() {
+	emake install DESTDIR="${D}"
+
+	sed -i -e "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
+			"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
+	if use unicode ; then
+		sed -i -e '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
+				"${ED}"/etc/lynx.cfg || die "lynx.cfg not found"
+	fi
+	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/metadata.xml b/www-client/lynx/metadata.xml
index e6955053216c..cc6a1de7024b 100644
--- a/www-client/lynx/metadata.xml
+++ b/www-client/lynx/metadata.xml
@@ -5,6 +5,10 @@
 	<maintainer>
 		<email>wormo@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>radhermit@gentoo.org</email>
+		<name>Tim Harder</name>
+	</maintainer>
 	<use>
 		<flag name='ssl'>Enable HTTPS support.</flag>
 		<flag name='gnutls'>Use gnutls library for HTTPS support (openssl is the default library for HTTPS support).</flag>