gentoo auto-resync : 22:03:2024 - 13:00:51

3 files changed, 2 insertions, 98 deletions

diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 8ae543b1cddb..12c52dd52e1b 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,5 +1,3 @@
-DIST jakartaee-migration-1.0.7-sources.tar.gz 43381 BLAKE2B 9a1a6bfd217f77890940240c6c860e21e0b72c758a63426a0c63009213738a9322a758d4525a9a8a8c69883c490edf128d8b70a6120ede431da434c4d1408e19 SHA512 f7edd70b997b2ae2a93b14b93c5b6dcb80de04f554125729f89e62eddaecfbfea21b304226887edb029c8a7b255b50a55a38381d017c7d44859f2e56b912f25a
 DIST jakartaee-migration-1.0.8-sources.tar.gz 43466 BLAKE2B f9ffbb46ef6a26c9884e1d3eb55f283556cf8dbaf0955c9efe7e9766f77eadaae1e5bd066225948e9d97adac0f2f34fee3d6ad552bbbdad7303a0abb98d3070c SHA512 ecb1db63cb258b1b8c0e8106ea171e80e66622a48cafa62f8fb75e1b1ba6d539cfefc5dfe0ba9536d06b102c599afeba80d094598d2af3fe1d2ca153ef61ced8
-EBUILD jakartaee-migration-1.0.7-r2.ebuild 2899 BLAKE2B 7610c74888de4245544642e47b186129751b44f3ed936659b12c20182203856e23c2520a0d6488382d30709a2beed897875b8aa622e2995ffb4b496ce9cb14c6 SHA512 bf0d1aa8a4fb808b8a6479e44469261ea5f90cbaf448620b3333ba7af935c264db0a7320c468f4ab2e95453f334039e2b0ead69a5e6288ca181f08d2dd6ad9dd
-EBUILD jakartaee-migration-1.0.8-r1.ebuild 2397 BLAKE2B a1b77be3392a885345254ef826ac60bfba28363b9c0ce6d9e315759a9b9518a2be6f90535fa1b84e17c391e303c233d9ebeafabf8a1dbcdfc0031ae0d2adc899 SHA512 631bb8e81f3be9e021a427452b61952c04813c625c4b69ef572999d11f97a60a2ca9f1bbcae1dcbfa01404476b9f6b0cfaa72082d4c7809f7d25a5b4cec00c44
+EBUILD jakartaee-migration-1.0.8-r1.ebuild 2396 BLAKE2B 284580c3318f854a5e444148fb77b21efd3b53404224a0006b8f5ee01b81a06103f7ec6ef327bde18c22abb54f51a73a3d14349eedd7b536c995705b6643cd62 SHA512 354ffdc0ffb97cb8dbee75602ee8a3ee26a02af54085a3695af66835b12f172d96457e4b77f14b98376c2ec15e74914d503d047312f2006e038c96084b1544ba
 MISC metadata.xml 335 BLAKE2B 5f9b427a9a229435fa8f5ee0a510b4943d95f1728500139d9d72f7c0d8ebe9130827815a4cb12976893f40962e12378480df968b6347efbb0a808bc37da46d9a SHA512 7064bbf92199c8e938c1370e583e0c361a98825016d7766ecc07a8bbe7b73cc13eb4cd4453a9720511a7d83328f3f8107c0447786425b101823b05ebb3eb2719
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
deleted file mode 100644
index 7e8daacf6943..000000000000
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.7-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.7"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
-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"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
-# org.apache.bcel:bcel:6.6.0 -> >=dev-java/bcel-6.6.0:0
-# org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!!
-
-CDEPEND="
-	>=dev-java/ant-1.10.14-r1:0
-	dev-java/bcel:0
-	dev-java/commons-compress:0
-	dev-java/commons-io:1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
-
-# we need jdk-11 just for some tests as those need stuff from newer jdk,
-# otherwise the package as of version 1.0.7 compiles fine with jdk 1.8
-# with tests disabled
-# see bug https://bugs.gentoo.org/910499
-
-DEPEND="
-	>=virtual/jdk-11:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-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=(
-	"src/main/resources"
-)
-
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-JAVA_TEST_RESOURCE_DIRS=(
-	"src/test/resources"
-)
-JAVA_TEST_EXCLUDES=(
-	"org.apache.tomcat.jakartaee.TesterConstants"
-)
-
-src_prepare() {
-	default
-	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
-}
-
-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 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
-	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
-	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
-	for enc in rsa dsa ec; do
-		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
-		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
-	done
-	popd
-
-	java-pkg-simple_src_test
-}
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
index 6203c0152c9b..4ee56f6fa8ae 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.8-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 
 CP_DEPEND="
 	>=dev-java/ant-1.10.14-r1:0