Don't test for async use flag, fixes bug #180602.

(Portage version: 2.1.2.9)

5 files changed, 67 insertions, 33 deletions

diff --git a/app-emacs/emacs-w3m/ChangeLog b/app-emacs/emacs-w3m/ChangeLog
index 75853c440dc5..4dda6870dad0 100644
--- a/app-emacs/emacs-w3m/ChangeLog
+++ b/app-emacs/emacs-w3m/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-emacs/emacs-w3m
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.47 2007/01/09 12:33:42 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.48 2007/06/02 09:47:14 ulm Exp $
+
+*emacs-w3m-1.4.4-r2 (02 Jun 2007)
+
+  02 Jun 2007; Ulrich Mueller <ulm@gentoo.org>
+  -files/emacs-w3m-1.4.3-e23.diff, +files/71emacs-w3m-gentoo.el,
+  +emacs-w3m-1.4.4-r2.ebuild:
+  Ebuild reworked. Remove test for async use flag, fixes bug #180602. Install
+  icons under /usr/share/pixmaps. Require w3m-load for autoload functions.
+  Remove stale file.
 
   09 Jan 2007; Christian Faulhammer <opfer@gentoo.org>
   emacs-w3m-1.4.4-r1.ebuild:
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r2.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r2.ebuild
new file mode 100644
index 000000000000..cdea767cd127
--- /dev/null
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.4-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2007 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.4-r2.ebuild,v 1.1 2007/06/02 09:47:14 ulm Exp $
+
+inherit elisp eutils
+
+DESCRIPTION="emacs-w3m is an 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="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="virtual/w3m"
+RDEPEND="${DEPEND}"
+
+SITEFILE=71${PN}-gentoo.el
+
+# This is NOT redundant: elisp.eclass redefines src_compile() from default
+src_compile() {
+	econf || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake lispdir="${D}"/${SITELISP}/${PN} \
+		infodir="${D}"/usr/share/info \
+		ICONDIR="${D}"/usr/share/pixmaps/${PN} \
+		install install-icons || die "emake install failed"
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc ChangeLog* README*
+}
+
+pkg_postinst() {
+	elisp-site-regen
+	einfo "Please see /usr/share/doc/${PF}/README*"
+	einfo
+	elog "If you want to use the shimbun library, please emerge app-emacs/apel"
+	elog "and app-emacs/flim."
+	einfo
+}
+
+pkg_postrm() {
+	elisp-site-regen
+}
diff --git a/app-emacs/emacs-w3m/files/71emacs-w3m-gentoo.el b/app-emacs/emacs-w3m/files/71emacs-w3m-gentoo.el
new file mode 100644
index 000000000000..05cd223e6e4d
--- /dev/null
+++ b/app-emacs/emacs-w3m/files/71emacs-w3m-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; emacs-w3m site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(setq w3m-icon-directory "/usr/share/pixmaps/emacs-w3m")
+(require 'w3m-load)
diff --git a/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.4-r2 b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.4-r2
new file mode 100644
index 000000000000..299af32318ec
--- /dev/null
+++ b/app-emacs/emacs-w3m/files/digest-emacs-w3m-1.4.4-r2
@@ -0,0 +1,3 @@
+MD5 6e592a9c0ab22fb532ebc3bcb21a45b1 emacs-w3m-1.4.4.tar.gz 796123
+RMD160 d57a1296bcfcb422c379c9e8f35311ff2ac7d702 emacs-w3m-1.4.4.tar.gz 796123
+SHA256 a3e5e8374f7cfcedd5107feec84659248aad52fa302dec1e85f48529e71c77a4 emacs-w3m-1.4.4.tar.gz 796123
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
deleted file mode 100644
index d9889b86dd64..000000000000
--- a/app-emacs/emacs-w3m/files/emacs-w3m-1.4.3-e23.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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"))