Address bin/*.sh stuff not having execute bit set. Possibly upstream bug/problem.
authorWilliam Thomson <wltjr@gentoo.org>
Sun, 31 Dec 2006 21:58:23 +0000 (21:58 +0000)
committerWilliam Thomson <wltjr@gentoo.org>
Sun, 31 Dec 2006 21:58:23 +0000 (21:58 +0000)
Package-Manager: portage-2.1.1-r2

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

index 639ae24ae46094d143b7a02a8df22229e78a5b8b..18d39b08193ef0c80694064c4d25491b875f138d 100644 (file)
@@ -126,14 +126,14 @@ EBUILD tomcat-5.5.20-r6.ebuild 10235 RMD160 c75db964790363a05b2f04234e96dc880caa
 MD5 c29595278538a55ccc576c7ee80b0e03 tomcat-5.5.20-r6.ebuild 10235
 RMD160 c75db964790363a05b2f04234e96dc880caa54d5 tomcat-5.5.20-r6.ebuild 10235
 SHA256 1b0ea606f802e3903fcb43d65983cad0606f1bc562d9373feb8a5905e73a27d7 tomcat-5.5.20-r6.ebuild 10235
-EBUILD tomcat-6.0.7_alpha.ebuild 4808 RMD160 529ff75c9283396cd17810b2ac594c3b928ef630 SHA1 eca749cfec385ebdc7aca3f422e69e97b9c5210a SHA256 451d2c99c8f9532ac8653ed0fc85b38653af790909d71a2683ab55ac6ac5db4b
-MD5 c7e51ccdd4e00d177ebe5024d92b829b tomcat-6.0.7_alpha.ebuild 4808
-RMD160 529ff75c9283396cd17810b2ac594c3b928ef630 tomcat-6.0.7_alpha.ebuild 4808
-SHA256 451d2c99c8f9532ac8653ed0fc85b38653af790909d71a2683ab55ac6ac5db4b tomcat-6.0.7_alpha.ebuild 4808
-MISC ChangeLog 31430 RMD160 9a517b3f4fe3e118b71629030f9f10139f182bb9 SHA1 c5043801d573fa232dc0c1465ce064c2ae2cb9b1 SHA256 5ab7e74c707b8435a985b57444b94586ee7190894c1d42bf7eaa24402bf0fa58
-MD5 1e87a34dbbc737fb4b81f4522a01f440 ChangeLog 31430
-RMD160 9a517b3f4fe3e118b71629030f9f10139f182bb9 ChangeLog 31430
-SHA256 5ab7e74c707b8435a985b57444b94586ee7190894c1d42bf7eaa24402bf0fa58 ChangeLog 31430
+EBUILD tomcat-6.0.7_alpha-r1.ebuild 4831 RMD160 fe9c572d2d3081fddcae4d2d60864fb0829a7aea SHA1 1b5891d629f4c4be1ce55edef16192ecba849b7d SHA256 05a40b9a841591ca9f513bae47977ec55d63a832dfdcfcc47a7eb69e1e204d0a
+MD5 4e06c64a713dd81240a997b9e22edac1 tomcat-6.0.7_alpha-r1.ebuild 4831
+RMD160 fe9c572d2d3081fddcae4d2d60864fb0829a7aea tomcat-6.0.7_alpha-r1.ebuild 4831
+SHA256 05a40b9a841591ca9f513bae47977ec55d63a832dfdcfcc47a7eb69e1e204d0a tomcat-6.0.7_alpha-r1.ebuild 4831
+MISC ChangeLog 31673 RMD160 da39b32d7f83d43e213b00e7d032fb8ba3ecd5f2 SHA1 5ec19ed1a0d07c4a5140752636a0e97dfb3927dd SHA256 ffa036f7bdbd1711ca0c944f84d0fa213d5a34a9b943ee284c80af3551457a24
+MD5 265aeaa477e438d5690369651c3241ec ChangeLog 31673
+RMD160 da39b32d7f83d43e213b00e7d032fb8ba3ecd5f2 ChangeLog 31673
+SHA256 ffa036f7bdbd1711ca0c944f84d0fa213d5a34a9b943ee284c80af3551457a24 ChangeLog 31673
 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-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 274
-RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_alpha 274
-SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_alpha 274
+MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_alpha-r1 274
+RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_alpha-r1 274
+SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_alpha-r1 274
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha b/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha
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.ebuild b/www-servers/tomcat/tomcat-6.0.7_alpha.ebuild
deleted file mode 100644 (file)
index 55b18c9..0000000
+++ /dev/null
@@ -1,163 +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.7_alpha.ebuild,v 1.2 2006/12/27 19:35:29 wltjr 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"
-#      jni? ( mirror://tomcat/tomcat-connectors/native/tomcat-native-1.1.8-src.tar.gz )"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="~amd64 ~x86"
-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-libs/apr
-               dev-libs/openssl )"
-
-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}
-
-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
-}