7 files changed, 18 insertions, 13 deletions
diff --git a/java-virtuals/servlet-api/ChangeLog b/java-virtuals/servlet-api/ChangeLog
index da275c14c204..3bc0a4991353 100644
--- a/java-virtuals/servlet-api/ChangeLog
+++ b/java-virtuals/servlet-api/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for java-virtuals/servlet-api
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/ChangeLog,v 1.42 2012/09/29 17:51:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/ChangeLog,v 1.43 2012/10/04 17:40:04 sera Exp $
+
+  04 Oct 2012; Ralph Sennhauser <sera@gentoo.org> servlet-api-2.2.ebuild,
+  servlet-api-2.3.ebuild, servlet-api-2.4.ebuild, servlet-api-2.5.ebuild,
+  servlet-api-2.5-r1.ebuild, servlet-api-3.0-r1.ebuild:
+  Change license to public-domain. #426800
 
   29 Sep 2012; Fabian Groffen <grobian@gentoo.org> servlet-api-2.3.ebuild:
   Marked ~x64-macos
diff --git a/java-virtuals/servlet-api/servlet-api-2.2.ebuild b/java-virtuals/servlet-api/servlet-api-2.2.ebuild
index b03c813c6d1c..1186a3f266c3 100644
--- a/java-virtuals/servlet-api/servlet-api-2.2.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.2.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/java-virtuals/servlet-api/servlet-api-2.2.ebuild,v 1.15 2012/04/15 18:52:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.2.ebuild,v 1.16 2012/10/04 17:40:04 sera Exp $
 
 EAPI=1
 
@@ -10,7 +10,7 @@ DESCRIPTION="Virtual for servlet api"
 HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
-LICENSE="as-is"
+LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/java-virtuals/servlet-api/servlet-api-2.3.ebuild b/java-virtuals/servlet-api/servlet-api-2.3.ebuild
index 98acf7744c24..134621060b02 100644
--- a/java-virtuals/servlet-api/servlet-api-2.3.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.3.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/java-virtuals/servlet-api/servlet-api-2.3.ebuild,v 1.17 2012/09/29 17:51:43 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.3.ebuild,v 1.18 2012/10/04 17:40:04 sera Exp $
 
 EAPI=1
 
@@ -10,7 +10,7 @@ DESCRIPTION="Virtual for servlet api"
 HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
-LICENSE="as-is"
+LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
diff --git a/java-virtuals/servlet-api/servlet-api-2.4.ebuild b/java-virtuals/servlet-api/servlet-api-2.4.ebuild
index 4fd9242c7e5c..dd0e6025f6ef 100644
--- a/java-virtuals/servlet-api/servlet-api-2.4.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.4.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/java-virtuals/servlet-api/servlet-api-2.4.ebuild,v 1.11 2012/04/15 18:52:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.4.ebuild,v 1.12 2012/10/04 17:40:04 sera Exp $
 
 EAPI=1
 
@@ -10,7 +10,7 @@ DESCRIPTION="Virtual for servlet api"
 HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
-LICENSE="as-is"
+LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
diff --git a/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild b/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild
index 1c0f93c4818c..76a75a338f5e 100644
--- a/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.5-r1.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/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild,v 1.6 2012/04/15 18:52:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild,v 1.7 2012/10/04 17:40:04 sera Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="Virtual for servlet api"
 HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
-LICENSE="as-is"
+LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
diff --git a/java-virtuals/servlet-api/servlet-api-2.5.ebuild b/java-virtuals/servlet-api/servlet-api-2.5.ebuild
index 36cc20ffa538..2f9dfc67adf4 100644
--- a/java-virtuals/servlet-api/servlet-api-2.5.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-2.5.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/java-virtuals/servlet-api/servlet-api-2.5.ebuild,v 1.13 2012/04/15 18:52:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-2.5.ebuild,v 1.14 2012/10/04 17:40:04 sera Exp $
 
 EAPI=1
 
@@ -10,7 +10,7 @@ DESCRIPTION="Virtual for servlet api"
 HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
-LICENSE="as-is"
+LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="amd64 ~ia64 ppc ppc64 x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE=""
diff --git a/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild b/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
index f217557c7a23..3c1b928f7cf6 100644
--- a/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-3.0-r1.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/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild,v 1.4 2012/06/12 11:34:12 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild,v 1.5 2012/10/04 17:40:04 sera Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ DESCRIPTION="Virtual for servlet api"
 HOMEPAGE="http://java.sun.com/products/servlet/"
 SRC_URI=""
 
-LICENSE="as-is"
+LICENSE="public-domain"
 SLOT="${PV}"
 KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86 ~x86-fbsd"
 IUSE=""