Fix LICENSE as it has been Apache-2.0 for quite a while now.

Package-Manager: portage-2.2_rc33/cvs/Linux i686

6 files changed, 26 insertions, 21 deletions

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index abc877ac2e17..46d5e5199eca 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.60 2009/06/13 17:17:36 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.61 2009/06/13 17:21:32 betelgeuse Exp $
+
+  13 Jun 2009; Petteri Räty <betelgeuse@gentoo.org>
+  tomcat-servlet-api-4.1.36.ebuild, tomcat-servlet-api-5.5.26.ebuild,
+  tomcat-servlet-api-5.5.27.ebuild, tomcat-servlet-api-6.0.18.ebuild:
+  Fix LICENSE as it has been Apache-2.0 for quite a while now.
 
 *tomcat-servlet-api-6.0.20 (13 Jun 2009)
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 698f813c410d..64c26ea46b7a 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -11,17 +11,17 @@ DIST apache-tomcat-6.0.18-src.tar.gz 3484249 RMD160 ef85db0d65a4f3bdd3ca821420d0
 DIST apache-tomcat-6.0.20-src.tar.gz 3590562 RMD160 65b1b56132c03855e352e44a24b761bccd65b90c SHA1 ab538484d8d05c83a69c70ab6bf07606282633d8 SHA256 e8f709f0aeda8e164362144aca253249f050bc330e622dbb4196434db9933298
 DIST jakarta-servletapi-src.tar.gz 65342 RMD160 9fc0def14700c4850455da1312e50135fd56eea9 SHA1 ffa93e8b69e0aa4384b7ce4cbb7f4552b6dd467a SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697
 EBUILD tomcat-servlet-api-3.ebuild 925 RMD160 6d8d80e218e190a67a8641cbc4c79501a8e7fbed SHA1 c7dcdf87de3b01bc01cdbfc0d8eccb5aa33903b1 SHA256 9df50057ea6521bccbccb00f6db79fc479d1198fdf8e88ccd66a17ce05b50268
-EBUILD tomcat-servlet-api-4.1.36.ebuild 1044 RMD160 5f5dc80493e82c01705225f3f77e7d48f716030d SHA1 c82d406993ff1f1ab59c612649064d129f4db570 SHA256 bd903f29c3102ee50aeac49e3b6f20d4035d54e313096308c968b850573ebb75
-EBUILD tomcat-servlet-api-5.5.26.ebuild 1580 RMD160 cb2e756d2b499af0a84c0d1e1c644eb96236bb7d SHA1 b26f142ba4d256d5325cb05d795091caf3b6d899 SHA256 1f02a66e0483c48714a6d2147d961e301490ee3ebd5b6f16f159fcf44031af99
-EBUILD tomcat-servlet-api-5.5.27.ebuild 1581 RMD160 86a6b91794ec79d3d481413c2ebe25721fcc03b0 SHA1 9c2ed160be634c01a3d7d4cbd3e5430fc863e5f2 SHA256 b0ce99e4512b8a8bb48bd98d154e3461c9d04586cb81bc9e0e1cc2cf59a2042d
-EBUILD tomcat-servlet-api-6.0.18.ebuild 947 RMD160 0b169de5ba5fe6e2f80aac83a56478ce943235ee SHA1 69a081efc87f16ed6d2449d89d4d32ca39604a00 SHA256 81b6a3cbe96d60aa9f11cfad00fc90b167e4e11614c9f8f51def93ec8cb18ee6
+EBUILD tomcat-servlet-api-4.1.36.ebuild 1046 RMD160 eab477e4ad085b54dabde31654520ef74ffd3f81 SHA1 926e81d24a7ef3c590260058acd8f99e13315d5d SHA256 c4e3ea9e495a60ec584d54c42e2a5a88d7f027cbf70037c57ee91120e42c95b9
+EBUILD tomcat-servlet-api-5.5.26.ebuild 1584 RMD160 2394b11291ca8baf4392bc4affad2c7afe711ecc SHA1 2db1559c0add43b29cb71db60f88f09800c0745b SHA256 9f59b58dcd58b8873421c142ecf49dcc797f978a20f61101cec1fdb3e32e8a99
+EBUILD tomcat-servlet-api-5.5.27.ebuild 1585 RMD160 0be08cfa97abcc4474f40d2eca120fc1d237fce0 SHA1 5f87bd989a3d3ba563ed24937bb7faa909d551fc SHA256 3e1934445c8a022edb1f95c73f3f055be43be9360cfd5b405db9e6faa6fa3b9d
+EBUILD tomcat-servlet-api-6.0.18.ebuild 950 RMD160 c0122ad6f6b49a5e160c73c08e60cc7d5555be35 SHA1 6c4d2d10d5ae15c68d12382fcc6af673fff0d942 SHA256 13d996d9f8637203cc3283f59331022b14f95ff62c4c232c1b2a1e535b0255e3
 EBUILD tomcat-servlet-api-6.0.20.ebuild 948 RMD160 d323129878fd55472fb6e2c8b4b3ed7d21e1ee77 SHA1 e6e97d2d01914365330b4d0aed235b742841623e SHA256 071c7ecf5b59accec241f85d9e933466dc4310ac4663e97c6f8e57ab5426584d
-MISC ChangeLog 10326 RMD160 4fdf1717bcfe565d1aaecdd38601b3d3a2ea5b79 SHA1 2d16c3e8b2c01753523df30593e1692e60f9596f SHA256 dad67651109066ccce4c631376322937f1b4e6597334f4dd9f14bf4600bdf72e
+MISC ChangeLog 10583 RMD160 a743fb8994a366de0172a3d4c8b1645c46e51561 SHA1 fc9099073d9ffb83786068472c52e62dc7455407 SHA256 3c8dc728b77cc238d4131f038ad769b3ff734be00b6be359d2b1b3bc649f75ae
 MISC metadata.xml 265 RMD160 a2216ab83ce6380767c2b520d7db29fbac39758c SHA1 33a911d99c033f3cab73367890ae18925c3b2ce7 SHA256 6b387cd849d192d7139aa572a2638fd4d44d99d7ea78e30f26b0f3f4baeab84b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoz3yMACgkQcxLzpIGCsLQk+gCfaxLGtLgUNoSZcjHAxmsTtZHn
-UloAn2RyARvWfvtuOk7QAsUwEYFwwnSm
-=erJK
+iEYEARECAAYFAkoz4BAACgkQcxLzpIGCsLTXYwCggkRAEMLwdO2X/lx8GuzLR2XW
+zTsAoJ0c7ik8y4fKY/2TNhAafBIretmE
+=MmmK
 -----END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
index b816b682c9cd..17c22133e0fd 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild,v 1.5 2008/03/16 17:40:50 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.36.ebuild,v 1.6 2009/06/13 17:21:32 betelgeuse Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-4/v${PV}/src/${MY_P}.tar.gz"
 DEPEND=">=virtual/jdk-1.4"
 RDEPEND=">=virtual/jre-1.4"
-LICENSE="Apache-1.1"
+LICENSE="Apache-2.0"
 SLOT="2.3"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.26.ebuild
index 9b82343556ed..c56df138576e 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.26.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.26.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.26.ebuild,v 1.4 2008/05/12 10:56:22 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.26.ebuild,v 1.5 2009/06/13 17:21:32 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2 java-osgi
 
@@ -9,7 +9,7 @@ DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
 HOMEPAGE="http://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
-LICENSE="Apache-1.1"
+LICENSE="Apache-2.0"
 SLOT="2.4"
 KEYWORDS="amd64 ppc x86 ~x86-fbsd"
 IUSE="doc java5 source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27.ebuild
index 4284346812ad..4729dd09ae03 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27.ebuild,v 1.2 2008/09/17 21:39:28 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.27.ebuild,v 1.3 2009/06/13 17:21:32 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2 java-osgi
 
@@ -9,7 +9,7 @@ DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
 HOMEPAGE="http://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-5/v${PV/_/-}/src/${MY_P}.tar.gz"
 
-LICENSE="Apache-1.1"
+LICENSE="Apache-2.0"
 SLOT="2.4"
 KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
 IUSE="doc java5 source"
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.18.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.18.ebuild
index d6614ee7f2f9..4271338b54c2 100644
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.18.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.18.ebuild,v 1.4 2008/08/24 10:56:35 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.18.ebuild,v 1.5 2009/06/13 17:21:32 betelgeuse Exp $
 
 JAVA_PKG_IUSE="source"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
 HOMEPAGE="http://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-6/v${PV/_/-}/src/${MY_P}.tar.gz"
 
-LICENSE="Apache-1.1"
+LICENSE="Apache-2.0"
 SLOT="2.5"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"