added env.d file for tomcat to export CATALINA_HOME. fixes #79625

(Portage version: 2.0.51.16)

6 files changed, 61 insertions, 52 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 0fae6029421b..aad414a7269e 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.14 2005/02/07 23:43:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.15 2005/02/09 18:21:17 luckyduck Exp $
+
+  09 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/5.0.27/tomcat.env,
+  +files/5.0.28/tomcat.env, tomcat-5.0.27-r4.ebuild, tomcat-5.0.28.ebuild:
+  added env.d file for tomcat to export CATALINA_HOME. fixes #79625
 
   08 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> metadata.xml:
   updated maintainer informations.
 
   18 Dec 2004; Karl Trygve Kalleberg <karltk@gentoo.org> tomcat-5.0.28.ebuild:
-  Fixes #74858 thanks to Petteri Räty <petteri.raty@welho.com>
+  Fixes #74858 thanks to Petteri Räty <petteri.raty@welho.com>
 
   17 Nov 2004; Markus Rothe <corsair@gentoo.org> tomcat-5.0.27-r4.ebuild,
   tomcat-5.0.28.ebuild:
@@ -147,7 +151,7 @@
   25 Jun 2004; Aron Griffis <agriffis@gentoo.org> tomcat-5.0.18.ebuild:
   QA - fix use invocation
 
-  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> tomcat-5.0.18.ebuild:
+  08 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> tomcat-5.0.18.ebuild:
   Stable on alpha.
 
 *tomcat-5.0.25 (19 May 2004)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 55a87f340baa..b7bd699d1670 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,9 +1,11 @@
 MD5 6d3093b061ac48958c13092ecefc9834 tomcat-5.0.27-r4.ebuild 3650
-MD5 7e2a9211435c19c97c19bd63816b15f0 tomcat-5.0.28.ebuild 6964
+MD5 45ff7f9739508943d987b0d6a474cbf2 tomcat-5.0.28.ebuild 6874
 MD5 b8bdcdd27b76556b90401621fc29996c tomcat-4.1.30-r5.ebuild 3614
 MD5 257ce52cfc15f63798cb7b13ee761cb4 tomcat-3.3.2-r2.ebuild 3217
 MD5 f374b1280af843dc767255cc7f44524e ChangeLog 12833
 MD5 c11ce937193406815ff7a2b306784fd8 metadata.xml 555
+MD5 45ff7f9739508943d987b0d6a474cbf2 tomcat-5.5.7.ebuild 6874
+MD5 9ba7e3a6bb7c8ecb9fce2824b4c1d59d files/digest-tomcat-5.5.7 77
 MD5 71d59fd713a960e63c1b894ca5893a1b files/digest-tomcat-4.1.30-r5 74
 MD5 d5a48abc8db5543a73abbbf151d0630e files/digest-tomcat-5.0.27-r4 75
 MD5 af26ca4772989a2090085a6e24b71628 files/digest-tomcat-5.0.28 78
diff --git a/www-servers/tomcat/files/5.0.27/tomcat.env b/www-servers/tomcat/files/5.0.27/tomcat.env
new file mode 100644
index 000000000000..7570b733c38c
--- /dev/null
+++ b/www-servers/tomcat/files/5.0.27/tomcat.env
@@ -0,0 +1 @@
+CATALINA_HOME=/opt/tomcat5
diff --git a/www-servers/tomcat/files/5.0.28/tomcat.env b/www-servers/tomcat/files/5.0.28/tomcat.env
new file mode 100644
index 000000000000..7570b733c38c
--- /dev/null
+++ b/www-servers/tomcat/files/5.0.28/tomcat.env
@@ -0,0 +1 @@
+CATALINA_HOME=/opt/tomcat5
diff --git a/www-servers/tomcat/tomcat-5.0.27-r4.ebuild b/www-servers/tomcat/tomcat-5.0.27-r4.ebuild
index 8b89a511f2fa..ed16bdf6c381 100644
--- a/www-servers/tomcat/tomcat-5.0.27-r4.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.27-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.27-r4.ebuild,v 1.5 2005/02/07 23:43:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.27-r4.ebuild,v 1.6 2005/02/09 18:21:17 luckyduck Exp $
 
 inherit eutils
 
@@ -31,14 +31,17 @@ src_unpack() {
 src_install() {
 	dodoc RELEASE* RUNNING.txt LICENSE
 
-	# INIT SCRIPTS AND ENV
+	# init.d, conf.d , env.d
 	insinto /etc/init.d
 	insopts -m0750
-	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
+	newins ${FILESDIR}/${PV}/${PN}.init ${TOMCAT_NAME}
+
+	insinto /etc/env.d/
+	newins ${FILESDIR}/${PV}/${PN}.env 21${PN}
 
 	insinto /etc/conf.d
 	insopts -m0644
-	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
+	newins ${FILESDIR}/${PV}/${PN}.conf ${TOMCAT_NAME}
 	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
 
 	diropts -m750
diff --git a/www-servers/tomcat/tomcat-5.0.28.ebuild b/www-servers/tomcat/tomcat-5.0.28.ebuild
index b332d3e26707..e02f8b36b790 100644
--- a/www-servers/tomcat/tomcat-5.0.28.ebuild
+++ b/www-servers/tomcat/tomcat-5.0.28.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28.ebuild,v 1.6 2005/02/07 23:43:14 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-5.0.28.ebuild,v 1.7 2005/02/09 18:21:17 luckyduck Exp $
 
 inherit eutils java-pkg
 
@@ -9,34 +9,35 @@ DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
 SLOT="${PV/.*}"
 SRC_URI="mirror://apache/jakarta/tomcat-${SLOT}/v${PV}/src/jakarta-${P}-src.tar.gz"
 HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~x86 ~ppc64"
+KEYWORDS="~x86 ~ppc64 ~amd64"
 LICENSE="Apache-2.0"
 DEPEND="sys-apps/sed
 	   >=virtual/jdk-1.4
+	   jikes? ( dev-java/jikes )"
+RDEPEND=">=virtual/jdk-1.4
 	   >=dev-java/commons-beanutils-1.7.0
 	   >=dev-java/commons-collections-3.1
 	   >=dev-java/commons-daemon-1.0
-	   >=dev-java/commons-digester-1.5
-	   >=dev-java/commons-logging-1.0.4
-	   >=dev-java/commons-el-1.0
-	   >=dev-java/regexp-1.3
-	   >=dev-java/xerces-2.6.2-r1
-	   >=dev-java/log4j-1.2.8
 	   >=dev-java/commons-dbcp-1.2.1
-	   >=dev-java/commons-httpclient-2.0
-	   >=dev-java/commons-pool-1.2
+	   >=dev-java/commons-digester-1.5
 	   >=dev-java/commons-fileupload-1.0
-	   >=dev-java/commons-modeler-1.1
+	   >=dev-java/commons-httpclient-2.0
+	   >=dev-java/commons-el-1.0
 	   >=dev-java/commons-launcher-0.9
+	   >=dev-java/commons-logging-1.0.4
+	   >=dev-java/commons-modeler-1.1
+	   >=dev-java/commons-pool-1.2
+	   ~dev-java/jaxen-1.0
 	   >=dev-java/junit-3.8.1
 	   dev-java/jmx
+	   >=dev-java/log4j-1.2.8
+	   >=dev-java/regexp-1.3
 	   =dev-java/struts-1.1-r2
 	   >=dev-java/saxpath-1.0
-	   >=dev-java/jaxen-1.0
-	   jikes? ( dev-java/jikes )"
-RDEPEND=">=virtual/jdk-1.4
+	   >=dev-java/xerces-2.6.2-r1
 		jikes? ( dev-java/jikes )"
 IUSE="doc jikes"
+
 S=${WORKDIR}/jakarta-${P}-src
 
 TOMCAT_HOME="/opt/${PN}${SLOT}"
@@ -54,6 +55,7 @@ src_unpack() {
 	java-pkg_jar-from jaxen
 	java-pkg_jar-from jmx
 	java-pkg_jar-from commons-beanutils
+	java-pkg_jar-from servletapi-2.4
 
 	cd ${S}
 
@@ -62,51 +64,44 @@ src_unpack() {
 	epatch ${FILESDIR}/${PV}/build.xml-02.patch
 
 	epatch ${FILESDIR}/${PV}/gentoo.diff
-	use jikes && epatch ${FILESDIR}/${PV}/jikes.diff
+	#epatch ${FILESDIR}/${PV}/jikes.diff
 
 }
 
 src_compile(){
 	local antflags="-Dbase.path=${T}"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
-	antflags="${antflags} -Dcommons-beanutils.jar=${T}/lib/commons-beanutils.jar"
+	antflags="${antflags} -Dactivation.jar=$(java-config -p sun-jaf-bin)"
 	antflags="${antflags} -Dcommons-collections.jar=$(java-config -p commons-collections)"
 	antflags="${antflags} -Dcommons-daemon.jar=$(java-config -p commons-daemon)"
 	antflags="${antflags} -Dcommons-digester.jar=$(java-config -p commons-digester)"
-	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
-
-	#
-	# Work around for the fact that java-config is unable to return a
-	# particular jar from a package.
-	#
-	antflags="${antflags} -Dcommons-logging.jar=${T}/lib/commons-logging.jar"
-	antflags="${antflags} -Dcommons-logging-api.jar=${T}/lib/commons-logging-api.jar"
-	antflags="${antflags} -Dregexp.jar=$(java-config -p regexp)"
-
-	#
-	# Same work around again
-	#
-	antflags="${antflags} -DxercesImpl.jar=${T}/lib/xercesImpl.jar"
-	antflags="${antflags} -Dxml-apis.jar=${T}/lib/xml-apis.jar"
-	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
 	antflags="${antflags} -Dcommons-dbcp.jar=$(java-config -p commons-dbcp)"
+	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
 	antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
 	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
 	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
-	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
-	antflags="${antflags} -Dstruts.jar=${T}/lib/struts.jar"
-
-	antflags="${antflags} -Djmx.jar=${T}/lib/jmxri.jar"
-	antflags="${antflags} -Djmx-tools.jar=${T}/lib/jmxtools.jar"
 	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
-	#`
-	# This is used to reference the tld files in /usr/share/struts/lib
-	#
-	antflags="${antflags} -Dstruts.home=/usr/share/struts"
 	antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
+	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
+	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
+	antflags="${antflags} -Dregexp.jar=$(java-config -p regexp)"
+
 	antflags="${antflags} -Dstruts.jar=${T}/lib/struts.jar"
+	antflags="${antflags} -Dcommons-beanutils.jar=${T}/lib/commons-beanutils.jar"
+	antflags="${antflags} -Dcommons-logging.jar=${T}/lib/commons-logging.jar"
+	antflags="${antflags} -Dcommons-logging-api.jar=${T}/lib/commons-logging-api.jar"
 	antflags="${antflags} -Djaxen.jar=${T}/lib/jaxen-full.jar"
+	antflags="${antflags} -Djmx.jar=${T}/lib/jmxri.jar"
+	antflags="${antflags} -Djmx-tools.jar=${T}/lib/jmxtools.jar"
+	antflags="${antflags} -Djsp-api.jar=${T}/lib/jsp-api.jar"
 	antflags="${antflags} -Dsaxpath.jar=${T}/lib/saxpath.jar"
+	antflags="${antflags} -Dservlet-api.jar=${T}/lib/servlet-api.jar"
+	antflags="${antflags} -Dstruts.jar=${T}/lib/struts.jar"
+	antflags="${antflags} -DxercesImpl.jar=${T}/lib/xercesImpl.jar"
+	antflags="${antflags} -Dxml-apis.jar=${T}/lib/xml-apis.jar"
+
+	antflags="${antflags} -Dstruts.home=/usr/share/struts"
+	antflags="${antflags} -Dlog4j.home=/usr/share/log4j"
 
 	ant ${antflags} || die "compile failed"
 
@@ -114,14 +109,17 @@ src_compile(){
 src_install() {
 	cd ${S}/jakarta-tomcat-5/build
 
-	# INIT SCRIPTS AND ENV
+	# init.d, env.d, conf.d
 	insinto /etc/init.d
 	insopts -m0750
-	newins ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
+	newins ${FILESDIR}/${PV}/${PN}.init ${TOMCAT_NAME}
+
+	insinto /etc/env.d/
+	newins ${FILESDIR}/${PV}/${PN}.env 21${PN}
 
 	insinto /etc/conf.d
 	insopts -m0644
-	newins ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
+	newins ${FILESDIR}/${PV}/${PN}.conf ${TOMCAT_NAME}
 	use jikes && sed -e "\cCATALINA_OPTScaCATALINA_OPTS=\"-Dbuild.compiler.emacs=true\"" -i ${D}/etc/conf.d/${TOMCAT_NAME}
 
 	diropts -m750