www-servers/tomcat: fixed bug #326979

Package-Manager: portage-2.1.9.39/cvs/Linux x86_64

4 files changed, 358 insertions, 22 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index aae5dbdf04ec..eff4004d797b 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.244 2011/02/13 11:28:25 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.245 2011/02/14 23:09:40 fordfrog Exp $
+
+*tomcat-6.0.32-r2 (14 Feb 2011)
+
+  14 Feb 2011; Miroslav Šulc <fordfrog@gentoo.org> +files/6/tomcat.init.3,
+  +tomcat-6.0.32-r2.ebuild:
+  Fixed bug #326979 (thanks to Pavel Goran <via-gentoo@pvgoran.name> for the
+  fix)
 
   13 Feb 2011; Markos Chandras <hwoarang@gentoo.org> tomcat-6.0.32-r1.ebuild:
   Stable on amd64 wrt bug #329937
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 692a89a08350..528822f9d814 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 5.5/26-main_tomcat_catalina_jasper_build_xml.patch 16573 RMD160 53f1deaa88a39459a584cf14c761cb411d68f2e6 SHA1 69b3ca39f9dbabe12c56865d47866c06dcb7c2e3 SHA256 99a2c1bb164d97407525305512a85e6139531d81a47aa2c25f5c2cfe50aee1f6
 AUX 5.5/5.5.27-dynamic-JSSE13Factory.patch 1853 RMD160 31d20202a3be06c156b0c13f0afb3b394b8ecf02 SHA1 d7e7640dd4f7b7b92b21ac51d1b508fe56691a81 SHA256 f7db0e692088ec25a4731a521c1da4a0075e747f68690235fde3ca93c6f2e19d
 AUX 5.5/build-jspc-classpath.patch 1486 RMD160 454b41920a864e06b5b70e448fae724241eb008d SHA1 3671b1cd4d53fd248c19380c96760c051f7f7bff SHA256 865fd2a8721799b1628fe7b31f9bad00563d679236aba5656740feb310b6eb88
@@ -15,6 +12,7 @@ AUX 6/examples-cal.patch 565 RMD160 85294480f354eb19340bdc7357690ae55ef5a89f SHA
 AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef42463b7bf186e2f1d1aeb083bdb370603265 SHA256 b04b085618be755ad9e1796fcbcbb8c2e192eefda3b240f1c06b0d9cc88f2ff0
 AUX 6/tomcat.init 3529 RMD160 45aabac31804faff713ca3648f4a675e5ea7ea89 SHA1 f2b499fda69d83aecda72742f88ed8bf64f5cfb3 SHA256 744daa31e36e548f76f2997c3e3430b961163bfe0d2ba2ef6d81f5c2ddb0470c
 AUX 6/tomcat.init.2 4057 RMD160 d84933e0792748e15ccd7c771b70ae9fe3fdfe2c SHA1 03348b4015f27c6b0018db74d801d5bf0b379e99 SHA256 9f100eaea7c9cb49a9c291faa8fdf8ea16cd1b2d049ddafd60f6ebdad51bc59a
+AUX 6/tomcat.init.3 4075 RMD160 680993c34cbe7b105a67395f8eb77bf3fdf0a79f SHA1 9dcf8fa77881407abcffca79744e03bbd9a2c6a2 SHA256 d138370f31616ec1a049de4dd257f05557601f4499cf1353e996e4c42898d78c
 AUX 7/7.0.6-build-xml.patch 4877 RMD160 e59cdf2a354260998fa06baa8baad6608d2b8bb0 SHA1 c27a869cda7742133cf4d3fecfff9f28b7786e14 SHA256 21b4642bb4dfbaf3d464bf242c068e635aec2575c48f0c6a0f64cd30eb72ee43
 AUX 7/7.0.8-build-xml.patch 4877 RMD160 e59cdf2a354260998fa06baa8baad6608d2b8bb0 SHA1 c27a869cda7742133cf4d3fecfff9f28b7786e14 SHA256 21b4642bb4dfbaf3d464bf242c068e635aec2575c48f0c6a0f64cd30eb72ee43
 AUX 7/build-xml.patch 5561 RMD160 672659e5273a9d6ef450fd29cc171fae56c99c9a SHA1 08714c12a72b1db8490460b10f74d32fc951dacb SHA256 f85ec37d37cc2bceca7877da3271570701a352e087e101e6b3146bdd16f31490
@@ -36,25 +34,9 @@ EBUILD tomcat-6.0.26.ebuild 6861 RMD160 38045bfd3921e366823b00061ee327fb17d21bbf
 EBUILD tomcat-6.0.28-r1.ebuild 6948 RMD160 dcc281587e6a2bd0dd81808e1fa5d1a4c5a3a7f7 SHA1 57ef17a33196a95e7581cdc6fcba3ba38679da57 SHA256 7af5502722afe40b4e54e4306598b9c86197ef0304022791ac96dbcfc3dbec9e
 EBUILD tomcat-6.0.29-r1.ebuild 6948 RMD160 d340dad22a80e36a03bdc0614fee97ce9e296fe2 SHA1 4885f884254f2475a6ca004e82dcfeed9462de7b SHA256 a6f9cba93f8f07fd184b62ac7aa2830b7d420050c08e13a060db54c77c730e7f
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
+EBUILD tomcat-6.0.32-r2.ebuild 6968 RMD160 756ffd21d60906c47031e0bc202d3fc77b21c868 SHA1 a9339169846af791be4a92c5cda053324eaa923a SHA256 ad9c4ce33cb4d998b3447a106f8a9df76dde19ef28b6dd94163362d0aaff3343
 EBUILD tomcat-7.0.5-r1.ebuild 7097 RMD160 9c17268799c3e6f36d30985b7f2757e51658aef2 SHA1 afcb2863df4d9b8066dd831b77b253e19f6e9a72 SHA256 0e60ee536b32d0721b6128194d24fec08bb2bcb9e58a2bd941e017b45e8712f3
 EBUILD tomcat-7.0.6.ebuild 7084 RMD160 750c35018ca313ec5c074e013883aa35452d6931 SHA1 e146f18bb292826b5e3c71c6f6f184418477be54 SHA256 1dad1d38658ead86e0d7ebf78407e7ddb9b54aa555b9af3a2caf1dcc7610ecb8
 EBUILD tomcat-7.0.8.ebuild 7084 RMD160 21785986e0958df3ab386eb873a53e3f8afcffd3 SHA1 b7eb5c717c1952f3d3695d3791b1bb7e2e9c19b9 SHA256 c7484ddf9f029be21412ac203fc3477c45c59c3508d894f44af4df589c8f7c7a
-MISC ChangeLog 62203 RMD160 6d23dffe8f4538740ae5dae8a4a20be9039ade12 SHA1 98167deec68abbe93891790bfc26c8f5cde37077 SHA256 7b75068ab1f9a52d62562ac975c4fbc9084908ea9d9b570ad40047512ab2e849
+MISC ChangeLog 62425 RMD160 082b79b918590c756ee563e02dd831ccfcece8d7 SHA1 e8808049088eac85d56374e96e61b8268068acde SHA256 c0c14e1fc0c1afb447679b103a71107dd01d1701f8aff4900da3ba2a6e2222a7
 MISC metadata.xml 521 RMD160 72b6ce433f5c9a65deaa0c1830c070c3adbcf33a SHA1 2c4f4fd887a5df9e955c711d0fcd21a5cab90a2d SHA256 dbab559e58c59eddd5df1c3bb39d17b26fadb587ad5dab51fc6fa7af5e601e22
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCgAGBQJNV7/FAAoJEPqDWhW0r/LCqlgQALics0X7gzc2bkpySCe3Fjbd
-7DM1j6zKTFuESJXQP3NmorYkgGX7fvHoiFwN57U99lpHmLGKpRPoHjRmzHTG/QSm
-xRGadchHHjBosSxXF/15fJBnnH5kds9SpEumgSpElhExF1EwMnF/0y8UYK7MQVDg
-FtF8YTEjkh5kXiY/0WlGpsLQozDJ/PxhW0H3TDye0IvoofQ63in1snnCYTxnb7Io
-xN/Cv3GzG37xVKxQR98j68sdFjftcTOWdCpygMugvEF5NWwbEstYc+OKuum3+evq
-xTh2JCcFBrdQK12Baw1L/2Y/PmVA8y6emTnjB1zc90felbsVEWoRWKh/+HqtB2YM
-xHeepJN1QKRvATKuEpFviYbII5tb2aK51jwbOUglVkACVAfe2cUJZbL3S50eP9Vv
-4gaFrDD/gCuBL723UlSnPmgrnJcMjKVhGwVv6DVibBujNaJ2gvnYyYazPMIJqKl8
-ovI69p1XEXlIHrt5LXqwKXEKjBYx7ez4dmyMszE5Jh3kncj6B5WinFECVLWQHTYG
-V8swfPuWK/IaFpMoVs8xUD0DRWc1fWTiGt8S4HcK4ajUHcoHqmgnHYD0OFQ00pHE
-XWK6noneLc3zMajpvk9zFz43GYOVF/febuPGplo/kMSm4XCRg5K91VlTl9gjsKBa
-lKWLz6ZdDSB0bsGwrfnM
-=5G45
------END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/6/tomcat.init.3 b/www-servers/tomcat/files/6/tomcat.init.3
new file mode 100644
index 000000000000..9cde76382c7c
--- /dev/null
+++ b/www-servers/tomcat/files/6/tomcat.init.3
@@ -0,0 +1,124 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/files/6/tomcat.init.3,v 1.1 2011/02/14 23:09:40 fordfrog Exp $
+
+opts="${opts} forcestop"
+
+init_env_vars() {
+	# Populate JAVA_HOME
+	JAVA_HOME=`java-config --jre-home`
+
+	# Set some sane defaults
+	if [ -z "${CATALINA_TMPDIR}" ] ; then
+		CATALINA_TMPDIR="${CATALINA_BASE}"/temp
+	fi
+	JPDA_TRANSPORT=${JPDA_TRANSPORT:="dt_socket"}
+	JPDA_ADDRESS=${JPDA_ADDRESS:="8000"}
+	JPDA_OPTS=${JPDA_OPTS="-Xdebug -Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
+
+	# Activate Logging
+	if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
+		JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
+			-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
+	fi
+
+	# Populate the classpath
+	unset CLASSPATH
+	CLASSPATH="${CATALINA_HOME}/lib:${JAVA_HOME}/lib/tools.jar"
+	if [ -n "${JSSE_HOME}" ]; then
+		CLASSPATH="${CLASSPATH}:${JSSE_HOME}/lib/jcert.jar:${JSSE_HOME}/lib/jnet.jar:${JSSE_HOME}/lib/jsse.jar"
+	fi
+	CLASSPATH="${CLASSPATH}:${CATALINA_HOME}/bin/bootstrap.jar:${CATALINA_HOME}/bin/tomcat-juli.jar"
+
+	OPTS_CP="${JAVA_OPTS} ${CATALINA_OPTS} -classpath ${CLASSPATH}"
+
+	CATALINA_ARGS="-Dcatalina.base=${CATALINA_BASE} \
+			-Dcatalina.home=${CATALINA_HOME} \
+			-Djava.io.tmpdir=${CATALINA_TMPDIR} \
+			org.apache.catalina.startup.Bootstrap "
+
+	if [ ! -f "${CATALINA_BASE}logs/catalina.out" ]; then
+		touch "${CATALINA_BASE}logs/catalina.out"
+		chown "${CATALINA_USER}:${CATALINA_GROUP}" "${CATALINA_BASE}logs/catalina.out"
+	fi
+}
+
+ssd() {
+	local exec=${1}
+	shift
+	local args="--start --quiet --background \
+		--chdir "${CATALINA_TMPDIR}" \
+		--chuid ${CATALINA_USER}:${CATALINA_GROUP} \
+		--make-pidfile --pidfile /var/run/tomcat-6.pid"
+
+	# bug #243348
+	if [ -e /etc/init.d/sysfs ] ; then
+		args="${args} \
+			 --stdout ${CATALINA_BASE}/logs/catalina.out \
+			 --stderr ${CATALINA_BASE}/logs/catalina.out"
+		start-stop-daemon ${args} --exec ${exec} -- ${OPTS_CP} "$@" ${CATALINA_ARGS} ${TOMCAT_START}
+	else
+		start-stop-daemon ${args} --name ${exec} --startas /bin/bash -- -c \
+			"exec ${exec} ${OPTS_CP} $@ ${CATALINA_ARGS} ${TOMCAT_START} >> \
+			\"$CATALINA_BASE/logs/catalina.out\" 2>&1"
+	fi
+	return $?
+}
+
+depend() {
+	use dns logger net
+}
+
+start()	{
+	ebegin "Starting Tomcat"
+	init_env_vars
+
+	if [ ! -e "${CATALINA_TMPDIR}" ]; then
+		eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat."
+		eerror "Please see /etc/conf.d/tomcat-6 for more information."
+		eend 1
+	fi
+
+	# Figure out what args to pass start_helper based on TOMCAT_START
+	if [ "${TOMCAT_START}" = "debug" ] ; then
+		ssd ${JAVA_HOME}/bin/jdb \
+			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share
+	elif [ "${TOMCAT_START}" = "-security debug" ] ; then
+		ssd ${JAVA_HOME}/bin/jdb \
+			-sourcepath ${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share \
+			-Djava.security.manager \
+			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
+	elif [ "${TOMCAT_START}" = "jpda start" ] ; then
+		ssd ${JAVA_HOME}/bin/java ${JPDA_OPTS}
+	elif [ "${TOMCAT_START}" = "start" ] ; then
+		ssd ${JAVA_HOME}/bin/java
+	elif [ "${TOMCAT_START}" = "-security start" ] ; then
+		ssd ${JAVA_HOME}/bin/java \
+			-Djava.security.manager \
+			-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy
+	else
+		eerror "Invalid TOMCAT_START variable value, or one is not set"
+		eerror "Please see /etc/conf.d/tomcat-6 for more information"
+		eend 1
+	fi
+	eend $?
+}
+
+stop()	{
+	ebegin "Stopping Tomcat"
+	init_env_vars
+	start-stop-daemon --stop --quiet --retry=60 \
+	       	--pidfile /var/run/tomcat-6.pid \
+		--exec ${JAVA_HOME}/bin/java -- ${OPTS_CP} ${CATALINA_args} stop ${STD_OUT}
+	eend $?
+}
+forcestop()	{
+	ebegin "Forcing Tomcat to Stop"
+	start-stop-daemon --stop --quiet --retry=60 \
+		--pidfile /var/run/tomcat-6.pid --signal=9
+	if service_started "${SVCNAME}"; then
+		mark_service_stopped "${SVCNAME}"
+	fi
+	eend $?
+}
diff --git a/www-servers/tomcat/tomcat-6.0.32-r2.ebuild b/www-servers/tomcat/tomcat-6.0.32-r2.ebuild
new file mode 100644
index 000000000000..276444d9ad31
--- /dev/null
+++ b/www-servers/tomcat/tomcat-6.0.32-r2.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.32-r2.ebuild,v 1.1 2011/02/14 23:09:40 fordfrog Exp $
+
+EAPI=2
+JAVA_PKG_IUSE="doc examples source test"
+WANT_ANT_TASKS="ant-trax"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
+
+MY_P="apache-${P}-src"
+SLOT="6"
+SRC_URI="mirror://apache/${PN}/${PN}-6/v${PV/_/-}/src/${MY_P}.tar.gz"
+HOMEPAGE="http://tomcat.apache.org/"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+LICENSE="Apache-2.0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-java/eclipse-ecj:3.3
+	dev-java/ant-eclipse-ecj:3.3
+	>=dev-java/commons-dbcp-1.2.1
+	>=dev-java/commons-logging-1.1
+	>=dev-java/commons-pool-1.2
+	~dev-java/tomcat-servlet-api-${PV}
+	examples? ( dev-java/jakarta-jstl )"
+
+RDEPEND="
+	!<dev-java/tomcat-native-1.1.20
+	>=virtual/jre-1.5
+	>=dev-java/commons-daemon-1.0.1
+	dev-java/ant-core
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	${COMMON_DEPEND}
+	test? ( =dev-java/junit-3.8* )"
+
+S=${WORKDIR}/${MY_P}
+
+TOMCAT_NAME="${PN}-${SLOT}"
+TOMCAT_HOME="/usr/share/${TOMCAT_NAME}"
+WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
+
+# TODO: Fails to find PrettyPrint in with python 2.6 and xml-rewriter-3
+# Find out why so
+JAVA_ANT_CELEMENT_REWRITER="true"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_NEEDS_TOOLS="true"
+EANT_GENTOO_CLASSPATH="tomcat-servlet-api-2.5,eclipse-ecj-3.3"
+
+EANT_BUILD_TARGET="build-only"
+EANT_DOC_TARGET="build-docs"
+
+EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV} -Dversion.number=${PV}
+-Dcompile.debug=false -Djsp-api.jar=jsp-api.jar -Dservlet-api.jar=servlet-api.jar
+-Dant.jar=ant.jar"
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+	enewgroup tomcat 265
+	enewuser tomcat 265 -1 /dev/null tomcat
+}
+
+java_prepare() {
+	rm -v webapps/examples/WEB-INF/lib/*.jar || die
+
+	# bug # 178980 and #312293
+	if use amd64; then
+		java-pkg_force-compiler ecj-3.3
+	fi
+
+	if ! use doc; then
+		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
+	fi
+
+	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.3 ecj.jar)"
+	java-pkg_jarfrom --build-only ant-core ant.jar
+}
+
+src_install() {
+	cd "${S}/bin"
+	rm -f *.bat
+	chmod 755 *.sh
+
+	# register jars per bug #171496
+	cd "${S}/output/build/lib/"
+	for jar in *.jar; do
+		java-pkg_dojar ${jar}
+	done
+
+	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
+
+	# init.d, conf.d
+	newinitd "${FILESDIR}"/${SLOT}/tomcat.init.3 ${TOMCAT_NAME}
+	newconfd "${FILESDIR}"/${SLOT}/tomcat.conf ${TOMCAT_NAME}
+
+	# create dir structure
+	dodir /usr/share/${TOMCAT_NAME}
+
+	diropts -m750 -o tomcat -g tomcat
+	dodir   /etc/${TOMCAT_NAME}
+	keepdir ${WEBAPPS_DIR}
+
+	diropts -m755 -o tomcat -g tomcat
+	dodir   ${CATALINA_BASE}
+
+	diropts -m775 -o tomcat -g tomcat
+	dodir   /etc/${TOMCAT_NAME}/Catalina/localhost
+	keepdir /var/log/${TOMCAT_NAME}/
+	keepdir /var/run/${TOMCAT_NAME}/
+	keepdir /var/tmp/${TOMCAT_NAME}/
+
+	cd "${S}"
+	# fix context's so webapps will be deployed
+	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/host-manager"  a:' "${S}"/webapps/host-manager/META-INF/context.xml
+	sed -i -e 's:Context a:Context docBase="${catalina.home}/webapps/manager"  a:' "${S}"/webapps/manager/META-INF/context.xml
+
+	# 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 -pPR output/build/bin "${D}"/usr/share/${TOMCAT_NAME} \
+		|| die "failed to copy"
+	# webapps get stored in /usr/share/${TOMCAT_NAME}/webapps
+	cd "${S}"/webapps || die
+	ebegin "Installing webapps to /usr/share/${TOMCAT_NAME}"
+
+	dodir /usr/share/${TOMCAT_NAME}/webapps
+	cp -pR ROOT "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	cp -pR host-manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	cp -pR manager "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	if use doc; then
+		cp -pR docs "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	fi
+	if use examples; then
+		cd "${S}"/webapps/examples/WEB-INF/lib
+		java-pkg_jar-from jakarta-jstl jstl.jar
+		java-pkg_jar-from jakarta-jstl standard.jar
+		cd "${S}"/webapps
+		cp -pR examples "${D}"/usr/share/${TOMCAT_NAME}/webapps || die
+	fi
+
+	# replace catalina.policy with gentoo specific one bug #176701
+#	cp ${FILESDIR}/${SLOT}/catalina.policy "${D}"/etc/${TOMCAT_NAME} \
+#		|| die "failed to replace catalina.policy"
+
+#	cp "${T}"/tomcat6-deps/jdt/jasper-jdt.jar "${D}"/usr/share/${TOMCAT_NAME}/lib \
+#		|| die "failed to copy"
+
+	cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
+	java-pkg_jar-from tomcat-servlet-api-2.5
+	java-pkg_jar-from eclipse-ecj-3.3
+
+	# 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
+
+	#install *.sh scripts bug #278059
+	exeinto /usr/share/${TOMCAT_NAME}/bin
+	doexe "${S}"/bin/*.sh
+}
+
+pkg_postinst() {
+	ewarn "Changing ownership recursively on /etc/${TOMCAT_NAME}"
+	# temp fix for bug #176097
+	chown -fR tomcat:tomcat /etc/${TOMCAT_NAME}
+	ewarn "Owner ship changed to tomcat:tomcat. Temp hack/fix."
+
+	# bug #180519
+	if [[ -e "${ROOT}var/lib/${TOMCAT_NAME}/webapps/manager" ]] ; then
+		elog "The latest webapp has NOT been installed into"
+		elog "${ROOT}var/lib/${TOMCAT_NAME}/webapps/ because directory already exists"
+		elog "and we do not want to overwrite any files you have put there."
+		elog
+		elog "Installing latest webapp into"
+		elog "${ROOT}usr/share/${TOMCAT_NAME}/webapps instead"
+		elog
+		elog "Manager Symbolic Links NOT created."
+
+		else
+		einfo "Installing latest webroot to ${ROOT}/${WEBAPPS_DIR}"
+		cp -pR "${ROOT}"/usr/share/${TOMCAT_NAME}/webapps/* \
+			"${ROOT}""${WEBAPPS_DIR}"
+		# link the manager's context to the right position
+		dosym ${TOMCAT_HOME}/webapps/host-manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/host-manager.xml
+		dosym ${TOMCAT_HOME}/webapps/manager/META-INF/context.xml /etc/${TOMCAT_NAME}/Catalina/localhost/manager.xml
+	fi
+
+	elog
+	elog " This ebuild implements a FHS compliant layout for tomcat"
+	elog " Please read http://www.gentoo.org/proj/en/java/tomcat6-guide.xml"
+	elog " for more information."
+	elog
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+	elog
+
+	ewarn "The manager webapps have known exploits, please refer to"
+	ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2450"
+
+	if use examples ; then
+		ewarn
+		ewarn "The examples webapp has a known exploit, please refer to"
+		ewarn "http://cve.mitre.org/cgi-bin/cvename.cgi?name=2007-2449"
+		ewarn
+	fi
+
+	elog
+	elog " Please report any bugs to http://bugs.gentoo.org/"
+	elog
+}