Fix LICENSE, bug 449682.

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

4 files changed, 29 insertions, 15 deletions

diff --git a/dev-java/xpp3/ChangeLog b/dev-java/xpp3/ChangeLog
index a615a18351c9..16abcd00b422 100644
--- a/dev-java/xpp3/ChangeLog
+++ b/dev-java/xpp3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xpp3
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.29 2012/09/29 18:10:57 grobian Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/ChangeLog,v 1.30 2013/01/12 10:22:42 ulm Exp $
+
+  12 Jan 2013; Ulrich Müller <ulm@gentoo.org> xpp3-1.1.4c.ebuild,
+  xpp3-1.1.4c-r1.ebuild:
+  Fix LICENSE, bug 449682.
 
   29 Sep 2012; Fabian Groffen <grobian@gentoo.org> xpp3-1.1.4c-r1.ebuild:
   Marked ~x64-macos
diff --git a/dev-java/xpp3/Manifest b/dev-java/xpp3/Manifest
index f16fec07d315..31228e78c66d 100644
--- a/dev-java/xpp3/Manifest
+++ b/dev-java/xpp3/Manifest
@@ -3,14 +3,24 @@ Hash: SHA256
 
 AUX xpp3-1.1.4c-build.xml.patch 950 SHA256 dd850813b2eaca04669ea7967fd95ec110f71e677bbedfd2ef01176af344a6c5 SHA512 65a5efe85a3a33353e61c04950dbb6a88af1bb6e56760d29826ce4c4ec56c685a76c84217a93ce4bcba55f282bc7ee905dac8ada3828a49b0dae05e5a3ad9a1e WHIRLPOOL a97abe461cc6d2757b76e2419fda042516ebd3a15fa56fe5ecfd4b54824bb9ff1d4d104bff7897d3dbfe7b63758c210f12828a58f32ea801509edd7adfa4903c
 DIST xpp3-1.1.4c_src.zip 959795 SHA256 c12c8c1bab5ce2c1d28a4075319d78c51d986581284b920faa5ed85df60437f4 SHA512 e9513b8c97a2fd04154f3717b802b81cb01c584e693303f6c6dcb763aa07e03f2f50178b80926457cb7f9147ff91c3e49cfce5e8ed522b4885d634f2f5a792fd WHIRLPOOL 6c0b541d1617e073827b9824c82014b106561d5941f2e68cae564a4d45e7c9af6f027030da1950b9a4e6d959a6659271fbe0f7a7069b3148860ae628a8fcd67d
-EBUILD xpp3-1.1.4c-r1.ebuild 1269 SHA256 0ee3bbf99e01a66b58317d479ae4d35b74ac2ad4be287643c8550869206b28a9 SHA512 678bfb8396f249608828f6593814c9f369c4f37827a7af85315eac9c04826f37a2496e3478461c32284de7906cee68b630a423cf6cb6182cb35af166140a02b8 WHIRLPOOL e7650f5d7dc3e5c51ceb5ff5426a42677d5852159648e42aabd27ff0897809afdd13b88b3de868ef2fec3c17fe87e8f0c993619bbf2a0c8322f4cb8eb21d8f02
-EBUILD xpp3-1.1.4c.ebuild 1087 SHA256 ffa6c08823bf041e47eb7d4c15d0c333cb489fcb998b1ae8934704992d8e22fc SHA512 79906b47444adce95d713ff1c3530eef3e338650e05cba9bd0b9fe1da65c21ad4437a995cb1a9a459a8919460581dacc8e01cdbc9032517325afa15e2a3760f0 WHIRLPOOL 87451ea2e1503bcc45fc2bfe50411b7434b30c2dfcf97d1049f6b0837a805384ff7f0122c2504b1809840a7f29f9ad0120ff6e68e40820be70cd48d224fb60f0
-MISC ChangeLog 3639 SHA256 13aa817e692cc4e8c7a2fa62d46e4a59edbabfe75cb2ca4ef03b9661a26baafd SHA512 82f6ebdfae19b0505b1c35681518e832cefef3020621f2464e4c6d7d971644ca56aad5175fee0a034c8d6d705ff963877760b66c264753dfc194b7fb708e24b0 WHIRLPOOL 24c39c0abc7a88373e89ef296b46de4cd3e26de068403cfd4e00dd30a64b20e0fe2774b5172b0402d911a71c389c188a01ca5fa11c6d32bc7b0165474447143d
+EBUILD xpp3-1.1.4c-r1.ebuild 1289 SHA256 4ac0f50f9d43185fccc5bfd9ae41f6d469c62db4ac5a652166386cb5f7be6f1d SHA512 5c7aa41d74768a6381231e744424d829254cbbea7962c5cc7a8b4ef7e66fd67416bfe9d44bbee0659424edfc391aa18dd3f6a734be99700e0989a8346a19546e WHIRLPOOL e1264d6b8b2efeeec5c224d03d51f1ace966f5672b950683af23a7f5848188b5dd45dcb6a296e24d8e1d9b93e68762e156003a617158f23b1282d669c6fa71cb
+EBUILD xpp3-1.1.4c.ebuild 1111 SHA256 ad9b03edff951e8a8c55be746b68a684ef5337bc8ac04cf1a98af2cc8897eb50 SHA512 d9ea923255b92d93bb81ff6f239d66b75073bd949ea7e80497ff3a636ab70f626e48ce115555cdd66c959a7008486e8addec3668f2b25296c9c5c4fe9293520a WHIRLPOOL 0473d071a265b3527ff40aa05142f076baabc9ea913c712fa5fadff1c1e6aa0c9b44eefaf9feb009389621b2981064b1e72bb49f658722aa7504f060731a4057
+MISC ChangeLog 3755 SHA256 9bc391cd92abc6a95bc0aa8e31ce18c777ae886d444454abeeeb7f5214382d60 SHA512 9b0f02085f49f84882803935ed9cfa2e0e6e42c1305b048aecf1dc74338361a36feaaeae1dfc9793d80cda778345891638760350e105a4a88af8fd703a773876 WHIRLPOOL e1196e3030bbf9490407a5d7f903ecebf20fc69c8d3c538aeb9fef102499d3be2f01b9d96068689538df7b8bfed634ee029e6c970ca73699e984e52d278edae3
 MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (SunOS)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBnObcACgkQX3X2B8XHTokBUgCePdHGY+57bPToPqsg4JJ97Cvt
-vIMAnR+lu7/BsEAqMNC2gNxodvzteTyO
-=OHOQ
+iQIcBAEBCAAGBQJQ8ToXAAoJEDxpGckxwJCBP7QQAJTv9iBI0giPsKwQdRCN7DLi
+INRG1Np3CWpn8Pyudwp3gSMCVPLQyu5RKyJoCMo9O99uXngOYbxKgEAwafpbhi2w
+nE8l+y/NiAbigUFd4qzopPqkngy20bm6nFUoH+1quf1rNCq0lIJXujG5r73dHXCe
+ROIZ+rCp6DWOy60V865dSJE6J/GTIwm7OBeXXDdGjKBt6mZA/aUJVabEVvfHYvTe
+qtARZ5Uuqr3QqxodXb9srNoz2tELVgodaXSUiOSYyU7uKfp2Ragmsxi5KtAYY39w
+NPyV9C+RlwiK76IJSzUa/5FHNt9vtzJOcDYfvmU3+BaFEP9euIbm6XNpdcLVB5lm
+qGpRt3hXxNp72eQNwBLxf0tMmH3EYO+Q306MS8nzvYDmhYDnPrmbNsZ9ttwK0lRJ
+pJ4CdRJquIkFGbazayjcSic9C11Vp7U9hbNQTx10bt4boYqMA2v3/jTsytYXeeju
+gqL4scwyiuddaElYN9E3zUaMJwdi3aX2GvTcegPxu0oxn2tKEjgIpp3deDGbyEiy
+ZjyyDYMTuuLEVLTzLKviF3gtTXstUgJn/phLvxq8h1d0+svYy5jaENMW7X3mLNdg
+zS9Cztxar009SclDnoQOvBPQl3bqXK2N5GMm9723OW8PF14fk6/KQcFPvCZshI36
+i6cl27MEup6JEBaek7/v
+=Tcpo
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild b/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild
index f8568700106e..d8c51bc6c57b 100644
--- a/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c-r1.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/xpp3/xpp3-1.1.4c-r1.ebuild,v 1.12 2012/09/29 18:10:57 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c-r1.ebuild,v 1.13 2013/01/12 10:22:42 ulm Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -13,7 +13,7 @@ DESCRIPTION="An implementation of XMLPULL V1 API."
 HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
 SRC_URI="http://www.extreme.indiana.edu/dist/java-repository/${PN}/distributions/${MY_P}_src.zip"
 
-LICENSE="as-is"
+LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
diff --git a/dev-java/xpp3/xpp3-1.1.4c.ebuild b/dev-java/xpp3/xpp3-1.1.4c.ebuild
index 9be070824f70..8ac8631b5d9c 100644
--- a/dev-java/xpp3/xpp3-1.1.4c.ebuild
+++ b/dev-java/xpp3/xpp3-1.1.4c.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/xpp3/xpp3-1.1.4c.ebuild,v 1.9 2012/01/01 15:44:43 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp3/xpp3-1.1.4c.ebuild,v 1.10 2013/01/12 10:22:42 ulm Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -13,7 +13,7 @@ DESCRIPTION="An implementation of XMLPULL V1 API."
 HOMEPAGE="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html"
 SRC_URI="http://www.extreme.indiana.edu/dist/java-repository/${PN}/distributions/${MY_P}_src.zip"
 
-LICENSE="as-is"
+LICENSE="Apache-1.1 IBM JDOM LGPL-2.1+"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE="test"