From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8E80615817D for ; Fri, 14 Jun 2024 10:22:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B52222BC015; Fri, 14 Jun 2024 10:22:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 94CDE2BC015 for ; Fri, 14 Jun 2024 10:22:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C41A1335DCD for ; Fri, 14 Jun 2024 10:22:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5E64611DF for ; Fri, 14 Jun 2024 10:22:41 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1718360462.9d179f221c61bf15a3ac7db6061e54673d9ddc9b.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-servlet-api/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40-r1.ebuild dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild X-VCS-Directories: dev-java/tomcat-servlet-api/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 9d179f221c61bf15a3ac7db6061e54673d9ddc9b X-VCS-Branch: master Date: Fri, 14 Jun 2024 10:22:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 74d406bd-cef5-40a8-8d14-da64e532bbdf X-Archives-Hash: 0f9a5d3153c87f3be2b9b939331d0366 commit: 9d179f221c61bf15a3ac7db6061e54673d9ddc9b Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Mon Jun 10 09:01:18 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Fri Jun 14 10:21:02 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d179f22 dev-java/tomcat-servlet-api: rewrite with java-pkg-simple Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/36770/commits/939b93e19a004fe67afe75b3f072505d35a9197d Signed-off-by: Miroslav Šulc gentoo.org> ....ebuild => tomcat-servlet-api-4.1.40-r1.ebuild} | 33 +++++++++------------- 1 file 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 similarity index 53% rename from dev-java/tomcat-servlet-api/tomcat-servlet-api-4.1.40.ebuild rename to 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 }