www-servers/tomcat: removed old version

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

diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index 36e4b5accae68ec0e4e8b3e0219f6851157cfa16..080bebdc264add114eb4a080765b8a50a0e9f8e8 100644 (file)
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,9 @@
 # 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.279 2012/01/04 17:59:40 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.280 2012/01/06 12:34:25 fordfrog Exp $
+
+  06 Jan 2012; Miroslav Šulc <fordfrog@gentoo.org> -tomcat-6.0.33.ebuild:
+  Removed old version
 
   04 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> tomcat-6.0.35.ebuild:
   x86 stable wrt bug #395933

diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 45cbb699bfbd5263e527479df19997bca8398fbc..0ce751fb8365ef2034c02f09b3cdd73fcbc49add 100644 (file)
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,6 +1,3 @@
------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
@@ -10,19 +7,10 @@ AUX 7/7.0.23-build-xml.patch 4897 RMD160 3b3b5755bd40e759985643f95f26e88069780f3
 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.33-src.tar.gz 3389376 RMD160 24bd6c0e1bee7daa4cb59ec56552599330f0bb4c SHA1 437db0ba55c6e398fe3af73c4fa5eed3c4666842 SHA256 6dbd5d6eedcf3acd8bf7b6e32544a6e94ec595f7c921baa92f08adb5a5d91b64
 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
 EBUILD tomcat-6.0.32-r1.ebuild 6964 RMD160 a38e0536f45b4fbf5d4cbffb903a11c83948bdb4 SHA1 3196907adc07db41a62c43078c1c078a11e4d249 SHA256 00f8ecbc1676db5902971dd76d354e8b5bfe8938f285e9d5578e64160dcc087b
-EBUILD tomcat-6.0.33.ebuild 6961 RMD160 17c4cc0cd1bf9b681f612bf131f34440e1a67bae SHA1 1dbe88bf2615d57add8e0deab2074d653a7423f0 SHA256 ae706bb3f875113fa03dc4e9770cd43b033db449f75bb3c76e7bd9b1405c2036
 EBUILD tomcat-6.0.35.ebuild 6991 RMD160 c52df23256dac9d51b9d4628b1baa390e24598fd SHA1 7e8f3d06f7bda4e5e451f4f8977d2e2982dd9111 SHA256 005a5291960908275e519f4fb5caa8a38e789093cee1b3af1ee5363e19df62c8
 EBUILD tomcat-7.0.23-r3.ebuild 7637 RMD160 0a40dd93603cd90f509a56d6423479eb9c79fb50 SHA1 9a641167acd790bed9f2ff40719825f22bdd921a SHA256 a36ed1d12064874e62842f60e3873260b8b245a87b4201b6ec275a477ab0dbd4
-MISC ChangeLog 69580 RMD160 5cdb6d464d380b74248b8c182d7c81d1fba1bc62 SHA1 c18fad38a4d651ae8c6b31b31008b86c0748fe91 SHA256 262e8be007ab1887a9d8f64a84d6e4a214d8b8b69b6a7d0d67378aeecc19e067
+MISC ChangeLog 69676 RMD160 f054e1c091d17f0ec1f3652590df5249249e3221 SHA1 7aae2c30574f6a74441a3e608e4a8102f0db9425 SHA256 a3f79ccdb560dc624983c69dfa40ba7bc9a3f6037485bea1e26a19a9cf1e2328
 MISC metadata.xml 451 RMD160 965e7cb85fbf383be678e48d2ae0cdf7b4247c99 SHA1 9b3717d68fdd17b010345fb0a63ad9aa0126dc42 SHA256 b508f373350a4e92bc04ebafa528a5c50eac8bfbd67d2fab6a4fa82811d1f109
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk8Ek5IACgkQuUQtlDBCeQJ4jgCfdAo0BZwOTzwPEx7ixDNlNywj
-220An1Hpm+o7Ck8sFQnPon+FkHiLO/ey
-=hW8p
------END PGP SIGNATURE-----

diff --git a/www-servers/tomcat/tomcat-6.0.33.ebuild b/www-servers/tomcat/tomcat-6.0.33.ebuild
deleted file mode 100644 (file)
index 63b6804..0000000
--- a/www-servers/tomcat/tomcat-6.0.33.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.33.ebuild,v 1.3 2011/11/13 15:02:17 maekke 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
-}