Removed unicode IUSE flag for the sake of emacs-w3m. See bug #38795

5 files changed, 8 insertions, 173 deletions

diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 70f65232fc6b..18222ed5818a 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,11 +1,8 @@
-MD5 f99791a6ad2c38664be59a118d229e77 w3m-0.4.2-r6.ebuild 4336
 MD5 1c5e6bd9c59cff053e5d78a5321de411 w3m-0.3.2.2.ebuild 3729
-MD5 5e5ef915ec9adcf99e0c2fb02a800623 w3m-0.4.2-r7.ebuild 4241
+MD5 8ee1d96c96c0c2aa58e22a97957b7153 w3m-0.4.2-r7.ebuild 4311
 MD5 8e10c8fb50097c894200b100a02601eb w3m-0.4.2.ebuild 1945
-MD5 6b91e408e12d1fce633e1747f755ee5d ChangeLog 8890
+MD5 67b153f9a30db57fd80b67c973b19edf ChangeLog 9104
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 d13d74f6074b3b50fea4f165b705f559 w3m-0.4.2-r5.ebuild 4033
-MD5 7eaf4e81f63a7050a49996bf510d87be files/digest-w3m-0.4.2-r6 276
 MD5 7eaf4e81f63a7050a49996bf510d87be files/digest-w3m-0.4.2-r7 276
 MD5 5b34b82be16b1b02dd603acbfd11d9db files/w3m-libwc-gentoo.diff 437
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
@@ -13,4 +10,3 @@ MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
 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 fdd23d795f443cd36b289ed9477d5e3c files/digest-w3m-0.4.2-r5 272
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r5 b/net-www/w3m/files/digest-w3m-0.4.2-r5
deleted file mode 100644
index 6353c813082e..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.2-r5
+++ /dev/null
@@ -1,4 +0,0 @@
-MD5 7246ebdcb27645a8a95beb64902068dd w3m-cvs-1.890.tar.gz 1888635
-MD5 a7160717037be0c2cd204614cf9c20b9 w3m-cvs-1.890-async-5.diff.gz 79246
-MD5 c3d412a682f5fdf3a42c229834a5c7fe w3m-cvs-1.890-nls-4.diff 4172
-MD5 0631258269b88bb22cbcc68e702b39f2 w3m-cvs-1.890-ja.po.diff 945
diff --git a/net-www/w3m/files/digest-w3m-0.4.2-r6 b/net-www/w3m/files/digest-w3m-0.4.2-r7
index 2b2d4cf7adbb..2b2d4cf7adbb 100644
--- a/net-www/w3m/files/digest-w3m-0.4.2-r6
+++ b/net-www/w3m/files/digest-w3m-0.4.2-r7
diff --git a/net-www/w3m/w3m-0.4.2-r5.ebuild b/net-www/w3m/w3m-0.4.2-r5.ebuild
deleted file mode 100644
index 6a6f1522b446..000000000000
--- a/net-www/w3m/w3m-0.4.2-r5.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# 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-r5.ebuild,v 1.1 2004/01/04 18:35:30 usata Exp $
-
-IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk async"
-#IUSE="canna nls unicode"
-
-W3M_CVS_PV="1.890"
-W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
-
-DESCRIPTION="Text based WWW browser, supports tables and frames"
-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
-	async? ( ${PATCH_PATH}/${W3M_CVS_P}-async-5.diff.gz )
-	${PATCH_PATH}/${W3M_CVS_P}-nls-4.diff
-	${PATCH_PATH}/${W3M_CVS_P}-ja.po.diff"
-# canna? ( http://www.j10n.org/files/${W3M_CVS_P}-canna.patch )"
-
-HOMEPAGE="http://w3m.sourceforge.net/"
-
-SLOT="0"
-LICENSE="w3m"
-# since it is a CVS snapshot, we better not change keywords to stable
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.57"
-# canna? ( app-i18n/canna )
-RDEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	>=dev-libs/boehm-gc-6.2
-	X? ( || ( !nopixbuf? ( >=media-libs/gdk-pixbuf-0.22.0 )
-		imlib2? ( >=media-libs/imlib2-1.1.0-r2 )
-		imlib? ( >=media-libs/imlib-1.9.8 )
-		virtual/glibc )
-	)
-	!X? ( imlib2? ( >=media-libs/imlib2-1.1.0-r2 ) )
-	xface? ( media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	migemo? ( >=app-text/migemo-0.40 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser
-	virtual/w3m"
-
-S="${WORKDIR}/${PN}"
-
-pkg_setup() {
-
-	if [ -n "`use X`" -a -n "`use nopixbuf`" -a -z "`use imlib2`" -a -z "`use imlib`" ] ; then
-		ewarn
-		ewarn "If you set USE=\"nopixbuf\" (disable gdk-pixbuf for w3mimgdisplay),"
-		ewarn "you need to enable either imlib2 or imlib USE flag."
-		ewarn
-		die "w3m requires gdk-pixbuf, imlib2 or imlib for image support."
-	fi
-}
-
-src_unpack() {
-
-	unpack ${W3M_CVS_P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	epatch ${FILESDIR}/${PN}-m17n-search-gentoo.diff
-	epatch ${DISTDIR}/${W3M_CVS_P}-nls-4.diff
-	epatch ${DISTDIR}/${W3M_CVS_P}-ja.po.diff
-	use async && epatch ${DISTDIR}/${W3M_CVS_P}-async-5.diff.gz
-	#use canna && epatch ${DISTDIR}/${W3M_CVS_P}-canna.patch
-}
-
-src_compile() {
-
-	export WANT_AUTOCONF_2_5=1
-	#autoconf || die "autoconf failed"
-
-	local myconf migemo_command imagelib
-
-	if [ -n "`use X`" ] ; then
-		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
-		if [ ! -n "`use nopixbuf`" ] ; then
-			imagelib="gdk-pixbuf"
-		elif [ -n "`use imlib2`" ] ; then
-			imagelib="imlib2"
-		elif [ -n "`use imlib`" ] ; then
-			imagelib="imlib"
-		else
-			# defaults to gdk-pixbuf
-			imagelib="gdk-pixbuf"
-		fi
-	else
-		if [ -n "`use imlib2`" ] ; then
-			myconf="${myconf} --enable-image=fb"
-			imagelib="imlib2"
-		else
-			myconf="${myconf} --enable-image=no"
-			imagelib="no"
-		fi
-	fi
-
-	if [ -n "`use migemo`" ] ; then
-		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
-	else
-		migemo_command="no"
-	fi
-
-	if [ -n "`use cjk`" ] ; then
-		myconf="${myconf}
-			--enable-japanese=E
-			--with-charset=EUC-JP"
-	else
-		myconf="${myconf}
-			--with-charset=US-ASCII"
-	fi
-
-	# You can't disable cjk and nls at the moment(w3mhelper hangs)
-	# `use_enable nls` `use_enable cjk`
-	# You can't disable unicode(build fails)
-	# `use_enable unicode`
-	econf --enable-keymap=w3m \
-		--with-editor=/usr/bin/nano \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/mozilla \
-		--with-termlib=ncurses \
-		--with-imagelib="${imagelib}" \
-		--with-migemo="${migemo_command}" \
-		--enable-m17n \
-		`use_enable gpm mouse` \
-		`use_enable ssl digest-auth` \
-		`use_with ssl` \
-		${myconf} "$@" || die
-		# `use_with canna`
-
-	# emake borked
-	make all || make all || die "make failed"
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die "make install failed"
-
-	insinto /usr/share/${PN}/Bonus
-	doins Bonus/*
-	dodoc README NEWS TODO ChangeLog
-	docinto doc-en ; dodoc doc/*
-	if [ -n "`use cjk`" ] ; then
-		docinto doc-jp ; dodoc doc-jp/*
-	else
-		rm -rf ${D}/usr/share/man/ja
-	fi
-}
diff --git a/net-www/w3m/w3m-0.4.2-r6.ebuild b/net-www/w3m/w3m-0.4.2-r7.ebuild
index 9c12c6f9981c..55d962d5b924 100644
--- a/net-www/w3m/w3m-0.4.2-r6.ebuild
+++ b/net-www/w3m/w3m-0.4.2-r7.ebuild
@@ -1,9 +1,9 @@
 # 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-r6.ebuild,v 1.1 2004/01/11 18:32:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.4.2-r7.ebuild,v 1.1 2004/01/21 15:26:39 usata Exp $
 
-IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk unicode nls async"
-#IUSE="canna"
+IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk nls async"
+#IUSE="canna unicode"
 
 W3M_CVS_PV="1.890"
 W3M_CVS_P="${PN}-cvs-${W3M_CVS_PV}"
@@ -110,9 +110,12 @@ src_compile() {
 		migemo_command="no"
 	fi
 
+	# emacs-w3m doesn't like "--enable-m17n --disable-unicode,"
+	# so we better enable or disable both
 	if [ -n "`use cjk`" ] ; then
 		myconf="${myconf}
 			--enable-m17n
+			--enable-unicode
 			--enable-japanese=E
 			--with-charset=EUC-JP"
 	else
@@ -121,15 +124,6 @@ src_compile() {
 			--with-charset=US-ASCII"
 	fi
 
-	if [ -n "`use unicode`" ] ; then
-		myconf="${myconf}
-			--enable-m17n
-			--enable-unicode"
-	else
-		myconf="${myconf}
-			--disable-unicode"
-	fi
-
 	econf --enable-keymap=w3m \
 		--with-editor=/usr/bin/nano \
 		--with-mailer=/bin/mail \