commit: 0f18e6adcddd42a1dc572c114c7b96b4b5989539 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Oct 28 15:02:48 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sat Oct 29 06:48:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f18e6ad
dev-java/tomcat-servlet-api: drop 10.0.23 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/28007 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/tomcat-servlet-api/Manifest | 1 - .../tomcat-servlet-api-10.0.23.ebuild | 98 ---------------------- 2 files changed, 99 deletions(-) diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 6bc5cde3f70c..11c59f08ba94 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -1,4 +1,3 @@ -DIST apache-tomcat-10.0.23-src.tar.gz 6136614 BLAKE2B 4eaf963187b9a754ed459d7f85e6f7d329927b949bb4a390a602cdc6651aa037aeec559c511ddb9880b6ec4d7cd97b96d82da341509370e412e1b21b799d8c2e SHA512 19ec026bae75318e9ffbe2e619ad2e12ec116382ea88a1064696275afb3fd13e6f08efe497dde79689bfc828f76e27d114ad3a9284b79c8d956a6a85bdac6360 DIST apache-tomcat-10.0.26-src.tar.gz 6153701 BLAKE2B fb16f83cf71dc97f21739c3714d2d3d201aa6b6b4242c351fabfc04ee767e59b6e376c7c8984dcda12d6942835221c55d4451b2d0a1245a2dbb73636c93da47c SHA512 f66387a3ca67b6b3df8504c4ae089e8f30e389811a8d0b7d2241e115b8cf712a38f3d0fea938cef7fa9745f412aa70ad47840e40e2385fbd1435b636e93b45b4 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15 DIST apache-tomcat-10.1.0-src.tar.gz 6060833 BLAKE2B 49f36131c1e809b298ac915e671b9f4df55b55c2ba34d21ee3fdeb8759ddaf53a6780b177e8049446079d91186c52669969f30762ddf776d9f8615e527d5a975 SHA512 08323eec0403473fa97f419d7911980c3dfe7b1607a64741bbe972a737dfa70ea04ea80ca9ab28bf72bdde9d24cf8f7161eeb8b194204c777d1628d00c78611c diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild deleted file mode 100644 index 0d28b0e15cd3..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.23.ebuild +++ /dev/null @@ -1,98 +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 5.0/JSP API 3.0/EL API 4.0 implementation" -HOMEPAGE="https://tomcat.apache.org/"; -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" -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 compile and package - mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ - ${EL_API_SRC} ${EL_API_RESOURCES} \ - ${JSP_API_SRC}/jakarta/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 jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" - mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources" - cp --parents -R jakarta/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/jakarta ${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 -}
