Bugfix to use SSL when requested

4 files changed, 96 insertions, 3 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index f824f31850a1..af91dd6507e4 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.23 2003/05/07 13:03:37 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.24 2003/05/12 08:23:03 phosphan Exp $
+
+*w3m-0.4.1-r1 (12 May 2003)
+
+  12 May 2003; Patrick Kursawe <phosphan@gentoo.org> w3m-0.4.1-r1.ebuild:
+  Fix to actually use SSL if in USE, provided in bug 20636 by Mamoru KOMACHI
+  <usata@sodan.ecc.u-tokyo.ac.jp>
 
 *w3m-0.4.1 (07 May 2003)
 
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index c18499569207..c6e86884fd49 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,12 +1,12 @@
 MD5 6064a4a10ff77029d4c490151e1bfe0e w3m-0.4.1.ebuild 2147
 MD5 66a4ea15846539603899abfe5b51fa45 w3m-0.3-r2.ebuild 3515
-MD5 7ce124330c4d6a4fab6304d301c01cdf w3m-0.4.1-r1.ebuild 2144
+MD5 9bd924fcb561a5eda3de8912b026d53f w3m-0.4.1-r1.ebuild 2147
 MD5 9ca609c558bf95cbbd769b314c50a9f0 w3m-0.3.2.2.ebuild 3747
 MD5 a85fdacc6ccf12a40c63b76f46ab98e7 w3m-0.4.ebuild 4454
 MD5 e91abafb626e658ddead4da60c447213 w3m-0.2.2-r1.ebuild 2997
 MD5 4c00a62192cd6ff57204232f94c36d1d w3m-0.3-r6.ebuild 3652
 MD5 e1c8eb026fee51aaded3ee5bd6b4f051 w3m-0.3.2.1.ebuild 3749
-MD5 199cf32c0cb81fdc261d96c5d41a16a9 ChangeLog 4339
+MD5 bd39f3222e70762e52f889be9571d6ad ChangeLog 4554
 MD5 7d3cca8a96c2485f12ee3c65fb4b3195 files/digest-w3m-0.2.2-r1 62
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r1 62
 MD5 ea9ffc3e59251a86366bc9f0899df712 files/digest-w3m-0.3-r2 60
diff --git a/net-www/w3m/files/digest-w3m-0.4.1-r1 b/net-www/w3m/files/digest-w3m-0.4.1-r1
new file mode 100644
index 000000000000..61a1d9de1887
--- /dev/null
+++ b/net-www/w3m/files/digest-w3m-0.4.1-r1
@@ -0,0 +1 @@
+MD5 b496ec119dc9734059035e70988dd470 w3m-0.4.1.tar.gz 1250762
diff --git a/net-www/w3m/w3m-0.4.1-r1.ebuild b/net-www/w3m/w3m-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..326fcc4611f0
--- /dev/null
+++ b/net-www/w3m/w3m-0.4.1-r1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.1-r1.ebuild,v 1.1 2003/05/12 08:23:03 phosphan Exp $
+
+inherit eutils
+
+IUSE="gpm cjk imlib ssl"
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
+HOMEPAGE="http://w3m.sourceforge.net/"
+
+SLOT="0"
+LICENSE="w3m"
+KEYWORDS="~x86"
+
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	imlib? ( >=media-libs/imlib-1.9.8 media-libs/compface )
+	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+
+PROVIDE="virtual/textbrowser"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use alpha; then
+		epatch ${FILESDIR}/w3m-0.4-alpha.patch || die "epatch failed"
+	fi
+}
+
+src_compile() {
+	local myuse
+	myuse="use_cookie=y use_ansi_color=y"
+
+	local myconf
+	myconf="-prefix=/usr -mandir=/usr/share/man -sysconfdir=/etc/w3m \
+		--gc-includedir=/usr/include/gc --gc-libdir=/usr/lib \
+		-cflags=${CFLAGS} -model=custom -nonstop"
+
+	if use cjk &>/dev/null; then
+		myconf="${myconf} -lang=ja -code=E"
+	else
+		myconf="${myconf} -lang=en"
+	fi
+
+	if use ssl &>/dev/null; then
+		myconf="${myconf} --ssl-includedir=/usr/include/openssl --ssl-libdir=/usr/lib"
+		myuse="${myuse} use_ssl=y use_ssl_verify=n use_digest_auth=y"
+	else
+		myuse="${myuse} use_ssl=n"
+	fi
+	
+	if use gpm &>/dev/null; then
+		myuse="${myuse} use_mouse=y"
+	else
+		myuse="${myuse} use_mouse=n"
+	fi
+
+	if use imlib &>/dev/null; then
+		myuse="${myuse} use_image=y use_w3mimg_x11=y use_w3mimg_fb=y w3mimgdisplay_setuid=n use_xface=y"
+	else
+		myuse="${myuse} use_image=n"
+	fi
+
+	env ${myuse} ./configure ${myconf} || die "configure failed"
+
+	# Test to make sure the above configuration was sane
+	grep -q "dcc='gcc'" config.param || \
+		die "configure out of sync; ebuild needs an update"
+
+	# binary executables come prebuilt for 80386! 
+	# clean it up and be sure to remake for ANY arch
+	cd ${S}/gc
+	make clean
+	cd -
+	
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+	dodoc doc/* README*
+	doman doc/w3m.1
+}