Fix up toplevel makefile for parallel builds (bug #262972).

  Give local descriptions for both openssl and gnutls flags.
  Clean out older rc.
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 25 insertions, 114 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index a36e063395d1..85d97a7597c1 100644
--- a/www-client/lynx/ChangeLog
+++ b/www-client/lynx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/lynx
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.79 2009/07/26 05:55:24 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.80 2009/07/26 22:55:46 wormo Exp $
+
+  26 Jul 2009; Stephanie Lockwood-Childs <wormo@gentoo.org> metadata.xml,
+  -lynx-2.8.7_rc4.ebuild, lynx-2.8.7_rc6.ebuild:
+  Fix up toplevel makefile for parallel builds (bug #262972).
+  Give local descriptions for both openssl and gnutls flags.
+  Clean out older rc.
 
   26 Jul 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
   +files/lynx-2.8.6-CVE-2008-4690.patch, lynx-2.8.6-r2.ebuild:
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index b5fae7b67e5f..7479aced3e2c 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,9 +1,7 @@
 AUX lynx-2.8.6-CVE-2008-4690.patch 1598 RMD160 f54f9a8ddf113e1d57eefbc4a624a4b2b0bca8a9 SHA1 3c6784afa7df360927126e9d49c310c62eb0341e SHA256 c65a04c603611c5e3f02ee2aa5f3a5a27a073cb3632063a50c22602b05d7996a
 DIST lynx2.8.6rel.4.tar.bz2 2291156 RMD160 47e48e4136df298bf5168bc8d2d49e1ac92a6820 SHA1 b4e37025e99aabaddb219b2f27b1b0ac5db89708 SHA256 c7d876d52d08e4e593e8f3a04ba6d6c86685570828d1b7a16723702c7643c2a3
-DIST lynx2.8.7pre.4.tar.bz2 2428159 RMD160 625f609dd0a8e8c21ee0327beb984892fdc9cafc SHA1 e3fceb50fad7b00e6887350814b0313497b04c5c SHA256 c4a9a16e5fbc6d4896cec0c832c3730e7a535f4cc9c08aefb345cee5599c5832
 DIST lynx2.8.7pre.6.tar.bz2 2432061 RMD160 3e2b3046665c9618e9f712c60b0c5beabb4b770f SHA1 4cbc840e3d850baf83f4389b083edb67e0e8f051 SHA256 3dbe054290b7cd6dd0d4ccdcccfc270d22da3f9c38366e3e15f65a34d7d80a4a
 EBUILD lynx-2.8.6-r2.ebuild 2240 RMD160 3c1b5736a5c47413027213efb9ff7282fa3a5a22 SHA1 e38601c7633413ef2abccd70d59f4eddffd03fa2 SHA256 510e6dc68e5ce9e6b3790de0e72d8efeea219033eb52633d09d9b80b307816b7
-EBUILD lynx-2.8.7_rc4.ebuild 2544 RMD160 c6be673be3f908adc473070c66050f188058847d SHA1 f87fd2848858f68d4c846d8c8cb59840f4ee3395 SHA256 03cf36f733604497b0e3cdc9380d17234ffc1958493a228e32768e3d0eaee5dd
-EBUILD lynx-2.8.7_rc6.ebuild 2543 RMD160 b857daf26699825a7dd0041b4e904deaec34410b SHA1 b631681782ad9cdf48f20022c30fd03d8a89cf19 SHA256 1f81ef1b2594983df0eab0e3d540365e1c2350687b7bbf1f07308dbe6e931303
-MISC ChangeLog 15922 RMD160 eaadc9f54c7832f0eb8e1589b825d822a53f38cf SHA1 16fafd2d514f56d6e4fd8fd7d269236be99ba55c SHA256 e0bc320946333331bc18c77e47a8783d33aa5208de30efdabf127880584e5f7b
-MISC metadata.xml 297 RMD160 7b51665ff33d089acb47620f939c2d99ae33e3aa SHA1 0e73f56752985f703fd72edc0d242c2d530c94cb SHA256 de0d87c33df1475cf0077a08ac329e0267d0986a35160f0176056b6b49e0896d
+EBUILD lynx-2.8.7_rc6.ebuild 2860 RMD160 66ab2d16b6910641c0445a0ae7b446c9496d3f50 SHA1 02c42964f3e0ebe0f3741ee31ef414d9870f153e SHA256 99dd8b295991cda1f5da118051cae71f327deaaeef295da688eeee937514cb9f
+MISC ChangeLog 16191 RMD160 1270bf54bc1341b63f3435d2e491dd11ca8a1035 SHA1 3c70ab0718ff638b8a821735a143b87f080aa2ef SHA256 6bd47d88adafaead7c9240b2a41e2b10aeabc71bd22f03f0aadeb69ce768d08a
+MISC metadata.xml 374 RMD160 46a17de18db8e11219b1bde3c79a74acf3a0a1c5 SHA1 d894914c367f1016a89452db243c2d32b405e1be SHA256 a3915729fd0d23d62528624f976591e116229dbd2487768d4d23b976716d585f
diff --git a/www-client/lynx/lynx-2.8.7_rc4.ebuild b/www-client/lynx/lynx-2.8.7_rc4.ebuild
deleted file mode 100644
index b73738092db3..000000000000
--- a/www-client/lynx/lynx-2.8.7_rc4.ebuild
+++ /dev/null
@@ -1,106 +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.7_rc4.ebuild,v 1.1 2009/05/26 06:02:41 loki_val Exp $
-
-EAPI=2
-
-inherit eutils versionator
-
-# VERSIONING SCHEME TRANSLATION
-# Upstream	:	Gentoo
-# rel.		:	_p
-# pre.		:	_rc
-# dev.		:	_pre
-
-if [[ "${PV/_p[0-9]}" != "${PV}" ]]
-then
-	MY_P="${PN}${PV/_p/rel.}"
-
-elif [[ "${PV/_rc[0-9]}" != "${PV}" ]]
-then
-	MY_P="${PN}${PV/_rc/pre.}"
-
-elif [[ "${PV/_pre[0-9]}" != "${PV}" ]]
-then
-	MY_P="${PN}${PV/_pre/dev.}"
-
-fi
-
-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 ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="bzip2 cjk gnutls ipv6 nls openssl unicode"
-
-RDEPEND="sys-libs/ncurses[unicode?]
-	sys-libs/zlib
-	nls? ( virtual/libintl )
-	openssl? ( >=dev-libs/openssl-0.9.8 )
-	!openssl? (
-		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 openssl
-	then
-		if use gnutls
-		then
-			elog "Both openssl and gnutls use-flags specified. Openssl will be used."
-		fi
-	else
-		if ! use gnutls
-		then
-			elog "No SSL library selected, you will not be able to access secure websites."
-		fi
-	fi
-}
-
-src_configure() {
-	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 openssl ssl) \
-		$(use_with gnutls) \
-		$(use_with bzip2 bzlib) \
-		$(use unicode && printf '%s' '--with-screen=ncursesw')
-}
-
-src_install() {
-	make 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 "lynx.cfg not found"
-	if use unicode
-	then
-		sed -i -e '/^#CHARACTER_SET:/ c\CHARACTER_SET:utf-8' \
-				"${D}"/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/lynx-2.8.7_rc6.ebuild b/www-client/lynx/lynx-2.8.7_rc6.ebuild
index ff5cafb4dee7..d1e1a3ca4d51 100644
--- a/www-client/lynx/lynx-2.8.7_rc6.ebuild
+++ b/www-client/lynx/lynx-2.8.7_rc6.ebuild
@@ -1,6 +1,6 @@
 # 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.7_rc6.ebuild,v 1.1 2009/06/28 17:20:41 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.7_rc6.ebuild,v 1.2 2009/07/26 22:55:46 wormo Exp $
 
 EAPI=2
 
@@ -65,6 +65,18 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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"
+}
+
 src_configure() {
 	econf \
 		--enable-cgi-links \
diff --git a/www-client/lynx/metadata.xml b/www-client/lynx/metadata.xml
index ea8e2aaac33a..a12aecfd5cb6 100644
--- a/www-client/lynx/metadata.xml
+++ b/www-client/lynx/metadata.xml
@@ -6,6 +6,7 @@
 		<email>wormo@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='openssl'>Use openssl for SSL support.</flag>
+		<flag name='openssl'>Use openssl library for HTTPS support.</flag>
+		<flag name='gnutls'>Use gnutls library for HTTPS support.</flag>
 	</use>
 </pkgmetadata>