New snapshot from CVS, fixes issues with Emacs 24, bug 459202. Remove old. Specify LICENSE more precisely.

(Portage version: 2.1.11.52/cvs/Linux x86_64, signed Manifest commit with key 9433907D693FB5B8!)

3 files changed, 22 insertions, 16 deletions

diff --git a/app-emacs/emacs-w3m/ChangeLog b/app-emacs/emacs-w3m/ChangeLog
index 0b76078acb34..c21ecad60e3e 100644
--- a/app-emacs/emacs-w3m/ChangeLog
+++ b/app-emacs/emacs-w3m/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emacs/emacs-w3m
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.73 2011/07/08 10:55:43 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/ChangeLog,v 1.74 2013/02/26 07:15:14 ulm Exp $
+
+*emacs-w3m-1.4.513_pre20130204 (25 Feb 2013)
+
+  25 Feb 2013; Ulrich Müller <ulm@gentoo.org>
+  -emacs-w3m-1.4.417_pre20101104.ebuild, emacs-w3m-1.4.437_pre20110310.ebuild,
+  +emacs-w3m-1.4.513_pre20130204.ebuild:
+  New snapshot from CVS, fixes issues with Emacs 24, bug 459202. Remove old.
+  Specify LICENSE more precisely.
 
   08 Jul 2011; Samuli Suominen <ssuominen@gentoo.org>
   emacs-w3m-1.4.417_pre20101104.ebuild, emacs-w3m-1.4.437_pre20110310.ebuild:
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.437_pre20110310.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.437_pre20110310.ebuild
index e42d5a7ef3a6..1c673eed3e90 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.437_pre20110310.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.437_pre20110310.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.437_pre20110310.ebuild,v 1.2 2011/07/08 10:55:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.437_pre20110310.ebuild,v 1.3 2013/02/26 07:15:14 ulm Exp $
 
 EAPI=3
 
@@ -10,7 +10,7 @@ DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs"
 HOMEPAGE="http://emacs-w3m.namazu.org"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="linguas_ja"
diff --git a/app-emacs/emacs-w3m/emacs-w3m-1.4.417_pre20101104.ebuild b/app-emacs/emacs-w3m/emacs-w3m-1.4.513_pre20130204.ebuild
index 03f40ed373aa..dbe41c9153f9 100644
--- a/app-emacs/emacs-w3m/emacs-w3m-1.4.417_pre20101104.ebuild
+++ b/app-emacs/emacs-w3m/emacs-w3m-1.4.513_pre20130204.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.417_pre20101104.ebuild,v 1.2 2011/07/08 10:55:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/emacs-w3m/emacs-w3m-1.4.513_pre20130204.ebuild,v 1.1 2013/02/26 07:15:14 ulm Exp $
 
-EAPI=3
+EAPI=5
 
 inherit elisp autotools
 
 DESCRIPTION="emacs-w3m is an interface program of w3m on Emacs"
-HOMEPAGE="http://emacs-w3m.namazu.org"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
+HOMEPAGE="http://emacs-w3m.namazu.org/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="linguas_ja"
@@ -25,21 +25,19 @@ src_prepare() {
 	eautoreconf
 }
 
-# This is NOT redundant, elisp.eclass redefines src_configure
 src_configure() {
-	econf
+	default
 }
 
 src_compile() {
-	emake all-en $(use linguas_ja && echo all-ja) || die "emake failed"
+	emake all-en $(use linguas_ja && echo all-ja)
 }
 
 src_install() {
 	emake lispdir="${ED}${SITELISP}/${PN}" \
 		infodir="${ED}/usr/share/info" \
 		ICONDIR="${ED}${SITEETC}/${PN}" \
-		install-en $(use linguas_ja && echo install-ja) install-icons \
-		|| die "emake install failed"
+		install-en $(use linguas_ja && echo install-ja) install-icons
 
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 	dodoc ChangeLog* NEWS README