Bumped 5.5 to latest development release

Package-Manager: portage-2.1.2-r9

5 files changed, 89 insertions, 35 deletions

diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
index 964346d37efe..430bbf27ab5d 100644
--- a/dev-java/commons-pool/Manifest
+++ b/dev-java/commons-pool/Manifest
@@ -1,21 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST commons-pool-1.1-src.tar.gz 46476 RMD160 425c198447d6138decc978846597b240fd2a8a4d SHA1 b54a5693c12c0dc7c9e23b00f35906264721a196 SHA256 c58d5f9f880c3a4538b3050d763146aeb31275347cb1a9fe126e5669a348cacf
 DIST commons-pool-1.2-src.tar.gz 269500 RMD160 281e734b82027ba7b7fb481105c7dd1a5a1defb3 SHA1 f9b19b097cc311000542c36c41661421a97dc9b7 SHA256 4c1d9b8ac0268be8ca6a12976d5ea009dbdd2bc9093b401e81e78de1e85e3d5e
 DIST commons-pool-1.3-src.tar.gz 305175 RMD160 a4fa896fd03a2285198495ccda5499b270eba686 SHA1 1c666fd5236e6fac7c9fe9be47152a1b709373f5 SHA256 28c055168601cc57c8a4cff360b79b6409fabfd7275605031c43c7b06b978add
-EBUILD commons-pool-1.1.ebuild 1304 RMD160 478153f2e1c4c6ed16c227eb7a37a56b1b456bd7 SHA1 22a1ade3b5e2406414e9a76c2d4ebcdd36ea2d35 SHA256 58e6e86ce0ee02651566169766a2dd445ae88f9fb441547635539715cf46d03e
-MD5 e107bfe5ac3a11c3d70a0026287d7710 commons-pool-1.1.ebuild 1304
-RMD160 478153f2e1c4c6ed16c227eb7a37a56b1b456bd7 commons-pool-1.1.ebuild 1304
-SHA256 58e6e86ce0ee02651566169766a2dd445ae88f9fb441547635539715cf46d03e commons-pool-1.1.ebuild 1304
-EBUILD commons-pool-1.2-r1.ebuild 1369 RMD160 87f4f074e05b0dff1f02f7c14c1512f0ac33a8b0 SHA1 60ac9bc14e883fa3b27429cd2f796384481cc75d SHA256 71add09e41913fbde1d9696c6fcc7a90f360ae766b0bee18dca314b8cc3149a5
-MD5 dc5fb136d0d7b6686f289fa03da5b9bb commons-pool-1.2-r1.ebuild 1369
-RMD160 87f4f074e05b0dff1f02f7c14c1512f0ac33a8b0 commons-pool-1.2-r1.ebuild 1369
-SHA256 71add09e41913fbde1d9696c6fcc7a90f360ae766b0bee18dca314b8cc3149a5 commons-pool-1.2-r1.ebuild 1369
-EBUILD commons-pool-1.2-r2.ebuild 1301 RMD160 e0cfb76396773e0d14be1e50d33cd1d2b90d1f52 SHA1 fd4badc51dfb1b3a1417ba66f23399004cbe5408 SHA256 6c4a89cb0581e7d7e359da5b51202a3835b70c47c19bcac9e53aa80afccfb7e5
-MD5 cfbffbba12ee961078e85629cd6150ab commons-pool-1.2-r2.ebuild 1301
-RMD160 e0cfb76396773e0d14be1e50d33cd1d2b90d1f52 commons-pool-1.2-r2.ebuild 1301
-SHA256 6c4a89cb0581e7d7e359da5b51202a3835b70c47c19bcac9e53aa80afccfb7e5 commons-pool-1.2-r2.ebuild 1301
 EBUILD commons-pool-1.2.ebuild 1315 RMD160 97cd41b97c19b61e4e9ac78067887fd11db1f92f SHA1 17bbfd9c894a2a9a4bea91c84d47864b8ed75c78 SHA256 da1a25f35717e764dd55d73cb672316f5f6a5176760ba6256d35e2449222e9bc
 MD5 d6525990ae432887cf690b84c247d9c4 commons-pool-1.2.ebuild 1315
 RMD160 97cd41b97c19b61e4e9ac78067887fd11db1f92f commons-pool-1.2.ebuild 1315
@@ -24,33 +11,24 @@ EBUILD commons-pool-1.3.ebuild 1076 RMD160 4a3a6e6a353bf746300b1d22074ac43106f84
 MD5 12cd2236fabfbf3e40826f58c7346c2a commons-pool-1.3.ebuild 1076
 RMD160 4a3a6e6a353bf746300b1d22074ac43106f84ac0 commons-pool-1.3.ebuild 1076
 SHA256 e2bf54c7cd86f43fb79bb6fe7f0d43685efca0eb7bd32e3baf880244f8f40480 commons-pool-1.3.ebuild 1076
-MISC ChangeLog 5255 RMD160 3d24f9cf5d373258dc64a8a9a1e60aea2572def3 SHA1 d38ad570d1822835551dba63da03415b9300bd7a SHA256 d058577993bc08c9f536741dcfacc359b6707d69b4f1a263e1d8336c04c3fdba
-MD5 7d0c5d86c0e9136dc26202361e610541 ChangeLog 5255
-RMD160 3d24f9cf5d373258dc64a8a9a1e60aea2572def3 ChangeLog 5255
-SHA256 d058577993bc08c9f536741dcfacc359b6707d69b4f1a263e1d8336c04c3fdba ChangeLog 5255
+MISC ChangeLog 5421 RMD160 d1f5b6913740f934eeb05b4ea84bc40477e3945f SHA1 f5ec974dd40bf94564c7eeb9cdc5fa4a2d8c2ec2 SHA256 68a0795c84854a9980037ecc16075f97cef0f31f779b1b8a1cb3ef2473d4dd30
+MD5 ee86394ec8423e0b96fc71052673695f ChangeLog 5421
+RMD160 d1f5b6913740f934eeb05b4ea84bc40477e3945f ChangeLog 5421
+SHA256 68a0795c84854a9980037ecc16075f97cef0f31f779b1b8a1cb3ef2473d4dd30 ChangeLog 5421
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
-MD5 135b754a5613db34dd018aa08c425442 files/digest-commons-pool-1.1 259
-RMD160 88b1208f05aca1ec39bce67135cf2316d7ea6a5d files/digest-commons-pool-1.1 259
-SHA256 58a1e94001498f6d41988185483393d2a7e404572de587f5e0347cf606b5c822 files/digest-commons-pool-1.1 259
 MD5 fa28aa24cacf04ca406e9d6f41357d3f files/digest-commons-pool-1.2 262
 RMD160 31925591306808a1d01ad8703c65be00b722c3f9 files/digest-commons-pool-1.2 262
 SHA256 1f01994705610d93d34aacfd0e5fbe0561f511a630e77a361b819b210274e5d1 files/digest-commons-pool-1.2 262
-MD5 fa28aa24cacf04ca406e9d6f41357d3f files/digest-commons-pool-1.2-r1 262
-RMD160 31925591306808a1d01ad8703c65be00b722c3f9 files/digest-commons-pool-1.2-r1 262
-SHA256 1f01994705610d93d34aacfd0e5fbe0561f511a630e77a361b819b210274e5d1 files/digest-commons-pool-1.2-r1 262
-MD5 fa28aa24cacf04ca406e9d6f41357d3f files/digest-commons-pool-1.2-r2 262
-RMD160 31925591306808a1d01ad8703c65be00b722c3f9 files/digest-commons-pool-1.2-r2 262
-SHA256 1f01994705610d93d34aacfd0e5fbe0561f511a630e77a361b819b210274e5d1 files/digest-commons-pool-1.2-r2 262
 MD5 0246e5636360bf00420b03a2dd6aa64f files/digest-commons-pool-1.3 262
 RMD160 327fc501ba6c9856e14d33e78382d60deff3ea04 files/digest-commons-pool-1.3 262
 SHA256 c1359174301b36b8898feb75177cb90c35df2a6cf0cbb9e273c88ef6721f4b6b files/digest-commons-pool-1.3 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFrRLocxLzpIGCsLQRApA8AJ4gfgqjkmdyeG7C/6j4FKh6N9e2PACfeCLF
-aB+wYvL+BP8xHdmxUNxWNsY=
-=I5sq
+iD8DBQFF0ihgcxLzpIGCsLQRAu0NAKCTAT9fY7qNFg757vKnddzcnbu3QACfeXSc
+dmb2y/V+eaUF97FRAf7wsJ8=
+=f35W
 -----END PGP SIGNATURE-----
diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 287a9e2e296d..6ede5824afcd 100644
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/tomcat-servlet-api
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.12 2007/02/13 19:24:37 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.13 2007/02/13 21:03:56 wltjr Exp $
+
+*tomcat-servlet-api-5.5.22_pre (13 Feb 2007)
+
+  13 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +tomcat-servlet-api-5.5.22_pre.ebuild:
+  Bumped 5.5 to latest development release
 
 *tomcat-servlet-api-6.0.10_pre (13 Feb 2007)
 
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 6db10c1895ad..1eebcf73e8ad 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,12 +3,17 @@ MD5 66ba82dc585e7dec8814097eae04a5d3 files/2.5-build.xml 2864
 RMD160 d69af37473e7526f17ce99d7e5e624d2edac630b files/2.5-build.xml 2864
 SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a files/2.5-build.xml 2864
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
+DIST apache-tomcat-5.5.22-src.tar.gz 4888257 RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db SHA1 9b9ad830c4db0f0668aa2500cc1d954c1bf95b96 SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a
 DIST apache-tomcat-6.0.10-src.tar.gz 3221070 RMD160 64762f16606645c6ef507906f2eb8eeb102173bb SHA1 4ec1acda174ab19082c4900c293d8bc7f9544a69 SHA256 54ae6b89a3ac3e3e33a580708403ca4ea0a449f287b91e6246bb6a6550e39199
 DIST apache-tomcat-6.0.9-src.tar.gz 3218164 RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 SHA1 2194a1162c0de5c5765fcd419145dbec44470be9 SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647
 EBUILD tomcat-servlet-api-5.5.20.ebuild 1517 RMD160 c6ed5b794b16d915d910987f6610e6aae82bafd5 SHA1 89a688794a84231a4bdfbf7f1efe05186083c894 SHA256 4a265b37fe9254ffa1cf72f702bdc991039cb18b20a7e2af026a2c99259acdfa
 MD5 09830f34f72c1f4d6e6751ed1fbf4330 tomcat-servlet-api-5.5.20.ebuild 1517
 RMD160 c6ed5b794b16d915d910987f6610e6aae82bafd5 tomcat-servlet-api-5.5.20.ebuild 1517
 SHA256 4a265b37fe9254ffa1cf72f702bdc991039cb18b20a7e2af026a2c99259acdfa tomcat-servlet-api-5.5.20.ebuild 1517
+EBUILD tomcat-servlet-api-5.5.22_pre.ebuild 1628 RMD160 212c9061e97beefc0d15a7821432b26e3481ea68 SHA1 408d7abc289d3d4c05c3db8bcb261bd788c23816 SHA256 b47887c4fdb30156e55ff0f34b86e823b70b8bde6f6528937b383fdfc0b2b2b2
+MD5 a1944260d4c7d59bb218175fb9543030 tomcat-servlet-api-5.5.22_pre.ebuild 1628
+RMD160 212c9061e97beefc0d15a7821432b26e3481ea68 tomcat-servlet-api-5.5.22_pre.ebuild 1628
+SHA256 b47887c4fdb30156e55ff0f34b86e823b70b8bde6f6528937b383fdfc0b2b2b2 tomcat-servlet-api-5.5.22_pre.ebuild 1628
 EBUILD tomcat-servlet-api-6.0.10_pre.ebuild 1277 RMD160 969d3d54783b3552e3a508f6c33dbd48a644b1c0 SHA1 5fb255695c7d1bb63b87928bbf5e9f253a602730 SHA256 0a2338faf500e3ed16b7de492f0c280d2a643dcb27ef7fcbc838d4c69916c220
 MD5 b7ce422c2e398464181c4fa729a6dbfd tomcat-servlet-api-6.0.10_pre.ebuild 1277
 RMD160 969d3d54783b3552e3a508f6c33dbd48a644b1c0 tomcat-servlet-api-6.0.10_pre.ebuild 1277
@@ -17,10 +22,10 @@ EBUILD tomcat-servlet-api-6.0.9_beta.ebuild 1195 RMD160 903a8fb4e39b3b1b6b200d47
 MD5 899e6092a39ab251173e3c7f7be9ccdc tomcat-servlet-api-6.0.9_beta.ebuild 1195
 RMD160 903a8fb4e39b3b1b6b200d47ddb694638d25e774 tomcat-servlet-api-6.0.9_beta.ebuild 1195
 SHA256 8fd594b3642a446c0f6a9bf2fbf7c65eeed9677035bc528de869413f12249e56 tomcat-servlet-api-6.0.9_beta.ebuild 1195
-MISC ChangeLog 2888 RMD160 d310ee8755d77c496b5d0b711ebc5a637df181d4 SHA1 c08cdb6dd273a003ccb790a270cd9a1b1d9e08de SHA256 799ec759fc7c726788d544198c9fdd363a709e9023e89f5d7ae9518c0e47a047
-MD5 ff9ca4520cbacf56add076f43781d7c6 ChangeLog 2888
-RMD160 d310ee8755d77c496b5d0b711ebc5a637df181d4 ChangeLog 2888
-SHA256 799ec759fc7c726788d544198c9fdd363a709e9023e89f5d7ae9518c0e47a047 ChangeLog 2888
+MISC ChangeLog 3076 RMD160 803d805f1cc613e151222f8fe27c2b3b9109e7f9 SHA1 6b5e42ec37f7e5d5d17f99dccf6f4441e26a15d7 SHA256 53eefcac9b7e7a0b1fc0a86213f9c798b3de5d801ce8121209b9a4f1937512fe
+MD5 10378a67089ed98148f9de26afe5ad17 ChangeLog 3076
+RMD160 803d805f1cc613e151222f8fe27c2b3b9109e7f9 ChangeLog 3076
+SHA256 53eefcac9b7e7a0b1fc0a86213f9c798b3de5d801ce8121209b9a4f1937512fe ChangeLog 3076
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
@@ -28,6 +33,9 @@ SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704 metadata
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-servlet-api-5.5.20 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-servlet-api-5.5.20 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-servlet-api-5.5.20 277
+MD5 688aca3d811cb2516ca3d4e7efa05bb6 files/digest-tomcat-servlet-api-5.5.22_pre 277
+RMD160 bab389aec90e5bd2a4a67d940e7e2171ac94d257 files/digest-tomcat-servlet-api-5.5.22_pre 277
+SHA256 52c8b51127d5456a17e54290706ca09621523d7befa04bd76dd74ced904cad11 files/digest-tomcat-servlet-api-5.5.22_pre 277
 MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-servlet-api-6.0.10_pre 277
 RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-servlet-api-6.0.10_pre 277
 SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-servlet-api-6.0.10_pre 277
diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.22_pre b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.22_pre
new file mode 100644
index 000000000000..9f11a897bf7a
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-5.5.22_pre
@@ -0,0 +1,3 @@
+MD5 1af391c1647752d4fd8e2c3892e1be68 apache-tomcat-5.5.22-src.tar.gz 4888257
+RMD160 39a5da86cce996c7c41baddfab825e5bfbd334db apache-tomcat-5.5.22-src.tar.gz 4888257
+SHA256 206fa6040b06cc98d705afe3594d588e2556dc15eb73083d4c1da146b997216a apache-tomcat-5.5.22-src.tar.gz 4888257
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.22_pre.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.22_pre.ebuild
new file mode 100644
index 000000000000..e6c01c0b2eab
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-5.5.22_pre.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2007 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.22_pre.ebuild,v 1.1 2007/02/13 21:03:56 wltjr Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_P="apache-${P/-servlet-api/}-src"
+MY_P="${MY_P/_pre/}"
+DESCRIPTION="Tomcat's Servlet API 2.4/JSP API 2.0 implementation"
+HOMEPAGE="http://tomcat.apache.org/"
+#SRC_URI="mirror://apache/tomcat-5/v${PV}/src/${MY_P}.tar.gz"
+SRC_URI="http://people.apache.org/~fhanik/tomcat/tomcat-5.5/v${PV/_pre/}/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE="doc java5 source"
+
+DEPEND="|| ( >=virtual/jdk-1.4 >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
+	>=dev-java/ant-core-1.5
+	source? ( app-arch/zip )
+	>=dev-java/java-config-2.0.31"
+RDEPEND="|| ( >=virtual/jre-1.4 >=virtual/jre-1.5 >=virtual/jre-1.6 )
+	>=dev-java/java-config-2.0.31"
+
+S="${WORKDIR}/${MY_P}/servletapi"
+
+pkg_setup() {
+	if use java5; then
+		JAVA_PKG_WANT_SOURCE="1.5"
+		JAVA_PKG_WANT_TARGET="1.5"
+	fi
+}
+
+src_compile() {
+	local antflags="jar $(use_doc javadoc examples)"
+	eant ${antflags} -f jsr154/build.xml
+	eant ${antflags} -f jsr152/build.xml
+}
+
+src_install() {
+	mv jsr{154,152}/dist/lib/*.jar ${S}
+
+	if use doc ; then
+		mkdir docs
+		cd ${S}/jsr154/build
+		mv docs ${S}/docs/servlet
+		mv examples ${S}/docs/servlet/examples
+
+		cd ${S}/jsr152/build
+		mv docs ${S}/docs/jsp
+		mv examples ${S}/docs/jsp/examples
+	fi
+
+	cd ${S}
+	java-pkg_dojar *.jar
+	use doc && java-pkg_dohtml -r docs/*
+	use source && java-pkg_dosrc jsr{152,154}/src/share/javax
+}