From 8eb973cc2247ee4fe34e4d907fdc6cf5b94709e3 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 28 Oct 2022 09:59:10 +0100 Subject: gentoo auto-resync : 28:10:2022 - 09:59:10 --- dev-java/tomcat-servlet-api/Manifest | 4 +- .../tomcat-servlet-api-10.0.26.ebuild | 2 +- .../tomcat-servlet-api-9.0.65.ebuild | 99 ---------------------- 3 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild (limited to 'dev-java/tomcat-servlet-api') diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 17cae0c5002a..3b7b92c72462 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -12,11 +12,10 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce DIST apache-tomcat-8.5.82-src.tar.gz 6011553 BLAKE2B ea34c0485877ace8c84144f0e75f370c0ac461b5b725d97a07e27014b7a14b1ab88fad4230d4fae60190d7bff3836f691615b57b9f085797477acc69560a57ce SHA512 3e0a0a808fb78493930ce8832731eba4ab3cc440387c3b5226ff6e4ac2faf5fd70eff1560d840d34f14a8acfd7e60fc8b7f638f3dbe0c0ed4569dc4271a9c3f2 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f -DIST apache-tomcat-9.0.65-src.tar.gz 6195265 BLAKE2B 13ca956b58e9f1831700f67d1fa8883f6471ab6b700b2af169bf284552658a4e9ad4130451b36976af4dd366cc987e228e0b0f98e688cccf577c626dfc78aae7 SHA512 3ff344370cc36f5bed389ed198054783a4f5bc86476a751cda280618457a06bae38c1e764b0c110c2f68efe2d34243a4e24596e8b90e8fbd171bf584a22fd3bc DIST apache-tomcat-9.0.67-src.tar.gz 6211392 BLAKE2B 273b921ce580be6fb76d8567e5b0aec01b936518875f8470c1cee4b159519f723e606680d9986f61fbbab79cea2d027195f3debe9af59dfac786b0d0566d7c02 SHA512 33319d70c50fde71d163f66dc388ed2d5855aa4f087f7e2259adc27cc7ed30ace079d81e52def43a904c88ac670bb0c71667938b931a214470d77679108914cc DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be EBUILD tomcat-servlet-api-10.0.23.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a -EBUILD tomcat-servlet-api-10.0.26.ebuild 3025 BLAKE2B 2198be652150c8c8d0cb4c7dab9beca30094e184e1812038df79b193a8c3c148d076fe8164a9d0b746b667dfbe9b261da266513573352229980b3481faf4fb56 SHA512 5ea6ad3fba96aef3ff05897fb1a13f58b7b106a6b9a8dc265851747719592dda261fa6b7fca1640c1dc1b3aa4e4e75b5ba8e22d4a2797a66f8b708bdfb5ed32b +EBUILD tomcat-servlet-api-10.0.26.ebuild 3021 BLAKE2B 5a7b1fc041750ed25e2b2ebd91a46d422b8b84455814a95f0ecc4b13634e8df876a1cc95e4f6318380392feb80f8a748bfe21898e18169ddb05eea7a0f086c2f SHA512 da77418b28127f4d7e05f691f835e7eb01a59e2f33daf15ecc2f76ccbc1f136e7b446d14104d9cbc62f9d251f926dc698e8051b877c61f4adbce45c51b21822a EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1175 BLAKE2B 8251cf902d082fae48bd5f0906bb23ad4dd2a69008ea6f127a50d009eb2e6f70a274b775d8edbc5eadd4c421b4d2d23d3176d92aebe017ada09186cca396c557 SHA512 cbc958b1ca9385a5bc04f9a689386b787a580f72f379217d3ddad8915d072f4f8c600a77bcb072972efa16f17a89b6f1e631215ce2d27777b739319ee82d08af EBUILD tomcat-servlet-api-10.1.0-r1.ebuild 1172 BLAKE2B 4f7067a7e31c04bf55c66c0fa25c10a3744bc6e010db04ad922739b4ad57130e667da67c3513636ecbd61f126866e9edafa0c05dedaed2a60ce4adc875183971 SHA512 73640743378e8914d06fd4ab02cb7418356b03b152e24272a3600a14eaaaa85045c8e4f47378c3bb397a6bf08a9366fe13aa3f2bf574cdc6cc33ed1ed10756e6 EBUILD tomcat-servlet-api-10.1.1.ebuild 1172 BLAKE2B a0e939bb1464ee12c11cd92ccba5ea6c868aaeea83fe0dd4a65d44ff5b04e9bbc7a8723575796833123232b351456e313530aa86cb9fdb94f1cd336bb355f9dd SHA512 98311d5bdcbb1e784bb8228b185c78bec7d46f06ec9ef6bae0f6bfc6f58dc0d5e5bc36b84df604864a332a4b53da5b750a092c99dcde8e1175b996b3a97433f5 @@ -26,7 +25,6 @@ EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263 EBUILD tomcat-servlet-api-8.5.82.ebuild 3002 BLAKE2B c45468894337c7e25099a50e10280a0e08b4be3c6f058ff4b1ead323f5c9713dbb618b8c47e8106cb7f1a8ca84e75cb14191bf263ec2ccc9f25e8220bb92992f SHA512 f05643a5452a73dbb03d451f576404b75fe1cd615aca31855d741223b70ec081b914311b063e16ec28c2779d92edcfa264a354a75bcc59ec56670b1ff426f634 EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1328 BLAKE2B 385d32707719ae49dff0255a2a5a432adfdd02ab57467c2b71e7edf70bcd6f502c30707e3a02ae80d243fa9453bcd4b6da0345a1f462b28a40c58aa3097607bc SHA512 4b22424585b88d442cf0441a810752d1dc8243d23cac139ab5259393a522a342d340b376e0adab288e6520732bad221950063c0b76eff7b165387b08c62ab254 -EBUILD tomcat-servlet-api-9.0.65.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a EBUILD tomcat-servlet-api-9.0.67.ebuild 3009 BLAKE2B bfcd05fd52b9fe8828076b1727c38fb62f3019f271e95c17a6b5a4ead3f0704e2e3449216dba58bc27c399c9c242e48bc3dc9f7e4b4f5d6c7a242ad36cce243a SHA512 e6ddc9b3168c85061a67941dc8860933df8d6479a966cd627ef9d3eb9d5d5a9e925a950cc8c740604b1c7520a3e7faf47dab41f07223a8bc1250219053a7444a EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1168 BLAKE2B 772b7aa6f72ba5aa6534e8e866c167864415c780e431c3304413abdfb0f568630108c8ab2bbd388edcc4e88ed816de8992d341bd7a42823ca311ff43761c9fc1 SHA512 070aedbac428440cfe68810109c5a598fcb9ccc8a6a3cdf205f15e5769f91809c75a2ab6c3cb50214dcf6289b4a5b9f0bcfccb5901ba5d6684771caf2e5e8c79 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild index acb0d6c5fcea..0d28b0e15cd3 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.26.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="5.0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild deleted file mode 100644 index f1c865a27bec..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.65.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="source" - -inherit java-pkg-2 java-pkg-simple - -MY_A="apache-${PN}-${PV}-src" -MY_P="${MY_A/-servlet-api/}" -DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="4.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" - -DEPEND=">=virtual/jdk-1.8:*" -RDEPEND=">=virtual/jre-1.8:*" - -S="${WORKDIR}/${MY_P}/" - -JAVA_TEST_SRC_DIR="src/test" - -SERVLET_API_JAR="servlet-api.jar" -SERVLET_API_SRC="src/main/servlet-api" -SERVLET_API_RESOURCES="src/resources/servlet-api" -EL_API_JAR="el-api.jar" -EL_API_SRC="src/main/el-api" -EL_API_RESOURCES="src/resources/el-api" -JSP_API_JAR="jsp-api.jar" -JSP_API_SRC="src/main/jsp-api" -JSP_API_RESOURCES="src/resources/jsp-api" - -src_prepare() { - default - - # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package - - mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ - ${EL_API_SRC} ${EL_API_RESOURCES} \ - ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ - ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" - - pushd java || die "Failed to cd to java dir" - - cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" - mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" - cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" - - popd - - for file in $(find src -type f | grep -vE "\.java$"); do - target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") - mkdir -p ${target_dir} || die "Failed to create resource directory" - mv $file ${target_dir} || die "Failed to move resource file" - done - - mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" - - java-pkg-2_src_prepare -} - -src_compile() { - JAVA_SRC_DIR="${SERVLET_API_SRC}" - JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" - JAVA_JAR_FILENAME="${SERVLET_API_JAR}" - java-pkg-simple_src_compile - rm -fr target || die "Failed to remove compiled files" - - JAVA_SRC_DIR="${EL_API_SRC}" - JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" - JAVA_JAR_FILENAME="${EL_API_JAR}" - java-pkg-simple_src_compile - rm -fr target || die "Failed to remove compiled files" - - JAVA_SRC_DIR="${JSP_API_SRC}" - JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" - JAVA_JAR_FILENAME="${JSP_API_JAR}" - JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" - java-pkg-simple_src_compile -} - -src_install() { - JAVA_SRC_DIR="${SERVLET_API_SRC}" - JAVA_JAR_FILENAME="${SERVLET_API_JAR}" - java-pkg-simple_src_install - - JAVA_SRC_DIR="${EL_API_SRC}" - JAVA_JAR_FILENAME="${EL_API_JAR}" - java-pkg-simple_src_install - - JAVA_SRC_DIR="${JSP_API_SRC}" - JAVA_JAR_FILENAME="${JSP_API_JAR}" - java-pkg-simple_src_install -} -- cgit v1.2.3