Version bump.

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

4 files changed, 201 insertions, 17 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index 9b8311373ace..ec617cd90410 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/lynx
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.131 2012/06/24 07:32:09 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.132 2012/09/27 04:29:22 radhermit Exp $
+
+*lynx-2.8.8_pre14 (27 Sep 2012)
+
+  27 Sep 2012; Tim Harder <radhermit@gentoo.org> +lynx-2.8.8_pre14.ebuild,
+  +files/lynx-2.8.8_pre14-parallel.patch:
+  Version bump.
 
   24 Jun 2012; Diego E. Pettenò <flameeyes@gentoo.org>
   +files/lynx-2.8.8_pre12-jobserver.patch, lynx-2.8.8_pre12.ebuild:
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 17fa27a53dea..e2c91e713d20 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-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.8_pre12-jobserver.patch 1056 RMD160 c2e7f7dbc22abeaf1088a3979b70b6fe79f787d6 SHA1 9e13398f1a9583061fb6a69e7293ecfaf5246f53 SHA256 3caf80ab2ca76fe4da7230b7322092556b17f480a44f24b510ace30bce9b163e
-AUX lynx-2.8.8_pre12-parallel.patch 3603 RMD160 5a637f09c74c6d6c9c1a8ebe608d912bcfe9b1f7 SHA1 f4d671d94902618233cddac02a01c9fb44c0cddf SHA256 ea2299193d4b8956d43444e0c95f82152bd42d4477f8a7df3a1fc513cd1cee2c
-DIST lynx2.8.8dev.12.tar.bz2 2539936 RMD160 84be91d54410973dd1a5f9951afcc7ccf00c5645 SHA1 daaefd4c5569176bdefcd8af09dd78d62e4658a4 SHA256 2856b570065a1334c896aad7b3203a273a3f0d5c7edcea93ffbd8bc3e8551273
-EBUILD lynx-2.8.8_pre12.ebuild 3281 RMD160 08eecfdbdb10ec17d7168747c9b54b8f3ba74fa2 SHA1 892ac2484000e1f86db48ae2109b9ab2e4a5ccdc SHA256 4b162735fe3ec8a3989e7434812771233511e50f6244514361fc0ca8cc60695a
-MISC ChangeLog 23891 RMD160 0b6a0568c5a7953ad9e623214d06adfa3d91ac98 SHA1 847c1fa23f248a8943f4be4e02a5804aea304b8e SHA256 59098430d1cab2ca4eca1f7dd2c2d9b0b2a474093667bcc8b1063f428c7d2b8e
-MISC metadata.xml 546 RMD160 a5fba3329b8308d6592df000e79026d88670d025 SHA1 7637c997e98414e0eabb5796ee4bc396c6d02586 SHA256 6b752488d634d33d18652c1a56f1e4c452091330472192c90f98ec260009687f
+AUX lynx-2.8.6-mint.patch 1001 SHA256 e82ae63b656664563c312c107fff0fe1f1b6c8ae1ec054cad3a2f543f3e7ad96 SHA512 c3f99d760886139c85aca68d99e4a51d57690c02348c6a5c42bbd640cb848682070e6ca7f13ae7a85ec58659765cb4dc8c58f66919d9276c96dc93f5f31f6674 WHIRLPOOL 88c7bdf06d5ad79139faeb9f5bfb7243d62e4c54ad4f2574b3d7904ba378bbc8f24b240b058d7a85c734768d9a87ef7c0e6938161acbbb4082ee5cf4b0958c63
+AUX lynx-2.8.7-configure-openssl.patch 1222 SHA256 1b7e679307a05e92646b9b6ee96f69ddbc5b60d72ad8bd7e3661c07d46abea15 SHA512 b96127cd82f31c121ce817e881699b84996b7cbfaff7ffb0e4f53e92fb9cd86ac269107094ed9ebeff5ba05081a8d6adb776388cecdfb0142e314beccaa3472f WHIRLPOOL 7cfdebdd97e9d867f0b952b8070029a33cdf80d65bf5474580daedcc8e746788023290c8a206add360fe763b6be0ba24305d926a8b31469dc8432e73877433a8
+AUX lynx-2.8.8_pre12-jobserver.patch 1056 SHA256 3caf80ab2ca76fe4da7230b7322092556b17f480a44f24b510ace30bce9b163e SHA512 9528107c23607f78dc95c9680e0e132cc9802e4bbbb52e15be850f8e73d07f811eff13977f717e5952f399974e47d0600ca9d9a43367dbcd25749e0a05680d60 WHIRLPOOL d63dbd84efc4719fc80f64bf5c1b2b3a6b18bee11d90ee42e963227396f6d28f23ecfb39916ca6273a231ad5db26ddd89ea1543813603a643136281c12a876a7
+AUX lynx-2.8.8_pre12-parallel.patch 3603 SHA256 ea2299193d4b8956d43444e0c95f82152bd42d4477f8a7df3a1fc513cd1cee2c SHA512 d1b71a10a621a85f6e0a12086f5cf3dd3ad38ca8e5dd60727e97a54bc43d3aefb991581ac42776ebc1668b607650bde2307a2ff5538a553b0d27ca78131eac2b WHIRLPOOL fbc87faeb86ed4adc91b31a433d1ae0f5b4fec468dc0e85cc7f30d304616cfb11854fb9d2157148a0162645486f93bd8d7032827de962fa86c5e7d0a29016599
+AUX lynx-2.8.8_pre14-parallel.patch 1975 SHA256 572cc24d23026498aaa559cd73787f34b3ee3c9ee436b9b0005d8d99a5e93b06 SHA512 51fe06150e03d4a2f78f98b7d39fa68c89d6a92bf761ebc04f0bddee891d55411eb2b523d8555a59a5ca0cee90ddc2545e3acc8cabd51ddc58dac5f07a30d261 WHIRLPOOL b1d1593839ef7fe4f13b7ebd70b2e6b823218ca7bffafc66a7d6a1227d1ad8c934c8ba362dd0c9240899c25fb439b70e2009f0d6b5f1a77d1bfdaccc152c0cad
+DIST lynx2.8.8dev.12.tar.bz2 2539936 SHA256 2856b570065a1334c896aad7b3203a273a3f0d5c7edcea93ffbd8bc3e8551273 SHA512 c6acc0aa455a9bf10830fc33202b70215a29db2cd332a1c35ff4b8c8b624eb0a449a06638398f87310a7869b36e6ab35e9ee06d6788d1d7a922b59e90210c250 WHIRLPOOL 624561bc1ae2e1b320d95e9dbbac981a8e37798c8b462624fbe8e85dade3b6c6366fb65b0820afccf58febc5c0a788e6daec60b9f2ec449df0eff6fc1bb76677
+DIST lynx2.8.8dev.14.tar.bz2 2551110 SHA256 152381ce57bb14cc7ada9b4cde49ec8a853a8498aae5f402048a27b4164df16c SHA512 9a554c9f0370a596e5a09e8640ab08a9a77cda4f1ff65c087f6e30f3408e463070236fff3617720f6db6560c9df96aa53d9a02cb6aa5395e88e5be53776ffe85 WHIRLPOOL de6412dd754c9196dba869ca879d2b08843bac1af4413f6ef13021d1d4b5b6e38769822763c1ecb3defcbff6b3d2aa48f5b5eaef60d0f977d7d35c2f9eaffa88
+EBUILD lynx-2.8.8_pre12.ebuild 3281 SHA256 4b162735fe3ec8a3989e7434812771233511e50f6244514361fc0ca8cc60695a SHA512 d808aacc6ddc0dc8cf118497b561e4aa093f2353bd6b5ecd56fbe155b7d617663bde032a75bc50c93a5422827dacda73673a139f3b8be1007a743ad30a61f77b WHIRLPOOL 2a0a769418c71c59a34a03a5ac804a9c01b8535c69f115fc5bac6726f65dc4688c30c01ed8471a55e57254f915c05b0ae557646978c5baf2998a9be544cfc5fa
+EBUILD lynx-2.8.8_pre14.ebuild 3225 SHA256 e123f266d7ee396ee427aa67bb0fa1cd431745418c0544dc62e40f981d9e66c8 SHA512 42150c6c61cde6348ea2932d47b2cc299b16c34cda20bd4e88c5a5d084a65e0721ce4698b4b1ba2f700ce4c7a508d37e50a53de4a19ff5b6829c501de05e1c4c WHIRLPOOL f0b8314cac8dd82ded0d55dac98304402546ac0389cdc598d274ee1f96a36f7a74b6a041ccfc359fe7c2ba73399cede23acb73f709b149efd5b2ad1ab2705685
+MISC ChangeLog 24058 SHA256 f09e3b127cf2e15dc720d90f80c06f55e95af6804b53ed8174a4820ecb4fe560 SHA512 26c01e9374d2baf14f34558da0ecc01988372036c686ad19f3c4f5e846063f23cd3082f3e8a459491067a6190f6ee121488550bc9f12fe0ee8ca81746379fac4 WHIRLPOOL 7bc3a44f7f181eb7f3c4495188a0c9e276697429b06b6fda83ed0e1fe866825ae255dcc23e10b8247f3999c260ef90f8d3ec7f57f003630a3a19731f211f8e94
+MISC metadata.xml 546 SHA256 6b752488d634d33d18652c1a56f1e4c452091330472192c90f98ec260009687f SHA512 62decbbfab12b8a9b758d31b90d635bf0ac50c0be6766a35e9b90a747388833983a551dcab26cf9faa7a37b84bb9c51ce5213df54f8505d98a6fb93f359c8cfd WHIRLPOOL 41aac07cbb57d83068e4fc503f9cc78098902be32a0a968d82fdafe8eaeb9032d1d2205fc0d13e79dfe307554bed1a7ddcbc6abf6328c7fad91275c2e8426ab8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP5sKVAAoJEBzRPIrUMBNCX6YH/ihA3JPQTCBGJHH8j7f5BEqv
-I3qn/sOOR9d0vVtrLeFZNXO2s9K0hJhpsYcglxIz8rRnzW6sBKIn4eqpeJNdL4ie
-Gwu0JX1iCQERGSQaf0Y6OCbJ1tI3bXZJ7x6sadZz81T5ZlJdaelz1Xr6RW2+kJCQ
-Rm+dWTaDpdzFwSeEH0ip0qIpER9yKywaXWq644ceZK/y+kHy3AaqFS4N2tiUvIey
-l5QyeFXX6FBn00YC3VoR31lXr3d/Ha3756pylSXAM5dSyCwI4xEE7jbBqGjESYaY
-5ujD4Vxb8ZJlfjgQRP5cNW9kDlyrpcL3WEbLb6KTDIu6A/0RGcUrkOO19a4LfKA=
-=RmvN
+iQEcBAEBCAAGBQJQY9YsAAoJEEqz6FtPBkyjghkH/jp/lOa+dJiKttHpQcHZ6Sa2
+ypbQ1CuyD/pg0qXVo7j1JxNfb51ggR94tLCDPFFhbQXy0H92Nzml5VhGg7hAGzQH
+/dlqKff7Z1GhZXiUCSOaFDsXNMYj5nkuC7fd87wczYaR2zd3wTHAUw0xmwqa1Jc4
+Em+JtDoaG6KrNA3s8dk8NrDd5To6Sia0mIXzO9U4jAMqpI6WUW8wuQ3WnpOXH3QM
+4c346HtqDl58eIW/1vJ6wOTzO8y2PYv7OamnkQFo7pUMQtVhf4lQH6j9RL8WsOG9
+ri6jPgCaP56z+g6ux/IVapfrxos2aPwKvlSIKfiNbWSzshXq3bx7hTDrT2ndAPQ=
+=W027
 -----END PGP SIGNATURE-----
diff --git a/www-client/lynx/files/lynx-2.8.8_pre14-parallel.patch b/www-client/lynx/files/lynx-2.8.8_pre14-parallel.patch
new file mode 100644
index 000000000000..ecc9dfdc94bc
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.8_pre14-parallel.patch
@@ -0,0 +1,55 @@
+--- lynx2-8-8/makefile.in
++++ lynx2-8-8/makefile.in
+@@ -199,9 +199,9 @@
+ 
+ all lynx$x: cfg_defs.h LYHelp.h
+ @MSG_DIR_MAKE@	$(SHELL) $(scripts_dir)/fixtext.sh $(srcdir)/LYMessages_en.h >LYMessages.c
+-@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR)
+-	cd $(WWW_DIR) && $(MAKE_RECUR) $(WWW_CFLAGS)
+-	cd $(SRC_DIR) && $(MAKE_RECUR) all $(SRC_CFLAGS)
++@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $(WWW_CFLAGS)
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) all $(SRC_CFLAGS)
+ 
+ lint:
+ 	cd $(WWW_DIR) && $(MAKE_RECUR) LINT="$(LINT)" $(WWW_CFLAGS) $@
+@@ -241,8 +241,8 @@
+ 	rm -f core *.core
+ 
+ depend: cfg_defs.h LYHelp.h
+-	cd $(WWW_DIR) && $(MAKE_RECUR) $@
+-	cd $(SRC_DIR) && $(MAKE_RECUR) $@
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(WWW_DIR) $@
++	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(SRC_DIR) $@
+ 
+ distclean: clean
+ 	-rm -f WWW/Library/*/*~
+@@ -320,7 +320,7 @@
+ 	@echo Full installation complete.
+ 
+ install-bin: $(BINDIR) lynx$x
+-@MSG_DIR_MAKE@	cd $(PO_DIR) && $(MAKE_RECUR) install
++@MSG_DIR_MAKE@	$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C $(PO_DIR) install
+ 	@ECHO_CC@$(SHELL) -c \
+ 	'if test -f $(BINDIR)/$(binary_PROG) ; then \
+ 	      mv -f $(BINDIR)/$(binary_PROG) $(BINDIR)/lynx.old; fi'
+--- lynx2-8-8/src/makefile.in
++++ lynx2-8-8/src/makefile.in
+@@ -116,7 +116,7 @@
+ 	@echo "Compiling Lynx sources"
+ 
+ do_chartrans_stuff:
+-	-cd chrtrans && $(MAKE_RECUR) \
++	-$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans \
+ 		SITE_DEFS="$(SITE_DEFS)" \
+ 		BUILD_CFLAGS="$(BUILD_CFLAGS)" \
+ 		BUILD_CPPFLAGS="$(BUILD_CPPFLAGS)" \
+@@ -207,7 +207,7 @@
+  $(CHRTR)viscii_uni.h
+ 
+ $(TABLES):
+-	-cd chrtrans && $(MAKE_RECUR) tables
++	-$(MAKE) @cf_cv_makeflags@ DESTDIR="$(DESTDIR)" CC="$(CC)" -C chrtrans tables
+ 
+ UCdomap$o :	UCdomap.c \
+ 		chrtrans/UCkd.h \
diff --git a/www-client/lynx/lynx-2.8.8_pre14.ebuild b/www-client/lynx/lynx-2.8.8_pre14.ebuild
new file mode 100644
index 000000000000..3578cf089008
--- /dev/null
+++ b/www-client/lynx/lynx-2.8.8_pre14.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2012 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_pre14.ebuild,v 1.1 2012/09/27 04:29:22 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? (
+			dev-libs/libgcrypt
+			>=net-libs/gnutls-2.6.4
+		)
+	)
+	bzip2? ( app-arch/bzip2 )
+	idn? ( net-dns/libidn )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+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 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
+	epatch "${FILESDIR}"/${P}-parallel.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
+			# ssl implementation = gnutls
+			myargs+=" --with-gnutls=${EPREFIX}/usr"
+		else
+			# ssl implementation = openssl
+			myargs+=" --with-ssl=${EPREFIX}/usr"
+		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_compile() {
+#	# see bug #403905
+#	emake -j1
+#}
+
+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/*
+}