Update LICENSE, jaxen is replaced by the JDOM license template.

Package-Manager: portage-2.1.11.38/cvs/Linux x86_64
Manifest-Sign-Key: 0xE7BE08CA7DC6EA25

4 files changed, 28 insertions, 18 deletions

diff --git a/dev-java/jaxen/ChangeLog b/dev-java/jaxen/ChangeLog
index 373c1caf2f86..4c48558d8d79 100644
--- a/dev-java/jaxen/ChangeLog
+++ b/dev-java/jaxen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/jaxen
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.56 2012/10/15 18:18:16 sera Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/ChangeLog,v 1.57 2013/01/01 19:14:29 ulm Exp $
+
+  01 Jan 2013; Ulrich Müller <ulm@gentoo.org> jaxen-1.1.1.ebuild,
+  jaxen-1.1.4.ebuild:
+  Update LICENSE, jaxen is replaced by the JDOM license template.
 
   15 Oct 2012; Ralph Sennhauser <sera@gentoo.org>
   files/jaxen-1.1.4_maven1-build.xml:
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index def28cfc1bf3..7cb2d3e9fc12 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -4,18 +4,24 @@ Hash: SHA256
 AUX jaxen-1.1.4_maven1-build.xml 13148 SHA256 494368debe33ffdf60b93c393319940b366dded769b221e5b3f03d040411674b SHA512 2f3625a2a14066289b20e1118a87168e6cf1ce252becdccbc6f4eeefac446e528298e1e6af7d1304ff9d1d4ee8c394c2cf67f6799d3062091d53cce7ff5b1e42 WHIRLPOOL 06bbd0f73a85785b381dd10ed6b5f61c908197bc495de5a8ea2e69013d8dab66a732a1a703d9671ecdccae5606d30512749b0f48b323a0159c6d7521eb274f68
 DIST jaxen-1.1.1-src.tar.gz 271343 SHA256 f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca SHA512 095523a1600324a2d2f748717c6af0ffe216120b834c1157912b57ea076c639aa3e47fe87da0316cae491ba838765e5e06bc304cdb610789101a54192d976940 WHIRLPOOL 2fec877f4b3e565304a7cd8bc7b5b391eaa74068c6bf241d8b2ef0fe5973273164247ec1166fedfbf92f082aa1120a4a3f0ce47e0e13a15add75ac00c128810a
 DIST jaxen-1.1.4-src.tar.gz 268493 SHA256 97d039a029ccaddf5ef301cafd1da8549b8360fe3ca0c15d65fc57162cd4433e SHA512 11c1c744af030c50579f872d8c8bf437e48ab4a01e6dd34529f2d9039c154533edaa9b5a367a866e2b57f311f1111717be300db8f80423c5492be38e0cffc031 WHIRLPOOL 44e3449ec8c0c15496c9528c668593d3dde67da67108e5927aee630df6ee3803999f812ab7597f37a68829e95a435fe6699bc9681583f6a500cd55cc51fbd6dc
-EBUILD jaxen-1.1.1.ebuild 1385 SHA256 08c57df9f14b4dd2f12c997dac8ef0839f4801437ccdf3f1fc0b0c8696b20ad4 SHA512 a6a89d2f1ee4b4be866d3b9698f5caedb17923d4365a4f131b10a9ce0dd4bd6d1c40c0ba6291468ab845e4c59d8efc680d1dfea4cf7b64a54abc448ce5e87bef WHIRLPOOL 085a23690024e73bd99e93c5064266c9423411c8c13e699d7311fcea38978e831858ee710c6a31acfeb174eeb90afa0619425869b0dd4f75d6bac7b0f284b0ff
-EBUILD jaxen-1.1.4.ebuild 1235 SHA256 e83d3f8ae4d5b742568bcabe5c4d123002a2dd8227e29364a060b45daec5f6d3 SHA512 74ab869c1894573c9911b6ad9e07660ede9ccd1560938da0d51341408b703555f8e07bfc7105c3b03671fe5768c7535c2c01dbd1e011b55dc25f9a6fd8daf6aa WHIRLPOOL e1a9ced143df756d5eb8230e23af1ef07230607d6fc9d96d131e33d095d3c40676ad4eba8c28a9573236e93d4ec296075d351350201a220442b20f5998746326
-MISC ChangeLog 7979 SHA256 9a8f54caecf98670fd5423559362cfca91b8fd8f3ca357f258e84364932fe544 SHA512 599dadc42820df305156e29d7363a57b3a45752a89dfd1537a79397a71dced7adfeb08f58d51bb3f84f6e11d071607db9fe40ca090fc5f5231fff13e2d2b00c5 WHIRLPOOL 34e3cb245af8eb18c66b9bd822d44bee3ee854cf3eac36d3155fe349629ace26046e01fcfc2ee5a08df2475984bf9b5618f0f742ac32b0e9dad6e221a17c164e
+EBUILD jaxen-1.1.1.ebuild 1382 SHA256 33ca23cfc7fc50d4a78d05c833592b46b63bb412f4f169f90dc10fd411440df6 SHA512 64aa047beae0f30b2b72794f93b7f3a23c7133eb0b921cb4211af0bf959238b89f8731ebde2b6a853844e11fc36dc19ee520c6ba5e612ef5892c46c5ae6aedbd WHIRLPOOL d26befe7f0c01b6432478a54c8eeca4f87b1a0b008bd54f6ab352e76ec8010c457eeba55f96698174835e01d391f2491222f4afb7f8844f92fea86f4452d4c10
+EBUILD jaxen-1.1.4.ebuild 1233 SHA256 faa9eedca9552942f5e9cb7fc75b6fb161dcb88231d924dcefb9fa994e3418f9 SHA512 278a7ac304e6e3b7b47c6d1c387e14b5aae5e7940b39a364034129caeb027f7067eada94ffb29afeb0b74b6f68a5fa33a5acd488fdc0516194f20bdf59f3f26d WHIRLPOOL 32d4060a5f4910cdbd997877c82c725282faa11a7018b75f2825253347f8dc32a2a78546502b6672820dfae837758e72b614a9286bd7fb9d926c6d12edb900a0
+MISC ChangeLog 8134 SHA256 768e5775f7186ed424e8d34d16ee2c6b9f28e381a6a6a39f6de65e2a7eccb954 SHA512 923f9900de6870be4675172845f14314da4c6900a6c316cfb83fa395c120dae236938b5cf66d32853d91e2c935d9577ca8a8a1a73d21d12190ace2d8014396cc WHIRLPOOL 562c53d25abe762da1640b0e4230e569e7e5b87a793465c3fee4089c1f8668b98b7872532fec68ba735640836e1bc651a9642c104e460e81b2a4415afe086f64
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQfFOBAAoJEIUJ+svaV16342AIAIoPa5a2v0NQ8HpSkawxiG1v
-Uc+QgsWUQdQ9vTZ79Z4H5FDpfYTrXO3H9gqznx3RSx0S/yVW4tcJ+0dTvrjdFR3M
-oLcZEv148AoKDtXxtS6yqUzTo3QQdqH96zJwIspviSWabaH5Q5rg++2RhuT8ERSn
-avM+q3KtGBIWqpmBfguaP0W2Z1U0tgANc7nwmq6F+gAAB54maPZB599FDTcyStdl
-Dby/g5N2mDyxCRhuBuONhfuiH3Z0D03XqiY8mO3iQnS2/Z/hY5ZIHVponUzi+Tol
-cQAIXxiwUroe1t/kzrsXZqpfSE2UPNSZ02nQdcWKvAN61zWlY8lniL0dVsuQBkc=
-=NRgS
+iQIcBAEBCAAGBQJQ4zYnAAoJEDxpGckxwJCBCWUQAIZQvzxu6CycATAeyS5PiQY0
+0JGQ0DzbZ1cOfVOBq4syiljp7n+NP0q7zlVklEirHcAm8bNLjy2hrgevGWoOSUn5
+tJtAjDSToyQ+6k/pJxOvJZnruyfJ7POIOjH1T2DvPtzvRnQ30eqWI1+/7nV148D4
+hhXjtZkN9MyTablu7JrQNNROxrgAO7zFuOD84lP/xPFEJ9RiQ82qcYtVHpsKbgUu
+6xzYy06jZM5tf49HqjzHSpMJskX0rvURcVISTw39FoF4Oeu25H/xNHEc0sZnxTPq
+uW/oMGS8N25TWMSK7JFJGK4RUJ5DugBVyC29Mp77XF4v/4BdfJYmVzGPlFX8vUTY
+hF2q/QWiMOUD49VcLO2V/bCv7ikCNy303tTD3E4wQpOFEpkhqwF0p5xkLy3Z8pIX
+XZVX1xmWc2P5gfVH8etnYD1NXPHaPZizsJQhSxpNA8eoOZL3KcjoYl0+/Ms0ilk1
+s0I9PkjpMFLewxR40RzQ/Ke88RsaKPE2uavlgnYrfteryacaHBd+6RqNxAG9UwYq
+m9IbXgxGwee5KXVMUyt6/Jx0g1pBSfsL7lDR1PDM40TNTkGPzBb120jzRrjtcexf
+rp+Oc/nhJjmOuuDgENYqbUjM+CJqU3VcsQEEF11i3bYxS2sfgQvyK73G/5PGmqON
+qtn473UPdfGeGfIl4WE5
+=uswN
 -----END PGP SIGNATURE-----
diff --git a/dev-java/jaxen/jaxen-1.1.1.ebuild b/dev-java/jaxen/jaxen-1.1.1.ebuild
index e351a80decb5..57ba52317b24 100644
--- a/dev-java/jaxen/jaxen-1.1.1.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.1.ebuild,v 1.9 2012/04/15 18:41:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.1.ebuild,v 1.10 2013/01/01 19:14:29 ulm Exp $
 
 JAVA_PKG_IUSE="doc examples source test"
 
@@ -11,7 +11,7 @@ DESCRIPTION="A Java XPath Engine"
 HOMEPAGE="http://jaxen.org/"
 SRC_URI="http://dist.codehaus.org/${PN}/distributions/${MY_P}-src.tar.gz"
 
-LICENSE="jaxen"
+LICENSE="JDOM"
 SLOT="1.1"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="doc source test"
diff --git a/dev-java/jaxen/jaxen-1.1.4.ebuild b/dev-java/jaxen/jaxen-1.1.4.ebuild
index 8bcafaad1d61..9432189d5b45 100644
--- a/dev-java/jaxen/jaxen-1.1.4.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.4.ebuild,v 1.1 2012/10/14 14:28:48 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxen/jaxen-1.1.4.ebuild,v 1.2 2013/01/01 19:14:30 ulm Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ DESCRIPTION="A Java XPath Engine"
 HOMEPAGE="http://jaxen.codehaus.org/"
 SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}-src.tar.gz"
 
-LICENSE="jaxen"
+LICENSE="JDOM"
 SLOT="1.1"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""