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

Package-Manager: portage-2.1.11.52/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

4 files changed, 37 insertions, 34 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/Manifest b/app-emacs/emacs-w3m/Manifest
index 6b41b6fadef1..a9f7a3998a7f 100644
--- a/app-emacs/emacs-w3m/Manifest
+++ b/app-emacs/emacs-w3m/Manifest
@@ -1,27 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 70emacs-w3m-gentoo.el 96 SHA256 69880f602183ac309a44c79f382bc08745db6c3951d7874359080a0f896c648e SHA512 7fd090a575e5b8f2df50bd751f301f5f4409dfd78eb45bb911c54a3cbfe76941a146630ea0e4089138c400caf45bb040f72e3ac335457061776e01e0aa3f5577 WHIRLPOOL c2f6ca7dcf3a18b1e918bb9f64d3c9e8b5c7bd90ec96df8dee1b7373592c69240a829bff5fb5e6df1ad605d3bb9d5541e577d1f8e8ef2d518a07860438f35749
-DIST emacs-w3m-1.4.417_pre20101104.tar.bz2 779145 SHA256 33ce2c8817117e46109d65e4f86e1bf9ef1e9e003741b8003a2e25a6ff118afc SHA512 5d1e00c3ea6f7229e93162abad2b3e97b53fce1c95add2383af539d3ad343b06c2ca750228481218543233828ddac54d8c6c9aebaeab095b0c5d9fd7566724e0 WHIRLPOOL c6554bf6afa5eb4aa88e6a0697967bd36eabaf192ace147205d7fbb0b9a8c4d801dd4beab8d66b6cad423aa162220ced8b3903c535853d81f3d71ec242fb3b02
 DIST emacs-w3m-1.4.437_pre20110310.tar.bz2 793222 SHA256 f5d5618f71baac14f3e4f8be6f85d3205594cd3a9c35548ecf54fb1d37eaa6ac SHA512 52fc42911114827c7fc156935e40190c992c50a04a9f2328b9be311e7f3b0810f8c2905d2bf1339da70561a4af1e896c127e5e184552f1bcc29325eea9b185c0 WHIRLPOOL 4b75239afa87926f12336849f696292cd48f8e740c488d4b1898aaf372facd470a6fff83b0e583a537038798dda231926969dcef07f195d4bbfb7dfe3a615650
-EBUILD emacs-w3m-1.4.417_pre20101104.ebuild 1420 SHA256 704303ee4b7fc198ee1f37822c2c903ba2460538f2db983fa0ae2f4c93ae44ec SHA512 23cd6372e13144a5e9d9f0ce74632300eaceed3e56698f1273659240f4f2d2c7a62386b1078c132da1b543b85b0ff6196078eb567a0e79a173a15a47664fa782 WHIRLPOOL a68e31096efaf9694a1f2547f23583706213e25c0470067c12e4b817e6bdf6e24774921850e0976b0cd8556ca5b0c5d4dc71891b7339cbf330f517b12c60d594
-EBUILD emacs-w3m-1.4.437_pre20110310.ebuild 1420 SHA256 2f19fda280d9c5217f3e4f5224463d4553420ef808edb7d2c143d024c0ea7268 SHA512 646ad20cdf9808d1d0bce2c4ffb379371528fb2f5083a624a5f675046541d9c7ad8bfc356ec5d1261af6d8960cc4d18f49f90671116cebfd6bd5a4a21613eb1c WHIRLPOOL d593efb1fa6594d7b6df19b7aa080920c518c0ac819433ee941e076e40ff04f47f24e5b6258f8bb1135620710008fee71bfc4abbefe1ecb70c5888d1762ad20a
-MISC ChangeLog 11087 SHA256 6e3150ca1250e9cc6c5ca9824445c0acf6fe5408b5c96af761a105091d311515 SHA512 6c97a1ec59d856b2a99717269ef61e9552b2a380941606ee6ca85b80477b30297a390133c20ac6545568300e3e29b945f8f2045071bdcdc7b9935d0f9b201374 WHIRLPOOL ffb352fd92a94cf23ce5f3925fefac8c8cd1197915e6f2d6055e9f38305373397fc60998d1351d02c433d0a5a89bde6a3bdc49c9aa4b88bc8ca709ae4d464a4d
+DIST emacs-w3m-1.4.513_pre20130204.tar.xz 724892 SHA256 fc71922e8a5249584075a86bb274f08f193d82ed2e29786dcdfac4049b6b8873 SHA512 86d5aadd4a3e667a5f940ac47bd7c828546260dc6026bd3a906c5439ed07c702019e7dc7c4eac1bc2f4d3a9a6e03e28b59f3c48ce649c644d6608a120a67dfc0 WHIRLPOOL b4e7bd2809f6518f5b96fdc11c491ebe25169aef07613e443b6d293cedc3195f4789d31c2bea3e5648073087ecad66dd25175858f78e7307dcc37fb7fc5f526a
+EBUILD emacs-w3m-1.4.437_pre20110310.ebuild 1415 SHA256 6a1368462c9cdd4eb5d0c9cb089881cccfeebcae2fe148bbd5d5ca29ae5efa15 SHA512 90d3afcbfec7d445b7aa9e72463c290b85f3cc5b69bced817721897f95ec72c44bb67651d42f87fed39f60af13f47f2638403b63f54c2ddf0ed40f506a32443b WHIRLPOOL 9012cf9c973603c41a023dca27e2f5584f7b3265a4358de5f0a60a85d690e4c1feded741b6b2b8c578fe45ea2439e614f4034c9b159ac6e339adaa8bb019a7d4
+EBUILD emacs-w3m-1.4.513_pre20130204.ebuild 1299 SHA256 33196f0325c1b23acc6bdd73741bf212e2d3f7a19db7c0208579dd72c8bca696 SHA512 9537f3243fa2c2ec8bac94f78a694f8735355195f6e2782fd9571ce9c43d58921f421b9d2345de459350a8a17175ac654368cf54162145ea9c14128ee0cf36da WHIRLPOOL 267ad00a7a8ba32a2aed9206ec1e6f7654d936019e31aaf642436c1169ce7ff29e53e07f1b7a14e4c2041fb6468f6533619eff7f1b6e5fa261836d02093af53b
+MISC ChangeLog 11406 SHA256 50d80c7de7fb7ea5e13099e4e3a228a08dba6a47ff19c20253431d0a57bf29df SHA512 b043531fc2a35e7899e915e25d45531761ea385ce30d4749496df8ec2c5bc119440d6e434cfc0b22e9312861f6b475d35e66b6e86bc23d23b4beaa847181b73b WHIRLPOOL c8b0e1ade08eac869ca924ed80fe35903fd031a3256420855aab447bc2b7d85953426ca8661bb2d5b6514f6a01344cd002ad8c5031693faa1e7f8e1bce10c07d
 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9e2QAAoJEDxpGckxwJCBymcQALF0n9jAIC/LAKg4ZIjKdab1
-TzWMb5AwJ1ZjaRQ6jT1V+MEuGxKDjh6KT3NUDuvyDdAvP53wPxwB6mUXVm5cvIOs
-FpfvJvIIbI+YZuiqU1bL9lFeNq6YMubwVG3nl4/QrttpLmP90jYvpIDHV8rQAVbO
-NAmdtSAeOlJ23mcLR7k6j9s2E8MwYzgEr66SXSz1gYvCzSOTQr9JaMcxJbqN3UZn
-tZ/3kcSK4CIZfVFtroFIwl4f2+NxDqC8WlwjBoFcy6t8AhWBaJ83IIVTlUK16Jno
-1rqpEPQk+1R/kRQ54mClDmpibuskv8Mvhwpa89UtySst9LHhPkavQgdk+ksRkCBP
-4mjJMCqzj3kEoCRq+hcxBzww51OQReXwT5q9MVSukIn4TIuNw2PO8WzPUCoOOnEN
-GlCAhPy6Tgtvi6EcT6u2+E2LctqHTTsTtWs6JSr5jWCCt5dzYCBiwnE1KZz2SYQQ
-VqheODVSLQHDZZUTxitr0CZaj7E0v6cMIotAFOmk0gR4BfDQ0eiBwNoU12nZUTQ2
-jGaZ51rsGKj+FIViMxUoIFb16XccEj+A9GCtFoFO30SsRpDD1slEO7NkAPX67SLK
-gXQhd45upJ0UDys/4OnQvAhsm/Dy9Xn2Fe4+vNrLIlbRtL01DmjxE8ffCygpbiVG
-Aq3MWcab6minrmtSGv/O
-=7zeM
+iQGcBAEBCAAGBQJRLGIQAAoJEJQzkH1pP7W4xZYMAK24wj20HrZhOEblW1jfcNoY
+GuXsUBmIU7PLSm2A6df7Chp/UvlMRWfa7fNsuUU7KY3fiRNq23LrfjjBM6AVHGA6
+OdR1GGdNvzhkrf3+ziNYQ2hTCmItySS4SC/1hktJ7JhJ4cxylVaH1CYz+YOcyzOa
+PKl5VWq0AX7JcAmhP7zY6KxUXYBERO5NrlgulxQN076m3ZNJ+k/zryHOmGgTtd8t
+hGf0nwUCww02YqXZYsa0SyuhyPWL5GZ9GaSqy/Lc1qAG9eDx/4v5o2gaETIAOpLv
+bmmbjY7yTrBrLpDI4Jcyy/vyUad7A0Y+Q0VVYtVSZyre7AjTHTmXuUwl7RU9qNaq
+mpGc89hqMjGhb+BAF7XxosWmBnEtqxABOBdMCkdtUxKyUmbs2qUbB4cVhSwfZJ6r
++G7KQppN6xXEQPGyNiSkQh2xtF1i2chpgAUaIyy2xAe0kfeRK1Ow81JmVX0PnEUr
+Oun7zASdof9SSXohgudDRX0AynfzGUK5bd0gr0TrAQ==
+=OUee
 -----END PGP SIGNATURE-----
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