diff options
| author |   Volkmar W. Pogatzki <gentoo@pogatzki.net> | 2024-06-10 11:01:18 +0200 |
|---|---|---|
| committer |   Miroslav Šulc <fordfrog@gentoo.org> | 2024-06-14 12:21:02 +0200 |
| commit | 9d179f221c61bf15a3ac7db6061e54673d9ddc9b (patch) | |
| tree | cd4b6c8024bd4d5a4f05bfa0df995cd795d7c6b4 /dev-java | |
| parent | app-text/trang: add 20220510 (diff) | |
| download | gentoo-9d179f221c61bf15a3ac7db6061e54673d9ddc9b.tar.gz gentoo-9d179f221c61bf15a3ac7db6061e54673d9ddc9b.tar.bz2 gentoo-9d179f221c61bf15a3ac7db6061e54673d9ddc9b.zip | |
dev-java/tomcat-servlet-api: rewrite with java-pkg-simple
Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/36770/commits/939b93e19a004fe67afe75b3f072505d35a9197d
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
Diffstat (limited to 'dev-java')
| -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 |
1 files changed, 14 insertions, 19 deletions
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 } |