Removed old versions

9 files changed, 23 insertions, 508 deletions

diff --git a/www-client/w3m/ChangeLog b/www-client/w3m/ChangeLog
index 55f10848f774..0b0f893b45aa 100644
--- a/www-client/w3m/ChangeLog
+++ b/www-client/w3m/ChangeLog
@@ -1,8 +1,13 @@
 # ChangeLog for www-client/w3m
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.20 2006/04/21 17:32:14 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/ChangeLog,v 1.21 2006/08/05 14:03:40 matsuu Exp $
 
-  21 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> w3m-0.4.2.ebuild,
+  05 Aug 2006; MATSUU Takuto <matsuu@gentoo.org>
+  -files/w3m-0.4.2-imglib-gentoo.diff, -w3m-0.4.2.ebuild,
+  -w3m-0.4.2-r10.ebuild, -w3m-0.5.1-r1.ebuild:
+  Removed old versions.
+
+  21 Apr 2006; Diego Petten嘆 <flameeyes@gentoo.org> w3m-0.4.2.ebuild,
   w3m-0.4.2-r10.ebuild, w3m-0.5.1-r1.ebuild, w3m-0.5.1-r3.ebuild:
   Drop virtual/textbrowser as per bug #130746.
 
diff --git a/www-client/w3m/Manifest b/www-client/w3m/Manifest
index b69839140d37..9c26ccce1c5f 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -1,46 +1,22 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 796232cdbe86214db78f03959e639df0 ChangeLog 13946
-RMD160 8c32b5f4c22db1a9fa7a3e28edbbc549a8c3b7eb ChangeLog 13946
-SHA256 dded13ff3d553f2ba53367a1b037619c4da0a22b8c7afd55ea0ee0cf997dc178 ChangeLog 13946
-MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
-RMD160 9746b6354c63264e497a650072257659cdeb1a3e files/digest-w3m-0.4.2 61
-SHA256 2c86d8444a622f7a15edddaf298a0be6403065a6760910acc4ec7c74a72af774 files/digest-w3m-0.4.2 61
-MD5 f818841f47776f4cdfe686de95223019 files/digest-w3m-0.4.2-r10 210
-RMD160 9b34216df05c4deaebccb390f2cbfca6e5b89721 files/digest-w3m-0.4.2-r10 210
-SHA256 b69a20f11f601259e993299cdb4b198ea4456809e946914b176cc97da800e2d4 files/digest-w3m-0.4.2-r10 210
-MD5 3734d8d1d8c19bfa94a11477e6cc38cd files/digest-w3m-0.5.1-r1 201
-RMD160 7feab338d699e02868e18abc06cb42675e9bfaf5 files/digest-w3m-0.5.1-r1 201
-SHA256 2de58d5792eba08351883b4d913b046d6501a09680816f9538aae4edef531dc2 files/digest-w3m-0.5.1-r1 201
-MD5 c6c17e9ab9b7b1e694542f4fb51fa8f2 files/digest-w3m-0.5.1-r3 205
-RMD160 a843dedf9444b4a9d59aa2c4099e2c74f7d8c003 files/digest-w3m-0.5.1-r3 205
-SHA256 58ac5edd844c5fa5c736198eb4e8d85a849eb6278357c986532b59086c4e220b files/digest-w3m-0.5.1-r3 205
-MD5 f91cc75929689839efc1a8dfb0dcbd83 files/w3m-0.4.2-imglib-gentoo.diff 5019
-RMD160 1c22d49d3db29ac99bc62c71372a586402529879 files/w3m-0.4.2-imglib-gentoo.diff 5019
-SHA256 03fa43d0deadafc37f442dd9c9e1ddf6ea0522d9044bd9c7e026ea51b30e8468 files/w3m-0.4.2-imglib-gentoo.diff 5019
+AUX w3m-w3mman-gentoo.diff 1059 RMD160 4045c2a7b2c1579274d86c7942c0d61aa7e9cc85 SHA1 985812c2ec6cad9d1e88bcd1538ef7aa93dc60b0 SHA256 dc4932c59f78d7dd5d5076acc2825aafd73a2ce7c4993216f125472aedb400b6
 MD5 0fd075401455ce9205836b4267202e22 files/w3m-w3mman-gentoo.diff 1059
 RMD160 4045c2a7b2c1579274d86c7942c0d61aa7e9cc85 files/w3m-w3mman-gentoo.diff 1059
 SHA256 dc4932c59f78d7dd5d5076acc2825aafd73a2ce7c4993216f125472aedb400b6 files/w3m-w3mman-gentoo.diff 1059
-MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
-RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
-SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
-MD5 402b61269eef6092bddd8f5a44a3305a w3m-0.4.2-r10.ebuild 2932
-RMD160 6e29c70cc403b0e8272de24c4d2b486eb836d640 w3m-0.4.2-r10.ebuild 2932
-SHA256 6c2a4da74887660f7068000c48a8ed89fb9c3506d1ad337ed187a9251afd02fd w3m-0.4.2-r10.ebuild 2932
-MD5 d58f9d7090aecd3bf04e1340cafbd12f w3m-0.4.2.ebuild 1870
-RMD160 b5e5e5d9cfcbda09db8eb97e5d8fcfc4b20b55cf w3m-0.4.2.ebuild 1870
-SHA256 53c9ab60b500833363ea078bf9dcc3baba7bd51a7dceb50721d6afdbd4bd4bd8 w3m-0.4.2.ebuild 1870
-MD5 6efc9e80d0700b60282cde9070b69526 w3m-0.5.1-r1.ebuild 3480
-RMD160 0d845b39d78e8321d0e77754ad937262249f9ac0 w3m-0.5.1-r1.ebuild 3480
-SHA256 f59e0d9e7f678ec6527f9fadef519b6209b06bd5e77e205610f0edd6379cc01f w3m-0.5.1-r1.ebuild 3480
+DIST w3m-0.5.1-cvs1.938.diff.gz 20040 RMD160 b18bbb4be4e110619ceb853d9c18441366ee1c77 SHA1 6baeafb464b6616af9f40c0fdb056802c98bf17d SHA256 907de5b4cb63955d589c4107907be579d756e694f84cd800db31d62ec5e1f858
+DIST w3m-0.5.1.tar.gz 1892121 RMD160 a5ffd3a8d44ed55109a1ab4a34d51ae236902654 SHA1 7da299648c236772bcde9b0e92e23346c8af0aca SHA256 e40c7e3a2c2d5fdc7d92369e77d69256f061493f38c91d699e4436e949802c1d
+DIST w3m-cvs-1.942-async-7.diff.gz 79535
+EBUILD w3m-0.5.1-r3.ebuild 3606 RMD160 110c3f70c1d6dc7bb4542254e0d30c74a5473137 SHA1 faf10ed994e1351bed2bf1fde9d448c9e35dda6f SHA256 1f9237a699faf25a4a4caf62c6fb76e6a867561782a20b97c45f79950c91cd5c
 MD5 bd389b766b378a8d244e1d1ec82b2558 w3m-0.5.1-r3.ebuild 3606
 RMD160 110c3f70c1d6dc7bb4542254e0d30c74a5473137 w3m-0.5.1-r3.ebuild 3606
 SHA256 1f9237a699faf25a4a4caf62c6fb76e6a867561782a20b97c45f79950c91cd5c w3m-0.5.1-r3.ebuild 3606
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFESRZrAiZjviIA2XgRAo9qAJsHArwX+MlmCYNFKvtEKEF7dYoWdwCeMF6k
-7Tbyf4yDr4rSp44YK6X/a9A=
-=srLh
------END PGP SIGNATURE-----
+MISC ChangeLog 14123 RMD160 ef987c114a296ef17b13abee9bf7b1f44ad47645 SHA1 586e57df0a006d7cceae4072a52c241701dec43a SHA256 7b2c70360e80d60740903d70e6414150bacec5bd5092e5348c637ac0fdb3bfb7
+MD5 f8198d4496f23d889163341972ac44d5 ChangeLog 14123
+RMD160 ef987c114a296ef17b13abee9bf7b1f44ad47645 ChangeLog 14123
+SHA256 7b2c70360e80d60740903d70e6414150bacec5bd5092e5348c637ac0fdb3bfb7 ChangeLog 14123
+MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
+MD5 e92a48548554c80cf90e18df17ff6a82 metadata.xml 156
+RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad metadata.xml 156
+SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215 metadata.xml 156
+MD5 ff4501c3db23d246ff63de7a580544cc files/digest-w3m-0.5.1-r3 561
+RMD160 725523ba119042e04dd11ed590af931651e70d19 files/digest-w3m-0.5.1-r3 561
+SHA256 9f877eef14851bbb2d299e26ca2ae7b6d164e18cf27d26a79d83cbccb1b2f646 files/digest-w3m-0.5.1-r3 561
diff --git a/www-client/w3m/files/digest-w3m-0.4.2 b/www-client/w3m/files/digest-w3m-0.4.2
deleted file mode 100644
index 517e99daf74e..000000000000
--- a/www-client/w3m/files/digest-w3m-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56b8948468a19778fce0b1653579775a w3m-0.4.2.tar.gz 660889
diff --git a/www-client/w3m/files/digest-w3m-0.4.2-r10 b/www-client/w3m/files/digest-w3m-0.4.2-r10
deleted file mode 100644
index a8657a4f7a27..000000000000
--- a/www-client/w3m/files/digest-w3m-0.4.2-r10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 baa9d375997cf495edf25216e0e3f3aa w3m-0.4.2+cvs-1.862.tar.gz 672615
-MD5 5d9dd2828ecab3214a87454bbc2b10b4 libwc-20030224.tar.gz 1150077
-MD5 41677a08822d49baaf7e28cfc66206e1 w3m-cvs-1.859-m17n-1.diff.gz 86023
diff --git a/www-client/w3m/files/digest-w3m-0.5.1-r1 b/www-client/w3m/files/digest-w3m-0.5.1-r1
deleted file mode 100644
index bf3e849b0db5..000000000000
--- a/www-client/w3m/files/digest-w3m-0.5.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/www-client/w3m/files/w3m-0.4.2-imglib-gentoo.diff b/www-client/w3m/files/w3m-0.4.2-imglib-gentoo.diff
deleted file mode 100644
index c74bdc2cecdf..000000000000
--- a/www-client/w3m/files/w3m-0.4.2-imglib-gentoo.diff
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -urN w3m-0.4.2.ORIG/acinclude.m4 w3m-0.4.2/acinclude.m4
---- w3m-0.4.2.ORIG/acinclude.m4	2003-09-25 18:16:27.000000000 +0900
-+++ w3m-0.4.2/acinclude.m4	2003-10-05 07:02:28.000000000 +0900
-@@ -515,6 +515,12 @@
- 	  enable_image=x11,fb
-         fi;;
-     esac
-+    AC_ARG_WITH(imglib,
-+    [  --with-imglib=IMGLIB	image library to link
-+			(IMGLIB should be either gdk_pixbuf, imlib or imlib2.
-+			Note that you need to use gdk_pixbuf or imlib2 to enable
-+			inline image handler support for framebuffer device.)],
-+    [test x"$with_imglib" = xyes || imglib="$with_imglib"])
-   fi   
-   save_ifs="$IFS"; IFS=",";
-   for img in $enable_image; do
-@@ -555,19 +561,25 @@
- 	[have_imlib2="yes"],
- 	[have_imlib2="no"])])
-   if test x"$x11" = xyes; then
--   if test x"$have_gdkpixbuf" = xyes; then
-+   if test x"$have_gdkpixbuf" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = xgdk_pixbuf; then
-      AC_DEFINE(USE_W3MIMG_X11)
-      AC_DEFINE(USE_GDKPIXBUF)
-      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
-      IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
-      IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
--   elif test x"$have_imlib" = xyes; then
-+   elif test x"$have_imlib" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = ximlib; then
-      AC_DEFINE(USE_W3MIMG_X11)
-      AC_DEFINE(USE_IMLIB)
-      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
-      IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
-      IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
--   elif test x"$have_imlib2" = xyes; then
-+   elif test x"$have_imlib2" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = ximlib2; then
-      AC_DEFINE(USE_W3MIMG_X11)
-      AC_DEFINE(USE_IMLIB2)
-      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
-@@ -578,13 +590,17 @@
-    fi
-   fi
-   if test x"$fb" = xyes; then
--   if test x"$have_gdkpixbuf" = xyes; then
-+   if test x"$have_gdkpixbuf" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = xgdk_pixbuf; then
-      AC_DEFINE(USE_W3MIMG_FB)
-      AC_DEFINE(USE_GDKPIXBUF)
-      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
-      IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
-      IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
--   elif test x"$have_imlib2" = xyes; then
-+   elif test x"$have_imlib2" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = ximlib2; then
-      AC_DEFINE(USE_W3MIMG_FB)
-      AC_DEFINE(USE_IMLIB2)
-      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
-diff -urN w3m-0.4.2.ORIG/aclocal.m4 w3m-0.4.2/aclocal.m4
---- w3m-0.4.2.ORIG/aclocal.m4	2003-09-25 18:16:27.000000000 +0900
-+++ w3m-0.4.2/aclocal.m4	2003-10-05 07:03:49.000000000 +0900
-@@ -527,6 +527,12 @@
- 	  enable_image=x11,fb
-         fi;;
-     esac
-+    AC_ARG_WITH(imglib,
-+    [  --with-imglib=IMGLIB	image library to link
-+				(IMGLIB should be either gdk_pixbuf, imlib or imlib2.
-+				Note that you need to use gdk_pixbuf or imlib2 to enable
-+				inline image handler support for framebuffer device.)],
-+    [test x"$with_imglib" = xyes || imglib="$with_imglib"])
-   fi   
-   save_ifs="$IFS"; IFS=",";
-   for img in $enable_image; do
-@@ -567,19 +573,25 @@
- 	[have_imlib2="yes"],
- 	[have_imlib2="no"])])
-   if test x"$x11" = xyes; then
--   if test x"$have_gdkpixbuf" = xyes; then
-+   if test x"$have_gdkpixbuf" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = xgdk_pixbuf; then
-      AC_DEFINE(USE_W3MIMG_X11)
-      AC_DEFINE(USE_GDKPIXBUF)
-      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
-      IMGX11CFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
-      IMGX11LDFLAGS="`${GDKPIXBUF_CONFIG} --libs` -lgdk_pixbuf_xlib"
--   elif test x"$have_imlib" = xyes; then
-+   elif test x"$have_imlib" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = ximlib; then
-      AC_DEFINE(USE_W3MIMG_X11)
-      AC_DEFINE(USE_IMLIB)
-      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
-      IMGX11CFLAGS="`${IMLIB_CONFIG} --cflags`"
-      IMGX11LDFLAGS="`${IMLIB_CONFIG} --libs`"
--   elif test x"$have_imlib2" = xyes; then
-+   elif test x"$have_imlib2" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = ximlib2; then
-      AC_DEFINE(USE_W3MIMG_X11)
-      AC_DEFINE(USE_IMLIB2)
-      IMGOBJS="$IMGOBJS w3mimg/x11/x11_w3mimg.o"
-@@ -590,13 +602,17 @@
-    fi
-   fi
-   if test x"$fb" = xyes; then
--   if test x"$have_gdkpixbuf" = xyes; then
-+   if test x"$have_gdkpixbuf" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = xgdk_pixbuf; then
-      AC_DEFINE(USE_W3MIMG_FB)
-      AC_DEFINE(USE_GDKPIXBUF)
-      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
-      IMGFBCFLAGS="`${GDKPIXBUF_CONFIG} --cflags`"
-      IMGFBLDFLAGS="`${GDKPIXBUF_CONFIG} --libs`"
--   elif test x"$have_imlib2" = xyes; then
-+   elif test x"$have_imlib2" = xyes \
-+     -a -z "$with_imglib" \
-+     -o x"$with_imglib" = ximlib2; then
-      AC_DEFINE(USE_W3MIMG_FB)
-      AC_DEFINE(USE_IMLIB2)
-      IMGOBJS="$IMGOBJS w3mimg/fb/fb_w3mimg.o w3mimg/fb/fb.o w3mimg/fb/fb_img.o"
diff --git a/www-client/w3m/w3m-0.4.2-r10.ebuild b/www-client/w3m/w3m-0.4.2-r10.ebuild
deleted file mode 100644
index d011303084ed..000000000000
--- a/www-client/w3m/w3m-0.4.2-r10.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.4.2-r10.ebuild,v 1.3 2006/04/21 17:32:14 flameeyes Exp $
-
-inherit eutils
-
-W3M_CVS_PV="1.862"
-W3M_P="${P}+cvs-${W3M_CVS_PV}"
-
-W3M_M17N_CVS_PV="1.859"
-W3M_M17N_P="w3m-cvs-${W3M_M17N_CVS_PV}-m17n"
-LIBWC_PV="20030224"
-
-DESCRIPTION="Lightweight text based WWW browser w3m with multilingual extension"
-HOMEPAGE="http://w3m.sourceforge.net/
-	http://www2u.biglobe.ne.jp/~hsaka/w3m/
-	http://www.page.sannet.ne.jp/knabe/w3m/w3m.html"
-SRC_URI="mirror://gentoo/${W3M_P}.tar.gz
-	cjk? ( mirror://gentoo/libwc-${LIBWC_PV}.tar.gz
-		http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-1.diff.gz
-	)"
-#	nls? ( http://www.page.sannet.ne.jp/knabe/w3m/${W3M_M17N_P}-nls-1.diff.gz)
-
-LICENSE="w3m"
-SLOT="0"
-KEYWORDS="x86 alpha ppc sparc"
-IUSE="X cjk gpm gtk imlib2 migemo ssl xface" # nls
-
-RDEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	dev-lang/perl
-	>=dev-libs/boehm-gc-6.2
-	X? ( gtk? ( >=media-libs/gdk-pixbuf-0.22.0 )
-		!gtk? ( imlib2? ( >=media-libs/imlib2-1.0.5 )
-			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
-	)
-	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 )"
-
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	>=sys-devel/autoconf-2.58"
-
-PROVIDE="virtual/w3m"
-
-src_unpack() {
-	unpack ${W3M_P}.tar.gz
-	cd ${S}
-
-	if use cjk ; then
-		# libwc doesn't come with w3m-m17n now
-		unpack libwc-${LIBWC_PV}.tar.gz
-
-		unpack ${W3M_M17N_P}-1.diff.gz
-		sed -i -e "/^--- w3m\/version.c.in/,+8d" ${W3M_M17N_P}-1.diff || die
-		epatch ${W3M_M17N_P}-1.diff
-		sed -i -e "s/0.4.2/0.4.2-m17n-20030308/" version.c.in || die
-	fi
-
-	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
-	#use nls && epatch ${DISTDIR}/${W3M_M17N_P}-nls-1.diff.gz
-	epatch ${FILESDIR}/${P}-imglib-gentoo.diff
-}
-
-src_compile() {
-	local myconf migemo_command imglib
-
-	if use X ; then
-		myconf="${myconf} --enable-image=x11,fb $(use_enable xface)"
-		if use gtk ; then
-			imglib="gdk_pixbuf"
-		elif use imlib2 ; then
-			imglib="imlib2"
-		else
-			imglib="imlib"
-		fi
-	else
-		myconf="${myconf} --enable-image=no"
-	fi
-
-	if use migemo ; then
-		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
-	else
-		migemo_command="no"
-	fi
-
-	export WANT_AUTOCONF=2.5
-	autoconf || die
-
-	econf \
-		--enable-keymap=w3m \
-		--with-editor=/usr/bin/nano \
-		--with-mailer=/bin/mail \
-		--with-browser=/usr/bin/mozilla \
-		--with-termlib=ncurses \
-		--with-imglib="${imglib}" \
-		--with-migemo="${migemo_command}" \
-		$(use_enable gpm mouse) \
-		$(use_enable ssl digest-auth) \
-		$(use_with ssl) \
-		${myconf} || die
-
-	# make borks
-	emake -j1 || die "make failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	insinto /usr/share/${PN}/Bonus
-	doins Bonus/*
-	dodoc README NEWS TODO ChangeLog
-	docinto doc-en ; dodoc doc/*
-	docinto doc-jp ; dodoc doc-jp/*
-}
diff --git a/www-client/w3m/w3m-0.4.2.ebuild b/www-client/w3m/w3m-0.4.2.ebuild
deleted file mode 100644
index f08eac0be278..000000000000
--- a/www-client/w3m/w3m-0.4.2.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/w3m/w3m-0.4.2.ebuild,v 1.4 2006/04/21 17:32:14 flameeyes Exp $
-
-inherit eutils
-
-IUSE="gpm cjk gtk imlib xface ssl"
-
-DESCRIPTION="Text based WWW browser, supports tables and frames"
-SRC_URI="mirror://sourceforge/w3m/${P}.tar.gz"
-HOMEPAGE="http://w3m.sourceforge.net/"
-
-SLOT="0"
-LICENSE="w3m"
-KEYWORDS="x86 alpha ppc sparc amd64"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	>=dev-libs/boehm-gc-6.2
-	gtk? ( =x11-libs/gtk+-1.2*
-		media-libs/gdk-pixbuf )
-	!gtk? ( imlib? ( >=media-libs/imlib-1.9.8 ) )
-	xface? ( media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/w3m"
-
-src_unpack() {
-
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/w3m-w3mman-gentoo.diff
-}
-
-src_compile() {
-
-	local myconf migemo_command
-
-	use cjk && myconf="${myconf} --enable-japanese=E"
-
-	if use imlib || use gtk; then
-		myconf="${myconf} --enable-image=x11,fb `use_enable xface`"
-	else
-		myconf="${myconf} --enable-image=no"
-	fi
-
-	if has_version 'app-emacs/migemo' ; then
-		migemo_command="migemo -t egrep /usr/share/migemo/migemo-dict"
-	else
-		migemo_command="no"
-	fi
-
-	econf --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 ssl digest-auth` \
-		`use_with ssl` \
-		${myconf} || die
-
-	make || make || 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 cjk ; then
-		docinto doc-jp ; dodoc doc-jp/*
-	else
-		rm -rf ${D}/usr/share/man/ja
-	fi
-}
diff --git a/www-client/w3m/w3m-0.5.1-r1.ebuild b/www-client/w3m/w3m-0.5.1-r1.ebuild
deleted file mode 100644
index d934e57f379c..000000000000
--- a/www-client/w3m/w3m-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2006 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.8 2006/04/21 17:32:14 flameeyes 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}/${P}-async-1.diff.gz )
-	nls? ( ${PATCH_PATH}/w3m-cvs-1.916-nlsfix-2.diff )"
-# 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_P}-bkmknls-1.diff )
-
-LICENSE="w3m"
-SLOT="0"
-KEYWORDS="x86 alpha ppc sparc amd64 ppc64 ia64"
-IUSE="X async cjk gpm gtk imlib2 lynxkeymap migemo nls ssl xface"
-#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.
-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 )
-		!gtk? ( imlib2? ( >=media-libs/imlib2-1.1.0 )
-			!imlib2? ( >=media-libs/imlib-1.9.8 ) )
-	)
-	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/w3m"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-w3mman-gentoo.diff
-	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
-}
-
-src_compile() {
-
-	local myconf migemo_command imagelib
-
-	if use X ; then
-		myconf="${myconf} --enable-image=x11,fb $(use_enable xface)"
-		if use gtk ; then
-			imagelib="gdk-pixbuf"
-		elif use imlib2 ; then
-			imagelib="imlib2"
-		else
-			imagelib="imlib"
-		fi
-	else	# no X
-		myconf="${myconf} --enable-image=no"
-		imagelib="no"
-	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 cjk ; then
-		myconf="${myconf}
-			--enable-japanese=E
-			--with-charset=EUC-JP"
-	else
-		myconf="${myconf}
-			--with-charset=US-ASCII"
-	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 \
-		--with-imagelib="${imagelib}" \
-		--with-migemo="${migemo_command}" \
-		--enable-m17n \
-		--enable-unicode \
-		$(use_enable gpm mouse) \
-		$(use_enable ssl digest-auth) \
-		$(use_with ssl) \
-		$(use_enable nls) \
-		${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 cjk ; then
-		docinto doc-jp ; dodoc doc-jp/*
-	else
-		rm -rf ${D}/usr/share/man/ja
-	fi
-}