Brand new 0 day release version of Tomcat 6.0.x :). Removed older development version...

Package-Manager: portage-2.1.2-r11

diff --git a/dev-java/tomcat-servlet-api/ChangeLog b/dev-java/tomcat-servlet-api/ChangeLog
index 7d3fbac44b197c57616125487611e7df99b8e9a5..e1596bd83e203b8013a4dcb25536327f63c0a23b 100644 (file)
--- a/dev-java/tomcat-servlet-api/ChangeLog
+++ b/dev-java/tomcat-servlet-api/ChangeLog
@@ -1,6 +1,14 @@
 # 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.14 2007/02/15 02:48:16 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/ChangeLog,v 1.15 2007/03/01 00:08:01 wltjr Exp $
+
+*tomcat-servlet-api-6.0.10 (01 Mar 2007)
+
+  01 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-servlet-api-6.0.9_beta.ebuild,
+  -tomcat-servlet-api-6.0.10_pre.ebuild, +tomcat-servlet-api-6.0.10.ebuild:
+  Brand new 0 day release version of Tomcat 6.0.x :). Removed older
+  development versions. Long live tc 6.0.x die <=5.5.x
 
   15 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   tomcat-servlet-api-5.5.20.ebuild, tomcat-servlet-api-5.5.22_pre.ebuild:

diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 6901d5fa41c9b470efa0e66b9ed3aa8f5cba59fd..4fd80209c4b513d8eecf36d55c5d088d643779f4 100644 (file)
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -5,7 +5,6 @@ SHA256 b2cbb540ab2bfacc8044e0c6d67afbbd8c1e2e04a12a9c0f565902e1ef3c687a files/2.
 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 1492 RMD160 9f526743a1a649d065428476c79208de7e90eb3d SHA1 30e2a13e2fcbdfface721c33f14cf61f3c131d05 SHA256 6f7be442373a9d6f88151d7fb90f056b275fc7d12e80a2c9ceb6855e78b5768f
 MD5 917bee4a85a6c9d7b80f720aa4702b40 tomcat-servlet-api-5.5.20.ebuild 1492
 RMD160 9f526743a1a649d065428476c79208de7e90eb3d tomcat-servlet-api-5.5.20.ebuild 1492
@@ -14,18 +13,14 @@ EBUILD tomcat-servlet-api-5.5.22_pre.ebuild 1603 RMD160 c0e562d258568ec331727637
 MD5 8f0080c4874c5bace193067cf4ee4ff5 tomcat-servlet-api-5.5.22_pre.ebuild 1603
 RMD160 c0e562d258568ec33172763707659a9de2fce0b5 tomcat-servlet-api-5.5.22_pre.ebuild 1603
 SHA256 00753ea73685884c3ed0669eba8f7c645b2df5a6c187afaf53b2f3303fc31b2d tomcat-servlet-api-5.5.22_pre.ebuild 1603
-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
-SHA256 0a2338faf500e3ed16b7de492f0c280d2a643dcb27ef7fcbc838d4c69916c220 tomcat-servlet-api-6.0.10_pre.ebuild 1277
-EBUILD tomcat-servlet-api-6.0.9_beta.ebuild 1195 RMD160 903a8fb4e39b3b1b6b200d47ddb694638d25e774 SHA1 349ad989f1dca2f7130946a1ae552fe7a8517418 SHA256 8fd594b3642a446c0f6a9bf2fbf7c65eeed9677035bc528de869413f12249e56
-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 3234 RMD160 6d64563cd464973e4f6a57886811e5608fa64b61 SHA1 13773eb0cb0000cb5b387e9c50e64a64b52b01e7 SHA256 c1cb1b940630d31adb07128b19ad35c200da745d8bad36cdb56480968a1e7170
-MD5 16c201021d99bbdbcee52ac150af3474 ChangeLog 3234
-RMD160 6d64563cd464973e4f6a57886811e5608fa64b61 ChangeLog 3234
-SHA256 c1cb1b940630d31adb07128b19ad35c200da745d8bad36cdb56480968a1e7170 ChangeLog 3234
+EBUILD tomcat-servlet-api-6.0.10.ebuild 1184 RMD160 e9577b9bdf9132c63bb21bf9cce225d6894bdb46 SHA1 14289ee483acc253480893813e72c0401df617b0 SHA256 30749a255f9ee6840d80e0a96fc5b09cbdad9f3d23a0bcf583b9fd27136db945
+MD5 7bc85a916313fb6eb57711633f7986a7 tomcat-servlet-api-6.0.10.ebuild 1184
+RMD160 e9577b9bdf9132c63bb21bf9cce225d6894bdb46 tomcat-servlet-api-6.0.10.ebuild 1184
+SHA256 30749a255f9ee6840d80e0a96fc5b09cbdad9f3d23a0bcf583b9fd27136db945 tomcat-servlet-api-6.0.10.ebuild 1184
+MISC ChangeLog 3574 RMD160 9e8053b3fbf057f3582b1cc2bb1bc9ea2af4f687 SHA1 cf1c88eb665f11e4ecd3818d0211418fa1efc01c SHA256 72981b57dd85159992ae8f00bf38dbf40a7657516e9ac7fae84795e1d1f1fd02
+MD5 db1a868012672949f0c18e6ab23c4f38 ChangeLog 3574
+RMD160 9e8053b3fbf057f3582b1cc2bb1bc9ea2af4f687 ChangeLog 3574
+SHA256 72981b57dd85159992ae8f00bf38dbf40a7657516e9ac7fae84795e1d1f1fd02 ChangeLog 3574
 MISC metadata.xml 370 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 SHA1 0d60a8ede5babbd15577612fe7b9e504e5a73689 SHA256 d82a36005520445f65916bb8e8e5a4e41c3af6cc5be87cb2263337074e39b704
 MD5 eab22d527a1a92afde250a0ff957b829 metadata.xml 370
 RMD160 80f77811a1330480797cff01b1e90e883ecb4d51 metadata.xml 370
@@ -36,9 +31,6 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 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
-MD5 09759fb978add9cc1dd420dc82345dbb files/digest-tomcat-servlet-api-6.0.9_beta 274
-RMD160 ff8e425e3de1f5fa5d1c31dd29d40752585d14d4 files/digest-tomcat-servlet-api-6.0.9_beta 274
-SHA256 80dce4147154d253edad52355cd69b8a6a53e9d8261dee84d9944fa5b9e06600 files/digest-tomcat-servlet-api-6.0.9_beta 274
+MD5 5f9244a61bfa0875478e8849b6cb845e files/digest-tomcat-servlet-api-6.0.10 277
+RMD160 3d16b85b1dcb55e6874b535c06f2a5df00b46ce1 files/digest-tomcat-servlet-api-6.0.10 277
+SHA256 49aef00c733c574a5c8536a6e5406769105dbe0b64ad0ea9b9682ca42bff23f0 files/digest-tomcat-servlet-api-6.0.10 277

diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.10_pre b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.10
similarity index 100%
rename from dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.10_pre
rename to dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.10

diff --git a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_beta b/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_beta
deleted file mode 100644 (file)
index ac34a58..0000000
--- a/dev-java/tomcat-servlet-api/files/digest-tomcat-servlet-api-6.0.9_beta
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f22e59e244270d8aef6e96d5026e8e1b apache-tomcat-6.0.9-src.tar.gz 3218164
-RMD160 c35c6441a358926a8bef4bc855b275ad2445f842 apache-tomcat-6.0.9-src.tar.gz 3218164
-SHA256 ce3a2a6976ecf0059245debcb2c69c9b3947baf1ecc383fa80c27e55f2ee5647 apache-tomcat-6.0.9-src.tar.gz 3218164

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_beta.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
similarity index 91%
rename from dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_beta.ebuild
rename to dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
index d20408c4f714e825793bd58a95f2ac82510155ac..2353a6dc790b8d2a04f3b7e920189efba5a812e6 100644 (file)
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.9_beta.ebuild
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild
@@ -1,10 +1,10 @@
 # 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-6.0.9_beta.ebuild,v 1.1 2007/02/08 15:21:12 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10.ebuild,v 1.1 2007/03/01 00:08:01 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
-MY_A="apache-${P/_beta/}-src"
+MY_A="apache-${P}-src"
 MY_P="${MY_A/-servlet-api/}"
 DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
 HOMEPAGE="http://tomcat.apache.org/"

diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10_pre.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10_pre.ebuild
deleted file mode 100644 (file)
index 30b875c..0000000
--- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-6.0.10_pre.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# 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-6.0.10_pre.ebuild,v 1.1 2007/02/13 19:24:37 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-MY_A="apache-${P/_pre/}-src"
-MY_P="${MY_A/-servlet-api/}"
-DESCRIPTION="Tomcat's Servlet API 2.5/JSP API 2.1 implementation"
-HOMEPAGE="http://tomcat.apache.org/"
-#SRC_URI="mirror://apache/jakarta/tomcat-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-SRC_URI="http://people.apache.org/~remm/tomcat-6/v${PV/_pre/}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-1.1"
-SLOT="2.5"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
-IUSE="source"
-
-DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
-       source? ( app-arch/zip )"
-RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )"
-
-S="${WORKDIR}/${MY_P}/"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       cp ${FILESDIR}/${SLOT}-build.xml build.xml || die "Could not replace build.xml"
-       rm */*/build.xml
-}
-
-src_compile() {
-#      local antflags="jar $(use_doc javadoc examples)"
-       local antflags="jar"
-       eant ${antflags}
-}
-
-src_install() {
-       cd "${S}/output/build/lib"
-       java-pkg_dojar *.jar
-#      use doc && java-pkg_dohtml -r docs/*
-       if use source; then
-               cd "${S}"
-               java-pkg_dosrc java/javax/servlet/
-       fi
-}