18 files changed, 9 insertions, 770 deletions
diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 14314bfa4e61..5a3889c35c46 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.28 2003/09/23 01:11:02 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.29 2003/09/23 07:32:53 usata Exp $
+
+  23 Sep 2003; Mamoru KOMACHI <usata@gentoo.org> w3m-0.2.2-r1.ebuild,
+  w3m-0.3-r2.ebuild, w3m-0.3-r6.ebuild, w3m-0.3.2.1.ebuild,
+  w3m-0.4.1-r1.ebuild, w3m-0.4.1-r2.ebuild, w3m-0.4.1.ebuild,
+  files/config.param, files/w3m-0.1.10.diff.gz:
+  Cleaned out old versions and patches. <net-www/w3m-0.3.2.2 had
+  security hole and w3m-0.4.1{,-r1,-r2} are somewhat redundant.
 
 *w3m-0.4.2 (23 Sep 2003)
 
diff --git a/net-www/w3m/Manifest b/net-www/w3m/Manifest
index 5395aa1196d3..e1b5788729e2 100644
--- a/net-www/w3m/Manifest
+++ b/net-www/w3m/Manifest
@@ -1,27 +1,11 @@
-MD5 e5e2a048d359cfce0ed961633e74fac2 ChangeLog 5521
-MD5 e91abafb626e658ddead4da60c447213 w3m-0.2.2-r1.ebuild 2997
-MD5 b8bcaa49829635f94fb6e7c879e1045b w3m-0.3-r2.ebuild 3503
-MD5 821ce7a4eecf2bbfbf8e49af063a7d7b w3m-0.3-r6.ebuild 3636
-MD5 9fe9cd8f1a746e5598cfdbae12104f8b w3m-0.3.2.1.ebuild 3732
+MD5 f0f04b33b0556f1551992b76b776032b ChangeLog 5891
 MD5 1f7b8fffb13d61fe43a3294dcf037926 w3m-0.3.2.2.ebuild 3732
-MD5 f91a81f2482305bc8f3af2e3cb0dbd88 w3m-0.4.1-r1.ebuild 2150
-MD5 e1bb4db5cf3c78477b1b5c44953be99c w3m-0.4.1-r2.ebuild 2150
-MD5 3078ac582f35e72b43ee1369a534d3d9 w3m-0.4.1.ebuild 2143
 MD5 003ecc09459bb3933a50d51c2b757630 w3m-0.4.ebuild 4437
 MD5 2cc7f122679cd4492d5da2a1f84bc972 w3m-0.4.1-r3.ebuild 2212
 MD5 97b0fc5d94ef0a7f1358492dfaaf1e8f w3m-0.4.2.ebuild 1731
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
-MD5 feec9d97e61a095d33af68a5b301372f files/config.param 404
-MD5 7d3cca8a96c2485f12ee3c65fb4b3195 files/digest-w3m-0.2.2-r1 62
-MD5 ea9ffc3e59251a86366bc9f0899df712 files/digest-w3m-0.3-r2 60
-MD5 ea9ffc3e59251a86366bc9f0899df712 files/digest-w3m-0.3-r6 60
-MD5 3b89845b1813e2abecb76bf4954444ef files/digest-w3m-0.3.2.1 64
 MD5 df74b28e72e6c2140a1dd6e4ea042e58 files/digest-w3m-0.3.2.2 64
 MD5 b289d2ea47e3369102b13b53f2bc47ac files/digest-w3m-0.4 60
-MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1 62
-MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r1 62
-MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r2 62
-MD5 8317b9a2ace48dc6562a52d7bf21abc6 files/w3m-0.1.10.diff.gz 562
 MD5 00a360d12cc07d61c5fd5df08a53d261 files/w3m-0.4-alpha.patch 930
 MD5 fd7a37dd6717b69b356f6179a19e17b7 files/digest-w3m-0.4.1-r3 62
 MD5 ccf8db4eb493664368e4e4c77cea99d4 files/digest-w3m-0.4.2 61
diff --git a/net-www/w3m/files/config.param b/net-www/w3m/files/config.param
deleted file mode 100644
index dca364cb7685..000000000000
--- a/net-www/w3m/files/config.param
+++ /dev/null
@@ -1,24 +0,0 @@
-# Configuretion at gentoolinux.mydomain
-def_bindir='/usr/bin'
-def_libdir='/usr/lib/w3m'
-def_helpdir='/usr/lib/w3m'
-pref_lang=2
-lynx_key=n
-ftppass_hostnamegen=n
-show_params=n
-use_nntp=n
-use_color=y
-use_menu=y
-use_mouse=y
-use_cookie=y
-use_ssl=y
-dmodel=5
-use_ssl_verify=y
-ded='/usr/bin/vi'
-dmail='mailx'
-dbrowser='/usr/X11R6/bin/netscape'
-dcc='gcc'
-dcflags='-O6 -mpentium'
-dtermlib='-lncurses'
-dldflags=''
-
diff --git a/net-www/w3m/files/digest-w3m-0.2.2-r1 b/net-www/w3m/files/digest-w3m-0.2.2-r1
deleted file mode 100644
index 70117d7e2526..000000000000
--- a/net-www/w3m/files/digest-w3m-0.2.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5c7f93827471fa86080a742b4bbaf51d w3m-0.2.2.tar.gz 1047478
diff --git a/net-www/w3m/files/digest-w3m-0.3-r2 b/net-www/w3m/files/digest-w3m-0.3-r2
deleted file mode 100644
index 9f6e24c4479d..000000000000
--- a/net-www/w3m/files/digest-w3m-0.3-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1dab828926801901276fbe1bbfedd5a w3m-0.3.tar.gz 1061297
diff --git a/net-www/w3m/files/digest-w3m-0.3-r6 b/net-www/w3m/files/digest-w3m-0.3-r6
deleted file mode 100644
index 9f6e24c4479d..000000000000
--- a/net-www/w3m/files/digest-w3m-0.3-r6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1dab828926801901276fbe1bbfedd5a w3m-0.3.tar.gz 1061297
diff --git a/net-www/w3m/files/digest-w3m-0.3.2.1 b/net-www/w3m/files/digest-w3m-0.3.2.1
deleted file mode 100644
index 9d60ab16a9da..000000000000
--- a/net-www/w3m/files/digest-w3m-0.3.2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57bf880287c6da22f4bb31630ac01122 w3m-0.3.2.1.tar.gz 1183467
diff --git a/net-www/w3m/files/digest-w3m-0.4.1 b/net-www/w3m/files/digest-w3m-0.4.1
deleted file mode 100644
index 61a1d9de1887..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b496ec119dc9734059035e70988dd470 w3m-0.4.1.tar.gz 1250762
diff --git a/net-www/w3m/files/digest-w3m-0.4.1-r1 b/net-www/w3m/files/digest-w3m-0.4.1-r1
deleted file mode 100644
index 61a1d9de1887..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b496ec119dc9734059035e70988dd470 w3m-0.4.1.tar.gz 1250762
diff --git a/net-www/w3m/files/digest-w3m-0.4.1-r2 b/net-www/w3m/files/digest-w3m-0.4.1-r2
deleted file mode 100644
index 61a1d9de1887..000000000000
--- a/net-www/w3m/files/digest-w3m-0.4.1-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b496ec119dc9734059035e70988dd470 w3m-0.4.1.tar.gz 1250762
diff --git a/net-www/w3m/files/w3m-0.1.10.diff.gz b/net-www/w3m/files/w3m-0.1.10.diff.gz
deleted file mode 100644
index d87f6fdda787..000000000000
--- a/net-www/w3m/files/w3m-0.1.10.diff.gz
+++ /dev/null
diff --git a/net-www/w3m/w3m-0.2.2-r1.ebuild b/net-www/w3m/w3m-0.2.2-r1.ebuild
deleted file mode 100644
index eb71cf5c4901..000000000000
--- a/net-www/w3m/w3m-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.2.2-r1.ebuild,v 1.10 2003/02/13 15:45:14 vapier Exp $
-
-IUSE="gpm ssl"
-
-S=${WORKDIR}/${P}
-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 sparc "
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser"
-
-src_compile() {
-	# It seems to be hard to configure this program in any reasonable
-	# way.
-	(
-		# Which directory do you want to put the binary?
-		echo /usr/bin
-		# Which directory do you want to put the support binary files?
-		echo /usr/lib/w3m
-		# Which directory do you want to put the helpfile?
-		echo /usr/share/w3m
-		# Which language do you prefer?
-		#  1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)
-		#  2 - English (charset US_ASCII, ISO-8859-1, etc.)
-		echo 2
-		# Do you want to use Lynx-like key binding?
-		echo n
-		# Do you want to automatically generate domain parts of passwords
-		# for anonymous FTP logins?
-		echo n
-		# Do you want listing of options?
-		echo n
-		# Do you want NNTP support?
-		echo n
-		# Do you want ANSI color escape sequences support?
-		echo y
-		# Let's do some configurations. Choose config option among the list.
-		# 
-		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
-		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
-		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
-		# 4 - Cookie model  (color, menu, mouse, cookie, no SSL)
-		# 5 - Monster model (with everything; you need openSSL library)
-		# 6 - Customize
-		# 
-		# Which?
-		echo 5
-		# Do you want SSL verification support?
-		# (Your SSL library must be version 0.8 or later)
-		use ssl &>/dev/null && echo y || echo n
-		# Input your favorite editor program.
-		echo /usr/bin/nano
-		# Input your favorite mailer program.
-		echo /usr/bin/mail
-		# Input your favorite external browser program.
-		echo /usr/bin/mozilla
-		# Input your favorite C-compiler.
-		echo gcc
-		# Input your favorite C flags.
-		# Cflags and next line were getting jammed together
-		printf "%s\n" "$CFLAGS"
-		# Which terminal library do you want to use? (type "none" if you do not
-		# need one) -- ncurses is the default actually, (default: -lncurses) :
-		# besides this printf needs spaces around the %s to work, use default
-		# instead
-		#printf " %s " "-lncurses"
-		echo
-		# Input additional LD flags other than listed above, if any:
-		# 
-		echo
-	) | ./configure || die "configure failed"
-
-	# binary executables come prebuilt for 80386!
-	# clean it up and be sure to remake for ANY arch
-	cd ${S}/gc
-	make clean
-	cd -
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc doc/* README*
-	doman doc/w3m.1
-}
diff --git a/net-www/w3m/w3m-0.3-r2.ebuild b/net-www/w3m/w3m-0.3-r2.ebuild
deleted file mode 100644
index bc176c4dc4f3..000000000000
--- a/net-www/w3m/w3m-0.3-r2.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3-r2.ebuild,v 1.10 2003/09/06 01:54:09 msterret Exp $
-
-IUSE="gpm imlib ssl"
-
-S=${WORKDIR}/${P}
-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 sparc "
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )
-	imlib? ( media-libs/imlib )"
-
-PROVIDE="virtual/textbrowser"
-
-src_compile() {
-	# It seems to be hard to configure this program in any reasonable
-	# way.
-	(
-		# Which directory do you want to put the binary?
-		echo /usr/bin
-		# Which directory do you want to put the support binary files?
-		echo /usr/lib/w3m
-		# Which directory do you want to put the helpfile?
-		echo /usr/share/w3m
-		# Which directory do you want to put the system wide w3m
-		# configuration file?
-		echo /etc/w3m
-		# Which language do you prefer?
-		#  1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)
-		#  2 - English (charset US_ASCII, ISO-8859-1, etc.)
-		echo 2
-		# Do you want to use Lynx-like key binding?
-		echo n
-		# Let's do some configurations. Choose config option among the list.
-		#
-		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
-		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
-		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
-		# 4 - Cookie model  (color, menu, mouse, cookie, no SSL)
-		# 5 - Monster model (with everything; you need openSSL library)
-		# 6 - Customize
-		# Ok this was 5 but there is no option to disable gpm which not all
-		# people want, so I'm switching this to 6 instead.
-		# Which?
-		echo 6
-		# Do you want color ESC sequence for kterm/pxvt?
-		echo n
-		# Use mouse (requires xterm/kterm/gpm/sysmouse)?
-		use gpm &>/dev/null && echo y || echo n
-		# Use popup menu?
-		echo y
-		# Use cookie?
-		echo y
-		# Do you want SSL verification support?
-		# (Your SSL library must be version 0.8 or later)
-		use ssl &>/dev/null && echo y || echo n
-		# Digest Auth support [y]?
-		echo y
-		# Inline image support (you need Imlib library) [n]?
-		use imlib &>/dev/null && echo y || echo n
-		# ANSI color escape sequences support [n]?
-		echo y
-		# Use Migemo (Roma-ji search; Please see
-		# http://migemo.namazu.org/) [n]?
-		echo n
-		# External URI loader support [y]?
-		echo y
-		# Use w3mmail.cgi [y]?
-		echo y
-		# NNTP support [y]?
-		echo n
-		# Gopher support [y]?
-		echo n
-		# Use alarm support code [y]?
-		echo y
-		# Use mark operation [y]?
-		echo y
-		# Input your favorite editor program.
-		echo /usr/bin/vi
-		# Input your favorite external browser program.
-		echo /usr/bin/mozilla
-		# Input your favorite C-compiler.
-		echo gcc
-		# Input your favorite C flags.
-		printf "%s\n" "$CFLAGS"
-		# Which terminal library do you want to use? (type "none" if you
-		# do not need one)
-		printf "%s\n" "-lncurses"
-		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) :
-		echo
-	) | ./configure || die "configure failed"
-
-	# binary executables come prebuilt for 80386!
-	# clean it up and be sure to remake for ANY arch
-
-	cd ${S}/gc
-	make clean
-	cd -
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dohtml -r doc
-	dodoc README* doc/{HISTORY,README*,keymap*,menu*}
-	doman doc/w3m.1
-}
diff --git a/net-www/w3m/w3m-0.3-r6.ebuild b/net-www/w3m/w3m-0.3-r6.ebuild
deleted file mode 100644
index 6397acaa01cc..000000000000
--- a/net-www/w3m/w3m-0.3-r6.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3-r6.ebuild,v 1.9 2003/09/06 01:54:09 msterret Exp $
-
-IUSE="gpm cjk imlib ssl"
-
-S=${WORKDIR}/${P}
-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 sparc  ppc alpha"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	imlib? ( >=media-libs/imlib-1.9.8 )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser"
-
-src_compile() {
-	# It seems to be hard to configure this program in any reasonable
-	# way.
-	(
-		# Which directory do you want to put the binary?
-		echo /usr/bin
-		# Which directory do you want to put the support binary files?
-		echo /usr/lib/w3m
-		# Which directory do you want to put the helpfile?
-		echo /usr/share/w3m
-		# Which directory do you want to put the system wide w3m
-		# configuration file?
-		echo /etc/w3m
-		# Which language do you prefer?
-		#  1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)
-		#  2 - English (charset US_ASCII, ISO-8859-1, etc.)
-		use cjk &>/dev/null && echo 1 || echo 2
-		# What is your Kanji display
-		use cjk &>/dev/null && echo E
-		# Use 2-byte character for table border, etc
-		use cjk &>/dev/null && echo n
-		# Do you want to use Lynx-like key binding?
-		echo n
-		# Let's do some configurations. Choose config option among the list.
-		#
-		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
-		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
-		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
-		# 4 - Cookie model  (color, menu, mouse, cookie, no SSL)
-		# 5 - Monster model (with everything; you need openSSL library)
-		# 6 - Customize
-		#
-		# Which?
-		echo 6
-		# Do you want color ESC sequence for Kterm/pxvt
-		echo y
-		# Use mouse (requires xterm/kterm/gpm/sysmouse)
-		echo y
-		# Use popup menu
-		echo y
-		# Use cookie
-		echo y
-		# Do you want SSL verification support?
-		# (Your SSL library must be version 0.8 or later)
-		use ssl &>/dev/null && echo y || echo n
-		# (ssl) SSL verification support (SSL library >= version 0.8) [n]?
-		use ssl &>/dev/null && echo n
-		# (ssl) Digest Auth support [y]?
-		use ssl &>/dev/null && echo y
-		# Inline image support (you need Imlib library) [n]?
-		use imlib &>/dev/null && echo y || echo n
-		# ANSI color escape sequences support [n]?
-		echo y
-		# Use Migemo (Roma-ji search; Please see
-		# http://migemo.namazu.org/) [n]?
-		echo n
-		# External URI loader support [y]?
-		echo y
-		# Use w3mmail.cgi [y]?
-		echo y
-		# NNTP support [y]?
-		echo n
-		# Gopher support [y]?
-		echo n
-		# Use alarm support code [y]?
-		echo y
-		# Use mark operation [y]?
-		echo y
-		# Input your favorite editor program.
-		echo /usr/bin/vi
-		# Input your favorite external browser program.
-		echo /usr/bin/mozilla
-		# Input your favorite C-compiler.
-		echo gcc
-		# Input your favorite C flags.
-		printf "%s\n" "$CFLAGS"
-		# Which terminal library do you want to use? (type "none" if you
-		# do not need one)
-		echo
-		#printf "%s\n" "-lncurses"
-		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) :
-		echo
-	) | ./configure || die "configure failed"
-
-	# binary executables come prebuilt for 80386!
-	# clean it up and be sure to remake for ANY arch
-
-	cd ${S}/gc
-	make clean
-	cd -
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc doc/* README*
-	doman doc/w3m.1
-}
diff --git a/net-www/w3m/w3m-0.3.2.1.ebuild b/net-www/w3m/w3m-0.3.2.1.ebuild
deleted file mode 100644
index 7e0efa861a29..000000000000
--- a/net-www/w3m/w3m-0.3.2.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3.2.1.ebuild,v 1.6 2003/09/06 01:54:09 msterret Exp $
-
-IUSE="gpm cjk imlib ssl"
-
-S=${WORKDIR}/${P}
-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 ~sparc  ~ppc"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	imlib? ( >=media-libs/imlib-1.9.8 )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser"
-
-src_compile() {
-	# It seems to be hard to configure this program in any reasonable
-	# way.
-	(
-		# Which directory do you want to put the binary?
-		echo /usr/bin
-		# Which directory do you want to put the support binary files?
-		echo /usr/lib/w3m
-		# Which directory do you want to put the helpfile?
-		echo /usr/share/w3m
-		# Which directory do you want to put the manfile?
-		echo /usr/share/man
-		# Which directory do you want to put the system wide w3m
-		# configuration file?
-		echo /etc/w3m
-		# Which language do you prefer?
-		#  1 - Japanese (charset ISO-2022-JP, EUC-JP, Shift_JIS)
-		#  2 - English (charset US_ASCII, ISO-8859-1, etc.)
-		use cjk &>/dev/null && echo 1 || echo 2
-		# What is your Kanji display
-		use cjk &>/dev/null && echo E
-		# Use 2-byte character for table border, etc
-		use cjk &>/dev/null && echo n
-		# Do you want to use Lynx-like key binding?
-		echo n
-		# Let's do some configurations. Choose config option among the list.
-		#
-		# 1 - Baby model    (no color, no menu, no mouse, no cookie, no SSL)
-		# 2 - Little model  (color, menu, no mouse, no cookie, no SSL)
-		# 3 - Mouse model   (color, menu, mouse, no cookie, no SSL)
-		# 4 - Cookie model  (color, menu, mouse, cookie, no SSL)
-		# 5 - Monster model (with everything; you need openSSL library)
-		# 6 - Customize
-		#
-		# Which?
-		echo 6
-		# Do you want color ESC sequence for Kterm/pxvt
-		echo y
-		# Use mouse (requires xterm/kterm/gpm/sysmouse)
-		use gpm &>/dev/null && echo y
-		# Use popup menu
-		echo y
-		# Use cookie
-		echo y
-		# Do you want SSL verification support?
-		# (Your SSL library must be version 0.8 or later)
-		use ssl &>/dev/null && echo y || echo n
-		# (ssl) SSL verification support (SSL library >= version 0.8) [n]?
-		use ssl &>/dev/null && echo n
-		# (ssl) Digest Auth support [y]?
-		use ssl &>/dev/null && echo y
-		# Inline image support (you need Imlib library) [n]?
-		use imlib &>/dev/null && echo y || echo n
-		# ANSI color escape sequences support [n]?
-		echo y
-		# Use Migemo (Roma-ji search; Please see
-		# http://migemo.namazu.org/) [n]?
-		echo n
-		# External URI loader support [y]?
-		echo y
-		# Use w3mmail.cgi [y]?
-		echo y
-		# NNTP support [y]?
-		echo n
-		# Gopher support [y]?
-		echo n
-		# Use alarm support code [y]?
-		echo y
-		# Use mark operation [y]?
-		echo y
-		# Input your favorite editor program.
-		echo /usr/bin/nano
-		# Input your favorite external browser program.
-		echo /usr/bin/mozilla
-		# Input your favorite C-compiler.
-		echo gcc
-		# Input your favorite C flags.
-		printf "%s\n" "$CFLAGS"
-		# Which terminal library do you want to use? (type "none" if you
-		# do not need one)
-		echo
-		#printf "%s\n" "-lncurses"
-		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) :
-		echo
-	) | ./configure || die "configure failed"
-
-	# binary executables come prebuilt for 80386!
-	# clean it up and be sure to remake for ANY arch
-
-	cd ${S}/gc
-	make clean
-	cd -
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc doc/* README*
-	doman doc/w3m.1
-}
diff --git a/net-www/w3m/w3m-0.4.1-r1.ebuild b/net-www/w3m/w3m-0.4.1-r1.ebuild
deleted file mode 100644
index b757779da2e2..000000000000
--- a/net-www/w3m/w3m-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2003 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.1-r1.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
-
-inherit eutils
-
-IUSE="gpm cjk imlib 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"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	imlib? ( >=media-libs/imlib-1.9.8 media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use alpha; then
-		epatch ${FILESDIR}/w3m-0.4-alpha.patch || die "epatch failed"
-	fi
-}
-
-src_compile() {
-	local myuse
-	myuse="use_cookie=y use_ansi_color=y"
-
-	local myconf
-	myconf="-prefix=/usr -mandir=/usr/share/man -sysconfdir=/etc/w3m \
-		--gc-includedir=/usr/include/gc --gc-libdir=/usr/lib \
-		-cflags=${CFLAGS} -model=custom -nonstop"
-
-	if use cjk &>/dev/null; then
-		myconf="${myconf} -lang=ja -code=E"
-	else
-		myconf="${myconf} -lang=en"
-	fi
-
-	if use ssl &>/dev/null; then
-		myconf="${myconf} --ssl-includedir=/usr/include/openssl --ssl-libdir=/usr/lib"
-		myuse="${myuse} use_ssl=y use_ssl_verify=n use_digest_auth=y"
-	else
-		myuse="${myuse} use_ssl=n"
-	fi
-
-	if use gpm &>/dev/null; then
-		myuse="${myuse} use_mouse=y"
-	else
-		myuse="${myuse} use_mouse=n"
-	fi
-
-	if use imlib &>/dev/null; then
-		myuse="${myuse} use_image=y use_w3mimg_x11=y use_w3mimg_fb=y w3mimgdisplay_setuid=n use_xface=y"
-	else
-		myuse="${myuse} use_image=n"
-	fi
-
-	env ${myuse} ./configure ${myconf} || die "configure failed"
-
-	# Test to make sure the above configuration was sane
-	grep -q "dcc='gcc'" config.param || \
-		die "configure out of sync; ebuild needs an update"
-
-	# binary executables come prebuilt for 80386!
-	# clean it up and be sure to remake for ANY arch
-	cd ${S}/gc
-	make clean
-	cd -
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc doc/* README*
-	doman doc/w3m.1
-}
diff --git a/net-www/w3m/w3m-0.4.1-r2.ebuild b/net-www/w3m/w3m-0.4.1-r2.ebuild
deleted file mode 100644
index b06a3f70d9be..000000000000
--- a/net-www/w3m/w3m-0.4.1-r2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2003 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.1-r2.ebuild,v 1.2 2003/09/06 01:54:09 msterret Exp $
-
-inherit eutils
-
-IUSE="gpm cjk imlib 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"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	imlib? ( >=media-libs/imlib-1.9.8 media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use alpha; then
-		epatch ${FILESDIR}/w3m-0.4-alpha.patch || die "epatch failed"
-	fi
-}
-
-src_compile() {
-	local myuse
-	myuse="use_cookie=y use_ansi_color=y"
-
-	local myconf
-	myconf="-prefix=/usr -mandir=/usr/share/man -sysconfdir=/etc/w3m \
-		--gc-includedir=/usr/include/gc --gc-libdir=/usr/lib \
-		-cflags=${CFLAGS} -model=custom -nonstop"
-
-	if use cjk &>/dev/null; then
-		myconf="${myconf} -lang=ja -code=E"
-	else
-		myconf="${myconf} -lang=en"
-	fi
-
-	if use ssl &>/dev/null; then
-		myconf="${myconf} --ssl-includedir=/usr/include/openssl --ssl-libdir=/usr/lib"
-		myuse="${myuse} use_ssl=y use_ssl_verify=y use_digest_auth=y"
-	else
-		myuse="${myuse} use_ssl=n"
-	fi
-
-	if use gpm &>/dev/null; then
-		myuse="${myuse} use_mouse=y"
-	else
-		myuse="${myuse} use_mouse=n"
-	fi
-
-	if use imlib &>/dev/null; then
-		myuse="${myuse} use_image=y use_w3mimg_x11=y use_w3mimg_fb=y w3mimgdisplay_setuid=n use_xface=y"
-	else
-		myuse="${myuse} use_image=n"
-	fi
-
-	env ${myuse} ./configure ${myconf} || die "configure failed"
-
-	# Test to make sure the above configuration was sane
-	grep -q "dcc='gcc'" config.param || \
-		die "configure out of sync; ebuild needs an update"
-
-	# binary executables come prebuilt for 80386!
-	# clean it up and be sure to remake for ANY arch
-	cd ${S}/gc
-	make clean
-	cd -
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc doc/* README*
-	doman doc/w3m.1
-}
diff --git a/net-www/w3m/w3m-0.4.1.ebuild b/net-www/w3m/w3m-0.4.1.ebuild
deleted file mode 100644
index 364c8843714f..000000000000
--- a/net-www/w3m/w3m-0.4.1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2003 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.1.ebuild,v 1.3 2003/09/06 01:54:09 msterret Exp $
-
-inherit eutils
-
-IUSE="gpm cjk imlib 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"
-
-DEPEND=">=sys-libs/ncurses-5.2-r3
-	>=sys-libs/zlib-1.1.3-r2
-	imlib? ( >=media-libs/imlib-1.9.8 media-libs/compface )
-	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
-	ssl? ( >=dev-libs/openssl-0.9.6b )"
-
-PROVIDE="virtual/textbrowser"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	if use alpha; then
-		epatch ${FILESDIR}/w3m-0.4-alpha.patch || die "epatch failed"
-	fi
-}
-
-src_compile() {
-	local myuse
-	myuse="use_cookie=y use_ansi_color=y"
-
-	local myconf
-	myconf="-prefix=/usr -mandir=/usr/share/man -sysconfdir=/etc/w3m \
-		--gc-includedir=/usr/include/gc --gc-libdir=/usr/lib \
-		-cflags=${CFLAGS} -model=custom -nonstop"
-
-	if use cjk &>/dev/null; then
-		myconf="${myconf} -lang=ja -code=E"
-	else
-		myconf="${myconf} -lang=en"
-	fi
-
-	if use ssl &>/dev/null; then
-		myconf="${myconf} --ssl-includedir=/usr/include/openssl --ssl-libdir=/usr/lib"
-		myuse="${myuse} use_ssl=yes use_ssl_verify=n use_digest_auth=y"
-	else
-		myuse="${myuse} use_ssl=no"
-	fi
-
-	if use gpm &>/dev/null; then
-		myuse="${myuse} use_mouse=y"
-	else
-		myuse="${myuse} use_mouse=n"
-	fi
-
-	if use imlib &>/dev/null; then
-		myuse="${myuse} use_image=y use_w3mimg_x11=y use_w3mimg_fb=y w3mimgdisplay_setuid=n use_xface=y"
-	else
-		myuse="${myuse} use_image=n"
-	fi
-
-	env ${myuse} ./configure ${myconf} || die "configure failed"
-
-	# Test to make sure the above configuration was sane
-	grep -q "dcc='gcc'" config.param || \
-		die "configure out of sync; ebuild needs an update"
-
-	# binary executables come prebuilt for 80386!
-	# clean it up and be sure to remake for ANY arch
-	cd ${S}/gc
-	make clean
-	cd -
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc doc/* README*
-	doman doc/w3m.1
-}