Bumped 6 to latest alpha, and dropped jni use flag. Due to it pulling in dep when USE flag is set, but dep still being installed when USE flag is unset.

Package-Manager: portage-2.1.2-r1

6 files changed, 190 insertions, 16 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 496f8a06d382..6a594869f655 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.104 2007/01/10 21:06:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.105 2007/01/20 16:54:57 wltjr Exp $
+
+*tomcat-6.0.8_alpha (20 Jan 2007)
+*tomcat-6.0.7_beta-r3 (20 Jan 2007)
+
+  20 Jan 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -tomcat-6.0.7_beta-r2.ebuild, +tomcat-6.0.7_beta-r3.ebuild,
+  +tomcat-6.0.8_alpha.ebuild:
+  Bumped 6 to latest alpha, and dropped jni use flag. Due to it pulling in dep
+  when USE flag is set, but dep still being installed when USE flag is unset.
 
 *tomcat-6.0.7_beta-r2 (10 Jan 2007)
 *tomcat-5.5.20-r8 (10 Jan 2007)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 48b6adf5197e..1d1c0210e112 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -108,6 +108,7 @@ RMD160 93cf9482ae26be1fae13ba2102f57b91f1c0022c files/6/tomcat.init 3314
 SHA256 1ba56d52b64ad7a7bd66fd2b7a40599f60e16cb6306812cbc5129d628ccf358c files/6/tomcat.init 3314
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
 DIST apache-tomcat-6.0.7-src.tar.gz 3210405 RMD160 830485c5e25926da950e6b2148aa8baae263b351 SHA1 6883fbed7840c20d0967c435deafc0260609200f SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3
+DIST apache-tomcat-6.0.8-src.tar.gz 3215835 RMD160 678f6a5c6a8709774735c07618512c6fe651d84b SHA1 757cd847d7a2c7de8f121cb99e4a9f6f48310168 SHA256 132d82dc169ce0de9ca9eba2891e7b3b6182ea7080bc41c160335da06e017ba8
 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 3847 RMD160 41cea01bc672d5ab288f88b5af3bd61cc295c970 SHA1 70a142673897e04a5a0ebaeca26e21e58132e987 SHA256 8784db8376eed0d3b5fdb74c1377505e7e3c3996c7e426dfa2fb795f0b91b019
@@ -126,14 +127,18 @@ EBUILD tomcat-5.5.20-r8.ebuild 10209 RMD160 38d895b3abae9b4861074c6655a27aed4e06
 MD5 5593c59ecb32a67719db071947c37897 tomcat-5.5.20-r8.ebuild 10209
 RMD160 38d895b3abae9b4861074c6655a27aed4e06eacc tomcat-5.5.20-r8.ebuild 10209
 SHA256 74098fc2db7b9e1de575949802c067e52ac49d505fe17abcfe5354237615cc5e tomcat-5.5.20-r8.ebuild 10209
-EBUILD tomcat-6.0.7_beta-r2.ebuild 4631 RMD160 115de11f9f873aaa75e8c918a213e99f2ffebad3 SHA1 eac23e879a89bee55ff14c6dd4c4d19cf390bb39 SHA256 bb30976c7fceeb989a722939646a11e196c14b21bcb70ad0d2d7b543cfdb1b38
-MD5 5d3c2a84ea94d69cef164a669b978c65 tomcat-6.0.7_beta-r2.ebuild 4631
-RMD160 115de11f9f873aaa75e8c918a213e99f2ffebad3 tomcat-6.0.7_beta-r2.ebuild 4631
-SHA256 bb30976c7fceeb989a722939646a11e196c14b21bcb70ad0d2d7b543cfdb1b38 tomcat-6.0.7_beta-r2.ebuild 4631
-MISC ChangeLog 33575 RMD160 efdc8f63c79adaf4cbde3145db737a35cb1a7c35 SHA1 7f662a86f8301aca3a754d2cf60e4d48da7f279d SHA256 6e1eaee0826c83efaa83492bc806a971c19919e8074356e77c27407e00e8beb5
-MD5 dcc838570f00f79834acd4e236cafc45 ChangeLog 33575
-RMD160 efdc8f63c79adaf4cbde3145db737a35cb1a7c35 ChangeLog 33575
-SHA256 6e1eaee0826c83efaa83492bc806a971c19919e8074356e77c27407e00e8beb5 ChangeLog 33575
+EBUILD tomcat-6.0.7_beta-r3.ebuild 4594 RMD160 29f1ab1b903fdb92d438e5a9ca7f5e91cb96a14d SHA1 e143791d36924f90223be83d3b87ccea78be500c SHA256 b27596f4ba9ba08eedc8fbfcb8bfcfe8d77b7c52e51862fe5e59e8289266f09f
+MD5 b0ad9f67abd102331b3d62c29c6b14fc tomcat-6.0.7_beta-r3.ebuild 4594
+RMD160 29f1ab1b903fdb92d438e5a9ca7f5e91cb96a14d tomcat-6.0.7_beta-r3.ebuild 4594
+SHA256 b27596f4ba9ba08eedc8fbfcb8bfcfe8d77b7c52e51862fe5e59e8289266f09f tomcat-6.0.7_beta-r3.ebuild 4594
+EBUILD tomcat-6.0.8_alpha.ebuild 4593 RMD160 8a340dbcf686ab679ce753aa7aeb744c9c27930e SHA1 b3e12470a30768334830ff758359b06e7f912146 SHA256 9c24041b800061606ac979ad8ad82eb91a1daabf374dc80635cca7d4323d8dac
+MD5 a9440f368151c2aff2814547fb6d568d tomcat-6.0.8_alpha.ebuild 4593
+RMD160 8a340dbcf686ab679ce753aa7aeb744c9c27930e tomcat-6.0.8_alpha.ebuild 4593
+SHA256 9c24041b800061606ac979ad8ad82eb91a1daabf374dc80635cca7d4323d8dac tomcat-6.0.8_alpha.ebuild 4593
+MISC ChangeLog 33953 RMD160 e65b943129765e2b0b35199c64e4212354bb866f SHA1 22789dfd187bcc024b34c056135c8f69dd488826 SHA256 a0d854e0d24d469863b5722601a5004dc5c5ea6268a4debc85c53b11034ca543
+MD5 9d3cd9dbab72f3653d21ba74ce8d8c67 ChangeLog 33953
+RMD160 e65b943129765e2b0b35199c64e4212354bb866f ChangeLog 33953
+SHA256 a0d854e0d24d469863b5722601a5004dc5c5ea6268a4debc85c53b11034ca543 ChangeLog 33953
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -150,6 +155,9 @@ SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/di
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r8 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r8 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r8 277
-MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r2 274
-RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r2 274
-SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r2 274
+MD5 ae090639fc2a4b844084020e9fd68796 files/digest-tomcat-6.0.7_beta-r3 274
+RMD160 887290424c340b8a024770ae6ee2adeb0252b5ea files/digest-tomcat-6.0.7_beta-r3 274
+SHA256 8c88ae20979c83fd4529d2493cf5bfc63d86ff37cb46af296db58166d2e0ad3d files/digest-tomcat-6.0.7_beta-r3 274
+MD5 d42fe3d19844276dfb1df24bd3d29897 files/digest-tomcat-6.0.8_alpha 274
+RMD160 831d3266c513184c82d467da6933a289798935b6 files/digest-tomcat-6.0.8_alpha 274
+SHA256 74cd7a38575a75a9f68d2e6da21d94ec2ae7c729431ab90b89716d6a5dcf7374 files/digest-tomcat-6.0.8_alpha 274
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r2 b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r3
index 1309a094c51c..1309a094c51c 100644
--- a/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r2
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.7_beta-r3
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha
new file mode 100644
index 000000000000..d9ae7e3b1bba
--- /dev/null
+++ b/www-servers/tomcat/files/digest-tomcat-6.0.8_alpha
@@ -0,0 +1,3 @@
+MD5 35bcd5d1c0747568aab289881563119c apache-tomcat-6.0.8-src.tar.gz 3215835
+RMD160 678f6a5c6a8709774735c07618512c6fe651d84b apache-tomcat-6.0.8-src.tar.gz 3215835
+SHA256 132d82dc169ce0de9ca9eba2891e7b3b6182ea7080bc41c160335da06e017ba8 apache-tomcat-6.0.8-src.tar.gz 3215835
diff --git a/www-servers/tomcat/tomcat-6.0.7_beta-r2.ebuild b/www-servers/tomcat/tomcat-6.0.7_beta-r3.ebuild
index 3825ca5dd9c1..48e8923bea94 100644
--- a/www-servers/tomcat/tomcat-6.0.7_beta-r2.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.7_beta-r3.ebuild
@@ -1,6 +1,6 @@
 # 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_beta-r2.ebuild,v 1.1 2007/01/10 21:06:33 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.7_beta-r3.ebuild,v 1.1 2007/01/20 16:54:57 wltjr Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -13,15 +13,14 @@ HOMEPAGE="http://tomcat.apache.org/"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 LICENSE="Apache-2.0"
 
-IUSE="doc examples jni source test"
+IUSE="doc examples 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 )"
+	>=dev-java/commons-pool-1.2"
 
 DEPEND="|| ( >=virtual/jdk-1.5 >=virtual/jdk-1.6 )
 	${RDEPEND}
diff --git a/www-servers/tomcat/tomcat-6.0.8_alpha.ebuild b/www-servers/tomcat/tomcat-6.0.8_alpha.ebuild
new file mode 100644
index 000000000000..f56c066f82f8
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.8_alpha.ebuild
@@ -0,0 +1,155 @@
+# 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.8_alpha.ebuild,v 1.1 2007/01/20 16:54:57 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"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+LICENSE="Apache-2.0"
+
+IUSE="doc examples 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"
+
+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
+}