Use the java-virtual for servlet-api. #398689

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

diff --git a/dev-java/antenna/ChangeLog b/dev-java/antenna/ChangeLog
index bcea29dc8358289b03ff29f8b562ef146359fb17..c10b42e80366af4e878b9cf4a215fe8202ee8d62 100644 (file)
--- a/dev-java/antenna/ChangeLog
+++ b/dev-java/antenna/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/antenna
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/ChangeLog,v 1.10 2010/09/18 16:27:39 betelgeuse Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/ChangeLog,v 1.11 2012/01/13 14:29:39 sera Exp $
+
+*antenna-1.0.2-r1 (13 Jan 2012)
+
+  13 Jan 2012; Ralph Sennhauser <sera@gentoo.org> -antenna-1.0.2.ebuild,
+  +antenna-1.0.2-r1.ebuild:
+  Use the java-virtual for servlet-api. #398689
 
   18 Sep 2010; Petteri Räty <betelgeuse@gentoo.org> -antenna-0.9.14.ebuild:
   remove old version

diff --git a/dev-java/antenna/Manifest b/dev-java/antenna/Manifest
index fe26751958a66b5bdada8c197589c4544c92372b..dd83214c9080fa63f8155fea5705feb7c7f8e741 100644 (file)
--- a/dev-java/antenna/Manifest
+++ b/dev-java/antenna/Manifest
@@ -3,13 +3,17 @@ Hash: SHA1
 
 AUX antenna-0.9.13-ant.patch 3893 RMD160 843561997b09401bf4430f99fa19b2453372aa29 SHA1 3553e0120531cde581e95abe1f5260d63659b3a0 SHA256 dcb5e693ce80aa944873eb3baa6ac6287157412dc1c4dd0e3bbf7853d936db53
 DIST antenna-src-1.0.2.zip 1502020 RMD160 fefe9214dc2a50583e09eb3e08c6dc16fe0f144d SHA1 49e5eca85b7786b0fd85a1cd0d5397d68c291d3c SHA256 a6a15d257ae2af8805cf002e51675246b119cb34f23bf3cc15398acaca0bcfe8
-EBUILD antenna-1.0.2.ebuild 1497 RMD160 19be4c5ab737362fab93c7ebbdee7e8660d857c4 SHA1 6f548ccca046b1d2792dcfe33d501897db5474de SHA256 c15ba1bed98ed53dcd4bce8c7bfe653a645b81594a8d3ad8ede909b30bddeae5
-MISC ChangeLog 1652 RMD160 f42e2574bb1ce0aa4baac40c87059ac54aa0a994 SHA1 26a3947c9d4bfdfc957edee6a07164ec5937dc67 SHA256 10257211f6d9e46b62bcbb462060676ce0657ddcf81881914fb88351a2c67547
+EBUILD antenna-1.0.2-r1.ebuild 1505 RMD160 e14b5195df836fbfb22fe650727afed5269ee073 SHA1 bc9eb0eba0fc60b52ed27adcd2aedd61473c12ec SHA256 9df6322e17ec829a7739ef9c1f977cc58ff0afa910422d9edea4b28f273ae1d0
+MISC ChangeLog 1829 RMD160 1537ac2e452ea973e280ccc5f6f082e47585eae2 SHA1 c04fddffdcef71606a33c939d8082eaf16b8f6d1 SHA256 d9615291a7142d1a3f767cbeeb3c93c944f3fcc802666d4448375864e1a2af65
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkyU6PEACgkQcxLzpIGCsLS3fQCfQR9Fuw1l1pTIiPO3KRg7eLR3
-MuMAnj0+EvXS8ywkKheugqf0WyPfu6kj
-=XuII
+iQEcBAEBAgAGBQJPED/iAAoJEIUJ+svaV163NpAH/0qKC133ddGgTAiNhhpSsctE
+vA6vRrRWnCAoryz9nMEUUyr8pT16GgaaK0Amqow8dcGm9T62lEwn30VreRjQvgqY
+XrWBG3COkobF3m/5hY+rr/kOKh9/cAQCGFsamkjSb3pgOmIZJjUrFOi5itLpNHw9
+hFMEtED4qVTsIxYax6gCSO1/w+hq0QOEpxFg/NeRymxXGpkUTEO/K9JpiLXAGQGs
+vw+BG/ZhpczXJMFSaXw7wz2n1WlpPJjCBFyanJvbHgVswXyiYtEze+oLbcbwvebH
+uCeB4zsMbrqq6vXLGHWhKSjwBj3HvxSLrQFbdgei2OsRczZauzVb8+WEWIsMzd4=
+=pcGO
 -----END PGP SIGNATURE-----

diff --git a/dev-java/antenna/antenna-1.0.2.ebuild b/dev-java/antenna/antenna-1.0.2-r1.ebuild
similarity index 89%
rename from dev-java/antenna/antenna-1.0.2.ebuild
rename to dev-java/antenna/antenna-1.0.2-r1.ebuild
index 46d6338687cc838b71e195fee68e232d3c31fb76..4f4cd5dac040c64a5bf580d2559ef804a37528ad 100644 (file)
--- a/dev-java/antenna/antenna-1.0.2.ebuild
+++ b/dev-java/antenna/antenna-1.0.2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/antenna-1.0.2.ebuild,v 1.2 2009/10/08 12:09:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antenna/antenna-1.0.2-r1.ebuild,v 1.1 2012/01/13 14:29:39 sera Exp $
 
 EAPI=2
 
@@ -21,7 +21,7 @@ IUSE=""
 
 COMMON_DEP="dev-java/ant-core:0
        dev-java/antlr:0
-       dev-java/servletapi:2.4"
+       java-virtuals/servlet-api:2.4"
 DEPEND=">=virtual/jdk-1.4
        app-arch/unzip
        ${COMMON_DEP}"
@@ -44,7 +44,7 @@ java_prepare() {
 }
 
 src_compile() {
-       local cp="ant-core,antlr,servletapi-2.4"
+       local cp="ant-core,antlr,servlet-api-2.4"
        EANT_GENTOO_CLASSPATH="${cp}" \
                EANT_BUILD_TARGET="init compile package" \
                EANT_DOC_TARGET="" java-pkg-2_src_compile