Fix LICENSE, see etc/schema/README in Emacs repository.

Package-Manager: portage-2.1.11.20/cvs/Linux x86_64

4 files changed, 25 insertions, 25 deletions

diff --git a/app-emacs/nxml-mode/ChangeLog b/app-emacs/nxml-mode/ChangeLog
index 8c8e5b7a07fe..15f9e640e6b5 100644
--- a/app-emacs/nxml-mode/ChangeLog
+++ b/app-emacs/nxml-mode/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-emacs/nxml-mode
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/ChangeLog,v 1.36 2009/11/24 21:25:46 fauli Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/ChangeLog,v 1.37 2012/09/25 14:01:47 ulm Exp $
+
+  25 Sep 2012; Ulrich Müller <ulm@gentoo.org> nxml-mode-20041004-r3.ebuild:
+  Fix LICENSE, see etc/schema/README in Emacs repository.
 
   24 Nov 2009; Christian Faulhammer <fauli@gentoo.org>
   nxml-mode-20041004-r3.ebuild:
diff --git a/app-emacs/nxml-mode/Manifest b/app-emacs/nxml-mode/Manifest
index 7e74e27c2c33..0c7635a73d29 100644
--- a/app-emacs/nxml-mode/Manifest
+++ b/app-emacs/nxml-mode/Manifest
@@ -1,29 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 50nxml-mode-gentoo.el 374 SHA256 62a2e92161b68bdaa3a4436c8b099ef3204e4dee8ebf9cb6469899d565510b6b SHA512 9c9297fdb2aa070e81a3896a3be63914bd4582695d3bbe4b0ab3be87ad9a491590e51da611a531e68639dc542e24be265a76a8db6ff3138227c77a61b61c2a6e WHIRLPOOL e8f3519695f439c1c66a63a069aa54e41eba5b6e59737e42ce28f9d877f69d3e14af18e25eabcbd53a6f7c634a7842ec39d7761679db94423ff119dc2fe6d5fb
+AUX 50nxml-mode-gentoo.el 334 SHA256 8a5cf17c693e5cdbc718b121fd1d06324438dc545a1fe5237c0d6a3afd77b110 SHA512 35b27af23aa136738adec3d85291fc6dc15e6986b86ce8001832760108bc2ee05bb013cb92cdfcc28f6817ad4692e1e27fbf8e122dfa8499797e2d8321892bda WHIRLPOOL 5a6be199d097517001a8cc0e4e84350518158d1b43879c16dce14006221e221ae9b9ad52832a7aff56a09e7512e1f4b7b7c34ed92a8d578e7098f49eb6aff824
 AUX nxml-mode-info-gentoo.patch 412 SHA256 482756e6a3f64f078839d4387f0847f9834130ed8ccf5e687c5d18e16a1d9c75 SHA512 0badc83338e037744cdd2164fabc5d4115fba0099a1b8af9428992b4df8c62b863b48ab6cd1e0757dc8923a5f77388f5a5f2412ee386d4e1a805041397f66685 WHIRLPOOL 304a39c7bd1553bcf8e2288e508d62317ed4aa4357cec1070f12e6ec2cc29ec1dd3277023eddd9aff97097e29dcb491a855d5398f4bc51964c140ac1a73badff
 AUX nxml-mode-xmlschema-xpath.patch 2410 SHA256 9137f3d5754399acfc0c75c54af0f2db030fd4f7eb81276558afa42da91f9ec5 SHA512 04ee9309494d28d0435ce2e30a798c79ba296944ad842c0ef04e3b44d699acadc8c99e8ae9af731b2711bf84fc1f13a07ca08b9bf024af79304f52286e106fc6 WHIRLPOOL 47abef3e93d9710aeddb4cfe2564b17e1607a64118f6d5ebc00bde3444b4d4b214b16a39d1d224034b61a72eccc83b5e233fae61d4850e03b8982d5613561848
 AUX xsd-regexp.el.2006-01-26.patch 768 SHA256 b2bb3df2b735ffef1ca7409af8231cba8b163e6a3b8ab7c88f77aa1d0773dcd6 SHA512 ccb39c31134d9b217dfdec92bb30d6ff04e9d28d19e57284b977e7af583902cdd336776ebdbff35b7b48167306744799fc83ed65dee3f8544fe448261b1ddcb9 WHIRLPOOL 41006ac8aae8f72250cdb4a37b913e44c5bc5d685817e2eed3044edc321964b71a2c40847f65fbfa07497351246cd153891fd8baae1629bfbeb9fe7ba429c012
 DIST nxml-mode-20040910-xmlschema.patch.gz 9069 SHA256 66be83896133c7d7e2debd275edb90527b87425bd8c05cf415c905520bc04914 SHA512 5d995b278c8b5b1c497be4f33485aaf8ad5e12dd0278690298f019445d458728f36d21deaa6b358a7e392b94748e28168da8dabe19833debc97aa0f4ffcdd615 WHIRLPOOL 1428cfb85441c7836b221238728af404726f394e8c46b9859fb6cc01e75148f15e5b01251e2507c422cd13a6afecbda1a5fdede8c62774f1d2ab6541c5aee153
 DIST nxml-mode-20041004.tar.gz 443020 SHA256 8cf71922962b134e08c4ad9048cd66e85c8297372f14dd1f1ada2d26c69c62ae SHA512 e80e09bc6a516fdeeb7482d9b053fdb546fd0191e8b6f76689c1150367f29312f49258f92b96ef8f39d5cf72d028e91cf2f0d37a93ff5875c3ad17e3c119ea76 WHIRLPOOL c0943287c9f3b856d0ffbceac572f5040b72539cb1e04b62dcc9bec7ed3d690e5ebbe6195b6ad5cae898eba6d187bd240353c2f44530cfd49d75ae51e3ac7a16
-EBUILD nxml-mode-20041004-r3.ebuild 1381 SHA256 d7b217320e2dde901a3be3546f4d2260901cbdd3ad3d3117b44b5faddc2db94e SHA512 2072441097624ab55f4fb004fa45a4b909db815a51f3bdc736d23315062dbeaeb6b908948f856d1f1fc6a287c81ecc8f4254e2cf40c5e88b963b78d06c225b41 WHIRLPOOL c5f7515aa75c130d3947ed0edcb027120f4fa8a9e1b3a68c0bb06d6fee19756fb3bba1b5d66380bfae5e9c6dafcb795f47ae1941041de8b585e49ba136855613
-MISC ChangeLog 5198 SHA256 6edea9684522ae1c1d220a02b2aee9f83e4e117227de607f100e754cf677c672 SHA512 e999e8842da3637425aa6a530fb82475a257df79c75b8ccde6c529b868a5cc40b08a8dcf5617969e503a5dbc56e285dbda618b73aac2b7b87a3b8a34b3fa44cf WHIRLPOOL 271e2f2079b5a4a229d2ce513d5c4619b4e8b5e6ea51cf64c3b722f8e6e807e0ce166d0d3c9d3e9683f3f3701ff610d0289a931854a794bbd1fcd2fd38894201
+EBUILD nxml-mode-20041004-r3.ebuild 1380 SHA256 193d6ca4b1e66b943fa5332f177da99e42e14445c78cb323db78d2718c68193e SHA512 fa6d90adb54dc5461610519af3e21704cf4da69fed0a14befc9b0154617ab6e40c142c257b80af5b928385318e56d614bca1160a8730cf167309cfb32dfa113e WHIRLPOOL 4294cfb9ca09ed3c2f22b49dd724d2025c4c419c73673d6846716b8dd742028e0c76537abf7342eba6e1958d417016eda5ed510e6f942d61e6221da5ef57f95a
+MISC ChangeLog 5332 SHA256 76b0a54f9d9342b456eb5727c3cb4839f3f927446373651e4c6a492d520dde08 SHA512 09126431256aa5398bc249bce3e50be4b727c8ccabecd884f0386256b071a75b659c72e85fb3c5b17b01fac2da1e08010d31d9f71c05503fa0624bbae2b13185 WHIRLPOOL 3805b2b3f20d63e64f026d366478d28f3f6d12bd011a95a25f444a50668ea6cf072d494f6b59148ca54def4eeaff9599d3649fe06e6739aca14430d67e0bb885
 MISC metadata.xml 420 SHA256 81071efdca44f52f577f8c0b698e54546d95b84240602b946e41aba3b869af32 SHA512 c5e0f375e2fc082dba0ab485767433649c7c68d841e90a5d5824b2a206cf677d5e361860010c29ccfb990c432ed359fa0611269753acef31e9299c87b74d0443 WHIRLPOOL f2a56f6218a139c73827d8e18fb81c2bd4561a078a874ddf02ca687bff5923a5f6714afe196f191235545c2a58dd01ee077ad1d5e86daa7b7f2142f75c0347a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9fImAAoJEDxpGckxwJCBDAAP/1qxW3eC9RQg9O8j9O/ChOZW
-S3ex4bP3KY7JUczicxXqDY/HkYFa15tKLnM91bNWukIJa7r0LNxlDoG7DA4dtLTD
-euiKIPln/ft6SJ0dywLK2huT083oMcPVhP/+pPI7oXgoA5X6HJPTQ2b/NmEu9KEE
-DEtYjEYMDMsR6R+a7ZP8k6Sq3gTknuNzhQ+dT8sUtGp0wtz8e2Iw6sxFbdMQYpsI
-rGhE2msaUJ6jR8VOex+jVEHqa/BqL93T2Qbe6IuR+OW3XVfGgcSxOPqtwnaDNG+t
-fEJNNGgPCTgruXcIV+Kjsu1Uqrp7ed5Di4JaGGzxjHJFO36BF0wVqrNyEV2xOu6n
-GWP6qCYhlSsjxBHlMZXQ45lepzCrjXA6H/nR5AP0l+aulV0Dt3qvYXoqVeYFbTqy
-KsIbgFSeSpTIPHdmixleHF4X74oEEs1oET+BGIIk6aFU8hIHa10Q5E03eihBGcwX
-vnk1w8u9ZIuHls2enFeovVduihD0b1Tazsy1EnezY+Vbi/u4TGnNvBaXtK5m9j6A
-hO1A1KleP6qy5s1sZdKhdST71lLD3F+UgVm6Y74bfHOGY8pk3CiQ2IP+fxzd0M16
-HMPMvuykUYnSLVwf4+EZCcoPp6LhBsWDLnOjeOFW0dgGuhvc5OzHhSuELv8JCU2p
-8q0a0WQ4JWm7pqRWTlDG
-=zeJc
+iQIcBAEBCAAGBQJQYbtnAAoJEDxpGckxwJCBAqwQAKJ7ONelBwA2gGXqeze59uLT
+yM/xqgV/n3JwCQd+4WAmrIwr431NpL7mWxokEiZS1osfblbCviplqNnItVG9Z/wS
+Isv0RCzYlN8q4+vLR2LoOJ6L5DnYrhwGSsaBa8aEDE+pMRqAxc5OxfJp4RXlq4vn
+85X0lGsG+nrZ7x7VMRjAc5wJvph7WR3ebpio1YWwKeeu0ocQGMpgll2wkKS6MiXj
+LiRIKvaIoYCKTsYpglTsee3IqpT63qwA4Xoh6qXQI9KyjDNrzz1QKW+1tPG/DHxV
+YXn2847VJYnIgewlcpSzy62uFsiE9l1zBbwTGc/VDGzkpORYYpXEuKtbnXOkSEx8
+OYC6E0SyZhVtv9jIGR2lkiEuQ5Qqz7WrYWVnKMP815JgsWlK+hNJUgYCqlOC1jN+
+dmoLZYFHRKQkLZwNpBD5EhPBUaa9O7YiQxffr/JaIVzWSwhKtZ04uN3+QrVl1v5m
+Rs5gaWJ/SGd/0HT+yCY8KgD672EnMgknKu9CgKqSzYea7y/egWmrRUXvJDucXM4/
+eSE7SCEcjlPn4/WGVgCuxbd/qWSurkQ1WmKmex0PFZRaX98ybUyeTb9gsRFW9Y8w
+82Fg7BDRyHHYVO1+6ggc39iEfJRlCKDTSiJmIOY9FrlaCqv42Cu0dyJv7pogF+Mt
+T3T/0vw8k+wK0Q2K9xVy
+=rB+E
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/nxml-mode/files/50nxml-mode-gentoo.el b/app-emacs/nxml-mode/files/50nxml-mode-gentoo.el
index 00fa3d0ec3a0..5f3824ffe158 100644
--- a/app-emacs/nxml-mode/files/50nxml-mode-gentoo.el
+++ b/app-emacs/nxml-mode/files/50nxml-mode-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; nxml-mode site-lisp configuration
-
 (add-to-list 'load-path "@SITELISP@")
 (load "rng-auto" nil t)
 
diff --git a/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild b/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild
index 67e0b4b2f562..315dc0d8214b 100644
--- a/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild
+++ b/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild,v 1.9 2009/11/24 21:25:46 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-mode/nxml-mode-20041004-r3.ebuild,v 1.10 2012/09/25 14:01:47 ulm Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ http://www.emacswiki.org/cgi-bin/wiki/NxmlMode"
 SRC_URI="http://thaiopensource.com/download/${P}.tar.gz
 	mirror://gentoo/${PN}-20040910-xmlschema.patch.gz"
 
-LICENSE="GPL-2 as-is W3C"
+LICENSE="GPL-2+ HPND W3C"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""