commit: d4bbac105d90e4fda3c8d6568d92054cfec16c23 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Fri Feb 2 18:00:44 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon Feb 5 09:08:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bbac10
dev-java/jakartaee-migration: add 1.0.7-r2 for >=dev-java/ant-1.10.14-r1 Bug: https://bugs.gentoo.org/923607 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35144 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> .../jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild | 6 +++--- ...n-1.0.7-r1.ebuild => jakartaee-migration-1.0.7-r2.ebuild} | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild index 4308d151f1bf..021d35532658 100644 --- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild +++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -77,8 +77,8 @@ src_prepare() { src_test() { # we need to create jar files for the tests the same way as it's done using pom.xml local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+") - mkdir -p target/test-classes/META-INF || die - pushd target/test-classes || die + mkdir -p generated-test/META-INF || die + pushd generated-test || die echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild similarity index 91% copy from dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild copy to dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild index 4308d151f1bf..339a87cf928b 100644 --- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r1.ebuild +++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ HOMEPAGE="https://tomcat.apache.org"; SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 ~arm ~arm64" +KEYWORDS="~amd64 ~arm ~arm64" # Common dependencies # POM: pom.xml @@ -23,7 +23,7 @@ KEYWORDS="amd64 ~arm ~arm64" # org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!! CDEPEND=" - dev-java/ant-core:0 + >=dev-java/ant-1.10.14-r1:0 dev-java/bcel:0 dev-java/commons-compress:0 dev-java/commons-io:1 @@ -53,7 +53,7 @@ S="${WORKDIR}/${P}" JAVA_LAUNCHER_FILENAME="${PN}" -JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1" +JAVA_GENTOO_CLASSPATH="ant,bcel,commons-compress,commons-io-1" JAVA_SRC_DIR="src/main/java" JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI" JAVA_RESOURCE_DIRS=( @@ -77,8 +77,8 @@ src_prepare() { src_test() { # we need to create jar files for the tests the same way as it's done using pom.xml local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+") - mkdir -p target/test-classes/META-INF || die - pushd target/test-classes || die + mkdir -p generated-test/META-INF || die + pushd generated-test || die echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
