Specify LICENSE more precisely. Bump ebuild to EAPI 4.

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

4 files changed, 33 insertions, 34 deletions

diff --git a/app-emacs/nxml-svg-schemas/ChangeLog b/app-emacs/nxml-svg-schemas/ChangeLog
index 71ec09d3d6e6..61014cc563e9 100644
--- a/app-emacs/nxml-svg-schemas/ChangeLog
+++ b/app-emacs/nxml-svg-schemas/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emacs/nxml-svg-schemas
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-svg-schemas/ChangeLog,v 1.3 2011/03/12 14:42:45 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-svg-schemas/ChangeLog,v 1.4 2012/09/26 06:56:28 ulm Exp $
+
+  26 Sep 2012; Ulrich Müller <ulm@gentoo.org>
+  nxml-svg-schemas-1.1.20081123.ebuild:
+  Specify LICENSE more precisely. Bump ebuild to EAPI 4.
 
   12 Mar 2011; Ulrich Mueller <ulm@gentoo.org>
   nxml-svg-schemas-1.1.20081123.ebuild:
diff --git a/app-emacs/nxml-svg-schemas/Manifest b/app-emacs/nxml-svg-schemas/Manifest
index 57548faf231d..3054238799f3 100644
--- a/app-emacs/nxml-svg-schemas/Manifest
+++ b/app-emacs/nxml-svg-schemas/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 60nxml-svg-schemas-gentoo.el 253 SHA256 a50c35001662139fbb8196a6dc4c5259c6eadae5bbccef6515521a169892a72f SHA512 4bad0ec4e90341a0bf33e1e0be036343c7e85e8369373492efb32893743bb972ea3b1679eda3a827f470db7cad4ef934637f463ff2fe096876a9a2ceffd5cea4 WHIRLPOOL 48564e53caaad4379578a373c63ae1f44130b70e123def1c82a5735a26dfb0f6d81bcb1e11a72f81e6912fe30d6205b5af45f9773d181ff4a5cbc87b095bfa34
+AUX 60nxml-svg-schemas-gentoo.el 206 SHA256 38e8b44242273597c40be36d0b334f130cdf7892f39bfcf0ab1cf3262de65eae SHA512 5592edb5663066fcccaf5b05c3df671b4069d4d259376a8a91ef3f7ae5990687b15dfdf40e6f7aa6cc7d62b7cdaa5090fd851de0ed2718d20ecfe3e3a78530ea WHIRLPOOL 6a30fb0ebb54d3c9ef018c4e108c89e78ff084a9ecc3a58ca72991e989e9c7f148a2e1882258fee2ecf30bafd9e53a466efb251d144f81065444f4d4d9818241
 AUX Makefile-trang 108 SHA256 e456e90cca7a1cbaf65cb39ae360b17b48fb2178f1ef2c844dabe781b6a8ac83 SHA512 3544959cc57ce1b273e4b9de95f51e1e21d23cc35fb48e02f179a055a61ee9092efdc43405f72c3aacb3c74eada7fabf5952eb49e3ff0514fd69a3092268dc4f WHIRLPOOL 9ac3f0bfc60fae61347b74cfb9ecb787512fd8277540ea3c3dd9ca44842f8aaf93ef16119d17a5cd0f2a54d231cf373622e28bbaea51a3845e2a95bbe7e43581
 AUX schemas.xml 495 SHA256 156eb863393dcab71357a94e32576d5187087eaaae8a73c88c4f9f59d38da458 SHA512 d6a9f0b9db51e05b4f3d0395c8d43a0577d23fdb6c0e9d0123682f00d4ccac5897dfdbd157560b3bb9f06a8a768298489e8b8a2843d7e7a65ffb4a5e20c1b316 WHIRLPOOL 9ff5c748f393933a121855442701e09eef9a81a6a07c0f82bafdbaf0815d90ee26344c5c531d5715af40145feab733f584e4877980b5090eaa7d9df275d65258
 DIST w3c-svg-rng-1.1.20081123.zip 48420 SHA256 995d72804ae518363080544999ea3f356fac168e193d0967ce9944fe0f8c31cf SHA512 69e44a7c04a3af77d0fed8f19372cfcad7998e262a44b520145fe2c0ad03bf20daf57e1e97f71ff27f0e06bd3f07d1ec0b0976fdd893d77df2f82709f7c1ce1f WHIRLPOOL 706509d058a187d7581612c103a333d83cc758a0fd436686d20c8de7fe07bb7e6be63169f3c14aee662ac9475d7e7718a696d68b8cfff6a8a0adfe941712e4be
-EBUILD nxml-svg-schemas-1.1.20081123.ebuild 1397 SHA256 b80e578efdd0da3c8b5dc3acb8de7d98ce354dcfab5c5336637f0876c19c0133 SHA512 f48fadb4d71866dc348e1b4c76526f4474538ef0a375b68bd8ccda5faedcfb37ee6f5b38d52e568e3ee91de0ca4d50687427acb48034bddecbdb9b0b729b3ee2 WHIRLPOOL cda9ec8f72f11d9fabe45c4ae1746d8fc1fc446987f11b4a51daba5e0b0746c0d44b86b438f62d9e4cd23837a30f43e1a35eac1d516a57b48fabaa8e6ce738de
-MISC ChangeLog 761 SHA256 1681fb49f24590844be7ec15f272856a4c26b40adf703e73546cbdb5d0dc4af1 SHA512 9286bad104e461c1026943731f0531705e0a72e3f4740be459b82dd455da3b3ba5e73e0489c28fee7772058f0d505dcc0162a9f95b8c354f8a50dc8f7aa97fe2 WHIRLPOOL 1378dddf50202ae3776e611912e85f3328e5518e8e42c1bcfa1c314de7613c982f7dd4fcab0b1cb9c720cbb34055d9779b09b17c28c8e52961c9bd24136a25de
+EBUILD nxml-svg-schemas-1.1.20081123.ebuild 1318 SHA256 e1828c59d3241302a041585ca32009a431715d82bfaec65a9a67e874f5d27321 SHA512 49b260331afc3c6a30f9ecd89e99ca0e185436392632d34cecb42c41e7b7453452299673079f28c558d826b804797d590606ab26f987783e23ea8ac1345d08ed WHIRLPOOL a5a08c162a8afb8d046a559e3e07d0584c3f56bc67d3de0f872b5f1a66fa7a7836c22eaedf325ac1f94ca3dc23cdc379c912563cdd780b8cc246777c5dc8ef21
+MISC ChangeLog 906 SHA256 1d7427147205a38f0a22fe74e807cd08bbc454aea66604aa4b309feae381a847 SHA512 6b4b2931aa06d8ce550ea061028c2c6c5eb7375cc3d872eb751dc7dceb643176f8e0f5c98b8269f904831d4dd10bb4a615b0bcc59f0fbd3958464745e4e944e4 WHIRLPOOL d4a66b23ca64569f3b6867affdd290c9824f0b1bacc0cd9ea7b28f4134da947f7614879ef60fb55ca425eb5a9a54be78359809716bd84a36b2b9f2d3655c088f
 MISC metadata.xml 231 SHA256 15f2e9bb26415e0ed249f76708ef53312d5b3f5fea4ee32397ff7930f0b3b03d SHA512 4b72bc666deb2085ee1fdb5d919507b02b2423ba01973563930d3109d430c280a6f3b624c350b4ca1ee0a77411053ceda4a2fcc84ba582e00309371d14e5ec70 WHIRLPOOL b6b1509f555a5ebff95793b0316aa2a01c16ab09e9b20e78211e386202a8e4c8cf3bcec628c0959928c7593b76f26a8960239a68b125fd09c1e0eb8c738e5940
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJP9fI1AAoJEDxpGckxwJCBbV4P/RbmJJddNjP3EViWOevfo69s
-tuJE+CPYy2gIQSsAHZQv9FVvmlHVSXzb86KGFMh/j6Ix7yraZtaygwf7GJd3fvW9
-JqLc2JC7YJLzsVWmXlng9+6lHGo5ZJo7hXZdWHcaFqXLGNoRuXST4s47Eezqu5eo
-JVDnGi20N4GLuWMdI2ZwH5CI7KhYoMr+qlygkbQSymwBXEFXL+ifrq4zdsIVPaFK
-nT7b5Xi+lMkeH/DPUZ/raRA0/JcCSdqVfn7c2b0kgiCI6T1Ba1vMQl7oc3BPEO1Z
-nTQrklA/MajLDK5xfm/IKjlcpviMg9gRUU5ALKVY3Jl35EZV65jqJklocIIAHUXz
-inRLOVuaqrim0IUHBMDWd2k1IquuuefcJ5Fb9z0oBUPysIxToJlDC3IOFj8agtro
-1G1wpvBq+ltw6tNUTJrk/ZviEMCM1LK2sL85SpM5uzg8o/vD/alu4efeq3dg/dm+
-ZaGjFbRuFiJFBv8a27ySxe2/OtHu92qzbvAKX8bXKF3aabEDATpSGeRgrLENrCEr
-lXVJ1oahquxfHh/8EyCtASZvmlBYx9OXVKQboiUqQPPbI+Iua/hMoxOlIPGUjyM1
-3TxN9gfwnF+eMzQa6DggAisNEB+2VVxLwqH4PnZEOfyVH5KWyjPZ4qG5cCiiwZ+h
-Eq8hYVubmrXdvuvT4dYW
-=pPaX
+iQIcBAEBCAAGBQJQYqk5AAoJEDxpGckxwJCBwvIQAItILsLKRRGdyERBql41taCY
+robxiurgHMq1i/qLK1BYoquNeVgabuzaPStLCS6YLlbPDRnhHYRF8ODwt5jf6qL+
+lXMXbV9fk9sFoOawwxnt4a33Eip7MJ52xfiy4FxS2++tH88BUa1NdN5IVIYuV4ev
+7kcGmgzGOHU1WLaQUU4C6YwfwX6HEfXYpX8WRzRi4IlIzBkAJtXkoDZsY3H4LQIK
+DNiq9CSpBF14TGGLED1ywRSkK63Ov16gv/VOx+egitCFGAOmHs1mBY3gHa1XTEdi
+YWea2a27aIGTRzf3xS+1QDelSGeqv6zL9exoc0AQi8Yz+1UygmsPffzaCB/jk9S3
+F5R58jAjiXI/+bbxzxzVAsnRLbLwvggWoMBZkFPyucLrLY/zP+HViprZg5aYLGL0
+fH8gDD9BxqvFoBStLfc+bStiaD4ijs7xLOclCjfHrUF7KsRLgtVt4x01idT3amni
+sqX9cDG1z7XKWiwkyYXh7T8qoTmPL+V3x5yq56yW9oTKGdOXurAYxLG3yImURMX8
+zdhxAuWVBUEJiZHgFgsl35YQnce/vT5l/fEjH0q1WG/MJ1ySU0BG29snQii1a0q/
+FX+ZD5z5iXr6Rn1ww9hgBDemL9rlD+sD9jCL9qiZGCL02DTaaOxzmHE3tWeS5I5E
+MRVeS6CxrGJpavCQHCM4
+=1g2D
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el b/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el
index 6f41677d3ac0..c574746e6576 100644
--- a/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el
+++ b/app-emacs/nxml-svg-schemas/files/60nxml-svg-schemas-gentoo.el
@@ -1,6 +1,3 @@
-
-;;; nxml-svg-schemas site-lisp configuration
-
 ;; This must be executed after rng-schema-locating-files
 ;; is set in rng-loc (which is part of nxml-mode).
 (eval-after-load "rng-loc"
diff --git a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
index d29ae1a587eb..9de02f062967 100644
--- a/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
+++ b/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 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-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild,v 1.3 2011/03/12 14:42:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/nxml-svg-schemas/nxml-svg-schemas-1.1.20081123.ebuild,v 1.4 2012/09/26 06:56:28 ulm Exp $
+
+EAPI=4
 
 NEED_EMACS=23
 inherit elisp
@@ -11,36 +13,32 @@ HOMEPAGE="http://www.w3.org/TR/SVG11/"
 # but since it's unversioned, I versioned it and got it locally.
 SRC_URI="http://www.flameeyes.eu/gentoo-distfiles/w3c-svg-rng-${PV}.zip"
 
-# This is truly as-is!
-LICENSE="as-is"
+LICENSE="HPND"
 # In a future we might have 1.2 schemas too, but for now we can only
 # install this one anyway because the schemas.xml syntax is not
 # sophisticated enough.
 SLOT="1.1"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 # Yes this requires Java, but I'd rather not repackage this, if you
 # know something better in C, I'll be glad to use that.
 DEPEND="app-text/trang"
 RDEPEND=""
 
-SITEFILE=60${PN}-gentoo.el
 S="${WORKDIR}"
+SITEFILE="60${PN}-gentoo.el"
 
-src_unpack() {
-	unpack ${A}
-
+src_prepare() {
 	# we don't need the doctype for our work
 	sed -i -e '/DOCTYPE grammar/d' *.rng || die "sed failed"
 }
 
 src_compile() {
-	emake -f "${FILESDIR}/Makefile-trang" || die "trang failed"
+	emake -f "${FILESDIR}/Makefile-trang"
 }
 
 src_install() {
-	insinto ${SITEETC}/${PN}
-	doins "${FILESDIR}/schemas.xml" *.rnc || die "install failed"
+	insinto "${SITEETC}/${PN}"
+	doins "${FILESDIR}/schemas.xml" *.rnc
 	elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
 }