summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2012-01-23 12:29:37 +0000
committerRalph Sennhauser <sera@gentoo.org>2012-01-23 12:29:37 +0000
commitb1a3b7e851a2561ced74c2b73b0cd6c7943f264d (patch)
tree44e1ad842918b3223761491b70640cc26173bdca /java-virtuals/servlet-api
parentBump xhtml to 3000.2.0.4 (diff)
downloadgentoo-2-b1a3b7e851a2561ced74c2b73b0cd6c7943f264d.tar.gz
gentoo-2-b1a3b7e851a2561ced74c2b73b0cd6c7943f264d.tar.bz2
gentoo-2-b1a3b7e851a2561ced74c2b73b0cd6c7943f264d.zip
Fix JAVA_VIRTUAL_PROVIDES to include the JAVA_PKG_NAMEs of providing
packages. Remove no longer need one. (Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'java-virtuals/servlet-api')
-rw-r--r--java-virtuals/servlet-api/ChangeLog11
-rw-r--r--java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild24
-rw-r--r--java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild (renamed from java-virtuals/servlet-api/servlet-api-3.0.ebuild)9
3 files changed, 38 insertions, 6 deletions
diff --git a/java-virtuals/servlet-api/ChangeLog b/java-virtuals/servlet-api/ChangeLog
index 57c81334f2b7..e59dc2128e6e 100644
--- a/java-virtuals/servlet-api/ChangeLog
+++ b/java-virtuals/servlet-api/ChangeLog
@@ -1,6 +1,15 @@
# 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.33 2012/01/01 19:00:14 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/ChangeLog,v 1.34 2012/01/23 12:29:37 sera Exp $
+
+*servlet-api-3.0-r1 (23 Jan 2012)
+*servlet-api-2.5-r1 (23 Jan 2012)
+
+ 23 Jan 2012; Ralph Sennhauser <sera@gentoo.org> +servlet-api-2.5-r1.ebuild,
+ -servlet-api-3.0.ebuild, +servlet-api-3.0-r1.ebuild:
+ Fix JAVA_VIRTUAL_PROVIDES to include the JAVA_PKG_NAMEs of providing
+ packages.
+ Remove no longer need one.
01 Jan 2012; Ralph Sennhauser <sera@gentoo.org> servlet-api-2.2.ebuild,
servlet-api-2.3.ebuild:
diff --git a/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild b/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild
new file mode 100644
index 000000000000..91ffd43b1bd1
--- /dev/null
+++ b/java-virtuals/servlet-api/servlet-api-2.5-r1.ebuild
@@ -0,0 +1,24 @@
+# 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.1 2012/01/23 12:29:37 sera Exp $
+
+EAPI=4
+
+inherit java-virtuals-2
+
+DESCRIPTION="Virtual for servlet api"
+HOMEPAGE="http://java.sun.com/products/servlet/"
+SRC_URI=""
+
+LICENSE="as-is"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE=""
+
+RDEPEND="|| (
+ dev-java/tomcat-servlet-api:${SLOT}
+ dev-java/resin-servlet-api:${SLOT}
+ dev-java/glassfish-servlet-api:${SLOT}
+ )"
+
+JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT} glassfish-servlet-api-${SLOT}"
diff --git a/java-virtuals/servlet-api/servlet-api-3.0.ebuild b/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
index dafbc3617fbe..2d651ca7735d 100644
--- a/java-virtuals/servlet-api/servlet-api-3.0.ebuild
+++ b/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.ebuild,v 1.2 2010/12/21 18:41:54 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/java-virtuals/servlet-api/servlet-api-3.0-r1.ebuild,v 1.1 2012/01/23 12:29:37 sera Exp $
-EAPI=1
+EAPI=4
inherit java-virtuals-2
@@ -19,6 +19,5 @@ RDEPEND="|| (
dev-java/tomcat-servlet-api:${SLOT}
dev-java/resin-servlet-api:${SLOT}
)"
-DEPEND=""
-JAVA_VIRTUAL_PROVIDES="resin-servlet-api-${SLOT}"
+JAVA_VIRTUAL_PROVIDES="tomcat-servlet-api-${SLOT} resin-servlet-api-${SLOT}"