Version bumped. Don't assign default to S. Removed old ebuilds.

9 files changed, 15 insertions, 96 deletions

diff --git a/app-emacs/emacs-w3m/ChangeLog b/app-emacs/emacs-w3m/ChangeLog
index e2d90d74ae35..fe158d4d10e5 100644
--- a/app-emacs/emacs-w3m/ChangeLog
+++ b/app-emacs/emacs-w3m/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/emacs-w3m
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.11 2004/04/19 21:02:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.12 2004/04/25 17:05:27 usata Exp $
+
+*emacs-w3m-1.3.90 (26 Apr 2004)
+
+  26 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> emacs-w3m-1.3.2.ebuild,
+  emacs-w3m-1.3.6.ebuild, emacs-w3m-1.3.85.ebuild, emacs-w3m-1.3.90.ebuild,
+  files/emacs-w3m-1.3.80-gentoo.diff:
+  Version bumped. Don't assign default to S. Removed old ebuilds.
 
   19 Apr 2004; Bryan Østergaard <kloeri@gentoo.org> emacs-w3m-1.3.85.ebuild:
   Added ~alpha.
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index fc95a8b65c5e..afb2faf6f3b6 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,10 +1,7 @@
-MD5 a72dc89dfe09263a34104c4203224b01 ChangeLog 1970
-MD5 a0dcf0429a18296ab18620b9de3d0a46 emacs-w3m-1.3.2.ebuild 1118
-MD5 2fdfdb589ffa2635143e56a1b5f39135 emacs-w3m-1.3.6.ebuild 1169
+MD5 516f4624fd740819f7707cdacf39ac03 emacs-w3m-1.3.6.ebuild 1149
+MD5 dc8d9dfc16467c338e466f98593ae042 ChangeLog 2256
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
-MD5 e3b3842e24ca243bfdec263a4bafc4c5 emacs-w3m-1.3.85.ebuild 1226
+MD5 52d229044ca29d8722f783b7c9a4001c emacs-w3m-1.3.90.ebuild 1206
 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 1728fc0eb49719ce91e3ee4ade3d63c2 files/digest-emacs-w3m-1.3.85 68
-MD5 1cbcf1e359d46ada44b5d439f7533071 files/emacs-w3m-1.3.80-gentoo.diff 877
+MD5 c457105ac96658135875e67d9f49f373 files/digest-emacs-w3m-1.3.90 68
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.3.2.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.3.2.ebuild
deleted file mode 100644
index 8cc6f4670037..000000000000
--- a/app-emacs/emacs-w3m/emacs-w3m-1.3.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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.2.ebuild,v 1.6 2004/04/19 21:02:02 kloeri Exp $
-
-inherit elisp
-
-IUSE=""
-
-DESCRIPTION="emacs-w3m is interface program of w3m on Emacs."
-HOMEPAGE="http://emacs-w3m.namazu.org"
-SRC_URI="http://emacs-w3m.namazu.org/${P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-
-DEPEND="virtual/emacs
-	virtual/w3m
-	>=app-emacs/apel-10.3
-	virtual/flim"
-
-S=${WORKDIR}/${P}
-
-src_compile() {
-	./configure --prefix=/usr \
-		--with-lispdir=${SITELISP}/${PN} \
-		--with-icondir=/usr/share/${PN}/icon
-
-	make || die
-}
-
-src_install () {
-	make lispdir=${D}/${SITELISP}/${PN} \
-		ICONDIR=${D}/usr/share/${PN}/icon \
-		install || die
-
-	make lispdir=${D}/${SITELISP}/${PN} \
-		ICONDIR=${D}/usr/share/${PN}/icon \
-		install-icons || die
-
-	elisp-site-file-install ${FILESDIR}/70emacs-w3m-gentoo.el
-
-	dodoc ChangeLog* README* TIPS* FAQ*
-}
-
-pkg_postinst() {
-	elisp-site-regen
-	einfo "Please see /usr/share/doc/${P}/README.gz."
-}
-
-pkg_postrm() {
-	elisp-site-regen
-}
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.3.6.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.3.6.ebuild
index 08a0ec4fc950..c0ea359af76a 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.3.6.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.3.6.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.6.ebuild,v 1.5 2004/04/19 21:02:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.3.6.ebuild,v 1.6 2004/04/25 17:05:28 usata Exp $
 
 inherit elisp
 
@@ -19,8 +19,6 @@ DEPEND="virtual/emacs
 	>=app-emacs/apel-10.3
 	virtual/flim"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	./configure --prefix=/usr \
 		--with-lispdir=${SITELISP}/${PN} \
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.3.85.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.3.90.ebuild
index d8d9c7272227..82c9fa956e14 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.3.85.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.3.90.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.85.ebuild,v 1.2 2004/04/19 21:02:02 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.3.90.ebuild,v 1.1 2004/04/25 17:05:28 usata Exp $
 
 inherit elisp
 
@@ -20,8 +20,6 @@ DEPEND="virtual/emacs
 	>=app-emacs/apel-10.3
 	virtual/flim"
 
-S=${WORKDIR}/${P}
-
 src_compile() {
 	./configure --prefix=/usr \
 		--with-lispdir=${SITELISP}/${PN} \
diff --git a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.2 b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.2
deleted file mode 100644
index efda8bddf5c9..000000000000
--- a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5cdfa562497f5033d6d36d9b7eb8996e emacs-w3m-1.3.2.tar.gz 351719
diff --git a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.85 b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.85
deleted file mode 100644
index bc330eec2821..000000000000
--- a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.85
+++ /dev/null
@@ -1 +0,0 @@
-MD5 309bdbc98dab81f44cad7d11984d4df7 emacs-w3m-1.3.85.tar.gz 694010
diff --git a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.90 b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.90
new file mode 100644
index 000000000000..22cae86048d6
--- /dev/null
+++ b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.3.90
@@ -0,0 +1 @@
+MD5 78976b6168d134beb064798eedc4b5f9 emacs-w3m-1.3.90.tar.gz 702052
diff --git a/app-emacs/emacs-w3m/files/emacs-w3m-1.3.80-gentoo.diff b/app-emacs/emacs-w3m/files/emacs-w3m-1.3.80-gentoo.diff
deleted file mode 100644
index 5d56329e7bd0..000000000000
--- a/app-emacs/emacs-w3m/files/emacs-w3m-1.3.80-gentoo.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: w3m.el
-===================================================================
-RCS file: /storage/cvsroot/emacs-w3m/w3m.el,v
-retrieving revision 1.980
-retrieving revision 1.981
-diff -u -r1.980 -r1.981
---- w3m.el	18 Jan 2004 14:36:43 -0000	1.980
-+++ w3m.el	22 Jan 2004 08:00:20 -0000	1.981
-@@ -3409,12 +3409,17 @@
- 			 "URL: "))
- 		   'w3m-url-completion nil nil initial
- 		   'w3m-input-url-history)))
--      (if (string= "" url) (setq url default))
-+      (when (string= "" url)
-+	(setq url default))
-       ;; remove duplication
-       (when (stringp url)
- 	(setq w3m-input-url-history
- 	      (cons url (delete url w3m-input-url-history))))
--      url)))
-+      ;; The return value of this function must contain a scheme part.
-+      (if (and (string-match w3m-url-components-regexp url)
-+	       (match-beginning 1))
-+	  url
-+	(concat "http://" url)))))
- 
- 
- ;;; Cache: