New snapshot, supports Emacs 24. Remove old.

Package-Manager: portage-2.2_rc67/cvs/Linux i686

3 files changed, 28 insertions, 18 deletions

diff --git a/app-emacs/emacs-w3m/ChangeLog b/app-emacs/emacs-w3m/ChangeLog
index def69cfb1284..31fa2d2a1d7e 100644
--- a/app-emacs/emacs-w3m/ChangeLog
+++ b/app-emacs/emacs-w3m/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/emacs-w3m
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.67 2010/01/31 01:08:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.68 2010/03/15 21:10:12 ulm Exp $
+
+*emacs-w3m-1.4.390_pre20100312 (15 Mar 2010)
+
+  15 Mar 2010; Ulrich Mueller <ulm@gentoo.org>
+  -emacs-w3m-1.4.4_p20090605.ebuild, +emacs-w3m-1.4.390_pre20100312.ebuild:
+  New snapshot, supports Emacs 24. Remove old.
 
 *emacs-w3m-1.4.379_pre20100125 (30 Jan 2010)
 
diff --git a/app-emacs/emacs-w3m/Manifest b/app-emacs/emacs-w3m/Manifest
index 53b6081ab11a..eb2ca5a0ecd9 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -3,17 +3,17 @@ Hash: SHA1
 
 AUX 70emacs-w3m-gentoo.el 96 RMD160 df841d6d2039c75bbfec1701546945bc97f6453f SHA1 047efca299b76523247febdd5d82fcaeb922bee9 SHA256 69880f602183ac309a44c79f382bc08745db6c3951d7874359080a0f896c648e
 DIST emacs-w3m-1.4.379_pre20100125.tar.bz2 747304 RMD160 bfc73fe480281231973f544573dfa0f63005a85d SHA1 53681d4b004210191bdc75fbc0c357b1a137cd31 SHA256 1ab063cf4351a8bb647140bdb4e778ad7e92d466ed57b22bdafdcb0495fb4e44
+DIST emacs-w3m-1.4.390_pre20100312.tar.bz2 750619 RMD160 85398e731270bd5cc74c5038497324cabbda4769 SHA1 25255246facd2130d6473f47dee567c23e13d3a6 SHA256 a686b66bb29489a5e3bb438a09a7c5c6c1e481188409e6a9b4a16b7ac33a29a1
 DIST emacs-w3m-1.4.4.tar.gz 796123 RMD160 d57a1296bcfcb422c379c9e8f35311ff2ac7d702 SHA1 e7b85e5af9d05fbb836c49b75b9aa76d90bbbde8 SHA256 a3e5e8374f7cfcedd5107feec84659248aad52fa302dec1e85f48529e71c77a4
-DIST emacs-w3m-1.4.4_p20090605.tar.bz2 741310 RMD160 0f79cf60c303808930dda7e82c1ef2b81f9c749f SHA1 8405fa2362a2966ff829d5141acd9a25ef9d91d2 SHA256 53f7d4de3a7de2688aca6df23c2302c246f55075e2fecc86a3d32152d49701d0
 EBUILD emacs-w3m-1.4.379_pre20100125.ebuild 1459 RMD160 bc576a80e9924ba79336288280a0928416ca2d14 SHA1 d067093dc4b36105e1b2f113ce49b591217181b4 SHA256 a3f63de4a382c377b7027461545c03b2c03baba24ceaea7deabd41dc85d0f25a
+EBUILD emacs-w3m-1.4.390_pre20100312.ebuild 1459 RMD160 0d20fff3ba85d22e4bd0365c59be46a4cf643862 SHA1 f26669b4238e0e3ed79d45073ef14d997bfc6035 SHA256 8ccbe73d6fdb023fd1b5d3995cbf1560aa422019cb5628d2d510474cd2fbafb0
 EBUILD emacs-w3m-1.4.4-r3.ebuild 1258 RMD160 f4885313384994cdb7315bd161747f302256ced8 SHA1 c7092946e7bb69c9da0dfdd79e4beb99955a85bb SHA256 4d0fe7c8528de04a84383e755d5ae1e977e6b35c851d71bc95db4831b7cd8c65
-EBUILD emacs-w3m-1.4.4_p20090605.ebuild 1361 RMD160 4e7051e765717a368ec063d876983c7b833f79a6 SHA1 9f5a52ea61746bad3a148c7a9a5ed58f4c355ef7 SHA256 5d6bb76ddb0c957580ab13bf63613aa53a3ee92c0d1caf36a271192aca4273e2
-MISC ChangeLog 10024 RMD160 1619ca174641edb5565f3e99a57dc9ac5a263004 SHA1 924eab12099a46a098a32abf10f56d9e26b42662 SHA256 14ee997b1bd2435b3d21c6a6913aef22fe33a304ea7ecce5e35490d26ab53e31
+MISC ChangeLog 10241 RMD160 ed382b548182ea91fbb77a61df0fdfd7ff7329bd SHA1 64af79e748dc85ff95e9d2ddbbb2f99b01c6f1e3 SHA256 877123c5e65db16fe40b77311dfbe4e3191389c19964cb1d02f2f60b8de0e459
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktk2CUACgkQOeoy/oIi7uyVcACdFumRa5ahTJhqonVQLsHTOPIT
-v7kAnAmCkWzpHKcqBj3H6w/E916b2JoB
-=o+w4
+iEYEARECAAYFAkueoq8ACgkQOeoy/oIi7uxCewCgl3oJQAuURI62pHpncjF983Tc
+kFwAoMxqN/vGWSK6XVX3fALC9RZO6UJC
+=GxNW
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.4_p20090605.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.390_pre20100312.ebuild
index 8f2240ca60ce..4047d51c0007 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.4_p20090605.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.390_pre20100312.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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_p20090605.ebuild,v 1.1 2009/06/08 19:54:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.390_pre20100312.ebuild,v 1.1 2010/03/15 21:10:12 ulm Exp $
+
+EAPI=3
 
 inherit elisp autotools
 
@@ -10,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="linguas_ja"
 
 DEPEND="virtual/w3m"
@@ -19,21 +21,23 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/${PN}"
 SITEFILE="70${PN}-gentoo.el"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	eautoreconf
 }
 
+# This is NOT redundant, elisp.eclass redefines src_configure
+src_configure() {
+	econf
+}
+
 src_compile() {
-	econf || die "econf failed"
 	emake all-en $(useq linguas_ja && echo all-ja) || die "emake failed"
 }
 
 src_install() {
-	emake lispdir="${D}${SITELISP}/${PN}" \
-		infodir="${D}/usr/share/info" \
-		ICONDIR="${D}${SITEETC}/${PN}" \
+	emake lispdir="${ED}${SITELISP}/${PN}" \
+		infodir="${ED}/usr/share/info" \
+		ICONDIR="${ED}${SITEETC}/${PN}" \
 		install-en $(useq linguas_ja && echo install-ja) install-icons \
 		|| die "emake install failed"
 
@@ -44,7 +48,7 @@ src_install() {
 
 pkg_postinst() {
 	elisp-site-regen
-	einfo "Please see /usr/share/doc/${PF}/README*"
+	einfo "Please see ${EPREFIX}/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."