Ebuild cleanup, removed older revisions
authorWilliam Thomson <wltjr@gentoo.org>
Sat, 4 Nov 2006 21:07:39 +0000 (21:07 +0000)
committerWilliam Thomson <wltjr@gentoo.org>
Sat, 4 Nov 2006 21:07:39 +0000 (21:07 +0000)
Package-Manager: portage-2.1.2_rc1-r1

www-servers/tomcat/Manifest
www-servers/tomcat/files/digest-tomcat-5.5.20 [deleted file]
www-servers/tomcat/files/digest-tomcat-5.5.20-r1 [deleted file]
www-servers/tomcat/tomcat-5.5.20-r1.ebuild [deleted file]
www-servers/tomcat/tomcat-5.5.20.ebuild [deleted file]

index 2c887a9093d18e2093eeceed1d8a4e2fe2642219..2926511f3023bb0089315a99ae4ef653d3387ac0 100644 (file)
@@ -154,22 +154,14 @@ EBUILD tomcat-5.5.17-r7.ebuild 10026 RMD160 c9ed391b49b799a3101326e9d3b5e0d71658
 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-r2.ebuild 10236 RMD160 803b546e349b196a101ea05d1270898f87df456b SHA1 3bf344200fda3db95ef798dd34b23e1adc667c44 SHA256 aae9bb56031ac2565d156de599e5c6e58076cb3ae7cd1d9672a9c478442c8961
 MD5 3ff07bfaf99e2a9666c74c9de87895ae tomcat-5.5.20-r2.ebuild 10236
 RMD160 803b546e349b196a101ea05d1270898f87df456b tomcat-5.5.20-r2.ebuild 10236
 SHA256 aae9bb56031ac2565d156de599e5c6e58076cb3ae7cd1d9672a9c478442c8961 tomcat-5.5.20-r2.ebuild 10236
-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
-SHA256 226a19b4d1357ef1e94afaac92cee0b551459357ff4513169b18940ea93ff760 tomcat-5.5.20.ebuild 10159
-MISC ChangeLog 25935 RMD160 9415bc6e4cf8fda110dba18dcd11eebce1c9c386 SHA1 dc83099ef3c6a1bb824bdd09b5b55e02739916ff SHA256 7d9c178555fa29ca5b547c27720dc0f57eb0bd3156e93a4d13c7cfa0e3e459f7
-MD5 aafe5b800221352458f0a7688ac8d3e7 ChangeLog 25935
-RMD160 9415bc6e4cf8fda110dba18dcd11eebce1c9c386 ChangeLog 25935
-SHA256 7d9c178555fa29ca5b547c27720dc0f57eb0bd3156e93a4d13c7cfa0e3e459f7 ChangeLog 25935
+MISC ChangeLog 26086 RMD160 67710c9c18f7abb9f5fefb8abdb46a1204470d3e SHA1 9e20cdd6c63f234de3f384db238dbaf5abd242b8 SHA256 a4b88a0cf8cb1321e4cca71d98649b90d96877850413f13727ff30f78bdb1f89
+MD5 be288887ef24a9b8e24c12016fdacee9 ChangeLog 26086
+RMD160 67710c9c18f7abb9f5fefb8abdb46a1204470d3e ChangeLog 26086
+SHA256 a4b88a0cf8cb1321e4cca71d98649b90d96877850413f13727ff30f78bdb1f89 ChangeLog 26086
 MISC metadata.xml 558 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea SHA1 6ab9eadb2a8f19b0d4ea1f02ba88315d49e61fb1 SHA256 d5b4cdcd581677edce5b62c586d618f4c95660127fcb2fb7157f83e6d0e35fce
 MD5 e26537a19167254676bb36654dc01f91 metadata.xml 558
 RMD160 f81f3d20ca526007bbd8f0f88deffb7a097334ea metadata.xml 558
@@ -183,12 +175,6 @@ SHA256 2c09d3ad89eb04ab24e5c95a9492d7f461e1935bdb076100010cd3d4f7cb8796 files/di
 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
-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
 MD5 8adc14a8534e1c6f8d5f96b371e1895f files/digest-tomcat-5.5.20-r2 277
 RMD160 b9c5deac84bf5acd7a65ad80bdfaca9f7e343f3f files/digest-tomcat-5.5.20-r2 277
 SHA256 fda2efc7c4fe103d3fec9599fe3797d8784381008f71d9006c7224db91862b30 files/digest-tomcat-5.5.20-r2 277
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.20 b/www-servers/tomcat/files/digest-tomcat-5.5.20
deleted file mode 100644 (file)
index 25cb711..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5775bae8fac16a0e3a2c913c4768bb37 apache-tomcat-5.5.20-src.tar.gz 4796377
-RMD160 587590d2e272d1ede73501b62933f544cd969822 apache-tomcat-5.5.20-src.tar.gz 4796377
-SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 apache-tomcat-5.5.20-src.tar.gz 4796377
diff --git a/www-servers/tomcat/files/digest-tomcat-5.5.20-r1 b/www-servers/tomcat/files/digest-tomcat-5.5.20-r1
deleted file mode 100644 (file)
index 25cb711..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5775bae8fac16a0e3a2c913c4768bb37 apache-tomcat-5.5.20-src.tar.gz 4796377
-RMD160 587590d2e272d1ede73501b62933f544cd969822 apache-tomcat-5.5.20-src.tar.gz 4796377
-SHA256 19f24717fb3e2db902c33e21650dfa88bbf98428c15b1ed68ecaf7a9150e4a77 apache-tomcat-5.5.20-src.tar.gz 4796377
diff --git a/www-servers/tomcat/tomcat-5.5.20-r1.ebuild b/www-servers/tomcat/tomcat-5.5.20-r1.ebuild
deleted file mode 100644 (file)
index 181f01c..0000000
+++ /dev/null
@@ -1,331 +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.20-r1.ebuild,v 1.1 2006/10/10 01:59:50 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"
-
-IUSE="admin java5 doc examples source test"
-
-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
-       admin? ( =dev-java/struts-1.2* )
-       dev-java/sun-javamail
-       java5? ( >=virtual/jre-1.5 )
-       !java5? (
-               =virtual/jre-1.4*
-               >=dev-java/commons-httpclient-2.0
-               dev-java/sun-jaf
-               ~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"
-
-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} -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 mail.jar)"
-       if use admin; then
-               antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
-               antflags="${antflags} -Dstruts.home=/usr/share/struts"
-       fi
-       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 sun-jaf)"
-               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 xml-commons-external-1.3 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
-       if use admin; then
-               cp ${S}/container/webapps/admin/admin.xml \
-                       conf/Catalina/localhost
-       fi
-       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
-       if use admin; then
-               cd server/webapps/admin/WEB-INF/lib
-               rm -f struts.jar
-               java-pkg_jar-from struts-1.2 struts.jar
-               cd ${base}
-       else
-               rm -fR server/webapps/admin
-       fi
-
-       # 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
-}
diff --git a/www-servers/tomcat/tomcat-5.5.20.ebuild b/www-servers/tomcat/tomcat-5.5.20.ebuild
deleted file mode 100644 (file)
index 85028ea..0000000
+++ /dev/null
@@ -1,331 +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.20.ebuild,v 1.1 2006/09/28 16:36:00 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"
-
-IUSE="admin java5 doc examples source test"
-
-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
-       admin? ( =dev-java/struts-1.2* )
-       dev-java/sun-javamail
-       java5? ( >=virtual/jre-1.5 )
-       !java5? (
-               =virtual/jre-1.4*
-               >=dev-java/commons-httpclient-2.0
-               dev-java/sun-jaf
-               ~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"
-
-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} -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 mail.jar)"
-       if ! use admin; then
-               antflags="${antflags} -Dstruts.jar=$(java-pkg_getjar struts-1.2 struts.jar)"
-               antflags="${antflags} -Dstruts.home=/usr/share/struts"
-       fi
-       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 sun-jaf)"
-               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 xml-commons-external-1.3 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
-       if use admin; then
-               cp ${S}/container/webapps/admin/admin.xml \
-                       conf/Catalina/localhost
-       fi
-       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
-       if use admin; then
-               cd server/webapps/admin/WEB-INF/lib
-               rm -f struts.jar
-               java-pkg_jar-from struts-1.2 struts.jar
-               cd ${base}
-       else
-               rm -fR server/webapps/admin
-       fi
-
-       # 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
-}