Fix bug 4701 and Cleaned house

9 files changed, 26 insertions, 178 deletions

diff --git a/net-www/w3m/ChangeLog b/net-www/w3m/ChangeLog
index 10b5cdbc00bf..feaaa39c03aa 100644
--- a/net-www/w3m/ChangeLog
+++ b/net-www/w3m/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-www/w3m
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.4 2002/06/09 07:34:26 naz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/ChangeLog,v 1.5 2002/07/14 19:25:43 naz Exp $
+
+
+*w3m-0.3-r2 (07 Jun 2002)
+
+    14 Jul 2002; Michael Nazaroff <naz@gentoo.org> w3m-0.3-r3.ebuild:
+
+	Updated the ebuild and changed the configure options so mouse support
+	is always on.  This should take care of bug 4701.  I probably need to 
+	look at a patch so we can have a gpm use variable in this ebuild, since
+	it still is flaky.
 
 
 *w3m-0.3-r2 (07 Jun 2002)
diff --git a/net-www/w3m/files/digest-w3m-0.2.2 b/net-www/w3m/files/digest-w3m-0.2.2
deleted file mode 100644
index 70117d7e2526..000000000000
--- a/net-www/w3m/files/digest-w3m-0.2.2
+++ /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-r1 b/net-www/w3m/files/digest-w3m-0.3-r1
deleted file mode 100644
index 9f6e24c4479d..000000000000
--- a/net-www/w3m/files/digest-w3m-0.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d1dab828926801901276fbe1bbfedd5a w3m-0.3.tar.gz 1061297
diff --git a/net-www/w3m/files/digest-w3m-0.3 b/net-www/w3m/files/digest-w3m-0.3-r3
index 9f6e24c4479d..9f6e24c4479d 100644
--- a/net-www/w3m/files/digest-w3m-0.3
+++ b/net-www/w3m/files/digest-w3m-0.3-r3
diff --git a/net-www/w3m/w3m-0.2.2-r1.ebuild b/net-www/w3m/w3m-0.2.2-r1.ebuild
index 3906507c468a..cd3ba0640b02 100644
--- a/net-www/w3m/w3m-0.2.2-r1.ebuild
+++ b/net-www/w3m/w3m-0.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.2.2-r1.ebuild,v 1.3 2002/07/11 06:30:49 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.2.2-r1.ebuild,v 1.4 2002/07/14 19:25:43 naz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text based WWW browser, supports tables and frames"
@@ -13,6 +13,10 @@ DEPEND="virtual/glibc
 	gpm? ( >=sys-libs/gpm-1.19.3-r5 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )"
 
+SLOT="0"
+LICENSE="w3m"
+KEYWORDS="x86"
+
 src_compile() {
 	# It seems to be hard to configure this program in any reasonable
 	# way.
diff --git a/net-www/w3m/w3m-0.2.2.ebuild b/net-www/w3m/w3m-0.2.2.ebuild
deleted file mode 100644
index e5658f2ac343..000000000000
--- a/net-www/w3m/w3m-0.2.2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.2.2.ebuild,v 1.5 2002/07/11 06:30:49 drobbins Exp $
-
-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/"
-
-DEPEND="virtual/glibc
-	>=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 )"
-
-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/vi
-		# 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.
-		printf "%s" "$CFLAGS"
-		# Which terminal library do you want to use? (type "none" if you
-		# do not need one)
-		printf "%s" "-lncurses"
-		# Input additional LD flags other than listed above, if any:
-		# (default: -lncurses) : 
-		echo
-	) | ./configure || die "configure failed"
-	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
index afdab9459a57..6cdc72a0bd15 100644
--- a/net-www/w3m/w3m-0.3-r2.ebuild
+++ b/net-www/w3m/w3m-0.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3-r2.ebuild,v 1.2 2002/07/04 08:19:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3-r2.ebuild,v 1.3 2002/07/14 19:25:43 naz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text based WWW browser, supports tables and frames"
@@ -14,6 +14,10 @@ DEPEND="virtual/glibc
 	ssl? ( >=dev-libs/openssl-0.9.6b )
 	imlib? ( media-libs/imlib )"
 
+SLOT="0"
+LICENSE="w3m"
+KEYWORDS="x86"
+
 src_compile() {
 	# It seems to be hard to configure this program in any reasonable
 	# way.
diff --git a/net-www/w3m/w3m-0.3-r1.ebuild b/net-www/w3m/w3m-0.3-r3.ebuild
index cf077a4095d9..6b8157ead313 100644
--- a/net-www/w3m/w3m-0.3-r1.ebuild
+++ b/net-www/w3m/w3m-0.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3-r1.ebuild,v 1.3 2002/07/11 06:30:49 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3-r3.ebuild,v 1.1 2002/07/14 19:25:43 naz Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Text based WWW browser, supports tables and frames"
@@ -14,6 +14,10 @@ DEPEND="virtual/glibc
 	ssl? ( >=dev-libs/openssl-0.9.6b )
 	imlib? ( media-libs/imlib )"
 
+SLOT="0"
+LICENSE="w3m"
+KEYWORDS="x86"
+
 src_compile() {
 	# It seems to be hard to configure this program in any reasonable
 	# way.
diff --git a/net-www/w3m/w3m-0.3.ebuild b/net-www/w3m/w3m-0.3.ebuild
deleted file mode 100644
index 4a4589907af3..000000000000
--- a/net-www/w3m/w3m-0.3.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-www/w3m/w3m-0.3.ebuild,v 1.4 2002/07/11 06:30:49 drobbins Exp $
-
-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/"
-
-DEPEND="virtual/glibc
-	>=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 )"
-
-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
-		# 
-		# 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
-		# 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"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc doc/* README*
-	doman doc/w3m.1
-}