Added CVS snapshot. gtk2 IUSE flag is now available. This closes bug #66825.

6 files changed, 55 insertions, 58 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 9db12859462e..7e4a23f37969 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/w3m
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.3 2004/09/12 23:40:08 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.4 2004/10/09 17:13:01 usata Exp $
+
+*w3m-0.5.1-r2 (10 Oct 2004)
+
+  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> w3m-0.5.1-r1.ebuild,
+  +w3m-0.5.1-r2.ebuild, -w3m-0.5.1.ebuild:
+  Added CVS snapshot. gtk2 IUSE flag is now available.
+  This closes bug #66825.
 
   12 Sep 2004; Jason Wever <weeve@gentoo.org> w3m-0.5.1-r1.ebuild:
   Stable on sparc.
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 0194fe6beca7..2e96f461a3ca 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,14 +1,14 @@
-MD5 0a1588ac555d1d8b56a44c0d80270f2b ChangeLog 11723
+MD5 2269dbbb550c4e27ad0163c10fc58365 ChangeLog 11947
 MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+MD5 66feed95b28e2a07ac47903fbab2da30 w3m-0.5.1-r1.ebuild 3498
 MD5 25b86e7a0da9e244a0d9e178599798e5 w3m-0.4.2.ebuild 1909
 MD5 67ba3308344ef9a9805263fab091bb44 w3m-0.5-r2.ebuild 3682
-MD5 b5eab2a61238d1788ab6beb0740c7a8a w3m-0.5.1-r1.ebuild 3694
-MD5 1bb8e0657c28ad2e7b3013964f5865e5 w3m-0.5.1.ebuild 3728
-MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
-MD5 9cd600ff1ce23fc3ad6e0c17be3ac84e files/digest-w3m-0.5-r2 207
-MD5 292a9e6f9df534134608fea83f535968 files/digest-w3m-0.5.1 205
+MD5 c5a878b201d5954f25723fc674f7e649 w3m-0.5.1-r2.ebuild 3675
 MD5 3734d8d1d8c19bfa94a11477e6cc38cd files/digest-w3m-0.5.1-r1 201
-MD5 ca82b0ff2fa196fadebdc71b825b4ccf files/w3m-0.4.2-async-m17n-gentoo.diff 1539
+MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
 MD5 5b34b82be16b1b02dd603acbfd11d9db files/w3m-libwc-gentoo.diff 437
 MD5 4deea28e3a4e09f22019b01b52273ab3 files/w3m-m17n-search-gentoo.diff 446
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
+MD5 ca82b0ff2fa196fadebdc71b825b4ccf files/w3m-0.4.2-async-m17n-gentoo.diff 1539
+MD5 9cd600ff1ce23fc3ad6e0c17be3ac84e files/digest-w3m-0.5-r2 207
+MD5 6c86671b874374231ff44e3660eedafc files/digest-w3m-0.5.1-r2 271
diff --git a/www-client/w3m/files/digest-w3m-0.5.1 b/www-client/w3m/files/digest-w3m-0.5.1
deleted file mode 100644
index d4ed82f6c51a..000000000000
--- a/www-client/w3m/files/digest-w3m-0.5.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0678b72e07e69c41709d71ef0fe5da13 w3m-0.5.1.tar.gz 1892121
-MD5 31e137778606614afe20e94eaea162ce w3m-cvs-1.912-async-1.diff.gz 76557
-MD5 10edbf22ab53c97dd83b6b6114a3c530 w3m-cvs-1.916-nlsfix-2.diff 4843
diff --git a/www-client/w3m/files/digest-w3m-0.5.1-r2 b/www-client/w3m/files/digest-w3m-0.5.1-r2
new file mode 100644
index 000000000000..e66dca4febbf
--- /dev/null
+++ b/www-client/w3m/files/digest-w3m-0.5.1-r2
@@ -0,0 +1,4 @@
+MD5 0678b72e07e69c41709d71ef0fe5da13 w3m-0.5.1.tar.gz 1892121
+MD5 c049959aa669b79ace40aa3099563723 w3m-0.5.1-async-1.diff.gz 72956
+MD5 10edbf22ab53c97dd83b6b6114a3c530 w3m-cvs-1.916-nlsfix-2.diff 4843
+MD5 291a22d15e5c465615b31ba41a4198f7 w3m-0.5.1-cvs1.938.diff.gz 20040
diff --git a/www-client/w3m/w3m-0.5.1-r1.ebuild b/www-client/w3m/w3m-0.5.1-r1.ebuild
index c46d8059b700..eb420a89b550 100644
--- a/www-client/w3m/w3m-0.5.1-r1.ebuild
+++ b/www-client/w3m/w3m-0.5.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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-r1.ebuild,v 1.3 2004/09/12 23:40:08 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r1.ebuild,v 1.4 2004/10/09 17:13:01 usata Exp $
 
 inherit eutils
 
@@ -35,7 +35,6 @@ DEPEND=">=sys-libs/ncurses-5.2-r3
 		!gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0 )
 			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
 	)
-	!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 )
@@ -49,7 +48,6 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
 	if use async ; then
 		epatch ${DISTDIR}/${P}-async-1.diff.gz
-	#	epatch ${FILESDIR}/${PN}-0.4.2-async-m17n-gentoo.diff
 	fi
 	#epatch ${DISTDIR}/${P}_256-005.patch.gz
 	#use canna && epatch ${DISTDIR}/w3m-cvs-1.914-canna.patch
@@ -60,7 +58,7 @@ src_compile() {
 	local myconf migemo_command imagelib
 
 	if use X ; then
-		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
+		myconf="${myconf} --enable-image=x11,fb $(use_enable xface)"
 		if use gtk ; then
 			imagelib="gdk-pixbuf"
 		elif use imlib2 ; then
@@ -69,13 +67,8 @@ src_compile() {
 			imagelib="imlib"
 		fi
 	else	# no X
-		if use imlib2 ; then
-			myconf="${myconf} --enable-image=fb"
-			imagelib="imlib2"
-		else
-			myconf="${myconf} --enable-image=no"
-			imagelib="no"
-		fi
+		myconf="${myconf} --enable-image=no"
+		imagelib="no"
 	fi
 
 	if use migemo ; then
@@ -112,12 +105,12 @@ src_compile() {
 		--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 gpm mouse) \
+		$(use_enable ssl digest-auth) \
+		$(use_with ssl) \
+		$(use_enable nls) \
 		${myconf} "$@" || die
-		# `use_with canna`
+		# $(use_with canna)
 
 	# emake borked
 	emake -j1 all || die "make failed"
diff --git a/www-client/w3m/w3m-0.5.1.ebuild b/www-client/w3m/w3m-0.5.1-r2.ebuild
index a0b64cff3e3e..3b78a060347c 100644
--- a/www-client/w3m/w3m-0.5.1.ebuild
+++ b/www-client/w3m/w3m-0.5.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.ebuild,v 1.1 2004/09/08 14:16:49 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.5.1-r2.ebuild,v 1.1 2004/10/09 17:13:01 usata Exp $
 
 inherit eutils
 
@@ -9,11 +9,11 @@ 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
-	nls? ( ${PATCH_PATH}/w3m-cvs-1.916-nlsfix-2.diff )"
-# w3m async patch:
-#	async? ( ${PATCH_PATH}/w3m-cvs-1.912-async-1.diff.gz )
+	async? ( ${PATCH_PATH}/${P}-async-1.diff.gz )
+	nls? ( ${PATCH_PATH}/w3m-cvs-1.916-nlsfix-2.diff )
+	http://dev.gentoo.org/~usata/distfiles/${P}-cvs1.938.diff.gz"
 # w3m color patch:
-#	http://homepage3.nifty.com/slokar/w3m/${P}-cvs-1.895_256-001.patch.gz
+#	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:
@@ -21,22 +21,21 @@ SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz
 
 LICENSE="w3m"
 SLOT="0"
-KEYWORDS="x86 alpha ppc sparc"
-IUSE="X gtk imlib2 xface ssl migemo gpm cjk nls lynxkeymap"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~ppc64"
+IUSE="X gtk gtk2 imlib imlib2 xface ssl migemo gpm cjk nls lynxkeymap async"
 #IUSE="canna unicode"
 
 # canna? ( app-i18n/canna )
-# removed nopixbuf IUSE flag as we now have per package USE flag.
-# if you don't want to pull in gtk1, set -gtk for this package in
-# /etc/portage/package.use.
+# 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? ( gtk? ( >=media-libs/gdk-pixbuf-0.22.0 )
+	X? ( gtk? ( gtk2? ( >=x11-libs/gtk+-2 )
+		!gtk2? ( >=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 ) )
 	xface? ( media-libs/compface )
 	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
 	migemo? ( >=app-text/migemo-0.40 )
@@ -47,12 +46,12 @@ PROVIDE="virtual/textbrowser
 src_unpack() {
 	unpack ${P}.tar.gz
 	cd ${S}
+	epatch ${DISTDIR}/${P}-cvs1.938.diff.gz
 	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	#if use async ; then
-	#	epatch ${DISTDIR}/w3m-cvs-1.912-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
+	if use async ; then
+		epatch ${DISTDIR}/${P}-async-1.diff.gz
+	fi
+	#epatch ${DISTDIR}/${P}_256-005.patch.gz
 	#use canna && epatch ${DISTDIR}/w3m-cvs-1.914-canna.patch
 }
 
@@ -61,8 +60,10 @@ src_compile() {
 	local myconf migemo_command imagelib
 
 	if use X ; then
-		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
-		if use gtk ; then
+		myconf="${myconf} --enable-image=x11,fb $(use_enable xface)"
+		if use gtk2 ; then
+			imagelib="gtk2"
+		elif use gtk ; then
 			imagelib="gdk-pixbuf"
 		elif use imlib2 ; then
 			imagelib="imlib2"
@@ -70,13 +71,8 @@ src_compile() {
 			imagelib="imlib"
 		fi
 	else	# no X
-		if use imlib2 ; then
-			myconf="${myconf} --enable-image=fb"
-			imagelib="imlib2"
-		else
-			myconf="${myconf} --enable-image=no"
-			imagelib="no"
-		fi
+		myconf="${myconf} --enable-image=no"
+		imagelib="no"
 	fi
 
 	if use migemo ; then
@@ -113,12 +109,12 @@ src_compile() {
 		--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 gpm mouse) \
+		$(use_enable ssl digest-auth) \
+		$(use_with ssl) \
+		$(use_enable nls) \
 		${myconf} "$@" || die
-		# `use_with canna`
+		# $(use_with canna)
 
 	# emake borked
 	emake -j1 all || die "make failed"