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

(Portage version: 2.2_rc33/cvs/Linux i686)

5 files changed, 18 insertions, 13 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/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"