summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin58599 -> 58613 bytes
-rw-r--r--dev-java/json-simple/Manifest4
-rw-r--r--dev-java/json-simple/json-simple-2.3.1.ebuild26
-rw-r--r--dev-java/json-simple/metadata.xml2
-rw-r--r--dev-java/junit/Manifest4
-rw-r--r--dev-java/junit/junit-5.9.2.ebuild337
-rw-r--r--dev-java/junit/metadata.xml6
-rw-r--r--dev-java/maven-bin/Manifest2
-rw-r--r--dev-java/maven-bin/maven-bin-3.9.0.ebuild2
-rw-r--r--dev-java/open-test-reporting-events/Manifest2
-rw-r--r--dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild2
-rw-r--r--dev-java/open-test-reporting-schema/Manifest2
-rw-r--r--dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild2
-rw-r--r--dev-java/picocli/Manifest2
-rw-r--r--dev-java/picocli/picocli-4.6.3-r1.ebuild2
-rw-r--r--dev-java/shrinkwrap-api/Manifest2
-rw-r--r--dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild2
-rw-r--r--dev-java/shrinkwrap-impl-base/Manifest2
-rw-r--r--dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild2
-rw-r--r--dev-java/shrinkwrap-spi/Manifest2
-rw-r--r--dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild2
21 files changed, 390 insertions, 17 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index eef3908ed0f0..c93da44caf18 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 4fdf793ff210..69b842cdbf35 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1,3 +1,5 @@
DIST json-simple-1.1.tar.gz 22154 BLAKE2B 594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570 SHA512 f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
+DIST json-simple-2.3.1.tar.gz 56230 BLAKE2B c4a196ffa67a729a1964db8c30b95ccb0bef0c213a76e37e463153a895a5fdb8c6f02f6d188d28f0b56665bf24c75dbdeeb42d88297c8df5e1b409606b0f04f2 SHA512 b80ea33480f8b32511ee2db5cfacc9c02cb5dbf0765b41fb76e099f41ac6c0ea69d75fdf0a5f783e3bfb7b4f200c49ca192a3321e0d8480b3a8b67ada469dbb1
EBUILD json-simple-1.1-r2.ebuild 592 BLAKE2B 8b9ded6bf2fa2350ddde5910836999bbdc2e10a5d6a19acd31bd76b523060bebb5df8489507ee089074a3d6ed3ce48cfbcb8f9829689b25a38c56f856451326e SHA512 f5bf630f85bf7347ae5dff5d2877e0b3a79632fc58309da7132d08ba34d146a332778af006ad6cb6c658713060c1f2e9e168d3e071c29096444599b0d2f9679d
-MISC metadata.xml 885 BLAKE2B 36739d989f99a763b0ddc4d18fa0f799503f44f85526b7f49b1fa9bcd241dcbbfe6da15a4d10c8c4f3aa3d961074ad6bb3b54ddaec43e2ff7f7a820148a1b7f4 SHA512 20f88fc9e0330bedd83e776a8bc83af4d4c3290a00b089597dd05030818bb06a8fe23c4da4eade5178c9fd24e2d320ad77cd95690cfde69b49b2bb211bd0a9d2
+EBUILD json-simple-2.3.1.ebuild 723 BLAKE2B ee0dce76a0947d389d5810ee9de5acc1da4363fb3c08c16a69b2a36029c9c073fb037ffbdb980c40f3f045f3b3c1173255e4096b72e687a7ce9b1415c6fc1ac7 SHA512 1499b477714b1e2b8e146d799a106f1512e3a3317c5ce604053103cacaea893549bcc175dadc72e0cc5b6c8f6dea0a607172ef411739f7c9c5ba74400959c096
+MISC metadata.xml 892 BLAKE2B 645106c0f6748a93c7609189be058eccbb288944c0a7f43b57483fd6097d4f6b4f9cfc151e9c67257cbfc894b28470337873343d21b4393a939c53dce2d957d1 SHA512 6cf5b5266158ff625cae80ea94e9912ca5f2603f29fa4a1c6d84b54c238c0e7a237ef558bf2fd8cbd6b597ec5da7cee9543f6ffe9cdde07fe9a2dd8a93539077
diff --git a/dev-java/json-simple/json-simple-2.3.1.ebuild b/dev-java/json-simple/json-simple-2.3.1.ebuild
new file mode 100644
index 000000000000..e7d6ef026a03
--- /dev/null
+++ b/dev-java/json-simple/json-simple-2.3.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="source doc test"
+MAVEN_ID="com.github.cliftonlabs:json-simple:2.3.1"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java 7+ toolkit to quickly develop RFC 4627 JSON compatible applications"
+HOMEPAGE="https://www.json.org"
+SRC_URI="https://github.com/cliftonlabs/json-simple/archive/json-simple-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${P}"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/json-simple/metadata.xml b/dev-java/json-simple/metadata.xml
index 0c65410880a7..22e6f7bfad33 100644
--- a/dev-java/json-simple/metadata.xml
+++ b/dev-java/json-simple/metadata.xml
@@ -13,6 +13,6 @@
website,I found that wrappers to JSONObject and JSONArray can be simpler,
due to the simplicity of JSON itself. So I wrote the JSON.simple package.</longdescription>
<upstream>
- <remote-id type="google-code">json-simple</remote-id>
+ <remote-id type="github">cliftonlabs/json-simple</remote-id>
</upstream>
</pkgmetadata>
diff --git a/dev-java/junit/Manifest b/dev-java/junit/Manifest
index 3e12dc3fc319..725abfe519fc 100644
--- a/dev-java/junit/Manifest
+++ b/dev-java/junit/Manifest
@@ -1,5 +1,7 @@
DIST junit-4.13.2.tar.gz 1077147 BLAKE2B c083982cd604812ba3375f90e0486bb3683ecbc3b08e3d14d4541845c5b91cd85100fe86028c70a7cec4e1ab6f6794bcb9333686b3c9b0705eacb75ac36e64da SHA512 29f8f8717efe50b9c7e27805a699f3664a0a068e32ce93e3a1a2bc67a045417490ac04251ef8f8bbd21c77a759bf7e4c6b7a5a07141227bd17de0c526c5031bb
+DIST junit-5.9.2.tar.gz 2882173 BLAKE2B 6baf8768654b399d64237a110dcb6a821ab7dc8964254a5d00f7ffb65c789818aed51ad7042a963a47669042baaeec87b5d0453643a2b0eeeaf6393a42c75fd6 SHA512 5673577f773042b4e253241d27298a60dbac239502788e1d999fbe0d3ffe76b29c90d4fb43660f2e2e00e3e9b8d4c1b6b909ff95dc6e87ccb6f7b009ae6b0e78
DIST junit3.8.2.zip 461426 BLAKE2B 8fbef1ccdf7f71c611976d63f45838f4cb2564da5f5064e7abc39931a3c99039a40660093aba2cc3c70af761171125f434c16c52021226f2e92fdf23597dbf25 SHA512 f203332ccc2bdc38c683a95bdbe448f38cbfbeea81ecc431bf9ebf0a3292f0150fcfe5cd5dd6da481be034366820f95775a33581931aed9e4cc12a6ff27e3930
EBUILD junit-3.8.2-r2.ebuild 842 BLAKE2B 01cc39cca58291852a2bd71b97283ce344656648c741792013e7daaf50cccad14551e4d0885d9fa4c3dfe52cfccd18c0943a55c0d479cd49b1d182eaa8252f75 SHA512 25a498140852340c429d965b8770a1844fdcff906164fcdf873e32cd303871b446d80d88fef2772c765254c7396fdd6a3688e9b253f04cf02c289c5a85e99ebe
EBUILD junit-4.13.2.ebuild 1982 BLAKE2B 36fb397f0cad9ab1553e56736038cdc8503ed90fa414155337f0a7ffb90b014b01c4b11ae553df1f013f906b767500451f6fa0c20617ac933c3a27579b9c07d7 SHA512 4412a06609d3b35ccb6261ef6f398d9fd6a0147c8448d12caa7547e9d8536c2bf212cf4ef208f45466370a0d13dd155f4f4166092cd76af13c5ed9fd23597e21
-MISC metadata.xml 369 BLAKE2B d22798c3ef0deeb9a6ca453bf3777a755aeab5e77b733502b802610cd1203db31121bbe93bbbc2c565e45fca350294e54ee7e00e00b07420176df55728b2095a SHA512 343f2067945c5398dc2a7c643ac84d25344c8ea6287a697ba0246d53b797e03b4ceee2576b4b4b568347087b58de00e2913880ad347c92d4c43eb951760848b2
+EBUILD junit-5.9.2.ebuild 12000 BLAKE2B 4e1a243983e2814054dd46944828b68a65451e15ed5eb54d420789731314736528643844799140d7c9453ee193daa25cab64377c7262970c74a40bfd4f8e3fbb SHA512 e9925ee10b30de57511a5669fa45355fe35bbe575ae654a3a4cb308117150d3ecc19d926d8cd355d9fe22f859d13fd5d75a2ceeb17301a29d28451540ba26e3e
+MISC metadata.xml 894 BLAKE2B d0f5c989f8a49dc923dfaf51a7d42d6fdc79a9c2cccd48cd31e687bcc5b7d7f25b15f1e7f91ebfe8f87cc15ce11b37c95e06dcf17611b03066f2b079efc6624b SHA512 7d40683565d1e4ff8ceb183fa26d8d6e3ae77dc1f7335a6ea452589f0f794bae8479a9e97c257a7d2332f3fa83b6721b334557944a4f0d6d064b66e0bcda9bd1
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
new file mode 100644
index 000000000000..e0fb4130e172
--- /dev/null
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -0,0 +1,337 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Declare the 'doc' USE flag in IUSE -- not JAVA_PKG_IUSE -- to
+# prevent java-pkg-simple.eclass from handling Javadoc; instead,
+# let this ebuild handle Javadoc generation and installation itself.
+# This ebuild invokes java-pkg-simple.eclass's phase functions
+# multiple times to build multiple modules, but the eclass always
+# installs each module's Javadoc to the same directory, which would
+# trigger an error when the second module's Javadoc is installed.
+JAVA_PKG_IUSE="source"
+IUSE="doc migration-support suite vintage"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Simple framework to write repeatable tests"
+HOMEPAGE="https://junit.org/junit5/"
+SRC_URI="https://github.com/junit-team/junit5/archive/r${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/junit5-r${PV}"
+
+LICENSE="EPL-2.0"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~ppc64"
+
+CP_DEPEND="
+ dev-java/apiguardian-api:0
+ dev-java/opentest4j:0
+ dev-java/open-test-reporting-events:0
+ dev-java/picocli:0
+ dev-java/univocity-parsers:0
+"
+
+# java-utils-2.eclass does not support
+# USE-conditional dependencies in CP_DEPEND
+COND_DEPEND="
+ migration-support? ( dev-java/junit:4 )
+ vintage? ( dev-java/junit:4 )
+"
+
+# Limiting JDK version to >=11 for module-info.java in this package
+# https://bugs.gentoo.org/796875#c3
+DEPEND="
+ >=virtual/jdk-11:*
+ ${CP_DEPEND}
+ ${COND_DEPEND}
+"
+
+RDEPEND="
+ >=virtual/jre-1.8:*
+ ${CP_DEPEND}
+ ${COND_DEPEND}
+"
+
+src_configure() {
+ # Please make sure to declare a module's dependencies before the module itself.
+ # Useful upstream documentation regarding modules and dependencies:
+ # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-metadata
+ # https://junit.org/junit5/docs/current/user-guide/index.html#dependency-diagram
+ JUNIT5_MODULES=(
+ junit-platform-commons
+ junit-platform-engine
+ junit-platform-launcher
+ junit-platform-reporting
+ junit-platform-console # For launching tests from CLI;
+ # an eclass would need it to support running tests using JUnit 5
+
+ $(use suite && echo \
+ junit-platform-suite-api \
+ junit-platform-suite-commons \
+ junit-platform-suite-engine \
+ )
+
+ junit-jupiter-api
+ junit-jupiter-engine # For JUnit Jupiter tests -- the so-called
+ # "JUnit 5 tests", which cannot run on earlier JUnit versions
+ junit-jupiter-params # For parameterized tests; the junit-jupiter
+ # aggregator module includes it, so building it unconditionally
+ $(usev migration-support junit-jupiter-migrationsupport)
+
+ $(usev vintage junit-vintage-engine)
+
+ # Modules not included:
+ # - junit-bom: Has no sources; solely for helping Maven and Gradle
+ # projects that use JUnit 5 manage dependencies easier
+ # - junit-jupiter: Aggregator; does not have 'src/main/java'
+ # - junit-platform-console-standalone: Has no sources; solely used
+ # by the upstream to build a fat JAR that bundles everything, so
+ # users can use just this single JAR to run JUnit 5
+ # - junit-platform-jfr: For an experimental feature
+ # - junit-platform-runner: Deprecated
+ # - junit-platform-suite: Aggregator; does not have 'src/main/java'
+ # - junit-platform-testkit: Requires >=dev-java/assertj-core-3.14.0
+ )
+ local cp_packages=()
+ (use migration-support || use vintage) && cp_packages+=( junit-4 )
+ local save_IFS="${IFS}"
+ IFS=',' JAVA_GENTOO_CLASSPATH="${cp_packages[*]}"
+ IFS="${save_IFS}"
+
+ JUNIT5_VM_VERSION="$(java-config --get-env PROVIDES_VERSION)"
+}
+
+junit5_foreach_module() {
+ local module
+ for module in "${JUNIT5_MODULES[@]}"; do
+ junit5_module_do "${module}" "${@}"
+ done
+}
+
+junit5_module_do() {
+ local module="${1}"
+ # Invocation of the passed function will not be guarded by '|| die'.
+ # Like the case for multibuild_foreach_variant(), it is recommended
+ # that the passed function itself calls 'die'.
+ local func=( "${@:2}" )
+
+ einfo "Running '${func[@]}' for ${module} ..."
+ pushd "${module}" > /dev/null || die "Failed to enter directory '${module}'"
+
+ # Set up Java eclass variables that are
+ # supposed to be set in the ebuild global scope
+
+ local JAVA_JAR_FILENAME="${module}.jar"
+
+ local JAVA_SRC_DIR=(
+ src/main/java
+ src/module
+ )
+
+ local JAVA_RESOURCE_DIRS=()
+ local default_resource_dir="src/main/resources"
+ [[ -d "${default_resource_dir}" ]] &&
+ JAVA_RESOURCE_DIRS+=( "${default_resource_dir}" )
+
+ if [[ "${module}" == junit-platform-console ]]; then
+ local JAVA_MAIN_CLASS="org.junit.platform.console.ConsoleLauncher"
+ local JAVA_LAUNCHER_FILENAME="${module}"
+ fi
+
+ # Invoke the passed function
+ "${func[@]}"
+ local ret="${?}"
+
+ popd > /dev/null || die "Failed to leave directory '${module}'"
+ return "${ret}"
+}
+
+junit5_gen_cp() {
+ echo "$(java-pkg_getjars --build-only --with-dependencies \
+ "${JAVA_GENTOO_CLASSPATH}"):${JAVA_GENTOO_CLASSPATH_EXTRA}"
+}
+
+junit5_module_compile() {
+ if [[ "${module}" == junit-platform-console ]]; then
+ # Unlike other modules that have a src/main/java9 directory, for this
+ # module, the upstream puts the class files built from src/main/java9
+ # in their JAR's top-level directory instead of META-INF/versions/9
+ cp -rv src/main/java9/* src/main/java/ ||
+ die "Failed to merge ${module}'s sources for Java 9+"
+ # Remove for the [[ -d src/main/java9 ]] test
+ # during versioned directory handling
+ rm -rv src/main/java9 ||
+ die "Failed to remove ${module}'s Java 9+ source directory"
+ fi
+
+ java-pkg-simple_src_compile
+ local sources="sources.lst"
+ local classes="target/classes"
+
+ # Collect a list of all compiler input files for building Javadoc
+ local source
+ while read source; do
+ echo "${module}/${source}" >> "${all_sources}"
+ done < "${sources}" ||
+ die "Failed to add ${module}'s sources to Javadoc input list"
+
+ # Handle classes that will go into versioned directories. This will be
+ # no longer needed after https://bugs.gentoo.org/900433 is implemented.
+ local vm_ver
+ for vm_ver in 9 17; do
+ local versioned_src="src/main/java${vm_ver}"
+ if [[ -d "${versioned_src}" ]]; then
+ if ver_test "${JUNIT5_VM_VERSION}" -ge "${vm_ver}"; then
+ local versioned_classes="target/${vm_ver}/classes"
+ mkdir -p "${versioned_classes}" ||
+ die "Failed to create directory for ${module}'s Java ${vm_ver}+ classes"
+ ejavac -d "${versioned_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "${classes}:$(junit5_gen_cp)" ${JAVAC_ARGS} \
+ $(find "${versioned_src}" -type f -name '*.java')
+ "$(java-config --jar)" -uvf "${JAVA_JAR_FILENAME}" \
+ --release "${vm_ver}" -C "${versioned_classes}" . ||
+ die "Failed to add ${module}'s Java ${vm_ver}+ classes to JAR"
+ else
+ # Modules that may hit this branch as of 5.9.2:
+ # - junit-platform-console:
+ # src/main/java17/.../ConsoleUtils.java tries to use
+ # java.io.Console.charset() (available since Java 17) to get
+ # the default output charset. It is fine to not use this
+ # file, even if the built artifacts will be used on JRE 17+,
+ # as src/main/java/.../ConsoleUtils.java still gets the
+ # default from java.nio.charset.Charset.defaultCharset().
+ elog "JDK ${JUNIT5_VM_VERSION} used; skipping Java ${vm_ver}-dependent parts in ${module}"
+ fi
+ fi
+ done
+
+ # Add the current module's JAR to classpath
+ # for the module's reverse dependencies in this package
+ JAVA_GENTOO_CLASSPATH_EXTRA+=":${S}/${module}/${JAVA_JAR_FILENAME}"
+}
+
+src_compile() {
+ local all_sources="${S}/all-sources.lst"
+ junit5_foreach_module junit5_module_compile
+
+ if use doc; then
+ einfo "Generating Javadoc for all modules ..."
+ local apidoc="target/api"
+ mkdir -p "${apidoc}" || die "Failed to create Javadoc directory"
+ ejavadoc -d "${apidoc}" \
+ -encoding "${JAVA_ENCODING}" -docencoding UTF-8 -charset UTF-8 \
+ -classpath "$(junit5_gen_cp)" ${JAVADOC_ARGS:- -quiet} \
+ -windowtitle "JUnit ${PV} API" \
+ "@${all_sources}"
+ fi
+}
+
+src_test() {
+ # Running the JUnit 5 modules' tests (located in each module's
+ # 'src/test/java') has a few obstacles:
+ # - Some test sources use text blocks -- a feature introduced in Java 15.
+ # A JDK at a lower version, e.g. 11, cannot compile them.
+ # - Some test classes depend on JUnit 5 modules that this ebuild does not
+ # include, like junit-platform-runner and junit-platform-testkit.
+ #
+ # Therefore, this ebuild uses a simpler approach to test the artifacts just
+ # built: it uses the artifacts to run tests in examples under the
+ # 'documentation/src' directory. The test coverage will not be impressive,
+ # but at least this approach verifies that the copy of JUnit 5 just built
+ # is capable of running some simple tests launched from CLI.
+
+ local JUNIT5_TEST_SRC_DIR="documentation/src/test/java"
+ local JUNIT5_TEST_RESOURCE_DIR="documentation/src/test/resources"
+ local JUNIT5_TEST_RM=(
+ $(usev !migration-support example/IgnoredTestsDemo.java)
+ $(use !suite && echo \
+ example/DocumentationTestSuite.java \
+ example/SuiteDemo.java \
+ )
+ $(usev !vintage example/JUnit4Tests.java)
+
+ # Need excluded module junit-platform-runner
+ example/JUnitPlatformClassDemo.java
+ example/JUnitPlatformSuiteDemo.java
+
+ # Need excluded module junit-platform-testkit
+ example/testkit/
+
+ # Not necessary for the tests; some files even require extra dependency
+ org/junit/api/tools/
+
+ # Needs dev-java/hamcrest; no need to pull in extra dependency
+ # as the examples already provide ample tests to run
+ example/HamcrestAssertionsDemo.java
+
+ # Makes an HTTP request and expects a certain response
+ example/session/HttpTests.java
+ )
+
+ pushd "${JUNIT5_TEST_SRC_DIR}" > /dev/null ||
+ die "Failed to enter test source directory"
+ rm -rv "${JUNIT5_TEST_RM[@]}" ||
+ die "Failed to remove unneeded test sources"
+ # Test sources expect the working directory to be 'documentation'
+ sed -i -e "s|src/test/resources|${JUNIT5_TEST_RESOURCE_DIR}|g" \
+ example/ParameterizedTestDemo.java ||
+ die "Failed to update file paths in test sources"
+ popd > /dev/null || die "Failed to leave test source directory"
+
+ local test_dir="${T}/junit5_src_test"
+ local example_classes="${test_dir}/classes"
+ local test_classes="${test_dir}/test-classes"
+ mkdir -p "${example_classes}" "${test_classes}" ||
+ die "Failed to create test directories"
+
+ local example_sources="${test_dir}/sources.lst"
+ local test_sources="${test_dir}/test-sources.lst"
+ find documentation/src/main/java -type f -name '*.java' > "${example_sources}" ||
+ die "Failed to get a list of example sources"
+ find documentation/src/test/java -type f -name '*.java' > "${test_sources}" ||
+ die "Failed to get a list of test sources"
+
+ ejavac -d "${example_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "$(junit5_gen_cp)" ${JAVAC_ARGS} \
+ "@${example_sources}"
+
+ local test_cp="${example_classes}:${JUNIT5_TEST_RESOURCE_DIR}:$(junit5_gen_cp)"
+ ejavac -d "${test_classes}" -encoding "${JAVA_ENCODING}" \
+ -classpath "${test_cp}" ${JAVAC_ARGS} \
+ "@${test_sources}"
+
+ set -- "$(java-config --java)" -classpath "${test_classes}:${test_cp}" \
+ org.junit.platform.console.ConsoleLauncher \
+ --disable-ansi-colors --fail-if-no-tests --scan-classpath \
+ --include-classname='^(Test.*|.+[.$]Test.*|.*Tests?|.*Demo)$' \
+ --exclude-tag="exclude"
+ echo "${@}" >&2
+ "${@}"
+ local status="${?}"
+ [[ "${status}" -eq 2 ]] && die "JUnit did not discover any tests"
+ [[ "${status}" -eq 0 ]] || die "ConsoleLauncher failed"
+}
+
+junit5_module_install() {
+ # It is OK to let java-pkg-simple_src_install call einstalldocs for
+ # each module as long as each documentation file being installed
+ # has a unique filename among _all_ modules; otherwise, some files
+ # would overwrite other ones.
+ if [[ -f README.md ]]; then
+ mv -v README.md "README-${module}.md" ||
+ die "Failed to rename ${module}'s README.md"
+ fi
+ java-pkg-simple_src_install
+}
+
+src_install() {
+ junit5_foreach_module junit5_module_install
+ einstalldocs # For project-global documentation
+
+ if use doc; then
+ einfo "Installing Javadoc for all modules ..."
+ local apidoc="target/api"
+ java-pkg_dojavadoc "${apidoc}"
+ fi
+}
diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
index c6886950ead4..87435c66c2c7 100644
--- a/dev-java/junit/metadata.xml
+++ b/dev-java/junit/metadata.xml
@@ -6,7 +6,13 @@
<name>Java</name>
</maintainer>
<upstream>
+ <remote-id type="github">junit-team/junit5</remote-id>
<remote-id type="github">junit-team/junit4</remote-id>
<remote-id type="sourceforge">junit</remote-id>
</upstream>
+ <use>
+ <flag name="migration-support" restrict="&gt;=dev-java/junit-5">Include the junit-jupiter-migrationsupport module, which helps with migration from JUnit 4 to JUnit Jupiter</flag>
+ <flag name="suite" restrict="&gt;=dev-java/junit-5">Include the JUnit Platform Suite Engine, which adds test suite support</flag>
+ <flag name="vintage" restrict="&gt;=dev-java/junit-5">Include JUnit Vintage, which allows JUnit 5 to run JUnit 3 and JUnit 4 tests</flag>
+ </use>
</pkgmetadata>
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index f15de1e0d184..5478c4f3d743 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,5 +1,5 @@
DIST apache-maven-3.8.7-bin.tar.gz 8293440 BLAKE2B 0a586cf0eb2a579d99bbe5736f294369b774ee4b041b37ecd4721eb3b988e274fd6d88bb34cc20a48c98c4f70c256dd74441c0f57119f90958af05e8c16f89c6 SHA512 21c2be0a180a326353e8f6d12289f74bc7cd53080305f05358936f3a1b6dd4d91203f4cc799e81761cf5c53c5bbe9dcc13bdb27ec8f57ecf21b2f9ceec3c8d27
DIST apache-maven-3.9.0-bin.tar.gz 9024147 BLAKE2B ba2545a44a20c7ed7791ea116fbb72d549409d955f8403355e13cf86b95ffda685d5ee0c3d3377f2b5481b25a2f0e6f45d51e89b1ba5913c9be0688a98f8d585 SHA512 1ea149f4e48bc7b34d554aef86f948eca7df4e7874e30caf449f3708e4f8487c71a5e5c072a05f17c60406176ebeeaf56b5f895090c7346f8238e2da06cf6ecd
EBUILD maven-bin-3.8.7.ebuild 1372 BLAKE2B a33c01293f6df1f11f774464a1d1f59ab451d370f12a257938df3ca162294a5552c7529bfb32f37375ebc068129fa94abfde2c5a3e8dd20552bfbd4ca59ecf57 SHA512 418c8e3ee4717295d162419b1fea11656c3aef0125c7ba986e9b2f2963c4f7e563c7de92cb75bcc00c688da4612d125583e52d01c26a0c4a980095a220b7ccb8
-EBUILD maven-bin-3.9.0.ebuild 1374 BLAKE2B f29c698e5afb41cf62b0354414052f64473d4257ac89f4004f90bfc9717aec71adf18d9c91f9a592de4a07e95d635b64b15b61e4cd0533b762d86194901fecce SHA512 d415fd39d7a4cdab97fafe053c1f9b61d5c562e953b2502c8935f4a7ed6a2f2b55e6452e053a081ebc278b6453409c80015fc392761739a069e76bca7f6277a7
+EBUILD maven-bin-3.9.0.ebuild 1372 BLAKE2B 5e7c245e7888d018784a15d894ff5277c792b7f2a0f4a0ab4a354a26adb2ab7b23d80d549d0197394ec5ac9b7f5e0c9ceee3911e04362ee895f982ffce9af082 SHA512 4579ec07fca112b9765b1710dd70b321d5fc73e6c33a116d6f3e27d2a52ed8e7dd16acf9a1fa45846c7f89189fa4618d92553dc3a9079892b08dcc9415739524
MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.9.0.ebuild b/dev-java/maven-bin/maven-bin-3.9.0.ebuild
index 6748f5927604..59bdf23384c1 100644
--- a/dev-java/maven-bin/maven-bin-3.9.0.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.9.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
LICENSE="Apache-2.0"
SLOT="3.9"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
DEPEND="
>=virtual/jdk-1.8:*
diff --git a/dev-java/open-test-reporting-events/Manifest b/dev-java/open-test-reporting-events/Manifest
index 9f412863e12c..be1b35780b45 100644
--- a/dev-java/open-test-reporting-events/Manifest
+++ b/dev-java/open-test-reporting-events/Manifest
@@ -1,3 +1,3 @@
DIST open-test-reporting-0.1.0-M1.tar.gz 98076 BLAKE2B 1780f24776ddbb31752044c7ebee85cd852425b295b2c61d25e36856123e0d9cd4420ecb4f88e17bba52746dd209a5160bfe3bf0c05ac544a0a94e74c49ce1b2 SHA512 75523de2342b1b1027e68eb738ffef8571d6bb81b2cb0d87c26b097d8aac98f52728a6a5f46420ce8bb051d60b226646aef47ec00eee5876b833ba4e1121f5c7
-EBUILD open-test-reporting-events-0.1.0_pre1.ebuild 873 BLAKE2B 7e92fe1663868ac7042adef19bbd07a33a6a391da06cf9b2622245635669800ad6d25983686fc9bec1e566202a1746823a44132ff7741a6402f9e8e7f951f5a6 SHA512 1f463d5e9ab7738b6ce84229f02b677dd997336ab03e3a4272d689998334860d2a46bb227acd9547f7a936cdc1059486210a292feaffa1541ef32a7e7b186d7d
+EBUILD open-test-reporting-events-0.1.0_pre1.ebuild 878 BLAKE2B b28f3294406107d04edadd810c4e85edfa0cb61da07efece74ee228b8174676b308c74b091f6c68a830cdf5e90724f779e960b861dd2fcf5a445323a4463484a SHA512 a3f193b4e5689c98878bd2f632ef3758e42ffb9011d18ca94e3dada79b8f852818f2ac3005f683d0182fe3982d5f16e90ad96684e3bdc17e62b49e207abb9843
MISC metadata.xml 312 BLAKE2B f86b07af484d130ae5c23e9058b5b23e2bef39aee20c40d5b2cafa22932efe57d4b9191bf67c1d68ef382db74cb6e18a4940ca5b7f4319a7b73651603797797b SHA512 3c5c337327f941f4d89fef44ea9681b307b0319408c150fa01a7b35564d2885db0a1aaad9d20af3c717cc43d2bea0337f39c8a62094da93e9acd0e765197ef0b
diff --git a/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild b/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild
index 19acca154886..657c968615d7 100644
--- a/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild
+++ b/dev-java/open-test-reporting-events/open-test-reporting-events-0.1.0_pre1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/open-test-reporting-r${MY_PV}/events"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
CP_DEPEND="~dev-java/open-test-reporting-schema-${PV}:0"
RDEPEND=">=virtual/jre-1.8:*
diff --git a/dev-java/open-test-reporting-schema/Manifest b/dev-java/open-test-reporting-schema/Manifest
index 921f7c0649b0..46d58ec995ca 100644
--- a/dev-java/open-test-reporting-schema/Manifest
+++ b/dev-java/open-test-reporting-schema/Manifest
@@ -1,3 +1,3 @@
DIST open-test-reporting-0.1.0-M1.tar.gz 98076 BLAKE2B 1780f24776ddbb31752044c7ebee85cd852425b295b2c61d25e36856123e0d9cd4420ecb4f88e17bba52746dd209a5160bfe3bf0c05ac544a0a94e74c49ce1b2 SHA512 75523de2342b1b1027e68eb738ffef8571d6bb81b2cb0d87c26b097d8aac98f52728a6a5f46420ce8bb051d60b226646aef47ec00eee5876b833ba4e1121f5c7
-EBUILD open-test-reporting-schema-0.1.0_pre1.ebuild 828 BLAKE2B 3c589935dc8e2ec22713bdf9bd4ceb41b571017fee130d884587580b1cf6124c93da6e31036e51a8472630c1ae5888bdd8435ccee924508f87ac210b3b680303 SHA512 2bd579bb15b8294f4b04b0db0a3b47661341a27c6f6efb3b27890fab3b02ac8cbf5a71ce6f72639edaad0635b5bfbc0c663659d46b408b0f882f1fb0e8396356
+EBUILD open-test-reporting-schema-0.1.0_pre1.ebuild 833 BLAKE2B dce213d6aec6f73862fb1d640f239d291cb19c283f65ca375861ad40018a6ffa1a3a5b63804b4e43fc9e09199fb608c6a8880a174ed7993c8d7ae4130c5dd09b SHA512 50bf2d1c9a05f429ada1ab01207b6eda034913c5224cd1aacdd9a6a401c3fcb0097468a1406f450acccca80cfb727604e50e5c7888f26532473cc251994bb9e9
MISC metadata.xml 312 BLAKE2B f86b07af484d130ae5c23e9058b5b23e2bef39aee20c40d5b2cafa22932efe57d4b9191bf67c1d68ef382db74cb6e18a4940ca5b7f4319a7b73651603797797b SHA512 3c5c337327f941f4d89fef44ea9681b307b0319408c150fa01a7b35564d2885db0a1aaad9d20af3c717cc43d2bea0337f39c8a62094da93e9acd0e765197ef0b
diff --git a/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild b/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild
index bf3feead616f..fbb8a4025e88 100644
--- a/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild
+++ b/dev-java/open-test-reporting-schema/open-test-reporting-schema-0.1.0_pre1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/open-test-reporting-r${MY_PV}/schema"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
RDEPEND=">=virtual/jre-1.8:*"
DEPEND=">=virtual/jdk-1.8:*"
diff --git a/dev-java/picocli/Manifest b/dev-java/picocli/Manifest
index 0c320009f2e7..0b5e2cb95dcf 100644
--- a/dev-java/picocli/Manifest
+++ b/dev-java/picocli/Manifest
@@ -1,3 +1,3 @@
DIST picocli-4.6.3-sources.tar.gz 56087383 BLAKE2B ce9aaada241358fd570332696b1ac529a9a1e300911aaf2e1f927a94a44a3e38cae96df3d99a7a7e287fb48d429097624004b4ddd792ba564cc9c67ec975d9e0 SHA512 34b8388c6cf268799f06d465aa06e8d5c39c2673806cdfa1b346dac4aaf32ae5b033ae975333b7401bb79c77c4e34b9b932f8699344d6cc00f35a00c1b7bc504
-EBUILD picocli-4.6.3-r1.ebuild 1049 BLAKE2B 826d3e51d8cae503ea6fc6d473e610c145f10a99bb1801443ade1c9204ff4e86aa7b54ad6506efa7a9d93a64e9f80a96dad5d0d5c0ccc315174800908c9cf94a SHA512 a9fd05e2b46f903bedb83d759933defeb887188f04d68a6cefc435ad768652c928609843d397aa8a2a0238c315e9e0b26f17713c397d1dc127dffae6519ff59d
+EBUILD picocli-4.6.3-r1.ebuild 1054 BLAKE2B 94f89ea272105575821932b2c914f99ce76ce6af89b9f38339cfeaf74274e9bb57d95125107ae4ded2935122ac3d656e69fb57fa35a727a28786b5294c1bf838 SHA512 17b60c9f16973aaf8fdd10b85d8e1cb37979a832fed561856e0b5b390f21ccf2877615b7f0dda61c55e3faafbb155aca0fb16beebd2ee388ebf997ce886473d1
MISC metadata.xml 701 BLAKE2B 67e85243551f69c831b4a91807a5dc0661da92e2e7c21fcb8fc9936dd047defa9382d659b7910d5929e193a0a97397c1bf7f8a4d20c86ce46185f5fec4ec15c7 SHA512 6c6056c3e204886ccdc9c6ca28911cf6a5e3cf64e1830fc5c3acca736d28f4c050dba5d1a4ae4bab6c3ae48ae3e34d6b3187d695b2275d20bfb2722bfea753a6
diff --git a/dev-java/picocli/picocli-4.6.3-r1.ebuild b/dev-java/picocli/picocli-4.6.3-r1.ebuild
index d4ce6e528166..f48d18ef3120 100644
--- a/dev-java/picocli/picocli-4.6.3-r1.ebuild
+++ b/dev-java/picocli/picocli-4.6.3-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://picocli.info"
SRC_URI="https://github.com/remkop/${PN}/archive/v${PV}.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
# package org.junit.contrib.java.lang.system does not exist
# the project is here: https://github.com/stefanbirkner/system-rules
diff --git a/dev-java/shrinkwrap-api/Manifest b/dev-java/shrinkwrap-api/Manifest
index da40a50c043d..c3b32d612c71 100644
--- a/dev-java/shrinkwrap-api/Manifest
+++ b/dev-java/shrinkwrap-api/Manifest
@@ -1,3 +1,3 @@
DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
-EBUILD shrinkwrap-api-1.2.6.ebuild 1374 BLAKE2B d182b70428290998aae52a26ed65e0cc3cb20be5338e49efe5fca86e6ced86fb8afa98839c31b6f4aaf2d11db57e18fb4eccad4cd5c2c893a8bc649b9aa32541 SHA512 5edae10ca724712802517e72af547e08fd2662b9e4c89a0a4e4dcc164bda2ac5bae149255912f5757229e9217707ee54a894ca0cb7930c8409aa2405020c40e6
+EBUILD shrinkwrap-api-1.2.6.ebuild 1379 BLAKE2B 7df90053ba217fc5903c925a9fbd712674c460e80c65370e804ccdbffffc2462187c974a80255853bf94c7c662d1818c3086f7c026cfcd3605b5722aaf2575a9 SHA512 13eb41c5780f16488b0a6ce5501ff056adfcccd4b6a174de2fcb6bfa58c4d1e74049090d7d8b139390f584db33eeb2a1cc7344692bab54854d17220d780234b6
MISC metadata.xml 303 BLAKE2B 9befb02178286b65db97b836897ace4dab5c9ccccbc4d2a98242960b18acbf9cf0e8ade440125332cbc6555c92b6813a141c2fa61d0ca1db911e625844178543 SHA512 a7417fe5d51ab1a5871cfd2ac6c8d0ae8190cc7bea21f8d2f43b99fab72c73a58fd88ccea32ed59871d043aa6ac4eefb5a1493f1a204d1f3c427d1809c3a5f39
diff --git a/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild b/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
index 423dd29c976c..832b90a96594 100644
--- a/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-api/shrinkwrap-api-1.2.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/shrinkwrap-${PV}/api"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
# Restrict to jdk:1.8 - otherwhise one test would fail:
# 1) shouldCreateDefensiveCopyOfURLOnConstruction(org.jboss.shrinkwrap.api.asset.UrlAssetTestCase)
diff --git a/dev-java/shrinkwrap-impl-base/Manifest b/dev-java/shrinkwrap-impl-base/Manifest
index ab8b37173bd8..931e4b14ebe6 100644
--- a/dev-java/shrinkwrap-impl-base/Manifest
+++ b/dev-java/shrinkwrap-impl-base/Manifest
@@ -1,3 +1,3 @@
DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
-EBUILD shrinkwrap-impl-base-1.2.6.ebuild 2336 BLAKE2B e60058bde134494be212df30744dffc7f9f1037ccdffeaf692f0c9bb7b2e4c7812c10be3e245142cf1b2821814246cbc71d39d75006933cd6d254332fbb10bbb SHA512 13d02c4087b736bd8c552dda5ea772dc3593798be89183c58eac638242f47dc15e7216aa0e18517e7f2727c3d7881b553750a10aac891bfe107b014322711a48
+EBUILD shrinkwrap-impl-base-1.2.6.ebuild 2341 BLAKE2B a82415dde4f71254eff7ba291df8ee18e833322f6e862760a2be71d1fac8d6c67410eb6024c66f638b8b55240e4fcc119f5ac4c657f1f9a2f635eec4d270ffe4 SHA512 beb6da2935d86504748bbe8f8e5d645686ce963962a35f166588e4b19fab4d08dab197b8372f3eb2bd63ebc92448b82eb28ab6c8f6348f0dd351e7df6297c130
MISC metadata.xml 303 BLAKE2B 9befb02178286b65db97b836897ace4dab5c9ccccbc4d2a98242960b18acbf9cf0e8ade440125332cbc6555c92b6813a141c2fa61d0ca1db911e625844178543 SHA512 a7417fe5d51ab1a5871cfd2ac6c8d0ae8190cc7bea21f8d2f43b99fab72c73a58fd88ccea32ed59871d043aa6ac4eefb5a1493f1a204d1f3c427d1809c3a5f39
diff --git a/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild b/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
index 5553bdac9b4a..6e632195e605 100644
--- a/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-impl-base/shrinkwrap-impl-base-1.2.6.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/shrinkwrap-${PV}/impl-base"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
CP_DEPEND="
dev-java/jakarta-activation:1
diff --git a/dev-java/shrinkwrap-spi/Manifest b/dev-java/shrinkwrap-spi/Manifest
index 5a381c00953e..9ceeeff9de23 100644
--- a/dev-java/shrinkwrap-spi/Manifest
+++ b/dev-java/shrinkwrap-spi/Manifest
@@ -1,3 +1,3 @@
DIST shrinkwrap-1.2.6.tar.gz 987090 BLAKE2B 0c837b6fae6c3e9c7155b6ddf1923b14320d39ee3fd45af5436f967535e8c3ab290b62b6ca67aafc146558466e8c161fa6527055e48a55b5456fce728c5618f9 SHA512 8d91e265f60f1ead931166da836106412ecb861112a65e4976f63df0e351d7cb2d1f64bc2633c5df1052eb39541906ac17d6c886d7d25cb1600799d17637a58c
-EBUILD shrinkwrap-spi-1.2.6.ebuild 743 BLAKE2B 8a2402dbf6261eed5500b079ceb630e0bd01375d4e65535989babcd63715bdaa26d03c4b3b40fbefbc8cb0ed1b86835f66c985e7b9fd9db6bc0b1f689d85b076 SHA512 9de6bd22b58456611f9ec24cb39d7067de37502553b2ad10a08e4c9182c1d09c0182a35f4af377ad18d01897c4ac7f5e540936105cc11a5687edfd087b97c886
+EBUILD shrinkwrap-spi-1.2.6.ebuild 748 BLAKE2B 1a9f2308992c8747d704b00aeb69e5f7f85691609104972402b59c93cf2ddc77dfac63fb984d247ead800558781fd5a5ba0b417cdb7d3f1648c09bbe81c9eb1a SHA512 398fac49ee12bee5204c0fd43ffda0ccc212df9b168b333920b38c325094c2ad3c3786218ba200d4cf2e53810fac93386729b59179cadcd9a8276dc0608ff682
MISC metadata.xml 303 BLAKE2B 9befb02178286b65db97b836897ace4dab5c9ccccbc4d2a98242960b18acbf9cf0e8ade440125332cbc6555c92b6813a141c2fa61d0ca1db911e625844178543 SHA512 a7417fe5d51ab1a5871cfd2ac6c8d0ae8190cc7bea21f8d2f43b99fab72c73a58fd88ccea32ed59871d043aa6ac4eefb5a1493f1a204d1f3c427d1809c3a5f39
diff --git a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
index 46fd2634d989..745c185260f3 100644
--- a/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
+++ b/dev-java/shrinkwrap-spi/shrinkwrap-spi-1.2.6.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/shrinkwrap-${PV}/spi"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
CP_DEPEND="~dev-java/shrinkwrap-api-${PV}:0"