Stable on x86 and alpha. IUSE cleanup

5 files changed, 18 insertions, 201 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 4e99a0ee1676..576d945117de 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,10 @@
 # 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.51 2004/04/07 16:40:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.52 2004/04/28 19:58:30 usata Exp $
+
+  29 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5-r1.ebuild,
+  w3m-0.5-r2.ebuild:
+  Stable on x86 and alpha. IUSE cleanup.
 
 *w3m-0.5-r2 (08 Apr 2004)
 
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index e2bd60aaa0ac..13f790d00a01 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,9 +1,8 @@
-MD5 d38b2a681152d86804262e685e6d06d0 w3m-0.5-r1.ebuild 4332
 MD5 5a4fb2341659f69f82de81dc12da6e4d w3m-0.3.2.2.ebuild 3731
-MD5 c9171a4926f377df6f2b445064581bc5 ChangeLog 9864
+MD5 d1152514d88a9f03e3498f4bbb382f11 ChangeLog 9995
 MD5 8e10c8fb50097c894200b100a02601eb w3m-0.4.2.ebuild 1945
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-MD5 48fb319fe478c41d84b4a0303e788fb2 w3m-0.5-r2.ebuild 4373
+MD5 2d5c1c9e6b4eec04118721c4fc0e8bbb w3m-0.5-r2.ebuild 3788
 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
@@ -12,5 +11,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
 MD5 9cd600ff1ce23fc3ad6e0c17be3ac84e files/digest-w3m-0.5-r2 207
diff --git a/net-www/w3m/files/digest-w3m-0.5-r1 b/net-www/w3m/files/digest-w3m-0.5-r1
deleted file mode 100644
index a03525e23f98..000000000000
--- a/net-www/w3m/files/digest-w3m-0.5-r1
+++ /dev/null
@@ -1,4 +0,0 @@
-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.5-r1.ebuild b/net-www/w3m/w3m-0.5-r1.ebuild
deleted file mode 100644
index 2337ec501d75..000000000000
--- a/net-www/w3m/w3m-0.5-r1.ebuild
+++ /dev/null
@@ -1,159 +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.5-r1.ebuild,v 1.1 2004/03/24 18:28:42 usata Exp $
-
-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/
-	http://www.page.sannet.ne.jp/knabe/w3m/"
-PATCH_PATH="http://www.page.sannet.ne.jp/knabe/w3m/"
-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"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk nls async"
-#IUSE="canna unicode"
-
-# 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"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-S=${WORKDIR}/${P}
-
-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 ${P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	epatch ${FILESDIR}/${PN}-m17n-search-gentoo.diff
-	epatch ${FILESDIR}/${PN}-libwc-gentoo.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-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
-}
-
-src_compile() {
-	export WANT_AUTOCONF=2.5
-	#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
-
-	# 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
-		myconf="${myconf}
-			--disable-m17n
-			--with-charset=US-ASCII"
-	fi
-
-	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}" \
-		`use_enable gpm mouse` \
-		`use_enable ssl digest-auth` \
-		`use_with ssl` \
-		`use_enable nls` \
-		${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.5-r2.ebuild b/net-www/w3m/w3m-0.5-r2.ebuild
index 3c1c5ad9c6ab..158e9e181ecf 100644
--- a/net-www/w3m/w3m-0.5-r2.ebuild
+++ b/net-www/w3m/w3m-0.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.5-r2.ebuild,v 1.1 2004/04/07 16:40:26 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.5-r2.ebuild,v 1.2 2004/04/28 19:58:30 usata Exp $
 
 inherit eutils
 
@@ -23,20 +23,19 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-IUSE="X nopixbuf imlib imlib2 xface ssl migemo gpm cjk nls async"
+KEYWORDS="x86 alpha ~ppc ~sparc"
+IUSE="X gtk imlib imlib2 xface ssl migemo gpm cjk nls async"
 #IUSE="canna unicode"
 
 # canna? ( app-i18n/canna )
-RDEPEND=">=sys-libs/ncurses-5.2-r3
+DEPEND=">=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? ( gtk? ( >=media-libs/gdk-pixbuf-0.22.0 )
+		!gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0 )
+			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
 	)
-	!X? ( imlib2? ( >=media-libs/imlib2-1.1.0-r2 ) )
+	!X? ( imlib2? ( >=media-libs/imlib2-1.1.0 ) )
 	xface? ( media-libs/compface )
 	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
 	migemo? ( >=app-text/migemo-0.40 )
@@ -44,21 +43,6 @@ RDEPEND=">=sys-libs/ncurses-5.2-r3
 PROVIDE="virtual/textbrowser
 	virtual/w3m"
 
-DEPEND="${RDEPEND}
-	>=sys-devel/autoconf-2.58"
-
-S=${WORKDIR}/${P}
-
-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 ${P}.tar.gz
 	cd ${S}
@@ -78,24 +62,18 @@ src_unpack() {
 }
 
 src_compile() {
-	export WANT_AUTOCONF=2.5
-	#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
+		if [ -n "`use gtk`" ] ; 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"
+			imagelib="imlib"
 		fi
-	else
+	else	# no X
 		if [ -n "`use imlib2`" ] ; then
 			myconf="${myconf} --enable-image=fb"
 			imagelib="imlib2"