Version bump.

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

3 files changed, 138 insertions, 2 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index a810a0e1b8b7..0bad94ca3c32 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,11 @@
 # 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.106 2011/01/31 16:56:47 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.107 2011/03/07 14:00:41 vapier Exp $
+
+*lynx-2.8.7_p2 (07 Mar 2011)
+
+  07 Mar 2011; Mike Frysinger <vapier@gentoo.org> +lynx-2.8.7_p2.ebuild:
+  Version bump.
 
   31 Jan 2011; Jeremy Olexa <darkside@gentoo.org>
   +files/lynx-2.8.6-mint.patch, lynx-2.8.8_pre5.ebuild:
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 73500715b396..35922d71c678 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,10 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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
 AUX lynx-2.8.7-include-locale.patch 381 RMD160 25566fffe5f4a0674b5130a44e33facc76252ba6 SHA1 18e9f8e71bbd248e597c7d8755509579c3842c1f SHA256 47bf397918356141dcee2556865032ac75f7ea72252e758246f881785b80992c
 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
 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 3462 RMD160 64dff26cd4b75ea90fb50e708dae5e680df7fe1a SHA1 dd40f49a25c6d1768da127b833e57f14e7c340f4 SHA256 e8e02b141f52b811668b0f6f7b91cac23a6412863daf909dc26d67e781cf334a
-MISC ChangeLog 20325 RMD160 495e32e05a7e7b82e8605b76c284d96ea1703fd6 SHA1 ef7be6ebac9069c6d33dcde1f22cf3f3b4079cd9 SHA256 73523122a6e1b1e9fcc36421304e893ecaaff22af2f3d97b0133358ea4f81c8c
+MISC ChangeLog 20443 RMD160 512329624b27cc89dabd1893ab75f38a41471ece SHA1 2be6f26dc981fe59ae292cede0c1fd726236d7ed SHA256 5f66dd9bd6ece53165954f745fea66a96d9bd4310e191b5928df7f23d2521858
 MISC metadata.xml 404 RMD160 f0a1810344dee760f35a9d4aa6e404e0e9904a00 SHA1 6e87ab7e46d6e24385a722abcd774c8c82c8fc5c SHA256 703ad7ce52e513f1c0f4c6c3361d20cb07bffe698dc3bdd21f17f66943e3a7e5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk105PoACgkQaC/OocHi7JZ7dgD9HftyRLwGAaphQtStot3Dy3MP
+wZjMpSuzxmNelrzOpWYA/iYsyknmjwk8BcrjnOWuSNKzayKlFAcm6kBd8CgUQxrS
+=700s
+-----END PGP SIGNATURE-----
diff --git a/www-client/lynx/lynx-2.8.7_p2.ebuild b/www-client/lynx/lynx-2.8.7_p2.ebuild
new file mode 100644
index 000000000000..ef5356207256
--- /dev/null
+++ b/www-client/lynx/lynx-2.8.7_p2.ebuild
@@ -0,0 +1,119 @@
+# 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.7_p2.ebuild,v 1.1 2011/03/07 14:00:42 vapier Exp $
+
+EAPI="2"
+
+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 ~sparc-fbsd ~x86-fbsd"
+IUSE="bzip2 cjk gnutls 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 )"
+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() {
+	if ! use ssl ; then
+		elog "SSL support disabled; you will not be able to access secure websites."
+	fi
+}
+
+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
+
+	# fix configure for openssl compiled with kerberos (bug #267749)
+	epatch "${FILESDIR}"/${PN}-2.8.7-configure-openssl.patch
+
+	# missing include of locale.h when compiled with -O0 (bug #286198)
+	epatch "${FILESDIR}"/${PN}-2.8.7-include-locale.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"
+		else
+			myargs+=" --with-ssl"
+		fi
+	fi
+
+	if use unicode ; then
+		myargs+=" --with-screen=ncursesw"
+	fi
+
+	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 unicode japanese-utf8) \
+		$(use_with bzip2 bzlib) \
+		${myargs}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+
+	sed -i \
+		-e "s|^HELPFILE.*$|HELPFILE:file://localhost/usr/share/doc/${PF}/lynx_help/lynx_help_main.html|" \
+		"${D}"/etc/lynx.cfg || die
+	if use unicode ; then
+		sed -i \
+			-e '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
+			"${D}"/etc/lynx.cfg || die
+	fi
+
+	dodoc CHANGES COPYHEADER PROBLEMS README
+	docinto docs
+	dodoc docs/*
+	docinto lynx_help
+	dodoc lynx_help/*.txt
+	dohtml -r lynx_help/*
+}