Cleanup ebuild. Depricated gtk2 USE flag. Bug #106560.

(Portage version: 2.0.51.22-r2)

4 files changed, 142 insertions, 11 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 4c41b9f79b96..768e166660d4 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/w3m
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.10 2005/03/21 16:51:41 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.11 2005/09/21 16:04:58 matsuu Exp $
+
+*w3m-0.5.1-r3 (21 Sep 2005)
+
+  21 Sep 2005; MATSUU Takuto <matsuu@gentoo.org> +w3m-0.5.1-r3.ebuild:
+  Cleanup ebuild.
+  depricated gtk2 USE flag. Bug #106560.
 
 *w3m-0.4.2-r10 (21 Mar 2005)
 
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index ed0a75b5cb4e..882ef8ff8e6f 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 a256d4b0c2ea4055801f91dc9af9729f w3m-0.4.2-r10.ebuild 2952
 MD5 ef673798787980429901d8a8c9e8933a w3m-0.5.1-r1.ebuild 3500
+MD5 d0314159b8250b0c16919856e14749fc w3m-0.5.1-r3.ebuild 3608
 MD5 6dbb19793ae901d3aa90c1ef1dabdabb w3m-0.4.2.ebuild 1887
 MD5 74ccf64ffc6b3efbc123f800fbec2867 ChangeLog 12782
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
@@ -10,13 +8,7 @@ MD5 bd173fd6509462ad462969ae96d43b22 w3m-0.5.1-r2.ebuild 3872
 MD5 f91cc75929689839efc1a8dfb0dcbd83 files/w3m-0.4.2-imglib-gentoo.diff 5019
 MD5 3734d8d1d8c19bfa94a11477e6cc38cd files/digest-w3m-0.5.1-r1 201
 MD5 c6c17e9ab9b7b1e694542f4fb51fa8f2 files/digest-w3m-0.5.1-r2 205
+MD5 c6c17e9ab9b7b1e694542f4fb51fa8f2 files/digest-w3m-0.5.1-r3 205
 MD5 f818841f47776f4cdfe686de95223019 files/digest-w3m-0.4.2-r10 210
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
 MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCz+dLBXaUFmZvwyMRArzYAJ9lmgS40G5rCENRHHh6VaLAcrt9WQCgv6v9
-Lxy+tm5pV/I7EdT0rhPsArA=
-=MDoI
------END PGP SIGNATURE-----
diff --git a/www-client/w3m/files/digest-w3m-0.5.1-r3 b/www-client/w3m/files/digest-w3m-0.5.1-r3
new file mode 100644
index 000000000000..cbce1bf139c0
--- /dev/null
+++ b/www-client/w3m/files/digest-w3m-0.5.1-r3
@@ -0,0 +1,3 @@
+MD5 0678b72e07e69c41709d71ef0fe5da13 w3m-0.5.1.tar.gz 1892121
+MD5 7abde0e5f0dc04352ebf3969a4a2c75c w3m-cvs-1.942-async-7.diff.gz 79535
+MD5 291a22d15e5c465615b31ba41a4198f7 w3m-0.5.1-cvs1.938.diff.gz 20040
diff --git a/www-client/w3m/w3m-0.5.1-r3.ebuild b/www-client/w3m/w3m-0.5.1-r3.ebuild
new file mode 100644
index 000000000000..6be3a133afb0
--- /dev/null
+++ b/www-client/w3m/w3m-0.5.1-r3.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r3.ebuild,v 1.1 2005/09/21 16:04:58 matsuu Exp $
+
+inherit eutils
+
+DESCRIPTION="Text based WWW browser, supports tables and frames"
+HOMEPAGE="http://w3m.sourceforge.net/
+	http://www.page.sannet.ne.jp/knabe/w3m/w3m.html"
+PATCH_PATH="http://www.page.sannet.ne.jp/knabe/w3m/"
+SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
+	async? ( ${PATCH_PATH}/w3m-cvs-1.942-async-7.diff.gz )
+	http://dev.gentoo.org/~usata/distfiles/${P}-cvs1.938.diff.gz"
+# w3m color patch:
+#	http://homepage3.nifty.com/slokar/w3m/${P}_256-005.patch.gz
+# w3n canna inline patch:
+#	canna? ( http://www.j10n.org/files/w3m-cvs-1.914-canna.patch )
+# w3m bookmark charset patch:
+#	nls? ( ${PATCH_PATH}/w3m-cvs-1.942-nls-2.diff.gz )
+
+LICENSE="w3m"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ppc64 ~ia64 ~ppc-macos"
+IUSE="X async fbcon gpm gtk imlib lynxkeymap migemo nls ssl unicode xface"
+#IUSE="canna unicode"
+
+# canna? ( app-i18n/canna )
+# We cannot build w3m with gtk+2 w/o X because gtk+2 ebuild doesn't
+# allow us to build w/o X, so we have to give up framebuffer w3mimg....
+DEPEND=">=sys-libs/ncurses-5.2-r3
+	>=sys-libs/zlib-1.1.3-r2
+	>=dev-libs/boehm-gc-6.2
+	X? ( virtual/x11 )
+	gtk? ( >=x11-libs/gtk+-2 )
+	!gtk? ( imlib? ( >=media-libs/imlib2-1.1.0 ) )
+	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"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+	epatch ${DISTDIR}/${P}-cvs1.938.diff.gz
+	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
+
+	use async && epatch ${DISTDIR}/w3m-cvs-1.942-async-7.diff.gz
+
+	#epatch ${DISTDIR}/${P}_256-005.patch.gz
+	#use canna && epatch ${DISTDIR}/w3m-cvs-1.914-canna.patch
+}
+
+src_compile() {
+
+	local myconf migemo_command imagelibval imageval
+
+	if use gtk ; then
+		imagelibval="gtk2"
+	elif use imlib ; then
+		imagelibval="imlib2"
+	fi
+
+	if [ ! -z "${imagelibval}" ] ; then
+		use X && imageval="${imageval}${imageval:+,}x11"
+		use fbcon && imageval="${imageval}${imageval:+,}fb"
+	fi
+
+	if 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. Default to enable
+	# m17n and unicode, see bug #47046.
+	if use linguas_ja ; then
+		myconf="${myconf} --enable-japanese=E"
+	else
+		myconf="${myconf} --with-charset=US-ASCII"
+	fi
+	if use unicode ; then
+		myconf="${myconf} --with-charset=UTF-8"
+	fi
+
+	# lynxkeymap IUSE flag. bug #49397
+	if use lynxkeymap ; then
+		myconf="${myconf} --enable-keymap=lynx"
+	else
+		myconf="${myconf} --enable-keymap=w3m"
+	fi
+
+	econf \
+		--with-editor=/usr/bin/nano \
+		--with-mailer=/bin/mail \
+		--with-browser=/usr/bin/mozilla \
+		--with-termlib=ncurses \
+		--enable-image=${imageval:-no} \
+		--with-imagelib="${imagelibval:-no}" \
+		--with-migemo="${migemo_command}" \
+		--enable-m17n \
+		--enable-unicode \
+		$(use_enable gpm mouse) \
+		$(use_enable ssl digest-auth) \
+		$(use_with ssl) \
+		$(use_enable nls) \
+		$(use_enable xface) \
+		${myconf} || die
+		# $(use_with canna)
+
+	# emake borked
+	emake -j1 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 use linguas_ja ; then
+		docinto doc-jp ; dodoc doc-jp/*
+	else
+		rm -rf ${D}/usr/share/man/ja
+	fi
+}