diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-06-15 00:09:17 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-06-15 00:09:17 +0100 |
| commit | 6a7029e0f7370d4d5dfe9e31cc2719a870482392 (patch) | |
| tree | 28c6c747114eaedfd2db81f86ac2ff3d7d13111e /dev-java/tomcat-servlet-api | |
| parent | 5e41a38157bb40e8513e8e34426e85faba672fe7 (diff) | |
gentoo auto-resync : 15:06:2024 - 00:09:17
Diffstat (limited to 'dev-java/tomcat-servlet-api')
| -rw-r--r-- | dev-java/tomcat-servlet-api/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild (renamed from dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild) | 33 |
2 files changed, 15 insertions, 20 deletions
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 41732dd1df60..9adcb7b3950c 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -1,3 +1,3 @@ DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e -EBUILD tomcat-servlet-api-4.1.40.ebuild 979 BLAKE2B 4a397aa3643ee673e454ca42c924200ec44441523b1c004c5537e2f2ae4133eedc4fa0ed05a35c3cbc700c72a1536d31e8efc1e25d6b251d29af06ed8cabc7e6 SHA512 6abaff35c0518c1c335d15b785f0df3a82b7899fd7c8b34461497de14c056c6d4c51657a9b88a322d6d0da7f479e760cbd32d3ac8dc293c41ae53de0811b74d7 +EBUILD tomcat-servlet-api-4.1.40-r1.ebuild 1027 BLAKE2B bac0575699baa8ae15b931f50d951bef48ab7ae81c2b7bae38ad47614d67fa70e25a67bc0e8ae1b485457da0550732f7afeb11cb86aebf924e677623da16e019 SHA512 1d2b631f71b83fd69491317fa75a77ffa812f04372cb73f684a398eb8804d40a911330b82828482f6b84a7fa2b6918a5b0930685ceafb80b732682e656540ee8 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild index 4cddc788557a..6e708992ad86 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" -inherit java-pkg-2 java-ant-2 +inherit java-pkg-2 java-pkg-simple MY_P="apache-${P/-servlet-api/}-src" DESCRIPTION="Tomcat's Servlet API 2.3/JSP API 1.2 implementation" @@ -19,20 +19,15 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-mac IUSE="" S="${WORKDIR}/${MY_P}/servletapi" -src_unpack() { - unpack ${A} - cd "${S}" - - einfo "Removing bundled jars and classes" - find "${WORKDIR}/${MY_P}" '(' -name '*.class' -o -name '*.jar' ')' -delete -} - -EANT_BUILD_TARGET="all" - -src_install() { - java-pkg_dojar dist/lib/servlet.jar - - use doc && java-pkg_dohtml -r dist/docs/* - use source && java-pkg_dosrc src/share/javax - dodoc dist/README.txt +JAVA_RESOURCE_DIRS="res/src/share" +JAVA_SRC_DIR="src/share" + +src_prepare() { + java-pkg-2_src_prepare + mkdir src/share/javax/servlet/{,jsp/}resources || die + mv src/share/dtd/web-app* src/share/javax/servlet/resources || die + mv src/share/dtd/* src/share/javax/servlet/jsp/resources || die + mkdir res || die + find src -type f ! -name '*.java' ! -name '*.gif' \ + | xargs cp --parent -t res || die } |