Bumped Tomcat 6.x to latest alpha

Package-Manager: portage-2.1.2_rc3-r6

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ff416be5c55c862b8293798ba198f8520905b6f8..62697083b4c689af9c5848210bfb5fd3cb39db2e 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -107,7 +107,7 @@ MD5 87bdf76317cb433fb0cd98a6fc10b630 files/6/tomcat.init 3077
 RMD160 4fc1fdda60f82037e6f1cd0ca264d5e348a2fbd4 files/6/tomcat.init 3077
 SHA256 ac4e4c30a09662dc44ff1c413d30a5a5db0be8e8f47983d94f21d50a8fab236e files/6/tomcat.init 3077
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
-DIST apache-tomcat-6.0.4-src.tar.gz 3210081 RMD160 67353d8c5a275517e56b2de236bdb19ebebaf7ff SHA1 9afd320c1274ae60d70e763915d6dd0c843df8c2 SHA256 f9383a861e489fcac2a7a98aad753744b48e1c6f52d8eb09e123a304b558244e
+DIST apache-tomcat-6.0.6-src.tar.gz 3209780 RMD160 34d41faf8d106dd4e745dcc2f94375792101cb2a SHA1 f10c302147b872c5b967dcd348c17e87f1cce76f SHA256 277de58ebaccbe347afe87c94ec8d3393964e564e9450010d75f4f1219e66879
 DIST jakarta-tomcat-5.0.27.tar.gz 10298374 RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa SHA1 5f3981ecdd67e2b9774e643b336ad98ebc1bd4e3 SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78
 DIST jakarta-tomcat-5.0.28-src.tar.gz 3565766 RMD160 22c5e60b2c5009dc33a62edcefa6760d82da859b SHA1 a4ac2ad52f8b8db8ae8c38979f5f50713e242e36 SHA256 bbf584b3c376d23d92b1a0d306eb8f3729cea244c7a850f81d2527a7df6d20fc
 EBUILD tomcat-5.0.27-r6.ebuild 3881 RMD160 80b96c74656e19ac148a68a8047b74066e5709b4 SHA1 8bb842e8a2f594593fab407e7f14d35f4a50ad38 SHA256 c750b594d6f7397f4dfa775738db62238391e86c347a3c5bbcc744d8394974ba
@@ -126,14 +126,14 @@ EBUILD tomcat-5.5.20-r5.ebuild 10313 RMD160 b94eb10ed54db7fb038469640350069c9ad9
 MD5 a5ed201c0985083dd85164054bee3d2c tomcat-5.5.20-r5.ebuild 10313
 RMD160 b94eb10ed54db7fb038469640350069c9ad91dbc tomcat-5.5.20-r5.ebuild 10313
 SHA256 957e3d4502fe7864136643d804a923bcc7ed03b793ee34cecf014c4441a97b4d tomcat-5.5.20-r5.ebuild 10313
-EBUILD tomcat-6.0.4.ebuild 4720 RMD160 0ab9b450fd0f489e4367d964b373dcbaa254a8ce SHA1 4ef1d6d8358ec2c3e1971777e48cc2ee7e79076b SHA256 9c2d60e5fe645033e8b6d001fabc6ebc8c4739853d81e31390bef04933341665
-MD5 5cdab7d864352e90ec3b8ad04087096d tomcat-6.0.4.ebuild 4720
-RMD160 0ab9b450fd0f489e4367d964b373dcbaa254a8ce tomcat-6.0.4.ebuild 4720
-SHA256 9c2d60e5fe645033e8b6d001fabc6ebc8c4739853d81e31390bef04933341665 tomcat-6.0.4.ebuild 4720
-MISC ChangeLog 29848 RMD160 68cde27cef0892ec2f3fa0f1545d435f0ab2fcf5 SHA1 5412eb6e4abf55d721b14cd67f5c2ccc01d33abe SHA256 af51d3489e49a9e6be5d1a067f4c6542e89573990d902efe75bb2938726df530
-MD5 349fd9f0d80e0e60586bf482d4bc9610 ChangeLog 29848
-RMD160 68cde27cef0892ec2f3fa0f1545d435f0ab2fcf5 ChangeLog 29848
-SHA256 af51d3489e49a9e6be5d1a067f4c6542e89573990d902efe75bb2938726df530 ChangeLog 29848
+EBUILD tomcat-6.0.6.ebuild 4715 RMD160 da719bb505293b8280db45c82e84a454a82ae98a SHA1 223cd5c4535630d7918f947e45b083e150326387 SHA256 88da5fa96e0e911853b8264d1fd24dd92200ce263a5f201d1fc546e039185acd
+MD5 5e13c46eed44f09d62d4a5208b13caac tomcat-6.0.6.ebuild 4715
+RMD160 da719bb505293b8280db45c82e84a454a82ae98a tomcat-6.0.6.ebuild 4715
+SHA256 88da5fa96e0e911853b8264d1fd24dd92200ce263a5f201d1fc546e039185acd tomcat-6.0.6.ebuild 4715
+MISC ChangeLog 30017 RMD160 79d9791f92b86bfba005a2418a390cb6119fb0e0 SHA1 652323ae3a705e72eb78ce2afb66f8d1cbf2ffd2 SHA256 7c1c2356b7182cb396d099945ff2067b487363fb12fc634e9f868b97a211c9f2
+MD5 4eba32874c609184b6c0a7ee7b7a8cf0 ChangeLog 30017
+RMD160 79d9791f92b86bfba005a2418a390cb6119fb0e0 ChangeLog 30017
+SHA256 7c1c2356b7182cb396d099945ff2067b487363fb12fc634e9f868b97a211c9f2 ChangeLog 30017
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -150,6 +150,6 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r5 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r5 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r5 277
-MD5 9769185a9c73b3ce5fd94872335f6687 files/digest-tomcat-6.0.4 274
-RMD160 ad9c1e6e82cc663e4e29b6df0c745e908b71b6bf files/digest-tomcat-6.0.4 274
-SHA256 2d408d8f09d648a39784eaf3996957a58487a18ec0df69a2654db18e41089a59 files/digest-tomcat-6.0.4 274
+MD5 448da02765cca1f68bb511db94de7366 files/digest-tomcat-6.0.6 274
+RMD160 fb076827535974cf7e7e029bcab60a02b5d7ff37 files/digest-tomcat-6.0.6 274
+SHA256 ea09af990170d2bcb09eb9d9c3adfec910e0428b33ea736c4afe80cbd5edd755 files/digest-tomcat-6.0.6 274

diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.4 b/www-servers/tomcat/files/digest-tomcat-6.0.4
deleted file mode 100644 (file)
index 566cc93..0000000
--- a/www-servers/tomcat/files/digest-tomcat-6.0.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58afcc8e6a25c2c12d82f9393be490d3 apache-tomcat-6.0.4-src.tar.gz 3210081
-RMD160 67353d8c5a275517e56b2de236bdb19ebebaf7ff apache-tomcat-6.0.4-src.tar.gz 3210081
-SHA256 f9383a861e489fcac2a7a98aad753744b48e1c6f52d8eb09e123a304b558244e apache-tomcat-6.0.4-src.tar.gz 3210081

diff --git a/www-servers/tomcat/tomcat-6.0.4.ebuild b/www-servers/tomcat/tomcat-6.0.4.ebuild
deleted file mode 100644 (file)
index f940307..0000000
--- a/www-servers/tomcat/tomcat-6.0.4.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.4.ebuild,v 1.2 2006/12/08 10:08:00 betelgeuse Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-MY_P="apache-${P}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~amd64 ~x86 -ppc -ppc64"
-LICENSE="Apache-2.0"
-
-IUSE="doc examples jni source test"
-
-RDEPEND=">=virtual/jre-1.5
-       =dev-java/eclipse-ecj-3.2*
-       >=dev-java/commons-daemon-1.0.1
-       >=dev-java/commons-dbcp-1.2.1
-       >=dev-java/commons-logging-1.1
-       >=dev-java/commons-pool-1.2
-       jni? ( dev-libs/apr
-               dev-libs/openssl )"
-
-DEPEND=">=virtual/jdk-1.5
-       ${RDEPEND}
-       test? (
-               dev-java/junit
-               dev-java/ant
-       )
-       !test? ( dev-java/ant-core )"
-
-JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*"
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_NAME="${PN}-${SLOT}"
-TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-pkg_setup() {
-       enewgroup tomcat 265
-       enewuser tomcat 265 -1 /dev/null tomcat
-
-       JAVA_PKG_WANT_SOURCE="1.5"
-       JAVA_PKG_WANT_TARGET="1.5"
-}
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-
-       epatch "${FILESDIR}/${SLOT}/build-xml.patch"
-
-       cd ${S}/bin
-       java-pkg_jar-from commons-daemon
-}
-
-src_compile(){
-       # Prevent out of memory/heap space errors
-       java-pkg_force-compiler ecj-3.2
-
-       local antflags="build-jasper-jdt build-only -Dbase.path=${T}"
-       antflags="${antflags} -Dant.jar=$(java-pkg_getjar ant-core ant.jar)"
-       antflags="${antflags} -Dcommons-daemon.jar=$(java-pkg_getjar commons-daemon commons-daemon.jar)"
-       antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.2 ecj.jar)"
-       eant ${antflags}
-
-       if use jni; then
-               cd ${S}/native/connector
-               sh buildconf --with-apr=/usr || die
-               econf --with-apr=/usr --with-ssl=/usr || die
-               make || die
-       fi
-}
-
-src_install() {
-       local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-
-       # init.d, conf.d
-       newinitd ${FILESDIR}/${SLOT}/tomcat.init ${TOMCAT_NAME}
-       newconfd ${FILESDIR}/${SLOT}/tomcat.conf ${TOMCAT_NAME}
-
-       # create dir structure
-       diropts -m755 -o tomcat -g tomcat
-       dodir   /etc/${TOMCAT_NAME}
-       fperms  750 /etc/${TOMCAT_NAME}
-       dodir /usr/share/${TOMCAT_NAME}
-       keepdir /var/log/${TOMCAT_NAME}/
-       keepdir /var/tmp/${TOMCAT_NAME}/
-       keepdir /var/run/${TOMCAT_NAME}/
-       dodir   ${CATALINA_BASE}
-       diropts -m0755
-
-       cd ${S}
-       # we don't need dos scripts
-       rm -f bin/*.bat
-
-       # fix context's since upstream is slackin
-       sed -i -e 's:}/server/:}/:' ${S}/webapps/host-manager/host-manager.xml
-       sed -i -e 's:}/server/:}/:' ${S}/webapps/manager/manager.xml
-
-       # copy the manager's context to the right position
-       mkdir -p conf/Catalina/localhost
-       cp ${S}/webapps/host-manager/host-manager.xml conf/Catalina/localhost
-       cp ${S}/webapps/manager/manager.xml conf/Catalina/localhost
-
-       # replace the default pw with a random one, see #92281
-       local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
-       sed -e s:SHUTDOWN:${randpw}: -i conf/server.xml
-
-       # copy over the directories
-       chown -R tomcat:tomcat webapps/* conf/*
-       cp -pR conf/* ${D}/etc/${TOMCAT_NAME} || die "failed to copy conf"
-       cp -R bin output/build/bin output/build/lib ${D}/usr/share/${TOMCAT_NAME} \
-               || die "failed to copy"
-
-       cp ${T}/tomcat6-deps/jdt/jasper-jdt.jar ${D}/usr/share/${TOMCAT_NAME}/lib \
-               || die "failed to copy"
-
-       keepdir               ${WEBAPPS_DIR}
-       chown  tomcat:tomcat ${D}/${WEBAPPS_DIR} || die "Failed to change owner off ${1}."
-       chmod  750           ${D}/${WEBAPPS_DIR} || die "Failed to change permissions off ${1}."
-
-       cd ${S}
-
-       # Copy over webapps, some controlled by use flags
-       cp -p RELEASE-NOTES webapps/ROOT/RELEASE-NOTES.txt
-       cp -pr webapps/ROOT ${D}${CATALINA_BASE}/webapps
-
-       mkdir ${D}${TOMCAT_HOME}/webapps
-       chown tomcat:tomcat ${D}${TOMCAT_HOME}/webapps
-       cp -pr webapps/host-manager ${D}${TOMCAT_HOME}/webapps
-       cp -pr webapps/manager ${D}${TOMCAT_HOME}/webapps
-
-       if use doc; then
-               cp -pr webapps/docs ${D}${CATALINA_BASE}/webapps
-       fi
-       if use examples; then
-               cp -pr webapps/examples \
-                       ${D}${CATALINA_BASE}/webapps
-       fi
-
-       # symlink the directories to make CATALINA_BASE possible
-       dosym /etc/${TOMCAT_NAME} ${CATALINA_BASE}/conf
-       dosym /var/log/${TOMCAT_NAME} ${CATALINA_BASE}/logs
-       dosym /var/tmp/${TOMCAT_NAME} ${CATALINA_BASE}/temp
-       dosym /var/run/${TOMCAT_NAME} ${CATALINA_BASE}/work
-
-       dodoc  ${S}/{RELEASE-NOTES,RUNNING.txt}
-       fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-       einfo
-       einfo " This ebuild implements a FHS compliant layout for tomcat"
-       einfo " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-       einfo " for more information."
-       einfo
-       einfo " Please report any bugs to http://bugs.gentoo.org/"
-       einfo
-}