www-servers/tomcat: removed obsolete versions

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

5 files changed, 7 insertions, 619 deletions

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 3bf703b3873a..ee79d0e5eb9b 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-servers/tomcat
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.288 2012/03/25 16:58:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.289 2012/03/25 20:09:06 fordfrog Exp $
+
+  25 Mar 2012; Miroslav Šulc <fordfrog@gentoo.org>
+  -files/7/7.0.25-build-xml.patch, -tomcat-6.0.32-r1.ebuild,
+  -tomcat-7.0.25.ebuild:
+  Removed obsolete versions
 
   25 Mar 2012; Agostino Sarubbo <ago@gentoo.org> tomcat-7.0.26.ebuild:
   Stable for amd64, wrt bug #409609
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 8984abf5a57a..ae5da9fd6f67 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,36 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX 6/catalina.policy 6956 RMD160 957ad3b5dc4aeaa5acd289cdaada0a2e48974d52 SHA1 13b65455c8f52fff9d1b09ea67e93ec7a88f1a47 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5
 AUX 6/tomcat.conf 2895 RMD160 36ece62ddff5257c04f47d75b9c77bd4dc198652 SHA1 8fef42463b7bf186e2f1d1aeb083bdb370603265 SHA256 b04b085618be755ad9e1796fcbcbb8c2e192eefda3b240f1c06b0d9cc88f2ff0
 AUX 6/tomcat.init.2 4034 RMD160 28a47d7e62ac5437eb2c9164f4595bd67b86f676 SHA1 c55f843f15db90e3e0af6069dfefc91daa4e0015 SHA256 55abf160871648ebeca531865b5918846cf298dadc9cdc5cc7ee060a8db487ad
 AUX 6/tomcat.init.3 4050 RMD160 d7fe0c83c7e5aeb30f2946c259c9f2bb3fe98aa8 SHA1 1519b957d5c467d604e5422f7876a08d79874ca5 SHA256 726fbfd0961df4a6fb70df17f72144a3f19c1080bd6f1f6abdadd849d5dd343c
 AUX 6/tomcat.init.4 4052 RMD160 cc78f9de540487a3fa456e1f88f4e3d016856b68 SHA1 cfba63b9d42e3e039e899e00b58a9c04460ae9b2 SHA256 f7e9b18f0381ae5ba6c0c28cf03a40a7f8b6256f61d630a4f7a941be01cc599d
 AUX 7/7.0.23-build-xml.patch 4897 RMD160 3b3b5755bd40e759985643f95f26e88069780f3c SHA1 8948dc0f168384670d6e69947de42069c30d78fd SHA256 e6f171cbdfa1af457dfe72be86a316e07a9bb9c22d3c98c094a0972ee4c38011
-AUX 7/7.0.25-build-xml.patch 4947 RMD160 73a69d96e362ef3535bd52be962e16583ffa2c6b SHA1 7928ed6a2504f8fdda2091708883f35a61475b5b SHA256 0b4d41ae8eec8077f7772662fe65a8a3c44e399599c90f9f14d3d2875e20adea
 AUX 7/7.0.26-build-xml.patch 4947 RMD160 73a69d96e362ef3535bd52be962e16583ffa2c6b SHA1 7928ed6a2504f8fdda2091708883f35a61475b5b SHA256 0b4d41ae8eec8077f7772662fe65a8a3c44e399599c90f9f14d3d2875e20adea
 AUX 7/tomcat.conf 2895 RMD160 e0f3b7f72b925a5d681780e1dcdde46143daef48 SHA1 1b94de2c71c046045b5622756d976378678200a3 SHA256 834b38c1e17294ee73c6571a45fb35bc398f15da4ed189e4d359b8b39121bb8e
 AUX 7/tomcat.init 3505 RMD160 6fd99e04c94ca5cccd61d4dce4f35fa9f058488f SHA1 1e550da27a648a36eec9a4e3991e77992fdbd7c8 SHA256 9b2eaaadc9ccf25cf56212d3ca0574bba286fef7895c0a56327d5c3d5f98f5d5
-DIST apache-tomcat-6.0.32-src.tar.gz 3394648 RMD160 e6203645e6570564b25154018436d908c5b1a71a SHA1 ec94c511e54da2b02dd2ba45b9fd1703d5771a45 SHA256 aa2b72343f2d7f5090e8aabdbf6e0c4f65cd504a719ebb2e18268207ff2c426c
 DIST apache-tomcat-6.0.35-src.tar.gz 3403286 RMD160 d292b210fe62aafec4a074e3a626766585367a3e SHA1 1a47ad41d52a27757cfeddf7fa1627688ed4027a SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764
 DIST apache-tomcat-7.0.23-src.tar.gz 4103854 RMD160 ebe500ffcc7903c6f4d301533a2a16cb878d11ef SHA1 fe56adb0939825c4f7c0f69e57858b1fb93ae958 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0
-DIST apache-tomcat-7.0.25-src.tar.gz 4114977 RMD160 2ba8934a16b994702722f15fac5511da7b2c9966 SHA1 009b5bf79bb155894d256061bdc141c2e520a05e SHA256 645bcf6e6f09e85c84d1ce9c000bd1eda6f4dac040063ef32531b4fc736b2a35
 DIST apache-tomcat-7.0.26-src.tar.gz 4127697 RMD160 809b05b3b41c1712579d8a9f90641c3e54ad2f9d SHA1 05f40cb17c99d7d135cdfcd16005b9a59a7f1392 SHA256 864304e76ff6edb284fc56d7297f8e0711ce0968c9f735c89b2617d70694cc0e
-EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
 EBUILD tomcat-6.0.35.ebuild 6985 RMD160 048285bb084918490b679f8074c2d8725e4b0161 SHA1 be111aaa36c5dcb7e02f018c9bcd58645c4fe711 SHA256 49ab1c00568f34f75f98a9c865731ed31aa740385d68eb350a56e1ebdddc7346
 EBUILD tomcat-7.0.23-r3.ebuild 7638 RMD160 8a804145e24e1fcc1d2991937cc4889bae16ce5a SHA1 b2aaf63f1f81edbf9bc4dd12ef828f77f36d7f7f SHA256 a94b38f501e7c4f3db23570510dd274dcacd867dcf5ec9320829a5234bb331bf
-EBUILD tomcat-7.0.25.ebuild 7634 RMD160 d2a581f91dbf5f35bdea564315443806a237b972 SHA1 695db930f39d8922aa729a7bcd9ece8e146ab954 SHA256 bd913e46beba1d5e6b114359c8351102f9ad628d50626e293a184668c6bef139
 EBUILD tomcat-7.0.26.ebuild 7634 RMD160 523c1959050f94839f608c3004610bac1c65a97b SHA1 d84a90e2bf7081f1af621eed33c4b6a453f4eea3 SHA256 bdfdb09fd372f3346062f451ae4130e4299baba0fe452ab0007297e6ce23fe73
-MISC ChangeLog 70667 RMD160 dc8cfb5af39e89333f05c5d14477bdbde66e36e2 SHA1 fabd7e84e0c25ef97b26f50374b7216bca324271 SHA256 85c455a7be7d7ad7a033e48df3c6e091d53fa7251156225c0f1d16fa019ed498
+MISC ChangeLog 70839 RMD160 d4ae1eaeff3f97da1b9299d8ed174b7abdd9877e SHA1 3e988e34baafae27b37ef18a0747ce1daa9956d1 SHA256 9ac548f731eff1af3adc40eadc710f0280c333a5d0c15a82aa98b038c6141d47
 MISC metadata.xml 451 RMD160 965e7cb85fbf383be678e48d2ae0cdf7b4247c99 SHA1 9b3717d68fdd17b010345fb0a63ad9aa0126dc42 SHA256 b508f373350a4e92bc04ebafa528a5c50eac8bfbd67d2fab6a4fa82811d1f109
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQEcBAEBCgAGBQJPb07FAAoJEOTDgjZ80txd+jYH/3te0J147JxydBZGZpoBA+Na
-ZlfTMDUrme7nC/KDtt20CJ4SPL+L1uvXvNeWQs9AMBnILQGQKGcDK6lt2gJYGHCh
-dFLYW19RCUHh6WUEf9db+KAoa9/6sznGGKElsIICWiqvHr16AqBLB5d68BKjbc4M
-3Ez02Vc5fn63dXvL0xDlyVkkDqsk+g252tLT9+O9Kyma1GnXsqxZv+LgXcEOczba
-Cz8zPIgnoP9J8q5OWiiaXWU5Qwepqvilgf5mBJxGSof9idRzRtQaXzU4AvllVIiq
-ViaNyaggXzZArIFnLclwYwfk/lR8COWwQ2cH8cOxQV/Dw8Z1Qn4TAU526xJmrCE=
-=WRVO
------END PGP SIGNATURE-----
diff --git a/www-servers/tomcat/files/7/7.0.25-build-xml.patch b/www-servers/tomcat/files/7/7.0.25-build-xml.patch
deleted file mode 100644
index 50c21e21ef44..000000000000
--- a/www-servers/tomcat/files/7/7.0.25-build-xml.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-diff --git a/apache-tomcat-7.0.25-src/build.xml b/apache-tomcat-7.0.25-src/build.xml
-index c7d4669..d8dc2c5 100644
---- a/apache-tomcat-7.0.25-src/build.xml
-+++ b/apache-tomcat-7.0.25-src/build.xml
-@@ -163,6 +163,7 @@
- 
-   <!-- Classpaths -->
-   <path id="compile.classpath">
-+    <pathelement location="${ant.jar}"/>
-     <pathelement location="${jdt.jar}"/>
-   </path>
- 
-@@ -309,6 +310,7 @@
-     <exclude name="org/apache/catalina/mbeans/JmxRemote*" />
-     <exclude name="org/apache/catalina/tribes/**" />
-     <exclude name="org/apache/naming/factory/webservices/**" />
-+    <exclude name="javax/servlet/**" />
-   </patternset>
- 
-   <patternset id="files.catalina-tribes">
-@@ -438,7 +440,7 @@
-     
-   </target>
- 
--  <target name="validate" depends="download-validate" if="${execute.validate}">
-+  <target name="validate" if="${execute.validate}">
-     <!-- Required so we can cache checkstyle results -->
-     <mkdir dir="${tomcat.output}/res/checkstyle"/>
- 
-@@ -497,7 +499,7 @@
-     </copy>
-   </target>
- 
--  <target name="compile" depends="build-prepare,download-compile,compile-prepare,validate">
-+  <target name="compile" depends="build-prepare,compile-prepare,validate">
-     <!-- Compile internal server components -->
-     <javac srcdir="java" destdir="${tomcat.classes}"
-            debug="${compile.debug}"
-@@ -559,7 +561,7 @@
-       filesId="files.annotations-api"
-       manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
- 
--    <!-- Servlet 3.0 Implementation JAR File -->
-+<!-- Servlet 3.0 Implementation JAR File
-     <jarIt jarfile="${servlet-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.servlet-api"
-@@ -567,7 +569,7 @@
-       notice="${tomcat.manifests}/servlet-api.jar.notice"
-       license="${tomcat.manifests}/servlet-api.jar.license" />
- 
--    <!-- JSP 2.2 Implementation JAR File -->
-+    JSP 2.2 Implementation JAR File
-     <jarIt jarfile="${jsp-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.jsp-api"
-@@ -575,12 +577,12 @@
-       notice="${tomcat.manifests}/jsp-api.jar.notice"
-       license="${tomcat.manifests}/jsp-api.jar.license" />
- 
--    <!-- JSP 2.2 EL Implementation JAR File -->
-+    JSP 2.2 EL Implementation JAR File
-     <jarIt jarfile="${el-api.jar}"
-       filesDir="${tomcat.classes}"
-       filesId="files.el-api"
-       manifest="${tomcat.manifests}/el-api.jar.manifest" />
--
-+-->
-     <!-- Bootstrap JAR File -->
-     <jarIt jarfile="${bootstrap.jar}"
-       filesDir="${tomcat.classes}"
-@@ -671,7 +673,7 @@
- 
-   </target>
- 
--  <target name="build-docs" depends="compile-prepare" description="Builds all documentation from XML sources">
-+  <target name="build-docs" depends="compile-prepare" unless="nobuild.docs" description="Builds all documentation from XML sources">
- 
-     <copy todir="${tomcat.build}/webapps">
-       <fileset dir="webapps">
-@@ -779,14 +781,14 @@
- 
-   <target name="deploy" depends="package,build-docs"
-           description="Default. Builds a working Tomcat instance">
--
-+<!--
-     <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
-             file="${tomcat-native.tar.gz}" />
-     <copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz"
-             file="${commons-daemon.native.src.tgz}" />
- 
-     <copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" />
--
-+-->
-     <!-- Copy scripts -->
-     <copy todir="${tomcat.build}/bin">
-       <fileset dir="bin">
-@@ -843,7 +845,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="${tomcat.classes}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -855,7 +857,7 @@
-              source="${compile.source}"
-              target="${compile.target}"
-              optimize="${compile.optimize}"
--             classpath="$tomcat.lcasses}"
-+             classpath="${tomcat.classes}:${jsp-api.jar}"
-              excludes="**/CVS/**,**/.svn/**"
-              encoding="ISO-8859-1"
-              includeantruntime="false">
-@@ -863,11 +865,11 @@
- 
-     <!-- Add sources for examples -->
-     <antcall target="examples-sources" />
--
-+<!--
-     <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
-       failonerror="false"/>
-     <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
--
-+-->
-     <!-- build the jdbc-pool jar and source jar-->
-     <echo message="Building Tomcat JDBC pool libraries"/>
-     <ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" inheritall="false" target="build">
-@@ -1051,7 +1053,7 @@
- 
-   </target>
- 
--  <target name="test-compile" depends="compile,download-test-compile" >
-+  <target name="test-compile" depends="compile" >
-     <mkdir dir="${test.classes}"/>
-     <!-- Compile -->
-     <javac srcdir="test" destdir="${test.classes}"
diff --git a/www-servers/tomcat/tomcat-6.0.32-r1.ebuild b/www-servers/tomcat/tomcat-6.0.32-r1.ebuild
deleted file mode 100644
index 38736084adbd..000000000000
--- a/www-servers/tomcat/tomcat-6.0.32-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# 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-r1.ebuild,v 1.4 2011/02/13 11:28:25 hwoarang 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.2 ${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
-}
diff --git a/www-servers/tomcat/tomcat-7.0.25.ebuild b/www-servers/tomcat/tomcat-7.0.25.ebuild
deleted file mode 100644
index b92f5d071d87..000000000000
--- a/www-servers/tomcat/tomcat-7.0.25.ebuild
+++ /dev/null
@@ -1,237 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-7.0.25.ebuild,v 1.2 2012/02/23 12:27:13 ago 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-3.0/JSP-2.2 Container"
-
-MY_P="apache-${P}-src"
-SLOT="7"
-SRC_URI="mirror://apache/${PN}/${PN}-${SLOT}/v${PV}/src/${MY_P}.tar.gz"
-HOMEPAGE="http://tomcat.apache.org/"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-LICENSE="Apache-2.0"
-
-IUSE=""
-
-ECJV="3.7"
-
-# servlet-api slot
-SAPIS="3.0"
-
-COMMON_DEPEND="dev-java/eclipse-ecj:${ECJV}
-	dev-java/ant-eclipse-ecj:${ECJV}
-	>=dev-java/commons-dbcp-1.4
-	>=dev-java/commons-logging-1.1
-	>=dev-java/commons-pool-1.5.5
-	~dev-java/tomcat-servlet-api-${PV}
-	examples? ( dev-java/jakarta-jstl )"
-
-RDEPEND="
-	!<dev-java/tomcat-native-1.1.20
-	>=virtual/jre-1.6
-	>=dev-java/commons-daemon-1.0.3
-	dev-java/ant-core
-	${COMMON_DEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	${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-${SAPIS},eclipse-ecj-${ECJV}"
-
-EANT_BUILD_TARGET="package"
-EANT_DOC_TARGET="build-docs"
-
-EANT_EXTRA_ARGS="-Dbase.path=${T} -Dversion=${PV}-gentoo -Dversion.number=${PV}
--Dcompile.debug=false -Del-api.jar=el-api.jar -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() {
-	epatch "${FILESDIR}/${SLOT}/${PV}-build-xml.patch"
-
-	rm -v webapps/examples/WEB-INF/lib/*.jar \
-		test/webapp-3.0-fragments/WEB-INF/lib/*.jar || die
-
-	# bug # 178980 and #312293
-	use amd64 && java-pkg_force-compiler eclipse-ecj-${ECJV}
-
-	if ! use doc; then
-		EANT_EXTRA_ARGS+=" -Dnobuild.docs=true"
-	fi
-
-	EANT_EXTRA_ARGS+=" -Djdt.jar=$(java-pkg_getjar eclipse-ecj-${ECJV} 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 ${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 "${S}"/output/build/webapps/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"
-
-	cd "${D}/usr/share/${TOMCAT_NAME}/lib" || die
-	java-pkg_jar-from eclipse-ecj-${ECJV}
-	java-pkg_jar-from tomcat-servlet-api-${SAPIS}
-
-	# 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
-	# we cannot symlink work directory because that breaks saving session data
-	# because session file cannot be saved to symlinked location by default
-	#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
-		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
-
-	# bug with storing SESSIONS.ser file to path with symlink
-	if [[ -L "${ROOT}var/lib/${TOMCAT_NAME}/work" ]] ; then
-		elog
-		ewarn "${ROOT}var/lib/${TOMCAT_NAME}/work is symbolic link which breaks"
-		ewarn "storing of SESSIONS.ser files in work directory when allowLinking"
-		ewarn "is disabled (the default). Remove the symbolic link (while Tomcat is"
-		ewarn "not running) to fix the issue."
-	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
-}