Changed net-www/w3mmee to virtual/w3m. See bug #38795

4 files changed, 5 insertions, 26 deletions

diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index d3ad3008c7c0..b454e52cc2d4 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,12 +1,9 @@
 MD5 e277b009bc76f36ac989a13fa3e449af emacs-w3m-1.3.2.ebuild 1117
 MD5 af6e6f0b683147819758d23b35d568b2 emacs-w3m-1.3.6.ebuild 1168
-MD5 69cc7f48c58ba738e601c8212dfbe570 ChangeLog 1262
+MD5 bb6b7444df86be4920c856a395f1181d ChangeLog 1535
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 59ef181832ea4106f58593a46e0ad930 emacs-w3m-1.3.80.ebuild 1284
-MD5 7fe7226763d9f053f44b0bcf22f49628 emacs-w3m-1.3.80-r1.ebuild 1218
+MD5 875b45f1e74a3040a4f4eeee0909e935 emacs-w3m-1.3.80-r1.ebuild 1221
 MD5 652abce1ecea5cf20323bd9f27ec8a6b files/70emacs-w3m-gentoo.el 605
 MD5 e511ad802b2b7dd9d27a599c7d48797d files/digest-emacs-w3m-1.3.2 67
 MD5 51951f89d5a4c0bed84788a881adc286 files/digest-emacs-w3m-1.3.6 67
-MD5 13af620d276d60d15bf2bfdf63b426d5 files/digest-emacs-w3m-1.3.80 68
-MD5 199325bcdb7ff43532d617310d42f4d2 files/70emacs-w3mmee-gentoo.el 643
 MD5 13af620d276d60d15bf2bfdf63b426d5 files/digest-emacs-w3m-1.3.80-r1 68
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.3.80.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.3.80-r1.ebuild
index 8ee06b7531eb..178f091ecf2b 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.3.80.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.3.80-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.3.80.ebuild,v 1.2 2004/01/18 19:41:27 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.3.80-r1.ebuild,v 1.1 2004/01/21 16:37:01 usata Exp $
 
 inherit elisp
 
@@ -15,9 +15,8 @@ SLOT="0"
 # This is development release and is not intended to be stable
 KEYWORDS="~x86"
 
-# This version won't run on w3m and w3m-m17n
 DEPEND="virtual/emacs
-	>=net-www/w3mmee-0.3.2_p24-r3
+	virtual/w3m
 	>=app-emacs/apel-10.3
 	virtual/flim"
 
@@ -41,7 +40,7 @@ src_install () {
 		ICONDIR=${D}/usr/share/${PN}/icon \
 		install-icons || die
 
-	elisp-site-file-install ${FILESDIR}/70emacs-w3mmee-gentoo.el
+	elisp-site-file-install ${FILESDIR}/70emacs-w3m-gentoo.el
 
 	dodoc ChangeLog* README* TIPS* FAQ*
 }
diff --git a/app-emacs/emacs-w3m/files/70emacs-w3mmee-gentoo.el b/app-emacs/emacs-w3m/files/70emacs-w3mmee-gentoo.el
deleted file mode 100644
index df6b05102ca2..000000000000
--- a/app-emacs/emacs-w3m/files/70emacs-w3mmee-gentoo.el
+++ /dev/null
@@ -1,17 +0,0 @@
-
-;;; emacs-w3m site-lisp configuration
-
-(add-to-list 'load-path "@SITELISP@")
-
-(setq w3m-command "/usr/bin/w3mmee")
-
-(autoload 'w3m "w3m" "Interface for w3m on Emacs." t)
-(autoload 'w3m-browse-url "w3m" "Interface for w3m on Emacs." t)
-(autoload 'w3m-find-file "w3m" "w3m interface function for local file." t)
-(autoload 'w3m-search "w3m-search" "Search QUERY using SEARCH-ENGINE." t)
-(autoload 'w3m-weather "w3m-weather" "Display weather report." t)
-(autoload 'w3m-antenna "w3m-antenna" "Report chenge of WEB sites." t)
-(autoload 'w3m-namazu "w3m-namazu" "Search files with Namazu." t)
-
-(setq w3m-icon-directory "/usr/share/emacs-w3m/icon")
-
diff --git a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.80 b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.80-r1
index 71d85d8b7cb1..71d85d8b7cb1 100644
--- a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.80
+++ b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.80-r1