Bumped 6.0.7 to beta from alpha
authorWilliam Thomson <wltjr@gentoo.org>
Wed, 10 Jan 2007 16:57:34 +0000 (16:57 +0000)
committerWilliam Thomson <wltjr@gentoo.org>
Wed, 10 Jan 2007 16:57:34 +0000 (16:57 +0000)
Package-Manager: portage-2.1.2_rc4-r6

www-servers/tomcat/Manifest
www-servers/tomcat/files/digest-tomcat-6.0.7_alpha-r3 [deleted file]
www-servers/tomcat/tomcat-6.0.7_alpha-r3.ebuild [deleted file]

index 306d3c3106de149bb1095f566d3a0476bc97e671..f174aa374c8292ca00a0bce351fa00f8f81a2e4c 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.0.27/gentoo.diff 463 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc SHA1 2cac8406125e5bd360fed919eeb0d4685969462b SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc files/5.0.27/gentoo.diff 463
@@ -129,14 +126,14 @@ EBUILD tomcat-5.5.20-r6.ebuild 10209 RMD160 d4d4ff17f5ea2a85ac72a12c92b02cec62af
 MD5 b6cd386a5a03055cd755b3f080e02195 tomcat-5.5.20-r6.ebuild 10209
 RMD160 d4d4ff17f5ea2a85ac72a12c92b02cec62af6c31 tomcat-5.5.20-r6.ebuild 10209
 SHA256 a9a4b84e286ef5a5f40af3b6bd8c09f326b67e19c692213139fae08c8b22a2e0 tomcat-5.5.20-r6.ebuild 10209
-EBUILD tomcat-6.0.7_alpha-r3.ebuild 4637 RMD160 b726725a3f0a0be5dff8008f74df568588375ac8 SHA1 1ba6a8183be9c1f13fd9921583f868418235b0d5 SHA256 8d4245d54d0de6d082ce48c6d21878d40c80e57890e46c31229fadadd5c6b53a
-MD5 5755ee420fd970a7162f8318494bdd53 tomcat-6.0.7_alpha-r3.ebuild 4637
-RMD160 b726725a3f0a0be5dff8008f74df568588375ac8 tomcat-6.0.7_alpha-r3.ebuild 4637
-SHA256 8d4245d54d0de6d082ce48c6d21878d40c80e57890e46c31229fadadd5c6b53a tomcat-6.0.7_alpha-r3.ebuild 4637
-MISC ChangeLog 32576 RMD160 5f82dc49ff969782d3d756c08094351e3dfe57dd SHA1 11bbe19ccc387ed6a220b87ee30ffc787789ef6a SHA256 6a78564bceb8eef37505148505cd9d1efe1c837796e69fc5d954e9052fbf0c0f
-MD5 cbe43838d74ecae8be050054c9c7a75c ChangeLog 32576
-RMD160 5f82dc49ff969782d3d756c08094351e3dfe57dd ChangeLog 32576
-SHA256 6a78564bceb8eef37505148505cd9d1efe1c837796e69fc5d954e9052fbf0c0f ChangeLog 32576
+EBUILD tomcat-6.0.7_beta.ebuild 4628 RMD160 e4cc182e716de1a3090010b65f1b602d78433446 SHA1 31bb651c626062c5e9aa72655961c358a4ce085b SHA256 23a0c7969353e75e906d0e0345029655af0b858847a0c397708a184bfb61aba1
+MD5 5786aa32636e8800ee229936996d21ee tomcat-6.0.7_beta.ebuild 4628
+RMD160 e4cc182e716de1a3090010b65f1b602d78433446 tomcat-6.0.7_beta.ebuild 4628
+SHA256 23a0c7969353e75e906d0e0345029655af0b858847a0c397708a184bfb61aba1 tomcat-6.0.7_beta.ebuild 4628
+MISC ChangeLog 32758 RMD160 33e848199c48c2cf09882d806abf08c52382ff11 SHA1 def168e0bb427dca226a4837f54ccfdf409927a4 SHA256 f5c145c3c62a050e9b5d34e4a89412ed6a540c68457edb5162f4d774bd30ee88
+MD5 6d5d8d4fc090e78d42f25c449e297997 ChangeLog 32758
+RMD160 33e848199c48c2cf09882d806abf08c52382ff11 ChangeLog 32758
+SHA256 f5c145c3c62a050e9b5d34e4a89412ed6a540c68457edb5162f4d774bd30ee88 ChangeLog 32758
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -153,13 +150,6 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r6 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r6 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r6 277
-MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_alpha-r3 274
-RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_alpha-r3 274
-SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_alpha-r3 274
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFo/awAiZjviIA2XgRAohoAJ9WqczaF3/u6s3HLH+61GnCL15BBgCggDO2
-KSbUZ7RnqC9aM+V2nV4vmpg=
-=jLEF
------END PGP SIGNATURE-----
+MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta 274
+RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta 274
+SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta 274
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha-r3 b/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha-r3
deleted file mode 100644 (file)
index 1309a09..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e4043356aeb6fd631df17adb1fbdb76d apache-tomcat-6.0.7-src.tar.gz 3210405
-RMD160 830485c5e25926da950e6b2148aa8baae263b351 apache-tomcat-6.0.7-src.tar.gz 3210405
-SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3 apache-tomcat-6.0.7-src.tar.gz 3210405
diff --git a/www-servers/tomcat/tomcat-6.0.7_alpha-r3.ebuild b/www-servers/tomcat/tomcat-6.0.7_alpha-r3.ebuild
deleted file mode 100644 (file)
index e2145f9..0000000
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_alpha-r3.ebuild,v 1.3 2007/01/09 20:01:35 flameeyes Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Apache Servlet-2.5/JSP-2.1 Container"
-
-MY_P="apache-${P/_alpha/}-src"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE="doc examples jni source test"
-
-RDEPEND="|| ( >=virtual/jre-1.5 >=virtual/jre-1.6 )
-       =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-java/tomcat-native )"
-
-DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
-       ${RDEPEND}
-       test? (
-               dev-java/junit
-               dev-java/ant
-       )
-       !test? ( dev-java/ant-core )"
-
-S=${WORKDIR}/${MY_P}
-NS=${WORKDIR}/tomcat-native-${TC_NV}-src
-
-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}
-}
-
-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
-       chmod 755 bin/*.sh
-
-       # 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() {
-       elog
-       elog " This ebuild implements a FHS compliant layout for tomcat"
-       elog " Please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-       elog " for more information."
-       elog
-       elog " Please report any bugs to http://bugs.gentoo.org/"
-       elog
-}