Update LICENSE, this is identical with the Apache-1.1 license, bug 444848.

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

4 files changed, 26 insertions, 16 deletions

diff --git a/dev-java/ognl/ChangeLog b/dev-java/ognl/ChangeLog
index 89a368c08c30..a850514d31ab 100644
--- a/dev-java/ognl/ChangeLog
+++ b/dev-java/ognl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/ognl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ChangeLog,v 1.9 2012/09/27 18:57:27 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ChangeLog,v 1.10 2012/12/02 08:33:38 ulm Exp $
+
+  02 Dec 2012; Ulrich Müller <ulm@gentoo.org> ognl-2.6.9-r1.ebuild,
+  ognl-2.6.9-r2.ebuild:
+  Update LICENSE, this is identical with the Apache-1.1 license, bug 444848.
 
 *ognl-2.6.9-r2 (27 Sep 2012)
 
diff --git a/dev-java/ognl/Manifest b/dev-java/ognl/Manifest
index b36e3493fa09..f967c2d14736 100644
--- a/dev-java/ognl/Manifest
+++ b/dev-java/ognl/Manifest
@@ -3,18 +3,24 @@ Hash: SHA256
 
 DIST ognl-2.6.9-dist.zip 2338429 SHA256 2fcb108c332b388c0ca282e8dfea9a079ab6af3caa08cfe3ccb307dffd57e290 SHA512 7883f4e2c3c4b1fab5966481c661cdb3fdd7489717333e985dc7a517fbf14f82e3c218f81e8ad94008f7fcd6e66d166bd03227ff5f1df6a203e1cbc2985bd44c WHIRLPOOL 821d93653b6217b69d575abcfaad9639d8f4e46699124b2ffc0d1ae8ba1fc763ec89b0bf6991b2a929b9e5d31e1b1fcbaf1fd1f6931952ed5f1c4df4d82c372c
 DIST osbuild.xml 5939 SHA256 b56534bfdceabe54f4c446d7ee3718dc373523aa368d83206723300fa6931726 SHA512 6b66b7b27073fd6b707b71fb2da7017602edd85de52e767ecb8d8931fdd96811b04d9ec0ac9ec1cb32daf03d43610f760471959cf7211b1921a92d5f5a070416 WHIRLPOOL d8b355472c773a4e180d8efa2c0ecbf55a1233432f8af6c21f9fc8e02012db9780f923af6c3383a343126f4753ce7a62316fdda6a393b5aceb822fe52b64f233
-EBUILD ognl-2.6.9-r1.ebuild 1156 SHA256 510dfd03e324ec12563ea02049131adf183d0a4b4054ee0b1e42d336167177a8 SHA512 8d4292ad559808bb82526b19e7c5d5f3a1daae3a98806e1b0ccf5b2b05a87e7a158faf0d415fb9b57ffdb8457a18430c704bcbd3f9e5bd7d2bbc12dac96cdb8f WHIRLPOOL fc4fe6c70435bcd813799050f5e7006a5b897504eeb94b5354794fdf8ca63c9cc8698df8845d73cb7b238f285cd18f2abbe50e38b97077ab3a1ed6895d023da1
-EBUILD ognl-2.6.9-r2.ebuild 950 SHA256 50142cbd7f77118b1ff2ee1ea1cb7389163a07db4fb792a982f954e0145ae4ba SHA512 5a187935e44f2457711adcf3cf324d49c180a825ebe04747e9c6467eb02433bb9d823b6d62aa1f38489f7a28b9489a8a303163cc757148387928758d6a37bfdf WHIRLPOOL ab93440e7fd6457793b3cebcbbf7a6a52de544e2b48d53ea2a73bb18526bf5ff0e4c5e2109b080de465baacacd9570ca61ce1f7051d249214af242cd38633bfe
-MISC ChangeLog 1504 SHA256 4cb82df34869c31cafb21b436b4736d9677f914b88816c4647541b861f0f78e2 SHA512 bced9d07b9e08e21c91f61f19e51919b4b8c7c9528ff456f1f5f1909e03fd21f085ace39167c25bee3369912599e41c0f2d4d4474fc564fff911c12f818bbb6e WHIRLPOOL f96b1a9e2017a41ea3c9025a3383d75d25bf08d397aa8e2df0853db0a9db4c6d873ad681bc35f410b54b85467c1e0a048bb235efc66ad43b9826d6169d5339cf
+EBUILD ognl-2.6.9-r1.ebuild 1148 SHA256 25d7f691c417afa3397f973c652399933960937470081852f9913f14bef7203b SHA512 d40276093b391c4e661a25a22b95b1b3da267e12967fd9b163d44abd06a912907909ecefc28c08da71f4774a79b7e5437ea348c694662069d68a49304576915d WHIRLPOOL 87586c1549dcd345a936ac583fce1124eff885873bb549064d1ff2e781a1bf8710d8ea42917e094982783f9eebe21862d63e635c582330706c72205277ddc317
+EBUILD ognl-2.6.9-r2.ebuild 943 SHA256 e8f52e291a56a513021a1a68751e2a11eac67fd0ad39b2ad933602f5c69b64d1 SHA512 c64ad6d2d14525fbc19bc9c47b298b58b67d4bfee87f47b3492f542223b24bad72c1ab15120dfda09cdc6950f9ad8e4d40f952f86ccdaaedc49fc8dd75e8a55f WHIRLPOOL 578e6b4a0f8c08cc9bda85502f8891e795e8c245cdc18db8deb23c14b64866260c013adcff70d874f3509ad5a737d7141a181c4c1abd06a2c6d6ab4c3e8f3d9c
+MISC ChangeLog 1675 SHA256 ffd34affde3384467fc6381b04106f857d51d258033bec5be626ebe21ddf2c1b SHA512 100e3ac64832150ed58d8afd00e0239508b4c4a879724413f9c0cdabfa124cf8595bd2561196282b727a5586bcfc647f38c66b6f3b58078332fe58e114168158 WHIRLPOOL 129ceed8694a2ad5e9720f2e8a4f7a75c8cd5b2bc80d133a4dcd1c2efb8a96dcb8cd39e66ce40c8bb0121e6f890efdba9818227401fc4c231f65f8e5169a467a
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQZKGmAAoJEIUJ+svaV163cfQH+QG1AG9lPWR36RbsptMGPDAX
-UMhmxkvcIVWYUOA0u5dKMXfC7W200qvyXHF1OJn6meU3HLSHk+NdY8s2ye11e8YV
-wbZ9E2tTKOHXnM4Ort9Px84VRNjSVqsCGSmwO77PftFXr/hedbcI3am9RWOoKWdI
-NJr3bS7gAi+zqFke/pPGFaM7HxS9LA34Ohj5qVik/vgb0sxFukOt7GxSwa1lv2fF
-+gsW78eFMpZ+zbFiwe9lfRMyhxCHlHFNBhenu3OneuPKscAKwqSCYjqOJCi1yWnR
-BmYkTm6J+mR2ccrblbUICLW6fagy8h7k6z/o6RdeJ3tI3Ah/2OgY0nqQtcIzVnA=
-=uGqx
+iQIcBAEBCAAGBQJQuxK4AAoJEDxpGckxwJCBL60P/1s0i5kQ/QCNBIpASy1f4sIc
+xYw4HLPTWVUn9OemP+QS4Ryxv4riArM0Uo4RZITY6hiA2Qc11xkPg9GJ0GgTy6yL
+77Ej1tnAhudezGgNUUTbIn0+SXzOYj23W0a23oXu4L+ookLkVMM9YEIowmeyR3XS
+Kms4f1Qxs+HuUng7kyV53gx39fRzqLnQyDu+AGI3QEYOX9iR0rTFIeSHgxHF4bwg
+Sfwiz7G0HLQ68ADptwHQSQyL6p8FxngXfj1WjEaktlWv7DvHw7PiDOsRjLp/4SbJ
+GVJ6PpT6PuxoTAnsFI1SdJUT9hNm8OIgko6qD+4G3KtJlQJI1EBpjC7pHkgy0A7r
+xmYe8AjC5MyyaxMKN76e1+sjfdqZUt3dZ3MXLnjRjyZzujdAVBx5hVBNJtlCA4aD
+SRfzzMO6p7n4De6gzXIL6N9RLR83nBeCE/60Dad+n2G82nnVVcwHwTJeAMA2+k/L
+dSY76WCUnug0b6v1WrY3L3RQFxjwFqoayvd6doA1DpAq3nS8M86yFgBcF7Vko02T
+6oW2R69nXSMvWfKDyuA7m66i5S9Q3SoO2hIfXRL7GY83VyebSFU3NAuJlJAzYsEG
+iCmTUCkB0rO+SHeCUygdDPJdrbChsDSO1NMUVv580A4zDi0qgLLywHfDQoTwluFp
+rhPj9ky8jd0yNWWPZ3A0
+=+mqh
 -----END PGP SIGNATURE-----
diff --git a/dev-java/ognl/ognl-2.6.9-r1.ebuild b/dev-java/ognl/ognl-2.6.9-r1.ebuild
index 187d7c604a11..c7b20602079e 100644
--- a/dev-java/ognl/ognl-2.6.9-r1.ebuild
+++ b/dev-java/ognl/ognl-2.6.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-2.6.9-r1.ebuild,v 1.1 2007/03/19 02:33:54 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-2.6.9-r1.ebuild,v 1.2 2012/12/02 08:33:38 ulm Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.ognl.org/"
 SRC_URI="http://www.ognl.org/${PV}/${P}-dist.zip
 	https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
 
-LICENSE="OpenSymphony-1.1"
+LICENSE="Apache-1.1"
 SLOT="2.6"
 KEYWORDS="~x86 ~amd64"
 
diff --git a/dev-java/ognl/ognl-2.6.9-r2.ebuild b/dev-java/ognl/ognl-2.6.9-r2.ebuild
index 92f9b422a3d9..27781743ae17 100644
--- a/dev-java/ognl/ognl-2.6.9-r2.ebuild
+++ b/dev-java/ognl/ognl-2.6.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-2.6.9-r2.ebuild,v 1.1 2012/09/27 18:57:27 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ognl/ognl-2.6.9-r2.ebuild,v 1.2 2012/12/02 08:33:38 ulm Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.ognl.org/"
 SRC_URI="http://www.ognl.org/${PV}/${P}-dist.zip
 	https://ognl.dev.java.net/source/browse/*checkout*/ognl/osbuild.xml"
 
-LICENSE="OpenSymphony-1.1"
+LICENSE="Apache-1.1"
 SLOT="2.6"
 KEYWORDS="~amd64 ~x86"
 IUSE=""