Fix JAVA_VIRTUAL_PROVIDES to include the JAVA_PKG_NAMEs of providing

packages.
Remove no longer need one.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 48 insertions, 15 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/Manifest b/java-virtuals/servlet-api/Manifest
index 8fd95434b62f..ce4cf254f9f1 100644
--- a/java-virtuals/servlet-api/Manifest
+++ b/java-virtuals/servlet-api/Manifest
@@ -4,18 +4,19 @@ Hash: SHA1
 EBUILD servlet-api-2.2.ebuild 649 RMD160 53d8778404e7a62a27ab9df38f52de7f9c3aeea7 SHA1 8ffd22fa0e53df2548bf9d7e41ee833ca2ff8d69 SHA256 1bbba40243898a61b9f2ad25c2aea8cf818c2831714f3de20fefbd2b2888fa16
 EBUILD servlet-api-2.3.ebuild 638 RMD160 0a38c7dd2040f753efd0e10ed33d90deb1489af1 SHA1 a86e659bb6b051178779b20812e58e85ef57c3d2 SHA256 49ae82a0076964a7ebeb284b7380d2db0aa71fcc47423e98b1819f66bd388281
 EBUILD servlet-api-2.4.ebuild 658 RMD160 5fbbf6e4f00edfb91058914eb7a511f17f600e0e SHA1 6c3efe93e2af0f18cbc9b715a69dcf77ea34a328 SHA256 2c2959f65e767afbd57adcd0172802f55a911f4b036af2304740640d465331c2
+EBUILD servlet-api-2.5-r1.ebuild 739 RMD160 21f96e578abba72d3893be252f171d1c5de0b8a6 SHA1 e1f30a88ab82d45fd7fa9c3b560c4c06ab4f2b52 SHA256 304160dd8be75cecaf4423e46ff26d00589c01133ab17e6351aee911738e2896
 EBUILD servlet-api-2.5.ebuild 717 RMD160 57e3f433c46e37a7e2562cda9b1124abd7b29a89 SHA1 fa8b4d349e25595762e701efb138f15fb2a55f65 SHA256 5229406a48d6592411a28273d9c179a4082c52e970404728cbb8bddc1db64e29
-EBUILD servlet-api-3.0.ebuild 602 RMD160 38e21ab46dc6d9c9c8bf6ce4e327329bd7ab92ec SHA1 34720e03d59039c3cf17c8c36817a964bdc8ed7c SHA256 8f55b56e15cb710b8a61c85d2384f99b31be2a9aa99ac7536cded48a652600b8
-MISC ChangeLog 4812 RMD160 b7d0dcc42ab50856b5b6dba75dea6cce5adcb502 SHA1 85e9517d8fdc710c3712bc5664d1cc9d60eb1244 SHA256 0013d6e5ec8428ef238979dbfbace06faab8817bc5f885ecfb662b029ee7b454
+EBUILD servlet-api-3.0-r1.ebuild 618 RMD160 ea03b648330b51f0cb26da1e462deb57ccba46b1 SHA1 d17d361b4e3dddb984b79a07b39dcb28053e854c SHA256 f6541ea1baf13b74d0560d43bfcb06700beef88f3f3f460b3ee2749c223f634e
+MISC ChangeLog 5127 RMD160 921d9403cbd57341e59b451ce1aafbdd5c000ae2 SHA1 27c388e3a8bed9efe683f0c2121f680ee4328d31 SHA256 49a2aca383d92a705dce37aaaa558a1e3de6a0ca8c1d47ed2559fc4dafa75c6a
 MISC metadata.xml 301 RMD160 da194a466d44a3c2881af76ad5c7cd6ada6bdd03 SHA1 d4f9e120730f62f3d3330ef439a74943e22bcab0 SHA256 00e5727cdab1ac56a00e649bbd232b30a544168fe6fb0cf000f60ad1b893f605
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPAK1PAAoJEIUJ+svaV163N2gH+wSItV3pPodomjcWzTlZcGNF
-QQ6ioEAqpuTRX23QrNYWOjpGkHZMz2hScK7yVvXriECNRd+EJDzquEMpgr7uHn9G
-UK2qjip1D+UZQF7xFsfnzqxAWol28njTHsWsMddNvqYrzjXkL8RPIk+mwoBAC12b
-LFhrizmb8NQAfOCctiIB/07ZRGbr5feIJT4WCOP5xI+mAAznnSra0GGYncBWrdDC
-VMnsdRZcR2tYgTHaLAQqVChc5rywa1UmFqviM0ub8aUSHCiS6KpOhWcS+DybKuGW
-XswZuH3b85otTgVf7ftYfoYzKjsHEvHxcYRTrceutGoPRhjZge11t6uCqn410rg=
-=W6Ex
+iQEcBAEBAgAGBQJPHVK/AAoJEIUJ+svaV163vgUIAKXl41X8nGhhzor/uSB1+mTd
+Miasbt4oo+n1CnfkVLhw7qK8urXzqxaNM5ZyLUhuWwMSg+stdjRupmq+Ccw67vU0
+g/1UWfPeSBMvIh6mRy9mrSDOTG1bwws3sXxv0FmiO618EvTQEZNw9Htp/85y2bCu
+GT6IRDRSNcUUHfQoqi3nxljJWj9MgrYPdcVCuBbZtKaAderDVq+81D+xe4UvyX7j
+q/YKBSMC2Dzkn1fH8A6cWADUpT9FQvvcORpfp4EIVPxipQrUJXqlx/RovME4O2CB
+/0SfdF3PEOpSYP34hd2WNd9DI9CubFqcoHXTxru0E/O5zKRL10xFe5jXzDnTlxo=
+=Y6Vs
 -----END PGP SIGNATURE-----
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}"