Change functionality of jni use flag from compiling/installing to dep on a package that does both, tomcat-native :)

(Portage version: 2.1.2_rc4-r6)
 (Unsigned Manifest commit)

3 files changed, 11 insertions, 188 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index a7514cd674ad..7ca249a493e3 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -110,7 +110,6 @@ DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933
 DIST apache-tomcat-6.0.7-src.tar.gz 3210405 RMD160 830485c5e25926da950e6b2148aa8baae263b351 SHA1 6883fbed7840c20d0967c435deafc0260609200f SHA256 a76be3230db0a3363835916f14afcccce6f18509577c2999f5491c0fb861e4f3
 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
-DIST tomcat-native-1.1.8-src.tar.gz 174445 RMD160 0bb333973e7d177fd6d3e2dca1d0003633dfca3e SHA1 ed8a007abd5b658536caa5e5da76140d8112648a SHA256 c4924e416def6993e8ee41e9cb88346705da8f5d51be0523d7567b34530ed1c2
 EBUILD tomcat-5.0.27-r6.ebuild 3881 RMD160 80b96c74656e19ac148a68a8047b74066e5709b4 SHA1 8bb842e8a2f594593fab407e7f14d35f4a50ad38 SHA256 c750b594d6f7397f4dfa775738db62238391e86c347a3c5bbcc744d8394974ba
 MD5 999b5f8d571956043cde42233459eb5b tomcat-5.0.27-r6.ebuild 3881
 RMD160 80b96c74656e19ac148a68a8047b74066e5709b4 tomcat-5.0.27-r6.ebuild 3881
@@ -127,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-r2.ebuild 5056 RMD160 f4019990ef84d86174f93c28f2cdc4a1fc61bf07 SHA1 eb064eb13710f3e020f3139b4dcc7a7181acab3c SHA256 a5c63c1122a5f4de78b889735b5584c0a9874a82e25f72cab6762149d9271ead
-MD5 abeee0dc02b8e3b2f1965cbaafdcd7a9 tomcat-6.0.7_alpha-r2.ebuild 5056
-RMD160 f4019990ef84d86174f93c28f2cdc4a1fc61bf07 tomcat-6.0.7_alpha-r2.ebuild 5056
-SHA256 a5c63c1122a5f4de78b889735b5584c0a9874a82e25f72cab6762149d9271ead tomcat-6.0.7_alpha-r2.ebuild 5056
-MISC ChangeLog 31961 RMD160 1cf4650b6286a68e258591ff1308dc522263c8f0 SHA1 3f5e90259d1f4af644538026affb763e44c064e1 SHA256 5518b1da1087ddd1bdb2cad08ce77760d68f09d1da3e6086e4e1e1a7f638ff41
-MD5 d6a6ec56ef9ddb0c25f131a0e557fa7e ChangeLog 31961
-RMD160 1cf4650b6286a68e258591ff1308dc522263c8f0 ChangeLog 31961
-SHA256 5518b1da1087ddd1bdb2cad08ce77760d68f09d1da3e6086e4e1e1a7f638ff41 ChangeLog 31961
+EBUILD tomcat-6.0.7_alpha-r3.ebuild 4630 RMD160 5c828822b73cec59bb432c4b419ca42d85373a91 SHA1 1baa8f924fd4f0b1ecd2f1761db10e9d6349e2a6 SHA256 ccf1afed8738fc4145037f822c649ce1006e132304c132d147d0feb57e1c8d04
+MD5 b3d9c65197f142668369d668fb782365 tomcat-6.0.7_alpha-r3.ebuild 4630
+RMD160 5c828822b73cec59bb432c4b419ca42d85373a91 tomcat-6.0.7_alpha-r3.ebuild 4630
+SHA256 ccf1afed8738fc4145037f822c649ce1006e132304c132d147d0feb57e1c8d04 tomcat-6.0.7_alpha-r3.ebuild 4630
+MISC ChangeLog 32241 RMD160 247615b7b4975d50d9f03bf5af7564e2b0ae0f01 SHA1 f853f40dbf48c13767e4521a79826eee9a846728 SHA256 29aa11d59e3d5426d04382d0d15048b3714732e8380adbe746f56f5ab3a12003
+MD5 31d4768ea12b5129b5b5ec2c11d5c280 ChangeLog 32241
+RMD160 247615b7b4975d50d9f03bf5af7564e2b0ae0f01 ChangeLog 32241
+SHA256 29aa11d59e3d5426d04382d0d15048b3714732e8380adbe746f56f5ab3a12003 ChangeLog 32241
 MISC metadata.xml 556 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 SHA1 e8dcd8204d0ea02558dd07e1aded5dc58ed1460c SHA256 ac94c1d58b05b47598f311e6efb971fdb30ad9a25f3c32cb9c064fb6330dad79
 MD5 0609d3339e0b8d5a3b4707f6b02aad3a metadata.xml 556
 RMD160 88a7809fe3f73c2d351b9fdda025fe88dfb11f31 metadata.xml 556
@@ -151,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 60f2f410898ac1ecbdcf7f9740f8386b files/digest-tomcat-6.0.7_alpha-r2 545
-RMD160 8f3644576c17dfe991bd61da26a44d25228cfd78 files/digest-tomcat-6.0.7_alpha-r2 545
-SHA256 a09dbc377d5bb263f8c67a9684d5f6771bc3249dfe862e3b2e8f9b36a5819c99 files/digest-tomcat-6.0.7_alpha-r2 545
+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
diff --git a/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha-r2 b/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha-r2
deleted file mode 100644
index 756988294340..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-6.0.7_alpha-r2
+++ /dev/null
@@ -1,6 +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
-MD5 ca9cf9faa07548cec385c9667af4276a tomcat-native-1.1.8-src.tar.gz 174445
-RMD160 0bb333973e7d177fd6d3e2dca1d0003633dfca3e tomcat-native-1.1.8-src.tar.gz 174445
-SHA256 c4924e416def6993e8ee41e9cb88346705da8f5d51be0523d7567b34530ed1c2 tomcat-native-1.1.8-src.tar.gz 174445
diff --git a/www-servers/tomcat/tomcat-6.0.7_alpha-r2.ebuild b/www-servers/tomcat/tomcat-6.0.7_alpha-r2.ebuild
deleted file mode 100644
index 8c7ff40169ac..000000000000
--- a/www-servers/tomcat/tomcat-6.0.7_alpha-r2.ebuild
+++ /dev/null
@@ -1,170 +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-r2.ebuild,v 1.1 2007/01/01 23:07:14 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"
-TC_NV="1.1.8"
-SLOT="6"
-SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz
-	jni? ( mirror://apache/tomcat/tomcat-connectors/native/tomcat-native-${TC_NV}-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}
-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}
-
-	if use jni; then
-		cd ${NS}/jni/native
-		econf --with-apr=/usr/bin/apr-config --with-ssl=/usr || die "Could not configure native sources"
-		emake || die "Could not build libtcnative.so"
-	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
-	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
-
-	if use jni; then
-		cd ${NS}/jni/native
-		make DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-	fi
-}
-
-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
-}