added stable version

6 files changed, 117 insertions, 15 deletions

diff --git a/net-www/w3m-m17n/ChangeLog b/net-www/w3m-m17n/ChangeLog
index 5b93c4a04ac9..7fa3dcc7bb64 100644
--- a/net-www/w3m-m17n/ChangeLog
+++ b/net-www/w3m-m17n/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-www/w3m-m17n
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.1 2003/06/20 13:47:54 yakina Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.2 2003/08/12 16:38:05 usata Exp $
+
+*w3m-m17n-0.4.1.20030308 (13 Aug 2003)
+
+  13 Aug 2003; Mamoru KOMACHI <usata@gentoo.org>
+  w3m-m17n-0.4.1.20030308.ebuild, w3m-m17n-20030308.ebuild:
+  Added stable version.  Added ~ppc and ~sparc keywords to snapshot
+  and marked unstable on x86 and alpha back.  Corrected libungif
+  DEPEND.  Enabled SSL certification, see #23714
 
 *w3m-m17n-20030308 (20 Jun 2003)
 
diff --git a/net-www/w3m-m17n/Manifest b/net-www/w3m-m17n/Manifest
index 0d77d458fa95..3fa40ea15cdb 100644
--- a/net-www/w3m-m17n/Manifest
+++ b/net-www/w3m-m17n/Manifest
@@ -1,6 +1,6 @@
-MD5 36425ada9c8c5cecbce1f2409d1f6b27 ChangeLog 477
+MD5 a6b6171a0443599e54802d1c3fb64cde ChangeLog 808
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 3774dffe85a6e9cd945eadd8179d603d w3m-m17n-0.4.1.20030308.ebuild 2231
-MD5 128835c938896edf1ee4a6636d6cba22 w3m-m17n-20030308.ebuild 2233
+MD5 25a5de1a42450fcd7fe47924f83104eb w3m-m17n-0.4.1.20030308.ebuild 2231
+MD5 5469657b2023ed07f021b9d2b38fc62b w3m-m17n-20030308.ebuild 2244
 MD5 af84e354d29ae8659a9e25888b8461a3 files/digest-w3m-m17n-20030308 139
 MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308 146
diff --git a/net-www/w3m-m17n/files/digest-w3m-m17n-0.4.1.20030308 b/net-www/w3m-m17n/files/digest-w3m-m17n-0.4.1.20030308
new file mode 100644
index 000000000000..2ac99e2a0c32
--- /dev/null
+++ b/net-www/w3m-m17n/files/digest-w3m-m17n-0.4.1.20030308
@@ -0,0 +1,2 @@
+MD5 5a7f2b205d64d97688e2d83d6c91571f w3m-0.4.1-stable-m17n-20030308.tar.gz 2435812
+MD5 347a1964f872f018de030e01cf8a097e gc6.2alpha5.tar.gz 737493
diff --git a/net-www/w3m-m17n/files/digest-w3m-m17n-20030308 b/net-www/w3m-m17n/files/digest-w3m-m17n-20030308
index 2ac99e2a0c32..d71bcb2f93da 100644
--- a/net-www/w3m-m17n/files/digest-w3m-m17n-20030308
+++ b/net-www/w3m-m17n/files/digest-w3m-m17n-20030308
@@ -1,2 +1,2 @@
-MD5 5a7f2b205d64d97688e2d83d6c91571f w3m-0.4.1-stable-m17n-20030308.tar.gz 2435812
-MD5 347a1964f872f018de030e01cf8a097e gc6.2alpha5.tar.gz 737493
+MD5 4b14040c2370ebe482226dc2061b9f18 w3m-0.4.1-m17n-20030308.tar.gz 2436023
+MD5 b703cf7ddda01ec625761abc46c84f41 gc6.3alpha1.tar.gz 751592
diff --git a/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308.ebuild b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308.ebuild
new file mode 100644
index 000000000000..af27e88e7175
--- /dev/null
+++ b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308.ebuild
@@ -0,0 +1,87 @@
+# 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-m17n/w3m-m17n-0.4.1.20030308.ebuild,v 1.1 2003/08/12 16:38:05 usata Exp $
+
+IUSE="gpm imlib ssl"
+
+GC_PV="6.2alpha5"
+MY_P=w3m-${PV%.*}-stable-m17n-${PV##*.}
+
+DESCRIPTION="Multilingual text based WWW browser"
+SRC_URI="http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/${MY_P}.tar.gz
+	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc${GC_PV}.tar.gz"
+HOMEPAGE="http://www2u.biglobe.ne.jp/~hsaka/w3m/"
+
+SLOT="0"
+LICENSE="w3m"
+KEYWORDS="x86 alpha"
+
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	dev-lang/perl
+	imlib? ( >=media-libs/imlib-1.9.8
+		media-libs/compface
+		media-libs/libungif )
+	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
+	ssl? ( >=dev-libs/openssl-0.9.6b )"
+
+PROVIDE="virtual/textbrowser
+	virtual/w3m"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd ${S}
+
+	# the boehm-gc which comes with w3m cannot be compiled on alpha
+	rm -rf gc
+	unpack gc${GC_PV}.tar.gz
+	mv gc${GC_PV} gc
+}
+
+src_compile() {
+	local myuse
+	myuse="use_cookie=y use_ansi_color=y use_history=y \
+		use_unicode=y charset=UTF-8"
+
+	local myconf
+	myconf="-prefix=/usr -mandir=/usr/share/man -sysconfdir=/etc/w3m \
+		-suffix=-m17n -lang=en -model=custom -nonstop"
+
+	if [ -n "`use ssl`" ] ; then
+		myconf="${myconf} --ssl-includedir=/usr/include/openssl --ssl-libdir=/usr/lib"
+		myuse="${myuse} use_ssl=y use_ssl_verify=y use_digest_auth=y"
+	else
+		myuse="${myuse} use_ssl=no"
+	fi
+	
+	if [ -n "`use gpm`" ] ; then
+		myuse="${myuse} use_mouse=y"
+	else
+		myuse="${myuse} use_mouse=n"
+	fi
+
+	if [ -n "`use imlib`" ] ; 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} -cflags="${CFLAGS}" \
+		|| die "configure failed"
+
+	emake || die "make failed"
+}
+
+src_install() {
+	einstall DESTDIR=${D}
+
+	# w3mman and manpages conflict with those from w3m
+	mv ${D}/usr/bin/w3mman ${D}/usr/bin/w3mman-m17n
+	mv ${D}/usr/share/man/ja/man1/w3m{,-m17n}.1
+	mv ${D}/usr/share/man/man1/w3m{,-m17n}.1
+	mv ${D}/usr/share/man/man1/w3mman{,-m17n}.1
+
+	dodoc doc/* README*
+}
diff --git a/net-www/w3m-m17n/w3m-m17n-20030308.ebuild b/net-www/w3m-m17n/w3m-m17n-20030308.ebuild
index eaf79097b18b..b0b9e7181bd2 100644
--- a/net-www/w3m-m17n/w3m-m17n-20030308.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-20030308.ebuild
@@ -1,33 +1,38 @@
 # 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-m17n/w3m-m17n-20030308.ebuild,v 1.2 2003/06/20 18:27:04 yakina Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-20030308.ebuild,v 1.3 2003/08/12 16:38:05 usata Exp $
 
 IUSE="gpm imlib ssl"
 
 W3M_PV="0.4.1"
-GC_PV="6.2alpha5"
+GC_PV="6.3alpha1"
+MY_P=w3m-${W3M_PV}-m17n-${PV}
+
 DESCRIPTION="Multilingual text based WWW browser"
-SRC_URI="http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/w3m-${W3M_PV}-stable-m17n-${PV}.tar.gz
+SRC_URI="http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/${MY_P}.tar.gz
 	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc${GC_PV}.tar.gz"
 HOMEPAGE="http://www2u.biglobe.ne.jp/~hsaka/w3m/"
 
 SLOT="0"
 LICENSE="w3m"
-KEYWORDS="x86 alpha"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
 
 DEPEND=">=sys-libs/ncurses-5.2-r3
 	>=sys-libs/zlib-1.1.3-r2
 	dev-lang/perl
-	imlib? ( >=media-libs/imlib-1.9.8 media-libs/compface )
+	imlib? ( >=media-libs/imlib-1.9.8
+		media-libs/compface
+		media-libs/libungif )
 	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
 
-PROVIDE="virtual/textbrowser"
+PROVIDE="virtual/textbrowser
+	virtual/w3m"
 
-S="${WORKDIR}/w3m-${W3M_PV}-stable-m17n-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
-	unpack ${A}
+	unpack ${MY_P}.tar.gz
 	cd ${S}
 
 	# the boehm-gc which comes with w3m cannot be compiled on alpha
@@ -47,7 +52,7 @@ src_compile() {
 
 	if [ -n "`use ssl`" ] ; 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"
+		myuse="${myuse} use_ssl=y use_ssl_verify=y use_digest_auth=y"
 	else
 		myuse="${myuse} use_ssl=no"
 	fi