gentoo auto-resync : 12:08:2022 - 14:22:05

3 files changed, 2 insertions, 93 deletions

diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 51d57e92955a..e7d861d07c7a 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,5 +1,3 @@
-DIST jakartaee-migration-1.0.0-sources.tar.gz 35116 BLAKE2B 98b587e5a51e8f3540d6f4570c60ffa5516801709e41260ac09f7fcabc9e96a3b9067e8eba6c5975c62e3c56585a1f334a21acc15627666e1616ced6f625c56f SHA512 f0c0dc5da4d3c5d4bae8fd4c3db349cb45b7c8d82ca0bb12f3c995e92d4b0893db111ab33ce812299d66904827adc91b22c49381625760fc05c1b10de76faa0c
 DIST jakartaee-migration-1.0.1-sources.tar.gz 35763 BLAKE2B 9e739668a7ebd65396960cd2447ecf2bc114cb85a2c554a17cb8478bef13f70f2fed26cc96553a22e7279dde698e1c094ca4dc7a8695ff9f82903ebe8badbd69 SHA512 6caaadfe5dcb21a859f2e401c039832b2774d8876ac724c3159b28c80a1153f7cd1c6706ba29a38d5f748cd2e55a85bd9bfecfb3a405f86aa85637ff3ca3c5f7
-EBUILD jakartaee-migration-1.0.0.ebuild 2875 BLAKE2B 5c1d22930a619cedf70f5ab662f97254d749f9e61b69cef1042cdf953ed88500760a584293f85ddfd6092e16cb5da37a6e338bd8774248a30b6a356bc1b65977 SHA512 437f3185594bcc8450f8f000ae300bd178e82a4da58cb6a30c9412e387684a50d435e026d28712d6d06c675055ea23f0fa85f9f18bc0290116a6ad8010bae1e3
-EBUILD jakartaee-migration-1.0.1.ebuild 2946 BLAKE2B d6fe4116b5c7244c28d8f60ffb402a5350b0a4da24f481740bbcbea0ebb319af61afd2f5827eeff69b1425b64929e83cf3b3136af8d818a2855bf336db49a1b9 SHA512 19f136cff748996cb735841a399de38ad98e34e3699482185ffa6dca9bb51441fc340a4424031a6d1834c5df2e58c333882d7ace2b7011ae278a6fbada7dbb24
+EBUILD jakartaee-migration-1.0.1.ebuild 2945 BLAKE2B 707735f243f9021cfa0644817e496391e4e0307fd47a3a374dad9c80ab0d45637636d90e8a0040f26549d1b160dca13c59496c3a04a3dc97c5dd5c48ec36cb77 SHA512 ec2915116456bcc77d5fcc4e2f9594ac9b8424d4a7a753dd28bd4e68aba01bfa64bdf7f1845b8eb3518bd91ea7a079a4ff1d2b1c56a872848beac0f0cbff99bb
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
deleted file mode 100644
index d2f4bdc8953d..000000000000
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.0/source/jakartaee-migration-1.0.0-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.0.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.0"
-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"
-
-# Common dependencies
-# POM: pom.xml
-# commons-io:commons-io:2.8.0 -> >=dev-java/commons-io-2.8.0:1
-# org.apache.bcel:bcel:6.5.0 -> >=dev-java/bcel-6.5.0:0
-# org.apache.commons:commons-compress:1.20 -> >=dev-java/commons-compress-1.20:0
-
-CDEPEND="
-	dev-java/ant-core:0
-	dev-java/bcel:0
-	>=dev-java/commons-compress-1.20:0
-	dev-java/commons-io:1
-"
-
-# Compile dependencies
-# POM: pom.xml
-# org.apache.ant:ant:1.10.9 -> !!!groupId-not-found!!!
-# POM: pom.xml
-# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.1:4
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	${CDEPEND}
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${P}"
-
-JAVA_LAUNCHER_FILENAME="${PN}"
-
-JAVA_GENTOO_CLASSPATH="ant-core,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"
-)
-
-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 target/test-classes/META-INF || die
-	pushd target/test-classes || 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.1.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
index 8dc73b5ae0eb..2f557abf9a8c 100644
--- a/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.1.ebuild
@@ -17,7 +17,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"
+KEYWORDS="amd64"
 
 # Common dependencies
 # POM: pom.xml