Updated async and nls patch.

5 files changed, 32 insertions, 25 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index c9b1db577722..5b8ce869f7bd 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.49 2004/03/21 19:21:18 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.50 2004/03/24 18:28:42 usata Exp $
+
+*w3m-0.5-r1 (25 Mar 2004)
+
+  25 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5-r1.ebuild:
+  Updated async and nls patch.
 
 *w3m-0.5 (22 Mar 2004)
 
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index ce9bb56ea524..c85622563636 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,11 +1,10 @@
+MD5 d38b2a681152d86804262e685e6d06d0 w3m-0.5-r1.ebuild 4332
 MD5 5a4fb2341659f69f82de81dc12da6e4d w3m-0.3.2.2.ebuild 3731
-MD5 bba18a825aba1531bd93647caf21aff3 w3m-0.4.2-r9.ebuild 4410
 MD5 f2510368a335349b461ae99885c0665d w3m-0.5.ebuild 4041
-MD5 04dfe663c639d48d171260309e63d2c3 ChangeLog 9587
+MD5 31fb56415f34fc0a8999d2ef89bc7586 ChangeLog 9714
 MD5 8e10c8fb50097c894200b100a02601eb w3m-0.4.2.ebuild 1945
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
 MD5 6d3f53a7bb3e6e26f72fb257cad0541e files/digest-w3m-0.5 200
-MD5 7eaf4e81f63a7050a49996bf510d87be files/digest-w3m-0.4.2-r9 276
 MD5 838d56c55726f00c34b0c8649e948e3c files/w3m-0.4.2-form.diff 429
 MD5 5b34b82be16b1b02dd603acbfd11d9db files/w3m-libwc-gentoo.diff 437
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
@@ -14,3 +13,4 @@ MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
 MD5 4deea28e3a4e09f22019b01b52273ab3 files/w3m-m17n-search-gentoo.diff 446
 MD5 ca82b0ff2fa196fadebdc71b825b4ccf files/w3m-0.4.2-async-m17n-gentoo.diff 1539
+MD5 79f9d642d00eb4b8c0aaf7483fc9e6e7 files/digest-w3m-0.5-r1 279
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r9 b/net-www/w3m/files/digest-w3m-0.4.2-r9
deleted file mode 100644
index 2b2d4cf7adbb..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.2-r9
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 7246ebdcb27645a8a95beb64902068dd w3m-cvs-1.890.tar.gz 1888635
-MD5 a6249d537160e169de2648e68a059236 w3m-cvs-1.890-1.896.diff.gz 2860
-MD5 a7160717037be0c2cd204614cf9c20b9 w3m-cvs-1.890-async-5.diff.gz 79246
-MD5 c3d412a682f5fdf3a42c229834a5c7fe w3m-cvs-1.890-nls-4.diff 4172
diff --git a/net-www/w3m/files/digest-w3m-0.5-r1 b/net-www/w3m/files/digest-w3m-0.5-r1
new file mode 100644
index 000000000000..a03525e23f98
--- /dev/null
+++ b/net-www/w3m/files/digest-w3m-0.5-r1
@@ -0,0 +1,4 @@
+MD5 31e470bcb09bad3150d73af760febe0c w3m-0.5.tar.gz 1889076
+MD5 31e137778606614afe20e94eaea162ce w3m-cvs-1.912-async-1.diff.gz 76557
+MD5 3c2de3de935ce70559fd3feda8311530 w3m-cvs-1.912-bkmknls-1.diff 16693
+MD5 83c4903221284ec5f92f19a285b2d86e w3m-cvs-1.912-nlscharset-1.diff 4027
diff --git a/net-www/w3m/w3m-0.4.2-r9.ebuild b/net-www/w3m/w3m-0.5-r1.ebuild
index da6b69ac172a..2337ec501d75 100644
--- a/net-www/w3m/w3m-0.4.2-r9.ebuild
+++ b/net-www/w3m/w3m-0.5-r1.ebuild
@@ -1,26 +1,28 @@
 # Copyright 1999-2004 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.2-r9.ebuild,v 1.1 2004/02/17 13:40:58 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.5-r1.ebuild,v 1.1 2004/03/24 18:28:42 usata Exp $
 
-W3M_CVS_PV="1.890"
+inherit eutils
+
+W3M_CVS_PV="1.912"
 W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
 
 DESCRIPTION="Text based WWW browser, supports tables and frames"
-HOMEPAGE="http://w3m.sourceforge.net/"
+HOMEPAGE="http://w3m.sourceforge.net/
+	http://www.page.sannet.ne.jp/knabe/w3m/"
 PATCH_PATH="http://www.page.sannet.ne.jp/knabe/w3m/"
-SRC_URI="mirror://gentoo/${W3M_CVS_P}.tar.gz
-	http://dev.gentoo.org/~usata/distfiles/${W3M_CVS_P}.tar.gz
-	http://dev.gentoo.org/~usata/distfiles/${W3M_CVS_P}-1.896.diff.gz
-	async? ( ${PATCH_PATH}/${W3M_CVS_P}-async-5.diff.gz )
-	${PATCH_PATH}/${W3M_CVS_P}-nls-4.diff"
+SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
+	async? ( ${PATCH_PATH}/${W3M_CVS_P}-async-1.diff.gz )
+	nls? ( ${PATCH_PATH}/${W3M_CVS_P}-nlscharset-1.diff )"
 # w3m color patch:
 #	http://homepage3.nifty.com/slokar/w3m/${P}-cvs-1.895_256-001.patch.gz
 # w3n canna inline patch:
 #	canna? ( http://www.j10n.org/files/${W3M_CVS_P}-canna.patch )
+# w3m bookmark charset patch:
+#	nls? ( ${PATCH_PATH}/${W3M_CVS_P}-bkmknls-1.diff )
 
 LICENSE="w3m"
 SLOT="0"
-# since it is a CVS snapshot, we better not change keywords to stable
 KEYWORDS="~x86 ~alpha ~ppc ~sparc"
 IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk nls async"
 #IUSE="canna unicode"
@@ -45,7 +47,7 @@ PROVIDE="virtual/textbrowser
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.58"
 
-S=${WORKDIR}/${PN}
+S=${WORKDIR}/${P}
 
 pkg_setup() {
 	if [ -n "`use X`" -a -n "`use nopixbuf`" -a -z "`use imlib2`" -a -z "`use imlib`" ] ; then
@@ -58,18 +60,18 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${W3M_CVS_P}.tar.gz
+	unpack ${P}.tar.gz
 	cd ${S}
-	epatch ${DISTDIR}/${W3M_CVS_P}-1.896.diff.gz
-	epatch ${FILESDIR}/${P}-form.diff
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
 	epatch ${FILESDIR}/${PN}-m17n-search-gentoo.diff
 	epatch ${FILESDIR}/${PN}-libwc-gentoo.diff
-	epatch ${DISTDIR}/${W3M_CVS_P}-nls-4.diff
-	#epatch ${DISTDIR}/${W3M_CVS_P}-ja.po.diff
+	if [ -n "`use nls`" ] ; then
+		#epatch ${DISTDIR}/${W3M_CVS_P}-bkmknls-1.diff
+		epatch ${DISTDIR}/${W3M_CVS_P}-nlscharset-1.diff
+	fi
 	if [ -n "`use async`" ] ; then
-		epatch ${DISTDIR}/${W3M_CVS_P}-async-5.diff.gz
-		epatch ${FILESDIR}/${P}-async-m17n-gentoo.diff
+		epatch ${DISTDIR}/${W3M_CVS_P}-async-1.diff.gz
+		epatch ${FILESDIR}/${PN}-0.4.2-async-m17n-gentoo.diff
 	fi
 	#epatch ${DISTDIR}/${P}-cvs-1.895_256-001.patch.gz
 	#use canna && epatch ${DISTDIR}/${W3M_CVS_P}-canna.patch