Fixed an error with emacs-cvs. Thanks to Ming Zhao <ming@gentoo.org>; bug #81406.

(Portage version: 2.0.51.19)

6 files changed, 61 insertions, 9 deletions

diff --git a/app-emacs/emacs-w3m/ChangeLog b/app-emacs/emacs-w3m/ChangeLog
index 317a01e0e753..de8aa7a03932 100644
--- a/app-emacs/emacs-w3m/ChangeLog
+++ b/app-emacs/emacs-w3m/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/emacs-w3m
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.29 2005/02/11 14:39:44 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.30 2005/03/05 15:19:08 usata Exp $
+
+*emacs-w3m-1.4.3-r2 (06 Mar 2005)
+
+  06 Mar 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/emacs-w3m-1.4.3-e23.diff, -emacs-w3m-1.4.2.ebuild,
+  +emacs-w3m-1.4.3-r2.ebuild:
+  Fixed an error with emacs-cvs. Thanks to Ming Zhao <ming@gentoo.org>;
+  bug #81406.
 
 *emacs-w3m-1.4.3-r1 (11 Feb 2005)
 
@@ -74,7 +82,7 @@
   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:
+  19 Apr 2004; Bryan ?stergaard <kloeri@gentoo.org> emacs-w3m-1.3.85.ebuild:
   Added ~alpha.
 
 *emacs-w3m-1.3.85 (28 Feb 2004)
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index 5ffd0e9f2c1b..5a3e3fe6793e 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -4,9 +4,12 @@ MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 f3d389fa1dbc63173d2fb85527e71605 emacs-w3m-1.4.2.ebuild 1564
 MD5 be681fa523c844480ea9f2ec7d40479c emacs-w3m-1.4.3.ebuild 1564
 MD5 8f2a422c5b42af439ba749cc663f6955 emacs-w3m-1.4.3-r1.ebuild 1649
+MD5 0f4efa7ab5c4bf80abdd518c984e6b3a emacs-w3m-1.4.3-r2.ebuild 1707
 MD5 652abce1ecea5cf20323bd9f27ec8a6b files/70emacs-w3m-gentoo.el 605
 MD5 51951f89d5a4c0bed84788a881adc286 files/digest-emacs-w3m-1.3.6 67
 MD5 709fbeaf9933c1c4be1aab5d8b8179fc files/digest-emacs-w3m-1.4.2 67
 MD5 1a86c5bfcbb063dad0683ef554222234 files/digest-emacs-w3m-1.4.3 67
 MD5 1a86c5bfcbb063dad0683ef554222234 files/digest-emacs-w3m-1.4.3-r1 67
 MD5 10f0df2344b9d0fa21c7b9bf6174dd79 files/emacs-w3m-1.4.3-e22.diff 1393
+MD5 a6227ba936faf41fe9c67abc735b06c7 files/emacs-w3m-1.4.3-e23.diff 1048
+MD5 844c0dc28b4157331c3dab94c9adecd7 files/digest-emacs-w3m-1.4.3-r2 123
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.2.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.3-r2.ebuild
index a740a4391f4d..6f39ce736be0 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.2.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.3-r2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.2.ebuild,v 1.5 2005/01/01 13:44:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.3-r2.ebuild,v 1.1 2005/03/05 15:19:08 usata Exp $
 
-inherit elisp
+inherit elisp eutils
 
 IUSE=""
 MY_P="${P/_/}"
@@ -10,14 +10,14 @@ S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs."
 HOMEPAGE="http://emacs-w3m.namazu.org"
-SRC_URI="http://emacs-w3m.namazu.org/${MY_P}.tar.gz"
+SRC_URI="http://emacs-w3m.namazu.org/${MY_P}.tar.gz
+	mirror://gentoo/w3m-e23.el.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 alpha sparc ppc"
+KEYWORDS="~x86 ~alpha ~sparc ~ppc"
 
-DEPEND="virtual/emacs
-	virtual/w3m"
+DEPEND="virtual/w3m"
 
 pkg_setup() {
 	# use async doesn't ensure you built w3m with async flag,
@@ -31,7 +31,15 @@ pkg_setup() {
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	mv w3m-e23.el ${S} || die
+	cd ${S}
+	epatch ${FILESDIR}/${P}-e23.diff
+}
+
 src_compile() {
+	autoconf || die
 	./configure --prefix=/usr \
 		--with-lispdir=${SITELISP}/${PN} \
 		--with-icondir=/usr/share/${PN}/icon
diff --git a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.2 b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.2
deleted file mode 100644
index b805adfe09e4..000000000000
--- a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 9807eb2c156c16c44d3e0cad4462fbe3 emacs-w3m-1.4.2.tar.gz 723139
diff --git a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.3-r2 b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.3-r2
new file mode 100644
index 000000000000..0de852d0a13b
--- /dev/null
+++ b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.3-r2
@@ -0,0 +1,2 @@
+MD5 d6520bb3588a9a8755d2b970d3bc2a25 emacs-w3m-1.4.3.tar.gz 725109
+MD5 495b63c574d58ad5653dec0caaf6523d w3m-e23.el.gz 7689
diff --git a/app-emacs/emacs-w3m/files/emacs-w3m-1.4.3-e23.diff b/app-emacs/emacs-w3m/files/emacs-w3m-1.4.3-e23.diff
new file mode 100644
index 000000000000..d9889b86dd64
--- /dev/null
+++ b/app-emacs/emacs-w3m/files/emacs-w3m-1.4.3-e23.diff
@@ -0,0 +1,32 @@
+--- w3m.el.bak	2005-02-26 20:13:58.000000000 +0800
++++ w3m.el	2005-02-26 20:16:06.000000000 +0800
+@@ -86,9 +86,10 @@
+   (cond
+    ((featurep 'xemacs)
+     (require 'w3m-xmas))
+-   ((>= emacs-major-version 22)
+-    (require 'w3m-e22))
+-   ((= emacs-major-version 21)
++   ((and (>= emacs-major-version 23)
++	 (fboundp 'define-coding-system))
++    (require 'w3m-e23))
++   ((>= emacs-major-version 21)
+     (require 'w3m-e21))
+    ((= emacs-major-version 20)
+     (require 'w3m-e20))
+--- w3mhack.el.bak	2005-02-26 20:16:27.000000000 +0800
++++ w3mhack.el	2005-02-26 20:28:09.000000000 +0800
+@@ -275,9 +275,10 @@
+ 				   "w3m-xmas.el")
+ 				  ((boundp 'MULE)
+ 				   "w3m-om.el")
+-				  ((>= emacs-major-version 22)
+-				   '("w3m-e22.el" "w3m-fsf.el"))
+-				  ((= emacs-major-version 21)
++				  ((and (>= emacs-major-version 23)
++					(fboundp 'define-coding-system))
++				   '("w3m-e23.el" "w3m-fsf.el"))
++				  ((>= emacs-major-version 21)
+ 				   '("w3m-e21.el" "w3m-fsf.el"))
+ 				  ((= emacs-major-version 20)
+ 				   '("w3m-e20.el" "w3m-fsf.el"))