Corrected Tomcat's build.xml patch to no longer comment out build-webapps-precompile and fix-webapps target. Which due to upstream changes of those targets were preventing all aspects of the admin webapp from being built. Users reporting issues like bug # 150562. I suspect aspects from other webapps were missing as well but not reported or confirmed. This should resolve any, short of anyones objects to the precompile target and it's functions

Package-Manager: portage-2.1.2_pre2-r6

3 files changed, 11 insertions, 346 deletions

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index c64d82635fa6..3431adcf9a00 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 5.0.27/gentoo.diff 463 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc SHA1 2cac8406125e5bd360fed919eeb0d4685969462b SHA256 d8c9da161ae1274479f88f69821be780bd70ebfe7ad9c2f92db0f03f4b4c9401
 MD5 cbb635ed31e3b7ddabe1db851a8b471e files/5.0.27/gentoo.diff 463
 RMD160 ace3fcd5d4d42e987840a0ba46c2f2e5db545dfc files/5.0.27/gentoo.diff 463
@@ -149,10 +146,10 @@ AUX 5.5.20/tomcatbuild-xml-examples.patch 2766 RMD160 2693d0e3c1a61eec4a00133264
 MD5 263ec369e78ddd9d4bfc7e60de2b1a9d files/5.5.20/tomcatbuild-xml-examples.patch 2766
 RMD160 2693d0e3c1a61eec4a001332648e21be92741c60 files/5.5.20/tomcatbuild-xml-examples.patch 2766
 SHA256 5f4f8541fd68b71ae659d970e0671c35f3f4edcd54e54e2f9db44876dbeb0824 files/5.5.20/tomcatbuild-xml-examples.patch 2766
-AUX 5.5.20/tomcatbuild-xml.patch 5235 RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 SHA1 7a97a4e3ab76228c3d6964355dd3b5a9b3bce33a SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec
-MD5 276495751102b4c1e19aa944043055e6 files/5.5.20/tomcatbuild-xml.patch 5235
-RMD160 b82aae53ac882e5914aea8dfc8f80283bee7f9b1 files/5.5.20/tomcatbuild-xml.patch 5235
-SHA256 d5f621c8d3972a88a057db3c028baedf4affab4333c3f1c6117461d3dd0b6cec files/5.5.20/tomcatbuild-xml.patch 5235
+AUX 5.5.20/tomcatbuild-xml.patch 4976 RMD160 6acb607da6859c90515a63026f75ab2b45f0d5c1 SHA1 3f6fda75dbb7342e9bbcff1bbc45df119a039803 SHA256 61b5d509e8e9956072769346cc65d8e41ac16f8e36a83495249be505d3b610ba
+MD5 4d23fa5f0c0183d7c719ee8167a6895e files/5.5.20/tomcatbuild-xml.patch 4976
+RMD160 6acb607da6859c90515a63026f75ab2b45f0d5c1 files/5.5.20/tomcatbuild-xml.patch 4976
+SHA256 61b5d509e8e9956072769346cc65d8e41ac16f8e36a83495249be505d3b610ba files/5.5.20/tomcatbuild-xml.patch 4976
 DIST apache-tomcat-5.5.17-src.tar.gz 4282022 RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 SHA1 d59994d06608fe13eb42a65484ccb1fdcca325e2 SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8
 DIST apache-tomcat-5.5.20-src.tar.gz 4796377 RMD160 587590d2e272d1ede73501b62933f544cd969822 SHA1 cc416242d8c9e1978702a207e305ca97afe53d4d SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77
 DIST jakarta-tomcat-5.0.27.tar.gz 10298374 RMD160 a333fcb531bb98af20db6e0a10d3e8b2c72ee1fa SHA1 5f3981ecdd67e2b9774e643b336ad98ebc1bd4e3 SHA256 873fc94b4316235091e69bca926bd66a0fb9fab542016e582a03323ed6777d78
@@ -165,14 +162,14 @@ EBUILD tomcat-5.0.28-r14.ebuild 9390 RMD160 478f2fb9f2774698020b4e2d52c46e69a323
 MD5 e13a973aead688e85bc744c7832c12e5 tomcat-5.0.28-r14.ebuild 9390
 RMD160 478f2fb9f2774698020b4e2d52c46e69a3233c60 tomcat-5.0.28-r14.ebuild 9390
 SHA256 20aab2cf8b43bd6e56d983bd0f7c52139f72ae9258c70356b98d58e13ca7a93e tomcat-5.0.28-r14.ebuild 9390
-EBUILD tomcat-5.5.17-r6.ebuild 10024 RMD160 e97c1373f46501a034a06eaaf214f47961a64eb2 SHA1 1add453cdf1050770f5179375c3f6c0b56073e9f SHA256 5fcb3706a2a5aa7fd3823b76d8ab57d84e448501c8bac8653b4d8dc14a90ac74
-MD5 eaa1497616248ef70dd7419bd4b39d62 tomcat-5.5.17-r6.ebuild 10024
-RMD160 e97c1373f46501a034a06eaaf214f47961a64eb2 tomcat-5.5.17-r6.ebuild 10024
-SHA256 5fcb3706a2a5aa7fd3823b76d8ab57d84e448501c8bac8653b4d8dc14a90ac74 tomcat-5.5.17-r6.ebuild 10024
 EBUILD tomcat-5.5.17-r7.ebuild 10026 RMD160 c9ed391b49b799a3101326e9d3b5e0d71658d034 SHA1 0e7ee5cc9398575f4c5f64d8e15b828f97e19505 SHA256 1c0e5a968089d97216f51b985ee25e615845cd26a538734e0b4f616fa75c0ea6
 MD5 8371674bc81a3d62d335fb0c26037a1f tomcat-5.5.17-r7.ebuild 10026
 RMD160 c9ed391b49b799a3101326e9d3b5e0d71658d034 tomcat-5.5.17-r7.ebuild 10026
 SHA256 1c0e5a968089d97216f51b985ee25e615845cd26a538734e0b4f616fa75c0ea6 tomcat-5.5.17-r7.ebuild 10026
+EBUILD tomcat-5.5.20-r1.ebuild 10160 RMD160 6bb48ece42420fcb236e1996b6756365bdb21b5c SHA1 24ced1006c840c1ad9b846774de333cc64de7fff SHA256 9fdafe2f1873958ede8e308256649ab8cbef92159920a2a401e74f321afc75f1
+MD5 b274087a9eeb3bb8b2cce756acfca69e tomcat-5.5.20-r1.ebuild 10160
+RMD160 6bb48ece42420fcb236e1996b6756365bdb21b5c tomcat-5.5.20-r1.ebuild 10160
+SHA256 9fdafe2f1873958ede8e308256649ab8cbef92159920a2a401e74f321afc75f1 tomcat-5.5.20-r1.ebuild 10160
 EBUILD tomcat-5.5.20.ebuild 10159 RMD160 ccb63bc3de9f6885378d0b460f54e900f36ba65e SHA1 5e42b03c4d37167c6baa0131908c220fc3ef5f2f SHA256 226a19b4d1357ef1e94afaac92cee0b551459357ff4513169b18940ea93ff760
 MD5 ece22bdbe2b716ccc17046c2babd6e66 tomcat-5.5.20.ebuild 10159
 RMD160 ccb63bc3de9f6885378d0b460f54e900f36ba65e tomcat-5.5.20.ebuild 10159
@@ -191,19 +188,12 @@ SHA256 8adce6bec0e657beb514e68dc8196cca8650ec0f2b5d1e421106ccc9fe954531 files/di
 MD5 d942ea8b8317ba352e744aed2d284d01 files/digest-tomcat-5.0.28-r14 280
 RMD160 7283323e161ab5dd3a94549def34af040891e49a files/digest-tomcat-5.0.28-r14 280
 SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/digest-tomcat-5.0.28-r14 280
-MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r6 277
-RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r6 277
-SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r6 277
 MD5 b8576467d4d99bc9c4862c31d5839d56 files/digest-tomcat-5.5.17-r7 277
 RMD160 6a37c8c24770ea3fdb63334615303b56350f1cf9 files/digest-tomcat-5.5.17-r7 277
 SHA256 99d72ea7a66a7df313d7f01eeb4bd0d7e6e0325601affc35142b9df1371398e7 files/digest-tomcat-5.5.17-r7 277
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20 277
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFFJRxQKRy60XGEcJIRAlT4AJ9xdJ+xlzTdEVooPZroc/NX43fpMQCgiD0W
-uk3gWMsftx6udZBw+1n+cbA=
-=gmHG
------END PGP SIGNATURE-----
+MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r1 277
+RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r1 277
+SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r1 277
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.17-r6 b/www-servers/tomcat/files/digest-tomcat-5.5.17-r6
deleted file mode 100644
index 51d603367aa1..000000000000
--- a/www-servers/tomcat/files/digest-tomcat-5.5.17-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 afedf090888029b19a1bebc471264105 apache-tomcat-5.5.17-src.tar.gz 4282022
-RMD160 004d87bc64b32eee42f9979d2fdbb36836b69015 apache-tomcat-5.5.17-src.tar.gz 4282022
-SHA256 295c9fa64d9aa81d5c836b694804d8d57fcfdbc76b9889a044852aa73f2c3ad8 apache-tomcat-5.5.17-src.tar.gz 4282022
diff --git a/www-servers/tomcat/tomcat-5.5.17-r6.ebuild b/www-servers/tomcat/tomcat-5.5.17-r6.ebuild
deleted file mode 100644
index ded6e0c5c6a6..000000000000
--- a/www-servers/tomcat/tomcat-5.5.17-r6.ebuild
+++ /dev/null
@@ -1,322 +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-5.5.17-r6.ebuild,v 1.1 2006/09/20 17:53:27 wltjr Exp $
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Apache Servlet-2.4/JSP-2.0 Container"
-
-MY_P="apache-${P}-src"
-SLOT="5.5"
-SRC_URI="mirror://apache/${PN}/${PN}-5/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://jakarta.apache.org/tomcat"
-KEYWORDS="~amd64 ~x86"
-LICENSE="Apache-2.0"
-
-RDEPEND="=dev-java/eclipse-ecj-3.1*
-	=dev-java/commons-beanutils-1.7*
-	>=dev-java/commons-collections-3.1
-	>=dev-java/commons-daemon-1.0.1
-	>=dev-java/commons-dbcp-1.2.1
-	>=dev-java/commons-digester-1.7
-	>=dev-java/commons-fileupload-1.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/log4j-1.2.9
-	~dev-java/servletapi-2.4
-	=dev-java/struts-1.2*
-	dev-java/sun-javamail-bin
-	java5? ( >=virtual/jre-1.5 )
-	!java5? (
-		=virtual/jre-1.4*
-		>=dev-java/commons-httpclient-2.0
-		=dev-java/gnu-jaf-1*
-		~dev-java/jaxen-1.0
-		>=dev-java/junit-3.8.1
-		=dev-java/mx4j-3*
-		>=dev-java/saxpath-1.0
-		>=dev-java/xerces-2.7.1
-	   	=dev-java/xml-commons-external-1.3*
-	   )"
-DEPEND="java5? ( >=virtual/jdk-1.5 )
-	!java5? ( =virtual/jdk-1.4* )
-	${RDEPEND}
-	sys-apps/sed
-	dev-java/ant"
-IUSE="java5 doc examples source test"
-
-if ! use java5; then
-	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.4*"
-else
-	JAVA_PKG_NV_DEPEND="=virtual/jdk-1.5*"
-fi
-
-S=${WORKDIR}/${MY_P}
-
-TOMCAT_HOME="/usr/share/${PN}-${SLOT}"
-TOMCAT_NAME="${PN}-${SLOT}"
-WEBAPPS_DIR="/var/lib/${TOMCAT_NAME}/webapps"
-
-pkg_setup() {
-	# new user for tomcat
-	enewgroup tomcat
-	enewuser tomcat -1 -1 /dev/null tomcat
-
-	if use java5; then
-		JAVA_PKG_WANT_SOURCE="1.5"
-		JAVA_PKG_WANT_TARGET="1.5"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	local PATCHES="
-		mainbuild-xml.patch
-		tomcatbuild-xml.patch
-		catalinabuild-xml.patch
-		jasperbuild-xml.patch
-	"
-	for patch in ${PATCHES}; do
-		epatch "${FILESDIR}/${PV}/${patch}"
-	done
-	if ! use doc; then
-		epatch "${FILESDIR}/${PV}/tomcatbuild-xml-docs.patch"
-	fi
-	if ! use examples; then
-		epatch "${FILESDIR}/${PV}/tomcatbuild-xml-examples.patch"
-		epatch "${FILESDIR}/${PV}/jsr152build-xml-examples.patch"
-		epatch "${FILESDIR}/${PV}/jsr154build-xml-examples.patch"
-	fi
-
-	# avoid packed jars :-)
-	mkdir -p ${S}/build/build/common
-	cd ${S}/build/build
-
-	mkdir ./bin && cd ./bin
-	java-pkg_jar-from commons-logging commons-logging-api.jar
-	java-pkg_jar-from commons-daemon
-	if ! use java5; then
-		java-pkg_jar-from mx4j-3.0 mx4j.jar jmx.jar
-		java-pkg_jar-from mx4j-3.0 mx4j-rjmx.jar jmx-remote.jar
-	fi
-
-	if ! use java5; then
-		mkdir ${S}/build/build/common/endorsed && cd ${S}/build/build/common/endorsed
-		java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
-		java-pkg_jar-from xerces-2 xercesImpl.jar
-	fi
-
-	mkdir ${S}/build/build/common/lib && cd ${S}/build/build/common/lib
-	java-pkg_jar-from ant-core
-	java-pkg_jar-from commons-collections
-	java-pkg_jar-from commons-dbcp
-	java-pkg_jar-from commons-el
-	java-pkg_jar-from commons-pool
-	java-pkg_jar-from servletapi-2.4
-
-	mkdir -p ${S}/build/build/server/lib && cd ${S}/build/build/server/lib
-	java-pkg_jar-from commons-beanutils-1.7 commons-beanutils.jar
-	java-pkg_jar-from commons-digester
-	java-pkg_jar-from commons-fileupload
-	java-pkg_jar-from commons-modeler
-}
-
-src_compile(){
-	local antflags="-Dbase.path=${T}"
-
-	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-dbcp.jar=$(java-config -p commons-dbcp)"
-	antflags="${antflags} -Dcommons-el.jar=$(java-config -p commons-el)"
-	antflags="${antflags} -Dcommons-pool.jar=$(java-config -p commons-pool)"
-	antflags="${antflags} -Dcommons-fileupload.jar=$(java-config -p commons-fileupload)"
-	antflags="${antflags} -Dcommons-launcher.jar=$(java-config -p commons-launcher)"
-	antflags="${antflags} -Dcommons-modeler.jar=$(java-config -p commons-modeler)"
-	antflags="${antflags} -Djunit.jar=$(java-config -p junit)"
-	antflags="${antflags} -Djdt.jar=$(java-pkg_getjar eclipse-ecj-3.1 ecj.jar)"
-	antflags="${antflags} -Dlog4j.jar=$(java-config -p log4j)"
-	antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
-	antflags="${antflags} -Dcommons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 commons-beanutils.jar)"
-	antflags="${antflags} -Dcommons-logging.jar=$(java-pkg_getjar commons-logging commons-logging.jar)"
-	antflags="${antflags} -Dcommons-logging-api.jar=$(java-pkg_getjar commons-logging commons-logging-api.jar)"
-	antflags="${antflags} -Dmail.jar=$(java-pkg_getjar sun-javamail-bin mail.jar)"
-	antflags="${antflags} -Dstruts.home=/usr/share/struts"
-	antflags="${antflags} -Djasper.home=${S}/jasper"
-	if ! use java5; then
-		antflags="${antflags} -Dcommons-httpclient.jar=$(java-config -p commons-httpclient)"
-		antflags="${antflags} -Dactivation.jar=$(java-config -p gnu-jaf-1)"
-		antflags="${antflags} -Djaxen.jar=$(java-pkg_getjar jaxen jaxen-full.jar)"
-		antflags="${antflags} -Djmx.jar=$(java-pkg_getjar mx4j-3.0 mx4j.jar)"
-		antflags="${antflags} -Djmx-remote.jar=$(java-pkg_getjar mx4j-3.0 mx4j-rjmx.jar)"
-		antflags="${antflags} -Dsaxpath.jar=$(java-pkg_getjar saxpath saxpath.jar)"
-		antflags="${antflags} -DxercesImpl.jar=$(java-pkg_getjar xerces-2 xercesImpl.jar)"
-		antflags="${antflags} -Dxml-apis.jar=$(java-pkg_getjar xerces-2 xml-apis.jar)"
-	fi
-
-	eant ${antflags}
-
-}
-
-src_install() {
-	cd ${S}/build/build
-
-	# init.d, conf.d
-	newinitd ${FILESDIR}/${PV}/tomcat.init ${TOMCAT_NAME}
-	newconfd ${FILESDIR}/${PV}/tomcat.conf ${TOMCAT_NAME}
-
-	# create dir structure
-	diropts -m755 -o tomcat -g tomcat
-	dodir /usr/share/${TOMCAT_NAME}
-	keepdir /var/log/${TOMCAT_NAME}/
-	keepdir /var/tmp/${TOMCAT_NAME}/
-	keepdir /var/run/${TOMCAT_NAME}/
-
-	local CATALINA_BASE=/var/lib/${TOMCAT_NAME}/
-	dodir   ${CATALINA_BASE}
-	keepdir ${CATALINA_BASE}/shared/lib
-	keepdir ${CATALINA_BASE}/shared/classes
-
-	keepdir /usr/share/${TOMCAT_NAME}/${CATALIA_HOME}/common/lib
-
-	dodir   /etc/${TOMCAT_NAME}
-	fperms  750 /etc/${TOMCAT_NAME}
-
-	diropts -m0755
-
-	# we don't need dos scripts
-	rm -f bin/*.bat
-
-	# copy the manager and admin context's to the right position
-	mkdir -p conf/Catalina/localhost
-	cp ${S}/container/webapps/admin/admin.xml \
-		conf/Catalina/localhost
-	cp ${S}/container/webapps/manager/manager.xml \
-		conf/Catalina/localhost
-
-	# make the jars available via java-config -p and jar-from, etc
-	base=$(pwd)
-	libdirs="common/lib server/lib"
-	for dir in ${libdirs}
-	do
-		cd ${dir}
-
-		for jar in *.jar;
-		do
-			# replace the file with a symlink
-			if [ ! -L ${jar} ]; then
-				java-pkg_dojar ${jar}
-				rm -f ${jar}
-				ln -s ${DESTTREE}/share/${TOMCAT_NAME}/lib/${jar} ${jar}
-			fi
-		done
-
-		cd ${base}
-	done
-
-	# replace a packed struts.jar
-	cd server/webapps/admin/WEB-INF/lib
-	rm -f struts.jar
-	java-pkg_jar-from struts-1.2 struts.jar
-	cd ${base}
-
-	# 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,server-minimal}.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 common server ${D}/usr/share/${TOMCAT_NAME} || die "failed to copy"
-
-	keepdir               ${WEBAPPS_DIR}
-	set_webapps_perms     ${D}/${WEBAPPS_DIR}
-
-	# 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
-	if use doc; then
-		cp -pr webapps/tomcat-docs ${D}${CATALINA_BASE}/webapps
-	fi
-	if use examples; then
-		cp -pr webapps/{jsp-examples,servlets-examples,webdav} \
-			${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}/build/{RELEASE-NOTES,RUNNING.txt}
-	fperms 640 /etc/${TOMCAT_NAME}/tomcat-users.xml
-}
-
-pkg_postinst() {
-	#due to previous ebuild bloopers, make sure everything is correct
-	chown root:root /etc/init.d/${TOMCAT_NAME}
-	chown root:root /etc/conf.d/${TOMCAT_NAME}
-
-	einfo
-	ewarn " This ebuild implements a new filesystem layout for tomcat"
-	ewarn " please read http://www.gentoo.org/proj/en/java/tomcat-guide.xml"
-	ewarn " for more information!."
-	einfo
-	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
-	einfo " may not get seen.  Thank you."
-	einfo
-
-#	einfo "Run emerge --config =${PF}"
-#	einfo "to configure Tomcat if you need to for example"
-#	einfo "change the home directory of the Tomcat user."
-}
-
-#helpers
-set_webapps_perms() {
-	chown  tomcat:tomcat ${1} || die "Failed to change owner off ${1}."
-	chmod  750           ${1} || die "Failed to change permissions off ${1}."
-}
-
-pkg_config() {
-	# Better suggestions are welcome
-	local currentdir="$(getent passwd tomcat | gawk -F':' '{ print $6 }')"
-
-	einfo "The default home directory for Tomcat is /dev/null."
-	einfo "You need to change it if your applications needs it to"
-	einfo "be an actual directory. Current home directory:"
-	einfo "${currentdir}"
-	einfo ""
-	einfo "Do you want to change it [yes/no]?"
-
-	local answer
-	read answer
-
-	if [[ "${answer}" == "yes" ]]; then
-		einfo ""
-		einfo "Suggestions:"
-		einfo "${WEBAPPS_DIR}"
-		einfo ""
-		einfo "If you want to suggest a directory, file a bug to"
-		einfo "http://bugs.gentoo.org"
-		einfo ""
-		einfo "Enter home directory:"
-
-		local homedir
-		read homedir
-
-		einfo ""
-		einfo "Setting home directory to: ${homedir}"
-
-		/usr/sbin/usermod -d"${homedir}" tomcat
-
-		einfo "You can run emerge --config =${PF}"
-		einfo "again to change to homedir"
-		einfo "at any time."
-	fi
-}