From 620698485d771f41baf901f3e1a651103014cab3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ulc?= Date: Mon, 25 Nov 2019 13:16:52 +0100 Subject: www-servers/tomcat-8.5.46: removed obsolete + patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Package-Manager: Portage-2.3.79, Repoman-2.3.18 Signed-off-by: Miroslav Šulc --- www-servers/tomcat/Manifest | 1 - .../tomcat/files/tomcat-8.5.40-build.xml.patch | 259 ------------------- .../tomcat/files/tomcat-9.0.19-build.xml.patch | 278 --------------------- www-servers/tomcat/tomcat-8.5.46.ebuild | 158 ------------ 4 files changed, 696 deletions(-) delete mode 100644 www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch delete mode 100644 www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch delete mode 100644 www-servers/tomcat/tomcat-8.5.46.ebuild diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 08ee3206a9dd..939f324b27c6 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,5 +1,4 @@ DIST apache-tomcat-7.0.96-src.tar.gz 4983881 BLAKE2B d5b828b7a4e8a7a5ce793a15421fbd6b12b55918aa7c15bc8209b4c762d7f422a7315e4cbe9b4ae2da754b6d8493bc11ae6a5c99f11a1ac3b23473e05fa26c83 SHA512 5797e66fb9ce558340e08d3a4ccd372d912707aabd6177318781925dd35055902a0ecc3e50e677d76b0feea547cc8fc038bb83ae5de65d28680cb4c9582f60c0 -DIST apache-tomcat-8.5.46-src.tar.gz 5599021 BLAKE2B 3755f15612e63ac06cbfa097f1531dc36542ba559a6ef60230b133e45d14bb4c4c54d4dcc8b05b9996f54ac253fb1630f6a6e900ee00e4af0a9200f83455a952 SHA512 02e93cc6fb4226e81b03ae60f479e15b438b1c68c1a4104200db9cc473939b92d66eea12f0783727b06f643d11ebe3da2a81c80cbe486ed497a3280e8cdb2e62 DIST apache-tomcat-8.5.47-src.tar.gz 5607118 BLAKE2B 3c326056f674032424d298c7581243a24dd01fae39b1ce7069b60e1bcf3d825de954164f643e887618c43c87d691bc41f942e73bf86b254b4c7dca9c68ce7cce SHA512 1513fdaf7751ee263d878cdfc05329bc4ee50e2f3aeea68e1d173a5f4d555ec59a43050222f013758f704967730dd25a64337cf1ba4365ab53b8730af87b4051 DIST apache-tomcat-9.0.27-src.tar.gz 5761278 BLAKE2B 7d4a65dfa43e0956a5dbb1dad3bf1aa475e7c503d3192ac24921d7cee9bd85379cd820ce693e8c583a7cab23263b0abfa960968d04d766764e222ba8c5bd97d4 SHA512 3f63cbd49f93e6a9d44ea63b4f787cf498930b82d19eaf60603c126b8800d2894d306c27e42ab73b042f3bba9cfb75b6c939b91b8b9141e4903eb1b88c2a4ec8 DIST apache-tomcat-9.0.7-src.tar.gz 5106551 BLAKE2B b4552146a40c2e7cbb2e454fb5ec9169425db5c08cf269c391ec3144425ad388a2b6f003a7c05f59a9fd724fb5c848102890a24fcfd43d5fea3d881141aa7798 SHA512 cb7dc5547671d94f7c7fb0b58eeb94d05128349cdabf576fc8ad837a4bf3ea655a8eab3342245dfa84a9db23f1cbee2918846eedd48e3ca372eecebfef13c5b2 diff --git a/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch b/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch deleted file mode 100644 index e049d77141e4..000000000000 --- a/www-servers/tomcat/files/tomcat-8.5.40-build.xml.patch +++ /dev/null @@ -1,259 +0,0 @@ -diff --git a/build.xml b/build.xml -index 179802b..49ac8c0 100644 ---- a/build.xml -+++ b/build.xml -@@ -727,24 +727,29 @@ - manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> - - -+ - -+ - - -+ - - - - - -- -+ filesId="files.tomcat-dbcp" /> --> - - - -- -+ - - - -@@ -1092,7 +1097,7 @@ - - - -- -+ - - - -@@ -1128,7 +1133,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - - - - - - -+ - - - -@@ -2629,7 +2640,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download components necessary to compile" unless="noget" > - - - -@@ -2655,7 +2666,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2733,7 +2744,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -2788,13 +2799,13 @@ skip.installer property in build.properties" /> - - - -- -+ - - - - -- -+ - - - -@@ -2916,7 +2927,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2933,7 +2944,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2958,7 +2969,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2974,7 +2985,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -2998,7 +3009,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3013,7 +3024,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3041,7 +3052,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3052,7 +3063,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3063,7 +3074,7 @@ skip.installer property in build.properties" /> - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - diff --git a/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch b/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch deleted file mode 100644 index a4bcbeb949bc..000000000000 --- a/www-servers/tomcat/files/tomcat-9.0.19-build.xml.patch +++ /dev/null @@ -1,278 +0,0 @@ -diff --git a/build.xml b/build.xml -index b3b299f..40bf4f8 100644 ---- a/build.xml -+++ b/build.xml -@@ -752,6 +752,7 @@ - addOSGi="true" /> - - -+ - -+ - -+ - - - - -- -+ addOSGi="true" /> --> - - - -- -+ - - - -@@ -1186,7 +1189,7 @@ - - - -- -+ - - - -@@ -1222,7 +1225,7 @@ - - - -- -+ - - - - - -- -+ - - - - -+ - - - -+ - - - Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. -@@ -1863,6 +1869,7 @@ Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform. - - -+ - - - -+ - - - -@@ -2686,7 +2696,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download components necessary to compile" unless="noget" > - - - -@@ -2741,7 +2751,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for the tests" unless="noget"> - - - -@@ -2819,7 +2829,7 @@ skip.installer property in build.properties" /> - - - -+ description="Download additional components for a distribution" unless="noget"> - - - -@@ -2874,13 +2884,13 @@ skip.installer property in build.properties" /> - - - -- -+ - - - - -- -+ - - - -@@ -3002,7 +3012,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3019,7 +3029,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3044,7 +3054,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3060,7 +3070,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3084,7 +3094,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3099,7 +3109,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3127,7 +3137,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3138,7 +3148,7 @@ skip.installer property in build.properties" /> - - - -- -+ - - - -@@ -3149,7 +3159,7 @@ skip.installer property in build.properties" /> - - -+ description="Prepares the source tree to be built in Eclipse" unless="noget"> - - - -@@ -3167,7 +3177,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho - - -+ description="Creates project directory .idea for IntelliJ IDEA" unless="noget"> - - - diff --git a/www-servers/tomcat/tomcat-8.5.46.ebuild b/www-servers/tomcat/tomcat-8.5.46.ebuild deleted file mode 100644 index 0437014fa017..000000000000 --- a/www-servers/tomcat/tomcat-8.5.46.ebuild +++ /dev/null @@ -1,158 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -JAVA_PKG_IUSE="doc source test" - -inherit eutils java-pkg-2 java-ant-2 prefix user - -MY_P="apache-${P}-src" - -DESCRIPTION="Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/${PN}/tomcat-8/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="8.5" -KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris" -IUSE="extra-webapps" - -RESTRICT="test" # can we run them on a production system? - -ECJ_SLOT="4.5" -SAPI_SLOT="3.1" - -COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT} - >=dev-java/tomcat-servlet-api-${SLOT}:${SAPI_SLOT}" -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.7" -DEPEND="${COMMON_DEP} - app-admin/pwgen - >=dev-java/ant-core-1.9.13 - >=virtual/jdk-1.7 - test? ( - >=dev-java/ant-junit-1.9:0 - dev-java/easymock:3.2 - )" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - java-pkg-2_pkg_setup - enewgroup tomcat 265 - enewuser tomcat 265 -1 /dev/null tomcat -} - -src_prepare() { - default - - find -name '*.jar' -type f -delete -print || die - - # Remove bundled servlet-api - rm -rv java/javax/{el,servlet} || die - - eapply "${FILESDIR}/${PN}-8.5.40-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-pkg-2_src_prepare -} - -JAVA_ANT_REWRITE_CLASSPATH="true" - -EANT_BUILD_TARGET="deploy" -EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SAPI_SLOT}" -EANT_TEST_GENTOO_CLASSPATH="easymock-3.2" -EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes" -EANT_NEEDS_TOOLS="true" -EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dexecute.validate=false" - -# revisions of the scripts -IM_REV="-r2" -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() { - 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 doc && java-pkg_dojavadoc output/dist/webapps/docs/api - use source && java-pkg_dosrc java/* - - ### Webapps ### - - # add missing docBase - local apps="host-manager manager" - for app in ${apps}; do - sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \ - output/build/webapps/${app}/META-INF/context.xml || die - done - - 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="$(pwgen -s -B 15 1)" - 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 (<7.0.32), 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://wiki.gentoo.org/wiki/Apache_Tomcat and" - einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information." -} -- cgit v1.2.3