Enables migemo support if app-emacs/migemo is installed

5 files changed, 56 insertions, 22 deletions

diff --git a/net-www/w3m-m17n/ChangeLog b/net-www/w3m-m17n/ChangeLog
index 9136152b084d..c41193fb94f8 100644
--- a/net-www/w3m-m17n/ChangeLog
+++ b/net-www/w3m-m17n/ChangeLog
@@ -1,9 +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.6 2003/09/20 17:51:14 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/ChangeLog,v 1.7 2003/09/25 08:58:57 usata Exp $
 
 *w3m-m17n-20030916 (21 Sep 2003)
 
+  25 Sep 2003; Mamoru KOMACHI <usata@gentoo.org>
+  w3m-m17n-0.4.1.20030308-r2.ebuild, w3m-m17n-20030916.ebuild,
+  files/w3m-w3mman-gentoo.diff:
+  Enables migemo support if app-emacs/migemo is installed.
+
   21 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-m17n-20030916.ebuild:
   Version bumped to the latest CVS snapshot. Rewrote econf part. Added
   gtk, xface and ipv6 IUSE flag. Now DEPENDs on dev-libs/boehm-gc.
diff --git a/net-www/w3m-m17n/Manifest b/net-www/w3m-m17n/Manifest
index 63deca37ba8a..a53ab3e9be94 100644
--- a/net-www/w3m-m17n/Manifest
+++ b/net-www/w3m-m17n/Manifest
@@ -1,12 +1,12 @@
-MD5 eeafa3ea5abe30e93a7a3c658326dd67 ChangeLog 1633
+MD5 b3ab8b6dbfca5a934fc0874049e1832c ChangeLog 1837
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 a8294317c97e58397044414b0175117b w3m-m17n-20030916.ebuild 3063
+MD5 e98ed662d20aff454ace121087ce6801 w3m-m17n-20030916.ebuild 3015
 MD5 01f54e4d61e2a9e4832cdc4b7612b6cd w3m-m17n-0.4.1.20030308.ebuild 2233
 MD5 f009aa4395e47aa9e4d90a9a8a7d544e w3m-m17n-20030308.ebuild 2246
 MD5 0c6edb2ab326fee131964fb38787e3fa w3m-m17n-20030308-r1.ebuild 2526
 MD5 65fba3e5d3732c492a075f4002353935 w3m-m17n-0.4.1.20030308-r1.ebuild 2525
 MD5 7a54c12151342ad1c49df7127b09a438 w3m-m17n-20030308-r2.ebuild 2553
-MD5 bd0374e5ac7083123ac43229042a5bc9 w3m-m17n-0.4.1.20030308-r2.ebuild 2552
+MD5 c2bb2e68c5a3b9e3e753aa39e9b1070c w3m-m17n-0.4.1.20030308-r2.ebuild 2715
 MD5 af84e354d29ae8659a9e25888b8461a3 files/digest-w3m-m17n-20030308 139
 MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308 146
 MD5 af84e354d29ae8659a9e25888b8461a3 files/digest-w3m-m17n-20030308-r1 139
@@ -14,3 +14,4 @@ MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308-r1 146
 MD5 af84e354d29ae8659a9e25888b8461a3 files/digest-w3m-m17n-20030308-r2 139
 MD5 1be9f4e35558ba722185319b64c707d8 files/digest-w3m-m17n-0.4.1.20030308-r2 146
 MD5 2df1dde324e4c58fe00c490180c587af files/digest-w3m-m17n-20030916 204
+MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
diff --git a/net-www/w3m-m17n/files/w3m-w3mman-gentoo.diff b/net-www/w3m-m17n/files/w3m-w3mman-gentoo.diff
new file mode 100644
index 000000000000..be0f16e560fa
--- /dev/null
+++ b/net-www/w3m-m17n/files/w3m-w3mman-gentoo.diff
@@ -0,0 +1,23 @@
+diff -urN w3m-0.4.2.ORIG/scripts/w3mman/w3mman.in w3m-0.4.2/scripts/w3mman/w3mman.in
+--- w3m-0.4.2.ORIG/scripts/w3mman/w3mman.in	2003-09-25 00:58:27.000000000 +0900
++++ w3m-0.4.2/scripts/w3mman/w3mman.in	2003-09-25 03:12:38.000000000 +0900
+@@ -1,7 +1,7 @@
+ #!@PERL@
+ 
+ @W3M = split(' ', $ENV{'W3MMAN_W3M'} || '@W3M@');
+-$ENV{'W3MMAN_MAN'} ||= '@MAN@';
++$ENV{'W3MMAN_MAN'} ||= 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $SCRIPT = 'file:///$LIB/w3mman2html.cgi';
+ 
+ sub usage {
+diff -urN w3m-0.4.2.ORIG/scripts/w3mman/w3mman2html.cgi.in w3m-0.4.2/scripts/w3mman/w3mman2html.cgi.in
+--- w3m-0.4.2.ORIG/scripts/w3mman/w3mman2html.cgi.in	2003-09-25 00:58:27.000000000 +0900
++++ w3m-0.4.2/scripts/w3mman/w3mman2html.cgi.in	2003-09-25 03:12:38.000000000 +0900
+@@ -1,6 +1,6 @@
+ #!@PERL@
+ 
+-$MAN = $ENV{'W3MMAN_MAN'} || '@MAN@';
++$MAN = $ENV{'W3MMAN_MAN'} || 'env LC_MESSAGES=${LC_MESSAGES:-${LC_ALL:-${LANG}}} LANG=C @MAN@';
+ $QUERY = $ENV{'QUERY_STRING'} || $ARGV[0];
+ $SCRIPT_NAME = $ENV{'SCRIPT_NAME'} || $0;
+ $CGI = "file://$SCRIPT_NAME";
diff --git a/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild
index 6f86a49d4847..ef17bf55e150 100644
--- a/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-0.4.1.20030308-r2.ebuild,v 1.3 2003/09/25 08:58:57 usata Exp $
 
 IUSE="gpm imlib ssl"
 
@@ -34,6 +34,8 @@ src_unpack() {
 	unpack ${MY_P}.tar.gz
 	cd ${S}
 
+	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
+
 	# the boehm-gc which comes with w3m cannot be compiled on alpha
 	rm -rf gc
 	unpack gc${GC_PV}.tar.gz
@@ -68,10 +70,17 @@ src_compile() {
 		myuse="${myuse} use_image=n"
 	fi
 
+	if has_version 'app-emacs/migemo' ; then
+		myuse="${myuse} use_migemo=y"
+		export def_migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		myuse="${myuse} use_migemo=n"
+	fi
+
 	env ${myuse} ./configure ${myconf} -cflags="${CFLAGS}" \
 		|| die "configure failed"
 
-	emake W3M=w3m-m17n MAN='env LC_MESSAGES=$${LC_MESSAGES:-$${LC_ALL:-$${LANG}}} LANG=C man' || die "make failed"
+	emake W3M=w3m-m17n || die "make failed"
 }
 
 src_install() {
diff --git a/net-www/w3m-m17n/w3m-m17n-20030916.ebuild b/net-www/w3m-m17n/w3m-m17n-20030916.ebuild
index 9d6968ab4da5..911278d713ad 100644
--- a/net-www/w3m-m17n/w3m-m17n-20030916.ebuild
+++ b/net-www/w3m-m17n/w3m-m17n-20030916.ebuild
@@ -1,8 +1,8 @@
 # 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-20030916.ebuild,v 1.1 2003/09/20 17:51:14 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m-m17n/w3m-m17n-20030916.ebuild,v 1.2 2003/09/25 08:58:57 usata Exp $
 
-IUSE="imlib gtk xface gpm ssl ipv6"
+IUSE="imlib gtk xface gpm ssl"
 #IUSE="nls"
 
 W3M_CVS_PV="1.860"
@@ -12,9 +12,6 @@ W3M_M17N_CVS_PV="1.859"
 W3M_M17N_P="w3m-cvs-${W3M_M17N_CVS_PV}-m17n"
 LIBWC_PV="20030224"
 
-#GC_PV="6.3alpha1"
-#GC_P="gc${GC_PV}"
-
 DESCRIPTION="Lightweight text based WWW browser w3m with multilingual extension"
 HOMEPAGE="http://w3m.sourceforge.net/
 	http://www2u.biglobe.ne.jp/~hsaka/w3m/
@@ -23,7 +20,6 @@ SRC_URI="http://dev.gentoo.org/~usata/distfiles/${W3M_P}.tar.gz
 	http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-1.diff.gz
 	http://dev.gentoo.org/~usata/distfiles/libwc-${LIBWC_PV}.tar.gz"
 #	nls? ( http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-nls-1.diff.gz)
-#	http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${GC_P}.tar.gz
 
 SLOT="0"
 LICENSE="w3m"
@@ -51,19 +47,17 @@ src_unpack() {
 	unpack ${W3M_P}.tar.gz
 	cd ${S}
 
-	#unpack ${GC_P}.tar.gz
-	#mv ${GC_P} gc
-
 	# libwc doesn't come with w3m-m17n now
 	unpack libwc-${LIBWC_PV}.tar.gz
 
 	epatch ${DISTDIR}/${W3M_M17N_P}-1.diff.gz
+	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
 	#use nls && epatch ${DISTDIR}/${W3M_M17N_P}-nls-1.diff.gz
 }
 
 src_compile() {
 
-	local myconf
+	local myconf migemo_command
 
 	if [ -n "`use imlib`" -o -n "`use gtk`" ] ; then
 		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
@@ -71,23 +65,25 @@ src_compile() {
 		myconf="${myconf} --enable-image=no"
 	fi
 
-	#	--enable-japanese=m
+	if has_version 'app-emacs/migemo' ; then
+		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
+	else
+		migemo_command="no"
+	fi
+
 	econf --program-suffix=-m17n \
 		--enable-keymap=w3m \
 		--with-editor=/usr/bin/nano \
 		--with-mailer=/bin/mail \
 		--with-browser=/usr/bin/mozilla \
 		--with-termlib=ncurses \
+		--with-migemo="${migemo_command}" \
 		`use_enable gpm mouse` \
-		`use_enable ipv6` \
 		`use_enable ssl digest-auth` \
 		`use_with ssl` \
 		${myconf} || die
 
-	emake package=w3m-m17n \
-		W3M=w3m-m17n \
-		MAN='env LC_MESSAGES=$${LC_MESSAGES:-$${LC_ALL:-$${LANG}}} LANG=C man'\
-		|| die "make failed"
+	emake package=w3m-m17n W3M=w3m-m17n || die "make failed"
 }
 
 src_install() {