Patch lynx configure script to prevent build failure when openssl

  is compiled with USE=kerberos (bug #267749, thanks to Guy for testing)
Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

5 files changed, 47 insertions, 121 deletions

diff --git a/www-client/lynx/ChangeLog b/www-client/lynx/ChangeLog
index ecfb784d0655..8837f35be7b2 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.89 2009/08/02 15:13:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/ChangeLog,v 1.90 2009/08/13 06:40:44 wormo Exp $
+
+  13 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
+  +files/lynx-2.8.7-configure-openssl.patch, -lynx-2.8.7_rc6.ebuild,
+  lynx-2.8.7_p1.ebuild:
+  Patch lynx configure script to prevent build failure when openssl
+  is compiled with USE=kerberos (bug #267749, thanks to Guy for testing)
 
   02 Aug 2009; Brent Baude <ranger@gentoo.org> lynx-2.8.6-r4.ebuild:
   Marking lynx-2.8.6-r4 ppc64 for bug 243058
diff --git a/www-client/lynx/Manifest b/www-client/lynx/Manifest
index 2ad34bb8af25..4f17003e5b5c 100644
--- a/www-client/lynx/Manifest
+++ b/www-client/lynx/Manifest
@@ -1,10 +1,9 @@
 AUX lynx-2.8.6-CVE-2008-4690.patch 1598 RMD160 f54f9a8ddf113e1d57eefbc4a624a4b2b0bca8a9 SHA1 3c6784afa7df360927126e9d49c310c62eb0341e SHA256 c65a04c603611c5e3f02ee2aa5f3a5a27a073cb3632063a50c22602b05d7996a
+AUX lynx-2.8.7-configure-openssl.patch 1222 RMD160 39f979bfad18b63322c91b2dd2762ad9674efd83 SHA1 50a987b46ec1139cf3ee73151b56a41bda04e74c SHA256 1b7e679307a05e92646b9b6ee96f69ddbc5b60d72ad8bd7e3661c07d46abea15
 DIST lynx2.8.6rel.4.tar.bz2 2291156 RMD160 47e48e4136df298bf5168bc8d2d49e1ac92a6820 SHA1 b4e37025e99aabaddb219b2f27b1b0ac5db89708 SHA256 c7d876d52d08e4e593e8f3a04ba6d6c86685570828d1b7a16723702c7643c2a3
-DIST lynx2.8.7pre.6.tar.bz2 2432061 RMD160 3e2b3046665c9618e9f712c60b0c5beabb4b770f SHA1 4cbc840e3d850baf83f4389b083edb67e0e8f051 SHA256 3dbe054290b7cd6dd0d4ccdcccfc270d22da3f9c38366e3e15f65a34d7d80a4a
 DIST lynx2.8.7rel.1.tar.bz2 2432045 RMD160 0969f85b6776c5e426cea4b910271356f9193bf1 SHA1 f5e67a298322b22fe0edcfba326c02eaa5edcb72 SHA256 40ec9774deb4a7acf69e1bcfb5e272a3857ccc17e20d923255d64cb5dbe55dad
 EBUILD lynx-2.8.6-r2.ebuild 2151 RMD160 19de76e04bede84a94aabc841430e13d7cee1c3b SHA1 2d4f595bf6e493406b824e52038d9e7baacdec15 SHA256 ceebc1f28c4d2a1057a2deca3819aae89db0aeb1bc7f61bd121eacf82b58d844
 EBUILD lynx-2.8.6-r4.ebuild 2241 RMD160 a7d0b18ecb42e5e9f8fd2b5f114e66d9a88c7ed8 SHA1 a3e1adfef7976492cd3aeceee6d46e2388d2e84d SHA256 b5e260b022a41c8932a736db3fcf82b6df44504dfd40455c907ee146eb070a88
-EBUILD lynx-2.8.7_p1.ebuild 2835 RMD160 ada92ce97db8c8a28f64ee7578dac2b2f373ed24 SHA1 1404b47eedd67097e58aa3358c3b215b79a39461 SHA256 b8b4bdab239cfe32c77058adc6e971bcecdfa95559557fb2b2cb478f6858734a
-EBUILD lynx-2.8.7_rc6.ebuild 2836 RMD160 5e9928ad378f03acb8ed4d066f9e067ff771f41e SHA1 35dcde13d540ee0956ffb8400e5288a20caac52c SHA256 0019441cfe5bcea5c9c896483d3a5750204dcbcb169e785cc0ac52473b786a75
-MISC ChangeLog 17256 RMD160 a255c09af5ad04ebc44d27b294a0fad8a8d2b587 SHA1 cf7dedc5dd28633c1e4b64830f0d9cbac97edc38 SHA256 7dc0d36bf1948b79b3bf7d9fa7fbb71bb2c91fe8faefad4d689d01f883d76c7b
+EBUILD lynx-2.8.7_p1.ebuild 2959 RMD160 fe2fa0ae44c1999c2a954ea8ea07451950eeae12 SHA1 56a9e0282316191b647adb90c6ae1ec3fb111a10 SHA256 70f4ab923649f07eedb0b16d49ca0c78594b3ad43c0534aace76ba64503a41c1
+MISC ChangeLog 17550 RMD160 1b1e60762656b79dee4301923431f77ebff6eead SHA1 be79e753a40f31c5e492b761292f4b6b0423d5b2 SHA256 9a9200ed4ca420e8579d90e6645e3dc600d1badb53a437f91c507d909b8213a8
 MISC metadata.xml 374 RMD160 46a17de18db8e11219b1bde3c79a74acf3a0a1c5 SHA1 d894914c367f1016a89452db243c2d32b405e1be SHA256 a3915729fd0d23d62528624f976591e116229dbd2487768d4d23b976716d585f
diff --git a/www-client/lynx/files/lynx-2.8.7-configure-openssl.patch b/www-client/lynx/files/lynx-2.8.7-configure-openssl.patch
new file mode 100644
index 000000000000..55bbb695bfd6
--- /dev/null
+++ b/www-client/lynx/files/lynx-2.8.7-configure-openssl.patch
@@ -0,0 +1,33 @@
+--- configure.old	2009-07-31 00:12:26.000000000 -0700
++++ configure	2009-07-31 00:10:05.000000000 -0700
+@@ -11763,16 +11763,23 @@
+ 				if test -n "$cf_cflags_ssl" ; then
+ 					case "$cf_cflags_ssl" in #(vi
+ 					*-I*) #(vi
+-						cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/^.*-I//' -e 's/ .*//'`
+-						;;
+-					*)
+-						cf_cv_header_path_ssl=/usr/include
++						# if openssl pkg-config lists more than one includedir,
++						# primary one will be first 
++						# (e.g. kerberos includedir may follow)
++						# so, pick out path following first '-I'
++						cf_cv_header_path_ssl=`echo "$cf_cflags_ssl" | sed -e 's/\(-I[^ ]*\).*/\1/' -e 's/.*-I//'`
++						cf_cv_header_path_ssl=$cf_cv_header_path_ssl/openssl
+ 						;;
+ 					esac
+-					if test -d $cf_cv_header_path_ssl/openssl ; then
+-						cf_cv_header_path_ssl=$cf_cv_header_path_ssl/openssl
++					# try standard location if couldn't
++					# figure out path using pkg-config
++					if ! test -d "$cf_cv_header_path_ssl" ; then
++						if test -d "/usr/include/openssl" ; then
++							cf_cv_header_path_ssl=/usr/include/openssl
++						else
++							cf_cv_header_path_ssl=/usr/include
++						fi
+ 					fi
+-
+ cf_fix_cppflags=no
+ cf_new_cflags=
+ cf_new_cppflags=
diff --git a/www-client/lynx/lynx-2.8.7_p1.ebuild b/www-client/lynx/lynx-2.8.7_p1.ebuild
index 3b154df1831d..cb75610fbb50 100644
--- a/www-client/lynx/lynx-2.8.7_p1.ebuild
+++ b/www-client/lynx/lynx-2.8.7_p1.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_p1.ebuild,v 1.1 2009/07/26 23:07:42 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/lynx/lynx-2.8.7_p1.ebuild,v 1.2 2009/08/13 06:40:44 wormo Exp $
 
 EAPI=2
 
@@ -72,6 +72,9 @@ src_prepare() {
 	# 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"
 }
 
 src_configure() {
diff --git a/www-client/lynx/lynx-2.8.7_rc6.ebuild b/www-client/lynx/lynx-2.8.7_rc6.ebuild
deleted file mode 100644
index 690d79550122..000000000000
--- a/www-client/lynx/lynx-2.8.7_rc6.ebuild
+++ /dev/null
@@ -1,115 +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_rc6.ebuild,v 1.3 2009/07/26 23:07:42 wormo 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_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"
-}
-
-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/*
-}