commit: e999a4915741e393f49138569e2caa68a1c3eb1c
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 21:10:25 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 21:15:02 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e999a491
www-servers/tomcat: Remove masked version 6
Upstream EOL is December 2016. We would rather focus on other things
than support it until then.
Package-Manager: portage-2.2.28
www-servers/tomcat/Manifest | 2 -
www-servers/tomcat/files/tomcat-6-sysprop.patch | 109 ----------------
.../tomcat/files/tomcat-6.0.44-build.xml.patch | 71 ----------
.../tomcat/files/tomcat-6.0.45-build.xml.patch | 71 ----------
www-servers/tomcat/files/tomcat.init | 105 ---------------
www-servers/tomcat/tomcat-6.0.44-r0.ebuild | 144 ---------------------
www-servers/tomcat/tomcat-6.0.44-r2.ebuild | 143 --------------------
www-servers/tomcat/tomcat-6.0.45.ebuild | 143 --------------------
8 files changed, 788 deletions(-)
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 26ffc16..31917ba 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -1,5 +1,3 @@
-DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256
c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512
0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be
WHIRLPOOL
c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
-DIST apache-tomcat-6.0.45-src.tar.gz 3494054 SHA256
d464b3e770197f026bf802d19be0195b941e8c3be7e552dc2f8eb563f9cc010e SHA512
d300e6b805bb70fc348133467b2aeac728dc0ae44f2fc1f309c3b2971987c1e46b81f156ebd7ddfda38f6746e90af1402c4e16a2d30bc7b081b761c87df8ffab
WHIRLPOOL
144678884f75034f1d692619ea8064daf02aee03bcac62fb0b666b5c0283f5abf93414d636c03c94488632cd13081cf00e69a9ddf19f4c8bafd80e7eca5a69da
DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256
0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512
dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52
WHIRLPOOL
ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
DIST apache-tomcat-7.0.68-src.tar.gz 4641238 SHA256
abb5d2cc7e34a18f968ec2535bdeeae919c53fa7feffe4d617db95e12e94b210 SHA512
dd97205044b03c6466c78bd165509ed9cd37c4d84de34c2170e67c475b28b72bfeda512f14f583c9983c045888d4704cdf7ba7c434f1d4bad9022428b0a0de1c
WHIRLPOOL
594cdf5584ea49faebfbea174e67bf85e761365717d56762138d07186c595195df2899a94d897578d1d20201ed4706b51a4d8870d9a6a4ca74c2436ba4283a05
DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256
b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512
4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c
WHIRLPOOL
77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
diff --git a/www-servers/tomcat/files/tomcat-6-sysprop.patch
b/www-servers/tomcat/files/tomcat-6-sysprop.patch
deleted file mode 100644
index 033bbc8..0000000
--- a/www-servers/tomcat/files/tomcat-6-sysprop.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-diff -Naur
apache-tomcat-6.0.44-src.orig/java/org/apache/catalina/startup/Bootstrap.java
apache-tomcat-6.0.44-src/java/org/apache/catalina/startup/Bootstrap.java
----
apache-tomcat-6.0.44-src.orig/java/org/apache/catalina/startup/Bootstrap.java
2015-05-08 13:22:05.000000000 +0100
-+++ apache-tomcat-6.0.44-src/java/org/apache/catalina/startup/Bootstrap.java
2015-08-25 21:34:29.774917427 +0100
-@@ -109,40 +109,18 @@
- String value = CatalinaProperties.getProperty(name + ".loader");
- if ((value == null) || (value.equals("")))
- return parent;
-+
-+ value = replace(value);
-
- ArrayList repositoryLocations = new ArrayList();
- ArrayList repositoryTypes = new ArrayList();
-- int i;
-
- StringTokenizer tokenizer = new StringTokenizer(value, ",");
- while (tokenizer.hasMoreElements()) {
-- String repository = tokenizer.nextToken();
--
-- // Local repository
-- boolean replace = false;
-- String before = repository;
-- while ((i=repository.indexOf(CATALINA_HOME_TOKEN))>=0) {
-- replace=true;
-- if (i>0) {
-- repository = repository.substring(0,i) + getCatalinaHome()
-- + repository.substring(i+CATALINA_HOME_TOKEN.length());
-- } else {
-- repository = getCatalinaHome()
-- + repository.substring(CATALINA_HOME_TOKEN.length());
-- }
-- }
-- while ((i=repository.indexOf(CATALINA_BASE_TOKEN))>=0) {
-- replace=true;
-- if (i>0) {
-- repository = repository.substring(0,i) + getCatalinaBase()
-- + repository.substring(i+CATALINA_BASE_TOKEN.length());
-- } else {
-- repository = getCatalinaBase()
-- + repository.substring(CATALINA_BASE_TOKEN.length());
-- }
-+ String repository = tokenizer.nextToken().trim();
-+ if (repository.length() == 0) {
-+ continue;
- }
-- if (replace && log.isDebugEnabled())
-- log.debug("Expanded " + before + " to " + repository);
-
- // Check for a JAR URL repository
- try {
-@@ -154,6 +132,7 @@
- // Ignore
- }
-
-+ // Local repository
- if (repository.endsWith("*.jar")) {
- repository = repository.substring
- (0, repository.length() - "*.jar".length());
-@@ -192,6 +171,51 @@
-
- }
-
-+ /**
-+ * System property replacement in the given string.
-+ *
-+ * @param str The original string
-+ * @return the modified string
-+ */
-+ protected String replace(String str) {
-+ // Implementation is copied from ClassLoaderLogManager.replace(),
-+ // but added special processing for catalina.home and catalina.base.
-+ String result = str;
-+ int pos_start = str.indexOf("${");
-+ if (pos_start >= 0) {
-+ StringBuilder builder = new StringBuilder();
-+ int pos_end = -1;
-+ while (pos_start >= 0) {
-+ builder.append(str, pos_end + 1, pos_start);
-+ pos_end = str.indexOf('}', pos_start + 2);
-+ if (pos_end < 0) {
-+ pos_end = pos_start - 1;
-+ break;
-+ }
-+ String propName = str.substring(pos_start + 2, pos_end);
-+ String replacement;
-+ if (propName.length() == 0) {
-+ replacement = null;
-+ } else if (CATALINA_HOME_TOKEN.equals(propName)) {
-+ replacement = getCatalinaHome();
-+ } else if (CATALINA_BASE_TOKEN.equals(propName)) {
-+ replacement = getCatalinaBase();
-+ } else {
-+ replacement = System.getProperty(propName);
-+ }
-+ if (replacement != null) {
-+ builder.append(replacement);
-+ } else {
-+ builder.append(str, pos_start, pos_end + 1);
-+ }
-+ pos_start = str.indexOf("${", pos_end + 1);
-+ }
-+ builder.append(str, pos_end + 1, str.length());
-+ result = builder.toString();
-+ }
-+ return result;
-+ }
-+
-
- /**
- * Initialize daemon.
diff --git a/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
b/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
deleted file mode 100644
index 7430651..0000000
--- a/www-servers/tomcat/files/tomcat-6.0.44-build.xml.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur apache-tomcat-6.0.44-src.orig/build.xml
apache-tomcat-6.0.44-src/build.xml
---- apache-tomcat-6.0.44-src.orig/build.xml 2015-05-08 13:22:05.000000000
+0100
-+++ apache-tomcat-6.0.44-src/build.xml 2015-08-25 23:38:46.147332131 +0100
-@@ -159,12 +159,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources"
encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+ -->
-
- </target>
-
-@@ -307,19 +309,25 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 2.5 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- license="${tomcat.manifests}/servlet-api.jar.license"
- notice="${tomcat.manifests}/servlet-api.jar.notice" />
-+-->
-
- <!-- JSP 2.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
-
- <!-- JSP 2.1 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}" filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap"
-@@ -492,12 +500,14 @@
-
- <target name="deploy" depends="build-only,build-docs,warn.dbcp">
-
-+<!--
- <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">
-@@ -649,9 +659,11 @@
- </fileset>
- </txt2html>
-
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
-
- </target>
-
diff --git a/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch
b/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch
deleted file mode 100644
index 7430651..0000000
--- a/www-servers/tomcat/files/tomcat-6.0.45-build.xml.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur apache-tomcat-6.0.44-src.orig/build.xml
apache-tomcat-6.0.44-src/build.xml
---- apache-tomcat-6.0.44-src.orig/build.xml 2015-05-08 13:22:05.000000000
+0100
-+++ apache-tomcat-6.0.44-src/build.xml 2015-08-25 23:38:46.147332131 +0100
-@@ -159,12 +159,14 @@
- </fileset>
- </copy>
- <!-- Copy JSP Schemas and DTDs to be packed into servlet-api.jar -->
-+<!--
- <copy todir="${tomcat.classes}/javax/servlet/resources"
encoding="ISO-8859-1">
- <fileset dir="${tomcat.classes}/javax/servlet/jsp/resources">
- <include name="*" />
- <exclude name="jspxml*" />
- </fileset>
- </copy>
-+ -->
-
- </target>
-
-@@ -307,19 +309,25 @@
- manifest="${tomcat.manifests}/annotations-api.jar.manifest" />
-
- <!-- Servlet 2.5 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${servlet-api.jar}" filesId="files.servlet-api"
- manifest="${tomcat.manifests}/servlet-api.jar.manifest"
- license="${tomcat.manifests}/servlet-api.jar.license"
- notice="${tomcat.manifests}/servlet-api.jar.notice" />
-+-->
-
- <!-- JSP 2.1 Implementation JAR File -->
-+<!--
- <jarIt jarfile="${jsp-api.jar}" filesId="files.jsp-api"
- manifest="${tomcat.manifests}/jsp-api.jar.manifest" />
-+-->
-
-
- <!-- JSP 2.1 EL Implementation JAR File -->
-+<!--
- <jarIt jarfile="${el-api.jar}" filesId="files.el-api"
- manifest="${tomcat.manifests}/el-api.jar.manifest" />
-+-->
-
- <!-- Bootstrap JAR File -->
- <jarIt jarfile="${bootstrap.jar}" filesId="files.bootstrap"
-@@ -492,12 +500,14 @@
-
- <target name="deploy" depends="build-only,build-docs,warn.dbcp">
-
-+<!--
- <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">
-@@ -649,9 +659,11 @@
- </fileset>
- </txt2html>
-
-+<!--
- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib"
- failonerror="false"/>
- <copy file="${jdt.jar}" todir="${tomcat.build}/lib" />
-+-->
-
- </target>
-
diff --git a/www-servers/tomcat/files/tomcat.init
b/www-servers/tomcat/files/tomcat.init
deleted file mode 100644
index 1f80681..0000000
--- a/www-servers/tomcat/files/tomcat.init
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/@GENTOO_PORTAGE_EPREFIX@sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_commands="forcestop"
-
-PIDFILE=/@GENTOO_PORTAGE_EPREFIX@var/run/${RC_SVCNAME}.pid
-
-: ${CATALINA_HOME:=/@GENTOO_PORTAGE_EPREFIX@usr/share/tomcat-@SLOT@}
-: ${CATALINA_BASE:=/@GENTOO_PORTAGE_EPREFIX@var/lib/${RC_SVCNAME}}
-: ${CATALINA_TMPDIR:=/@GENTOO_PORTAGE_EPREFIX@var/tmp/${RC_SVCNAME}}
-: ${CATALINA_USER:=tomcat}
-: ${CATALINA_GROUP:=tomcat}
-
-: ${TOMCAT_START:=start}
-
-: ${JPDA_TRANSPORT:="dt_socket"}
-: ${JPDA_ADDRESS:="8000"}
-: ${JPDA_OPTS="-Xdebug
-Xrunjdwp:transport=${JPDA_TRANSPORT},address=${JPDA_ADDRESS},server=y,suspend=n"}
-
-export JAVA_HOME=`java-config ${TOMCAT_JVM:+--select-vm ${TOMCAT_JVM}}
--jre-home`
-
-CLASSPATH=`java-config --classpath
tomcat-@SLOT@${TOMCAT_EXTRA_JARS:+,${TOMCAT_EXTRA_JARS}}`
-export
CLASSPATH="${CLASSPATH}${TOMCAT_EXTRA_CLASSPATH:+:${TOMCAT_EXTRA_CLASSPATH}}"
-
-depend() {
- use dns logger net
-}
-
-start() {
- ebegin "Starting ${RC_SVCNAME}"
-
- if [ ! -e "${CATALINA_TMPDIR}" ]; then
- eerror "CATALINA_TMPDIR does not exist. Unable to start tomcat."
- eerror "Please see
/@GENTOO_PORTAGE_EPREFIX@etc/conf.d/${RC_SVCNAME} for more information."
- eend 1
- fi
-
- cmd=java args=
- if [ "${TOMCAT_START}" = "debug" ] || [ "${TOMCAT_START}" = "-security
debug" ] ; then
- cmd=jdb
- args="${args} -sourcepath
${CATALINA_HOME}/../../jakarta-tomcat-catalina/catalina/src/share"
- fi
- if [ "${TOMCAT_START}" = "-security debug" ] || [ "${TOMCAT_START}" =
"-security start" ]; then
- args="${args} -Djava.security.manager"
- args="${args}
-Djava.security.policy=${CATALINA_BASE}/conf/catalina.policy"
- fi
- if [ "${TOMCAT_START}" = "jpda start" ] ; then
- args="${args} ${JPDA_OPTS}"
- fi
- if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then
- args="${args}
-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \
-
-Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties"
- fi
-
- start-stop-daemon --start \
- --quiet --background \
- --chdir "${CATALINA_TMPDIR}" \
- --user ${CATALINA_USER}:${CATALINA_GROUP} \
- --make-pidfile --pidfile ${PIDFILE} \
- --exec ${JAVA_HOME}/bin/${cmd} \
- -- \
- ${JAVA_OPTS} \
- ${args} \
- -Dcatalina.base="${CATALINA_BASE}" \
- -Dcatalina.home="${CATALINA_HOME}" \
- -Djava.io.tmpdir="${CATALINA_TMPDIR}" \
- -classpath "${CLASSPATH}" \
- org.apache.catalina.startup.Bootstrap \
- ${CATALINA_OPTS} \
- ${TOMCAT_START}
-
- eend $?
-}
-
-stop() {
- ebegin "Stopping '${RC_SVCNAME}'"
-
- start-stop-daemon --stop \
- --quiet --retry=60 \
- --pidfile ${PIDFILE} \
- --exec ${JAVA_HOME}/bin/java \
- -- \
- ${JAVA_OPTS} \
- -classpath "${CLASSPATH}" \
- ${CATALINA_OPTS} \
- stop ${STD_OUT}
-
- eend $?
-}
-
-forcestop() {
- ebegin "Forcing '${RC_SVCNAME}' to stop"
-
- start-stop-daemon --stop \
- --quiet --retry=60 \
- --pidfile ${PIDFILE} \
- --signal=9
-
- if service_started "${RC_SVCNAME}"; then
- mark_service_stopped "${RC_SVCNAME}"
- fi
-
- eend $?
-}
diff --git a/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
b/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
deleted file mode 100644
index 4b1d401..0000000
--- a/www-servers/tomcat/tomcat-6.0.44-r0.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-HOMEPAGE="http://tomcat.apache.org/";
-SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6"
-KEYWORDS="amd64 ppc64 x86 ~x86-fbsd"
-IUSE="extra-webapps"
-
-RESTRICT="test"
-
-ECJ_SLOT="3.7"
-SAPI_SLOT="2.5"
-
-CDEPEND="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/tomcat-servlet-api:${SAPI_SLOT}"
-RDEPEND="${CDEPEND}
- >=virtual/jre-1.6
- !<dev-java/tomcat-native-1.1.20"
-DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
- >=dev-java/ant-core-1.8.1:0
- test? (
- dev-java/ant-junit:0
- dev-java/junit:4
- )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -exec rm -v {} + || die
- epatch "${FILESDIR}/${P}-build.xml.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_DOC_TARGET=""
-EANT_GENTOO_CLASSPATH="tomcat-servlet-api-${SAPI_SLOT},eclipse-ecj-${ECJ_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV}
-Dcompile.debug=false"
-
-# revision of the instance-manager script
-IM_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar)"
- java-pkg-2_src_compile
-}
-
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
-
-src_test() {
- java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- # so we don't have to call java-config with --with-dependencies, which
might
- # bring in more jars than actually desired.
- java-pkg_addcp "$(java-pkg_getjars
eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT})"
-
- dodoc RELEASE-NOTES RUNNING.txt
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp "${FILESDIR}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash}
"${T}" || die
- eprefixify "${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g"
"${T}"/tomcat{.conf,.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- doexe "${T}"/tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash
tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you
used prior version"
- elog "of Tomcat (<6.0.36), you have to migrate your existing instance
to work with new Tomcat."
- elog "You can find more information at
https://wiki.gentoo.org/wiki/Apache_Tomcat";
-
- elog "To manage Tomcat instances, run:"
- elog "
${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read
https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-6.0.44-r2.ebuild
b/www-servers/tomcat/tomcat-6.0.44-r2.ebuild
deleted file mode 100644
index d8a5010..0000000
--- a/www-servers/tomcat/tomcat-6.0.44-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-HOMEPAGE="http://tomcat.apache.org/";
-SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6"
-KEYWORDS="amd64 ~ppc64 x86 ~x86-fbsd"
-IUSE="extra-webapps"
-
-ECJ_SLOT="3.7"
-SAPI_SLOT="2.5"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/oracle-javamail:0
- >=dev-java/tomcat-servlet-api-6.0.44-r1:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.6
- !<dev-java/tomcat-native-1.1.20"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled javamail, servlet-api
- rm -rv java/javax/{el,mail,servlet} || die
-
- epatch \
- "${FILESDIR}/${P}-build.xml.patch" \
- "${FILESDIR}/tomcat-6-sysprop.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_TEST_TARGET="all"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV}
-Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- EANT_BUILD_XML="test/build.xml" java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/'
output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp
"${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
"${T}" || die
- eprefixify
"${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g"
"${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash
tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you
used prior version"
- elog "of Tomcat (<6.0.36), you have to migrate your existing instance
to work with new Tomcat."
- elog "You can find more information at
https://wiki.gentoo.org/wiki/Apache_Tomcat";
-
- elog "To manage Tomcat instances, run:"
- elog "
${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read
https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
diff --git a/www-servers/tomcat/tomcat-6.0.45.ebuild
b/www-servers/tomcat/tomcat-6.0.45.ebuild
deleted file mode 100644
index 4c91dda..0000000
--- a/www-servers/tomcat/tomcat-6.0.45.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-JAVA_PKG_IUSE="source test"
-
-inherit eutils java-pkg-2 java-ant-2 prefix user
-
-MY_P="apache-${P}-src"
-
-DESCRIPTION="Tomcat Servlet-2.5/JSP-2.1 Container"
-HOMEPAGE="http://tomcat.apache.org/";
-SRC_URI="mirror://apache/${PN}/tomcat-6/v${PV}/src/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="extra-webapps"
-
-ECJ_SLOT="3.7"
-SAPI_SLOT="2.5"
-
-COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
- dev-java/oracle-javamail:0
- >=dev-java/tomcat-servlet-api-6.0.44-r1:${SAPI_SLOT}"
-RDEPEND="${COMMON_DEP}
- >=virtual/jre-1.6
- !<dev-java/tomcat-native-1.1.20"
-DEPEND="${COMMON_DEP}
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- java-pkg-2_pkg_setup
- enewgroup tomcat 265
- enewuser tomcat 265 -1 /dev/null tomcat
-}
-
-java_prepare() {
- find -name '*.jar' -type f -delete -print || die
-
- # Remove bundled javamail, servlet-api
- rm -rv java/javax/{el,mail,servlet} || die
-
- epatch \
- "${FILESDIR}/${P}-build.xml.patch" \
- "${FILESDIR}/tomcat-6-sysprop.patch"
-
- # For use of catalina.sh in netbeans
- sed -i -e "/^# ----- Execute The Requested Command/ a\
- CLASSPATH=\`java-config --classpath ${PN}-${SLOT}\`" \
- bin/catalina.sh || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_BUILD_TARGET="deploy"
-EANT_TEST_TARGET="all"
-EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},oracle-javamail,tomcat-servlet-api-${SAPI_SLOT}"
-EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
-EANT_NEEDS_TOOLS="true"
-EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV}
-Dcompile.debug=false"
-
-# revisions of the scripts
-IM_REV="-r1"
-INIT_REV="-r1"
-
-src_compile() {
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core
ant.jar)"
- java-pkg-2_src_compile
-}
-
-src_test() {
- EANT_BUILD_XML="test/build.xml" java-pkg-2_src_test
-}
-
-src_install() {
- local dest="/usr/share/${PN}-${SLOT}"
-
- java-pkg_jarinto "${dest}"/bin
- java-pkg_dojar output/build/bin/*.jar
- exeinto "${dest}"/bin
- doexe output/build/bin/*.sh
-
- java-pkg_jarinto "${dest}"/lib
- java-pkg_dojar output/build/lib/*.jar
-
- dodoc RELEASE-NOTES RUNNING.txt
- use source && java-pkg_dosrc java/*
-
- ### Webapps ###
-
- insinto "${dest}"/webapps
- doins -r output/build/webapps/{host-manager,manager,ROOT}
- use extra-webapps && doins -r output/build/webapps/{docs,examples}
-
- ### Config ###
-
- # create "logs" directory in $CATALINA_BASE
- # and set correct perms, see #458890
- dodir "${dest}"/logs
- fperms 0750 "${dest}"/logs
-
- # replace the default pw with a random one, see #92281
- local randpw=$(echo ${RANDOM}|md5sum|cut -c 1-15)
- sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
-
- # prepend gentoo.classpath to common.loader, see #453212
- sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/'
output/build/conf/catalina.properties || die
-
- insinto "${dest}"
- doins -r output/build/conf
-
- ### rc ###
-
- cp
"${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
"${T}" || die
- eprefixify
"${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
- sed -i -e "s|@SLOT@|${SLOT}|g"
"${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
-
- insinto "${dest}"/gentoo
- doins "${T}"/tomcat.conf
- exeinto "${dest}"/gentoo
- newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
- newexe "${T}"/tomcat-instance-manager${IM_REV}.bash
tomcat-instance-manager.bash
-}
-
-pkg_postinst() {
- elog "New ebuilds of Tomcat support running multiple instances. If you
used prior version"
- elog "of Tomcat (<6.0.36), you have to migrate your existing instance
to work with new Tomcat."
- elog "You can find more information at
https://wiki.gentoo.org/wiki/Apache_Tomcat";
-
- elog "To manage Tomcat instances, run:"
- elog "
${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
-
- ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
- ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
-
-# einfo "Please read
https://www.gentoo.org/proj/en/java/tomcat6-guide.xml for more information."
-}
