Added a patch for emacs-cvs. This closes bug #81406.

(Portage version: 2.0.51-r15)

5 files changed, 127 insertions, 2 deletions

diff --git a/app-emacs/emacs-w3m/ChangeLog b/app-emacs/emacs-w3m/ChangeLog
index 11221cb4b6d5..317a01e0e753 100644
--- a/app-emacs/emacs-w3m/ChangeLog
+++ b/app-emacs/emacs-w3m/ChangeLog
@@ -1,6 +1,12 @@
 # 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.28 2005/01/01 13:44:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.29 2005/02/11 14:39:44 usata Exp $
+
+*emacs-w3m-1.4.3-r1 (11 Feb 2005)
+
+  11 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
+  +files/emacs-w3m-1.4.3-e22.diff, +emacs-w3m-1.4.3-r1.ebuild:
+  Added a patch for emacs-cvs. This closes bug #81406.
 
   28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index e57cdb3d16e5..868764426df0 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,9 +1,14 @@
-MD5 19ae39645192071e1f83de7ebe06fffb ChangeLog 4112
 MD5 7deaac185fc43a11f5a61d9c77ce74bc emacs-w3m-1.3.6.ebuild 1532
+MD5 19ae39645192071e1f83de7ebe06fffb ChangeLog 4112
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 MD5 f3d389fa1dbc63173d2fb85527e71605 emacs-w3m-1.4.2.ebuild 1564
 MD5 be681fa523c844480ea9f2ec7d40479c emacs-w3m-1.4.3.ebuild 1564
+MD5 c32ed59dc511a00e80ee43fcd4f2172d emacs-w3m-1.4.3-r1.ebuild 1622
 MD5 652abce1ecea5cf20323bd9f27ec8a6b files/70emacs-w3m-gentoo.el 605
+MD5 669ba5ca71e4d55c7be7672270f20c42 files/emacs-w3m-e22.diff 733
 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 955e82e939adc50fbd3cf898c7dd4ee4 files/emacs-w3m-e22-1.diff 1004
+MD5 02c64b69e9c0d74f1ca7fba9853c2c9f files/emacs-w3m-1.4.3-e22.diff 1737
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.3-r1.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.3-r1.ebuild
new file mode 100644
index 000000000000..9506047cfbae
--- /dev/null
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.3-r1.ebuild
@@ -0,0 +1,73 @@
+# 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.3-r1.ebuild,v 1.1 2005/02/11 14:39:44 usata Exp $
+
+inherit elisp eutils
+
+IUSE=""
+MY_P="${P/_/}"
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~alpha ~sparc ~ppc"
+
+DEPEND="virtual/w3m"
+
+pkg_setup() {
+	# use async doesn't ensure you built w3m with async flag,
+	# but it's safe to abort if you have it.
+	ewarn
+	ewarn "emacs-w3m hangs if you build w3m with async support."
+	ewarn "Please turn off async USE flag if you set it."
+	ewarn
+	if use async ; then
+		die "async USE flag detected. aborting."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-e22.diff
+}
+
+src_compile() {
+	autoconf || die
+	./configure --prefix=/usr \
+		--with-lispdir=${SITELISP}/${PN} \
+		--with-icondir=/usr/share/${PN}/icon
+
+	make || die
+}
+
+src_install () {
+	make lispdir=${D}/${SITELISP}/${PN} \
+		infodir=${D}/usr/share/info \
+		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*
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	einfo "Please see /usr/share/doc/${P}/README.gz."
+	einfo
+	einfo "If you want to use shimbun library, please emerge app-emacs/apel and app-emacs/flim."
+	einfo
+}
+
+pkg_postrm() {
+	elisp-site-regen
+}
diff --git a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.3-r1 b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.3-r1
new file mode 100644
index 000000000000..54aadfe7a673
--- /dev/null
+++ b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.3-r1
@@ -0,0 +1 @@
+MD5 d6520bb3588a9a8755d2b970d3bc2a25 emacs-w3m-1.4.3.tar.gz 725109
diff --git a/app-emacs/emacs-w3m/files/emacs-w3m-1.4.3-e22.diff b/app-emacs/emacs-w3m/files/emacs-w3m-1.4.3-e22.diff
new file mode 100644
index 000000000000..d4a1026d9ea5
--- /dev/null
+++ b/app-emacs/emacs-w3m/files/emacs-w3m-1.4.3-e22.diff
@@ -0,0 +1,40 @@
+===================================================================
+RCS file: /var/lib/cvsd/storage/cvsroot/emacs-w3m/w3mhack.el,v
+retrieving revision 1.140
+retrieving revision 1.141
+diff -u -r1.140 -r1.141
+--- emacs-w3m/w3mhack.el	2004/12/23 23:21:03	1.140
++++ emacs-w3m/w3mhack.el	2005/02/10 01:18:44	1.141
+@@ -293,9 +293,10 @@
+ 				   "w3m-xmas.el")
+ 				  ((boundp 'MULE)
+ 				   "w3m-om.el")
+-				  ((>= emacs-major-version 22)
++				  ((and (>= emacs-major-version 22)
++					(fboundp 'define-coding-system))
+ 				   '("w3m-e22.el" "w3m-fsf.el"))
+-				  ((= emacs-major-version 21)
++				  ((>= emacs-major-version 21)
+ 				   '("w3m-e21.el" "w3m-fsf.el"))
+ 				  ((= emacs-major-version 20)
+ 				   '("w3m-e20.el" "w3m-fsf.el"))
+===================================================================
+RCS file: /var/lib/cvsd/storage/cvsroot/emacs-w3m/w3m.el,v
+retrieving revision 1.1096
+retrieving revision 1.1097
+diff -u -r1.1096 -r1.1097
+--- emacs-w3m/w3m.el	2005/02/02 10:32:30	1.1096
++++ emacs-w3m/w3m.el	2005/02/10 01:18:44	1.1097
+@@ -87,9 +87,10 @@
+   (cond
+    ((featurep 'xemacs)
+     (require 'w3m-xmas))
+-   ((>= emacs-major-version 22)
++   ((and (>= emacs-major-version 22)
++	 (fboundp 'define-coding-system))
+     (require 'w3m-e22))
+-   ((= emacs-major-version 21)
++   ((>= emacs-major-version 21)
+     (require 'w3m-e21))
+    ((= emacs-major-version 20)
+     (require 'w3m-e20))