summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-05-04 22:28:33 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-05-04 22:28:33 +0100
commita978c074e4272bb901fbe4a10de0a7b2af574f17 (patch)
tree8c764c1cc0576389ce22abd317bceba71ea5732d /dev-java
parent40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (diff)
gentoo resync : 04.05.2021
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin88716 -> 88716 bytes
-rw-r--r--dev-java/asm-analysis/Manifest6
-rw-r--r--dev-java/asm-analysis/asm-analysis-6.2.1.ebuild27
-rw-r--r--dev-java/asm-analysis/asm-analysis-7.3.1.ebuild27
-rw-r--r--dev-java/asm-analysis/asm-analysis-8.0.1.ebuild27
-rw-r--r--dev-java/asm-commons/Manifest6
-rw-r--r--dev-java/asm-commons/asm-commons-6.2.1.ebuild27
-rw-r--r--dev-java/asm-commons/asm-commons-7.3.1.ebuild27
-rw-r--r--dev-java/asm-commons/asm-commons-8.0.1.ebuild27
-rw-r--r--dev-java/asm-tree/Manifest6
-rw-r--r--dev-java/asm-tree/asm-tree-6.2.1.ebuild27
-rw-r--r--dev-java/asm-tree/asm-tree-7.3.1.ebuild27
-rw-r--r--dev-java/asm-tree/asm-tree-8.0.1.ebuild27
-rw-r--r--dev-java/asm-util/Manifest6
-rw-r--r--dev-java/asm-util/asm-util-6.2.1.ebuild27
-rw-r--r--dev-java/asm-util/asm-util-7.3.1.ebuild27
-rw-r--r--dev-java/asm-util/asm-util-8.0.1.ebuild27
-rw-r--r--dev-java/asm/Manifest6
-rw-r--r--dev-java/asm/asm-6.2.1.ebuild22
-rw-r--r--dev-java/asm/asm-7.3.1.ebuild22
-rw-r--r--dev-java/asm/asm-8.0.1.ebuild22
-rw-r--r--dev-java/aspectj/Manifest2
-rw-r--r--dev-java/aspectj/aspectj-1.9.6.ebuild2
-rw-r--r--dev-java/assertj-core/Manifest2
-rw-r--r--dev-java/assertj-core/assertj-core-2.3.0.ebuild3
-rw-r--r--dev-java/commons-digester/Manifest2
-rw-r--r--dev-java/commons-digester/commons-digester-2.1-r1.ebuild1
-rw-r--r--dev-java/commons-logging/Manifest2
-rw-r--r--dev-java/commons-logging/commons-logging-1.2-r3.ebuild2
-rw-r--r--dev-java/commons-pool/Manifest4
-rw-r--r--dev-java/commons-pool/commons-pool-1.6.ebuild39
-rw-r--r--dev-java/commons-pool/commons-pool-2.2.ebuild2
-rw-r--r--dev-java/commons-text/Manifest2
-rw-r--r--dev-java/commons-text/commons-text-1.9.ebuild2
-rw-r--r--dev-java/hawtjni-runtime/Manifest4
-rw-r--r--dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild29
-rw-r--r--dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild2
-rw-r--r--dev-java/htmlcleaner/Manifest5
-rw-r--r--dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch26
-rw-r--r--dev-java/htmlcleaner/htmlcleaner-2.24.ebuild (renamed from dev-java/htmlcleaner/htmlcleaner-2.13.ebuild)17
-rw-r--r--dev-java/icedtea/Manifest2
-rw-r--r--dev-java/icedtea/icedtea-3.18.0.ebuild5
-rw-r--r--dev-java/jackcess/Manifest2
-rw-r--r--dev-java/jackcess/jackcess-1.2.14.3.ebuild32
-rw-r--r--dev-java/jansi/Manifest4
-rw-r--r--dev-java/jansi/jansi-1.11-r2.ebuild2
-rw-r--r--dev-java/jansi/jansi-1.5-r2.ebuild36
-rw-r--r--dev-java/jaxen/Manifest2
-rw-r--r--dev-java/jaxen/jaxen-1.1.6-r2.ebuild2
-rw-r--r--dev-java/json-simple/Manifest2
-rw-r--r--dev-java/json-simple/json-simple-1.1-r2.ebuild (renamed from dev-java/json-simple/json-simple-1.1-r1.ebuild)8
-rw-r--r--dev-java/libg/Manifest2
-rw-r--r--dev-java/libg/libg-2.1.0-r2.ebuild (renamed from dev-java/libg/libg-2.1.0-r1.ebuild)13
-rw-r--r--dev-java/miglayout/Manifest2
-rw-r--r--dev-java/miglayout/miglayout-4.0-r1.ebuild (renamed from dev-java/miglayout/miglayout-4.0.ebuild)6
-rw-r--r--dev-java/openjdk-bin/Manifest3
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild3
-rw-r--r--dev-java/osgi-compendium/Manifest2
-rw-r--r--dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild (renamed from dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild)18
-rw-r--r--dev-java/osgi-foundation/Manifest2
-rw-r--r--dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild (renamed from dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild)11
-rw-r--r--dev-java/protobuf-java/Manifest2
-rw-r--r--dev-java/protobuf-java/protobuf-java-3.15.8.ebuild2
-rw-r--r--dev-java/resin-servlet-api/Manifest2
-rw-r--r--dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild (renamed from dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild)15
-rw-r--r--dev-java/swt/Manifest6
-rw-r--r--dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch243
-rw-r--r--dev-java/swt/files/swt-4.2-manifest16
-rw-r--r--dev-java/swt/swt-4.2-r4.ebuild159
-rw-r--r--dev-java/validation-api/Manifest2
-rw-r--r--dev-java/validation-api/validation-api-1.0.0-r1.ebuild (renamed from dev-java/validation-api/validation-api-1.0.0.ebuild)10
71 files changed, 118 insertions, 1066 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index d8313d7c0f9d..b0beeebdfb2c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/asm-analysis/Manifest b/dev-java/asm-analysis/Manifest
index 966510bc11f1..631ab030f332 100644
--- a/dev-java/asm-analysis/Manifest
+++ b/dev-java/asm-analysis/Manifest
@@ -1,9 +1,3 @@
-DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff
-DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b
-DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932
DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-analysis-6.2.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82
-EBUILD asm-analysis-7.3.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82
-EBUILD asm-analysis-8.0.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82
EBUILD asm-analysis-9.1.ebuild 700 BLAKE2B bbd76cf8dcc1aecb24fc0744abf88cfd09ccce6149828478afeeb15f251c59225f0df586dc64d9731dc9d63991eeb4e8938a6b47b9a442c8f09aa443e333c267 SHA512 130a3c7b829601892fab5105c425c19df8580dc8dea84d5146c42f9ceadcdbcd1322c33599cb06ab5baea5264cbbc209329bd787884112e0ec8b48418b8ffd82
MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-analysis/asm-analysis-6.2.1.ebuild b/dev-java/asm-analysis/asm-analysis-6.2.1.ebuild
deleted file mode 100644
index 75683d81ab30..000000000000
--- a/dev-java/asm-analysis/asm-analysis-6.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Static code analysis API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-tree:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-analysis/asm-analysis-7.3.1.ebuild b/dev-java/asm-analysis/asm-analysis-7.3.1.ebuild
deleted file mode 100644
index 75683d81ab30..000000000000
--- a/dev-java/asm-analysis/asm-analysis-7.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Static code analysis API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-tree:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-analysis/asm-analysis-8.0.1.ebuild b/dev-java/asm-analysis/asm-analysis-8.0.1.ebuild
deleted file mode 100644
index 75683d81ab30..000000000000
--- a/dev-java/asm-analysis/asm-analysis-8.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Static code analysis API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-tree:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-commons/Manifest b/dev-java/asm-commons/Manifest
index 5692c5f0b21a..967fc4b9e46c 100644
--- a/dev-java/asm-commons/Manifest
+++ b/dev-java/asm-commons/Manifest
@@ -1,9 +1,3 @@
-DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff
-DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b
-DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932
DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-commons-6.2.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6
-EBUILD asm-commons-7.3.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6
-EBUILD asm-commons-8.0.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6
EBUILD asm-commons-9.1.ebuild 769 BLAKE2B e569b9632f1656e385af311369bc5b9c2156315f8a2db159a3419fdc64d60192340d34f13c664274355ba99e8fbac48247a545bbd519b737fbf05046cf3667b4 SHA512 16d15c845a8f06cd7738fe51083b6567080d829d04d433db870255679f46bfab687dbafb140e5429cfec7c994d50335ab39a59ff3a8cebc225b0b4b7e70447b6
MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-commons/asm-commons-6.2.1.ebuild b/dev-java/asm-commons/asm-commons-6.2.1.ebuild
deleted file mode 100644
index 47ceb6a135cd..000000000000
--- a/dev-java/asm-commons/asm-commons-6.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Common class adaptors)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-commons/asm-commons-7.3.1.ebuild b/dev-java/asm-commons/asm-commons-7.3.1.ebuild
deleted file mode 100644
index 47ceb6a135cd..000000000000
--- a/dev-java/asm-commons/asm-commons-7.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Common class adaptors)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-commons/asm-commons-8.0.1.ebuild b/dev-java/asm-commons/asm-commons-8.0.1.ebuild
deleted file mode 100644
index 47ceb6a135cd..000000000000
--- a/dev-java/asm-commons/asm-commons-8.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Common class adaptors)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-tree/Manifest b/dev-java/asm-tree/Manifest
index 4144a3b51699..740f5ad7fa01 100644
--- a/dev-java/asm-tree/Manifest
+++ b/dev-java/asm-tree/Manifest
@@ -1,9 +1,3 @@
-DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff
-DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b
-DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932
DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-tree-6.2.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472
-EBUILD asm-tree-7.3.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472
-EBUILD asm-tree-8.0.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472
EBUILD asm-tree-9.1.ebuild 662 BLAKE2B 3cc2919b16edec71673143635884aa743c474be37a65296f80e45c33c53e610723f183ef5a4231a03ac3bd80acfcd33971377d3eff2f74b341b5a81b8d9e5e30 SHA512 5b5f645cab8d2136df0a53dc74e8073aa153c5a25ad6599f2ae48c0d5fdcb1cfc48859f4da0f4448720b000a7f975a8be2b06c5c3d9fcdbe22dbd6055d27e472
MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-tree/asm-tree-6.2.1.ebuild b/dev-java/asm-tree/asm-tree-6.2.1.ebuild
deleted file mode 100644
index 2bfd7ac66a44..000000000000
--- a/dev-java/asm-tree/asm-tree-6.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Tree API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-tree/asm-tree-7.3.1.ebuild b/dev-java/asm-tree/asm-tree-7.3.1.ebuild
deleted file mode 100644
index 2bfd7ac66a44..000000000000
--- a/dev-java/asm-tree/asm-tree-7.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Tree API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-tree/asm-tree-8.0.1.ebuild b/dev-java/asm-tree/asm-tree-8.0.1.ebuild
deleted file mode 100644
index 2bfd7ac66a44..000000000000
--- a/dev-java/asm-tree/asm-tree-8.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Tree API)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-util/Manifest b/dev-java/asm-util/Manifest
index 6227cd85f344..275767a305b9 100644
--- a/dev-java/asm-util/Manifest
+++ b/dev-java/asm-util/Manifest
@@ -1,9 +1,3 @@
-DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff
-DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b
-DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932
DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
-EBUILD asm-util-6.2.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a
-EBUILD asm-util-7.3.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a
-EBUILD asm-util-8.0.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a
EBUILD asm-util-9.1.ebuild 757 BLAKE2B fadcb25b7ed26ae26d07c19d98f284c1d318b14698a97232ff2c0b37a92334a102e61c79a2d0d7fe97fd43b4055488f5699a79db01f303378681663b070582d1 SHA512 5f0b62d4d222f1a4b67aeb40f3f1fde8e933c28514b495bb9e2d6cb61964af28c2d373e40f9a48a1711a256f89f2b00822378fa06f90df0bd98ac6e3cc58579a
MISC metadata.xml 1095 BLAKE2B d02943be5ee7eeae4250adc26d2c70c97c601fb1b8cf1f6d95a9b412b09d80e4f035a02106f2d9f1c3dc8dae2cf4261ae52522801513f8c6254b6271d5864a6d SHA512 e46d43827595682502ae3fc377544dd2a70f72c7784ea4768b3dbf06e62188f6b81fd9a341c2c0467bb8cffc960c0a860affdc18e2221e24db5a2d6269e81b53
diff --git a/dev-java/asm-util/asm-util-6.2.1.ebuild b/dev-java/asm-util/asm-util-6.2.1.ebuild
deleted file mode 100644
index ab7c52e86c38..000000000000
--- a/dev-java/asm-util/asm-util-6.2.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Utilities)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-util/asm-util-7.3.1.ebuild b/dev-java/asm-util/asm-util-7.3.1.ebuild
deleted file mode 100644
index ab7c52e86c38..000000000000
--- a/dev-java/asm-util/asm-util-7.3.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Utilities)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm-util/asm-util-8.0.1.ebuild b/dev-java/asm-util/asm-util-8.0.1.ebuild
deleted file mode 100644
index ab7c52e86c38..000000000000
--- a/dev-java/asm-util/asm-util-8.0.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java (Utilities)"
-HOMEPAGE="http://asm.ow2.org"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT=`ver_cut 1`
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}"
-DEPEND=">=virtual/jdk-1.8
-${CDEPEND}
-"
-RDEPEND=">=virtual/jre-1.8
-${CDEPEND}
-"
-
-JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}"
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 5842744a8397..df82369ddb7f 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -1,12 +1,6 @@
DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e
DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518
-DIST asm-ASM_6_2_1.tar.gz 1509237 BLAKE2B fb287ff5346b2fd0a016e7744d44387d2973f89c4d1cfe7b46b864019a56443e71ea0a847940f49db2a2b359651297b65feca236cb1c847e0a9217117f9300b9 SHA512 93e2e4c386b5ae8f459830cf708d62bf96aa35353e93ae9c07005467afc684596281ecc32e4a9441aa9787731c0e8f8967ec9c797c4392f80ee3e828f5c39cff
-DIST asm-ASM_7_3_1.tar.gz 1556552 BLAKE2B 23d7b21de9c163e2e69b8edb5d5d72a79ddcdd80e03393bef33285dc2455a59267ba5a95dec21d9d22e04b2518e593fbf8e856c9f361516826e1141131657259 SHA512 09abd673152ffa2d9f88aea8d940f77e8fc16e8d4b3486f39b8ae56c6f57cf4e40cff8ba829ca568c6ca71d8b676dee394d0e2f36bbf9781f9e3a9ad106e201b
-DIST asm-ASM_8_0_1.tar.gz 1559218 BLAKE2B 2b1d039ccb569cf2574d55fb7f6d2c1535dfa3edfab785a6f0622a893cb5f83f21de2d6a737ac164914893cccdd1d87754284742cdf20f2bbd4f57843dd3b36d SHA512 0b0773c3970a426ebca489e68641c3ecf0cfd3b48cddba1b56ffe0e0ab95274b5a7bcb3ae8b5ade04dffdc366bd0fdd6fd0f0db59936d1994f88107e15c90932
DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18
EBUILD asm-5.1-r1.ebuild 1281 BLAKE2B 4b96ddb02de5c1fddf23646db0133774464554bf2957161e1d83c3bab9c3c9bc8fdbeeec67c04b2e2d83438fee807f44d8fb535baf750e6e4e413410a5045582 SHA512 fccc9bd86fe9e41469e2002c2c5ff9cb3bd53b6ba3d935195d92bb8ab771091290b3db0bfa3ce5a685480511a364d3c17a0f74ee08f6be16a1779b6e25f081df
-EBUILD asm-6.2.1.ebuild 568 BLAKE2B 32971b777f8b654ad23e36ec2e15e9ce1dc2e0724dbed9baa3ffd1a508deee565b95031352813f6bddb6bd5f147e2d013e7022cb3b149a50e88bfb5a993db423 SHA512 13492f12664ba269f2ab8cb331bdba728279feaa29dc6c1315164ca16c2de12778958fead17eb827095ef61f273045be6d9efbdd07772e177a10e5b379dd35dc
-EBUILD asm-7.3.1.ebuild 568 BLAKE2B 5813e8eda936a34f77c9647583b92e7ae845b52aa6c9a74408cf096a4b1badfad8fa1b075429bd75ac0d3aea2fe0b9adefca15265869d981dc18a29453d25d40 SHA512 5619c7922bab5b984283968749a46fce73903ebe4db57589f37b2c21a0f242ef03498e753dd0464aa68e66d798db07e3656e30d86ad015799dd1b6e668612bd7
-EBUILD asm-8.0.1.ebuild 568 BLAKE2B 5861690e7bb9868484dbf18e6bd1dd62efd3e779aa63a35364e832db79b4d01d799d583b5c8fcf4967c5815d45baf836b6c2557f597b54deb12b9558790d91ca SHA512 847fcfa188a7028850fb66ebb9f1d615a0f645a0b845276eb0d1c2abdbb5d02d6e9b411d633887d655f9dcbfd9a75670e33d2dc5346330f765b47a21bb8466a3
EBUILD asm-9.1.ebuild 564 BLAKE2B 26b31a92001b6a04925ab4fcccd999d86c17a2623aa91ccf587ec04f0f0b70da39a6f18dfb9f0889535ddd24fdaa171f8b32a8ce94cb9bc856f15cc66e9b5366 SHA512 dbfbeb8921791c282faedeaabda397a08c3967749eb4191d654a2140682d1372eb01258a52996045235338f561cbdcd561aac9b3773e102c9ff108cd436c6f46
MISC metadata.xml 1230 BLAKE2B a71da4c461c9ba0e7092f9c16916b0a72359fa198654c7ddabd4544efa0eb17c52378712dfe4bad27f5dcd14b289999d899dac0e89a7fd19350afe951de27839 SHA512 91a6876a431249ac794c998ab741eb4c8e3bef302e090402fd7b84dd6ebfb7734a4dfcf85fdd1ab3cedbf1d746f60ec7aa4444be44a8e316e01b8d1d45fcee5d
diff --git a/dev-java/asm/asm-6.2.1.ebuild b/dev-java/asm/asm-6.2.1.ebuild
deleted file mode 100644
index d5e30d7baf28..000000000000
--- a/dev-java/asm/asm-6.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND=""
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm/asm-7.3.1.ebuild b/dev-java/asm/asm-7.3.1.ebuild
deleted file mode 100644
index 9b1ce17b7973..000000000000
--- a/dev-java/asm/asm-7.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND=""
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/asm/asm-8.0.1.ebuild b/dev-java/asm/asm-8.0.1.ebuild
deleted file mode 100644
index 9535ca9a5ecb..000000000000
--- a/dev-java/asm/asm-8.0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Bytecode manipulation framework for Java"
-HOMEPAGE="https://asm.ow2.io"
-MY_P="ASM_${PV//./_}"
-SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz"
-LICENSE="BSD"
-SLOT="8"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
-RESTRICT="test"
-
-CDEPEND=""
-DEPEND=">=virtual/jdk-1.8"
-RDEPEND=">=virtual/jre-1.8"
-
-JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java"
diff --git a/dev-java/aspectj/Manifest b/dev-java/aspectj/Manifest
index 678134fc560a..50a0b142682c 100644
--- a/dev-java/aspectj/Manifest
+++ b/dev-java/aspectj/Manifest
@@ -1,5 +1,5 @@
DIST aspectj-1.7.4-src.jar 7570114 BLAKE2B caa942a2414c6f1b39b881bc5abad0cd4e718b231822833756493ce389207d1d855be36f74a4c58ad5f00f7acfcd5791b4ab8e151fd0e11ac497d4f68cab2eb0 SHA512 643d457fba4d58114ee09a37007f5cf5fd40f7ff196ffc69d371d1986cbf6930567ddffd3f1af625139619a0be386e1d9c7e30d267bf53b4286e2179735299bf
DIST aspectj-1.9.6-src.jar 8616829 BLAKE2B adc12e181b2584287dd149657f0505b2d3ba877aa3e8cea1f2fd827b4d05c24728f120798019f1679ebafe850a8e68fa3db1467ac080c27692d5f81d31aebd48 SHA512 f15416a3921ef614ab8068c8ff8277f0fd3c177e9b277ac471786953615f1fe81638b8d13d77ebfe0643fdf089ee3cd5e718d522d2e588989a42df775f2a0516
EBUILD aspectj-1.7.4.ebuild 1259 BLAKE2B 897ff1e5eaaec08f9ac8998174b2251265c1d43373fcdfe97e2def0ab06cbfce039e1080fcc459c0eecf3c11b3022ed2f5c131fb90ef63b41e663267dead0b00 SHA512 885778f6e1ab1c66118ba3756a5369e705c464869898866e73b032014c143310bdd790a7d9bba003fb50d574ec92330afc6d99f7ea66f0213e8abf6e627bef3c
-EBUILD aspectj-1.9.6.ebuild 1175 BLAKE2B a4358d0064da922e555af439a87d62e7150d655acdf6d2d93cf62f493e01ffc99b751ddde4a48e55b7be0579e34f34ded122ddf1dcdb8c04eb249c4f76a2c4d6 SHA512 d8cf226a8f39dfa6decbfd1a589ab2973cdff7315b0f6ba295d3aa5d270710a0b460f524d94d06937ca75c75405cb0dc55afb03678bc2953f92544cb353c6007
+EBUILD aspectj-1.9.6.ebuild 1174 BLAKE2B 17ae90141631e398d05186512bfbb3a1f0a71d30f2d2ce2689147760b5c5fc675d0053e49b8e00ed7025a0b64276b924a6c6719dc4a83ad399996d35855c0098 SHA512 1c4eee056643286c019d3cc70dbe07ce4133443dc41dd5e2673e5e23696346af21ffce3dc8d14158ac6ddccd070062191a44d275e0176f933ee4e60ff0bf2058
MISC metadata.xml 382 BLAKE2B f2aa03e9e9411d65bfd57f63e9de032ba3f48f9ee80e2ca11e2b1ebea7c7223820c75d3e1516f07e94edf4328cd44a511005636f8bead11506b934513fcc8c5e SHA512 c4581ac985534be3aba02b312bcb54c36c358db73d91a449b72d19b3e7e743ad28d50f4bc6f08eb56409f8270b601f41b5f69f18d4a392937aac577bb5515a25
diff --git a/dev-java/aspectj/aspectj-1.9.6.ebuild b/dev-java/aspectj/aspectj-1.9.6.ebuild
index a27323985b9f..8c7f6df2776b 100644
--- a/dev-java/aspectj/aspectj-1.9.6.ebuild
+++ b/dev-java/aspectj/aspectj-1.9.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.eclipse.org/downloads/download.php?file=/tools/${PN}/${P}-s
LICENSE="EPL-1.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
CDEPEND="dev-java/asm:9
dev-java/commons-logging:0"
diff --git a/dev-java/assertj-core/Manifest b/dev-java/assertj-core/Manifest
index 5758d136a34d..81dd83bf8317 100644
--- a/dev-java/assertj-core/Manifest
+++ b/dev-java/assertj-core/Manifest
@@ -1,3 +1,3 @@
DIST assertj-core-2.3.0.tar.gz 611609 BLAKE2B b99a01f67da75bad18e08df739c10943012f75eda9855ed906d407e474eeafe9a30be2e761de0bc791d72a6ff8c7ec8181cd37c6b6c9126f073df82a974163c3 SHA512 da67930d45afde12d317579edb62b5cff546283ea6a252c9b297f21b74404d7cfb63372d339f51733322205b89d35734e97888085387fb1a83c80d5963b05fd3
-EBUILD assertj-core-2.3.0.ebuild 745 BLAKE2B 2dffcadb02ebd13c9178b71c4ae4732573c8a5d9464fa49cd8289dc7effc99738da2f019ed4575c34ad1bc64366c21ca88f85def16bb016030d5b3a1ddc14696 SHA512 6c6c8f520d2d64839eb615d5f4d8c5fb477657527885c1085e01a7b14cfeff7309ceb341722146becd80d24c12879bc6c854e3563c0aa718924aa6392bf7ddc3
+EBUILD assertj-core-2.3.0.ebuild 784 BLAKE2B 108ee65b0b2e90be50f290c56fc68bbe8a905018d384e9523a80c74a9d450fcbfaf0f8fc5e0658a0278c7abf55a6d405b03c9158391ffcd3e69ea493bed1ffef SHA512 2b642a8d64dbade28ded16649d64d5d8dcac7d0b6a74f3dc6007226f53e7d499b2061bc6a67b47ed70220d1f7a77de44d82f5dbf60f98609916575af16ad3d48
MISC metadata.xml 639 BLAKE2B 838a5321ee12c23f8d85c9767a15085724c1fb872fefdc9412d67f113de7e1515dca16afe11c5f5fd55790bb9e4feaac3bd26027a33f728655592bb7bbd448cc SHA512 ae023f76f4d256b3efc4b8393370db21600ebd381066691574ef9f02b962bd49996af10eb74fc009b94860e29b3a18d747943ddb3642e0501c14b41bbe428359
diff --git a/dev-java/assertj-core/assertj-core-2.3.0.ebuild b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
index 065a36adbeed..6ef61f2b87f5 100644
--- a/dev-java/assertj-core/assertj-core-2.3.0.ebuild
+++ b/dev-java/assertj-core/assertj-core-2.3.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.assertj:assertj-core:2.3.0"
inherit java-pkg-2 java-pkg-simple
diff --git a/dev-java/commons-digester/Manifest b/dev-java/commons-digester/Manifest
index 326e91912627..d84a831c0dd1 100644
--- a/dev-java/commons-digester/Manifest
+++ b/dev-java/commons-digester/Manifest
@@ -4,6 +4,6 @@ DIST commons-digester-1.8.1-src.tar.gz 303266 BLAKE2B 618885c812a9bf40c080bc5736
DIST commons-digester-2.1-src.tar.gz 304060 BLAKE2B 2360f6f8ab77b20ad6b4058e0437aa792bf3886ddec2e09b6db259bc142c070965ce066ef224e92fb91614075631a2af1358ae4b4fc065fe9118e1d2559bb9bb SHA512 6bdb63431ed1e17f5e8ba24951762750a0e59b70c76eabecbf13f5fe6974864825456beed615c8f2c16f9a2f1404f2e56bdbc3ba335656c3661d5f368c708b88
DIST commons-digester3-3.2-src.tar.gz 324555 BLAKE2B 7b8bdaa70eeafb069e9ecbfe697ab86f5167ae3b9933e8aa306f0080de0ec99d12bd023067678b7b904329178f553fd6d4d98141ab329154a1c27385b33e449f SHA512 6d5ed9a1cc7612244747dcbd5c713349f27d63d1cef39fa368b4e91eaa3b1fe7043ab2fb498a73e8afde8081b8ff26a966e5b87b8b6dc68a3d907e9b25aa7cad
EBUILD commons-digester-1.8.1-r2.ebuild 1324 BLAKE2B 2cef18509056f371eb658b67e4a9eff75d6eae6e197eaaf8887a674850399d4f58543913e43113e35e9a5dc2da1ad8397b84711713d82158d6a0fe07ad895117 SHA512 0ac87e54cb3e3ecd4872c9df9ea2bc2174ca8a52922582575ec0006e6e484e6e7e3c878525705de4ba42a58d36fe9235f47065d8837c44c905d8b03ce4481a81
-EBUILD commons-digester-2.1-r1.ebuild 1261 BLAKE2B 0fa8d71a2d26fd25429bbb19e595aba3ff667082aaf551ed777f4d1bfd8ff0b947296a3b4277cef28f073b360172f8b7fe2ad1a912cfe7102ff7c9e795e4e5d1 SHA512 728fd63dec4ef39b69b60ce7a618e60a4d7b5ed35cdf6046b4f733ef133fdfa1cb9ac7bd66ed67c42a9b3c0308b907f32b2c3dffd2abab7ae35ee13cd2c7fe26
+EBUILD commons-digester-2.1-r1.ebuild 1310 BLAKE2B 3e8e5971648240771f5031f90991ee20a5009f42c81ac7cd72f7145331212bf19dba9688ce501081562f08cb01b4bd5510d77ab37638d047d5d6803374e6cc24 SHA512 86db8e1e6fbcc76f64f90f20e14efb30cb29427525147204f6edcb845b90082ba53f0e46f3db4d6a751105c0429da672bbb943b256bafb6a859efb520e63130a
EBUILD commons-digester-3.2-r2.ebuild 1336 BLAKE2B 4f9b7003b2c7b09cd21d79f0f2fb2e0f970a85c48d502e9921ae2e55883edeb5008630bde20f6428b2d91583527a73b8d9630603a608ea06120797631d909c4b SHA512 4325436fc97d1378b011ab7bde10a6187b8e7e0ef7b305e28d531780bc36225f8838bd5aeb5e7dde2c8da5031e97ff68da4f6932c2bdfa685ba836afe2ea5a75
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
index 242838b96140..0533f4f8b685 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -4,6 +4,7 @@
EAPI="5"
JAVA_PKG_IUSE="doc examples source test"
+MAVEN_ID="commons-digester:commons-digester:2.1"
inherit java-pkg-2 java-ant-2
diff --git a/dev-java/commons-logging/Manifest b/dev-java/commons-logging/Manifest
index 9875d68781f8..3d2004e42b1e 100644
--- a/dev-java/commons-logging/Manifest
+++ b/dev-java/commons-logging/Manifest
@@ -2,5 +2,5 @@ AUX commons-logging-1.2-gentoo.patch 825 BLAKE2B 154927ebbda77a76007fe9b448fc280
AUX commons-logging-1.2-servletapi.patch 1783 BLAKE2B 5f8bc256542335b5d955d998ef2ee49d8becca46b367ba0ac1152f68ea4fccc226afcd2475331cf292c3f0f11471052e6917c9508a6737c6482c556c2ec87363 SHA512 bf2f0aca771b7278f2d80ae3c149492040c137c1ab190513fd9894fad315f75e4b0423f65a5ffaff04faed3f7256728b5f474cfbe0aefc2a53d60337a6344d39
DIST commons-logging-1.2-src.tar.gz 188536 BLAKE2B 80613b78619f7b3429f60df4fb9b66dd4836e8b89fcf93a3a1bcd5cb7e410d474be010da16b325143e028a40ff4dd971753962c9d9145f85b1738f5dda13ba99 SHA512 9f3761184950f2f13e85d8bc447709ab8be631dfd231b4f053f8147468db1bf71fb116ddba95e39f4afc4cf28c742e07d40c7a637f28004a60dc13935f9609f9
EBUILD commons-logging-1.2-r1.ebuild 2200 BLAKE2B 00edbc2be3dbf082669f84234fb6e198f6f0209e3b668e227294e25632eafafdc242fce9b56d6cde269bfa2bab3e9110ee5d5d8dd99d268ad11257e144cfd095 SHA512 e3501a786040b5db5d6b323edfc80e8bfab2b9347a8dd3303fe874ad4f05e62ce7f27e723aeec8f25dedf7e5525a6cabd1f43f6169f0efe58b8366c917121e4b
-EBUILD commons-logging-1.2-r3.ebuild 2355 BLAKE2B f7a302e42b8acc956240e2b5775586fd6deda25239483b9ef88ff595bed7fe9dbaee14239a3a7b696f8723285aa078916813121e886f319bec8cdd3256ef1946 SHA512 4513dce22a7665c5d3f93fcbead5d5ece436dea6cb85bbd6b1751dd8db4613c9010a186ca5471777cc9c3e253442b411d0363c822797674f41fbeda5c48e820a
+EBUILD commons-logging-1.2-r3.ebuild 2354 BLAKE2B 2bfce6d3dca66c44422ca1ea371d7216c90e0746b0406fc5061dd876c44a3c0369cca7dab77fa136f3fd37b14c44b70e27104c7efba11efdcb5c1a8664733c3b SHA512 cbaf947feba2d6193fff5c2db8f7c873d62621e0a693e62ea83cf0721175f335f8a887f00591e31299f9e2d21d6768366d098810ff7e8407d48a928ee87cc1cc
MISC metadata.xml 551 BLAKE2B c48c3681129ce8ab7a497385bc3bed8a16ca0f5f4557ebda30565db471b25fea1b6c48ad43a470cf27930a0b2dc3a282242600aee3f60eff66291e6d0c80491f SHA512 1ea71763a6890b1f01fb357a7427b99bcb4918eb87290997e61918808daea37dab371b7fd5b6fee114104b2ee4445e022c0f090a2a58017a3d8b755f8dfcd5bd
diff --git a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
index bc6d4e26fd4f..8abf39696e22 100644
--- a/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
+++ b/dev-java/commons-logging/commons-logging-1.2-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://apache/commons/logging/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="avalon-framework avalon-logkit log4j servletapi test"
RESTRICT="!test? ( test ) !servletapi? ( test )"
diff --git a/dev-java/commons-pool/Manifest b/dev-java/commons-pool/Manifest
index 6b6522f49afc..52581acd1ce5 100644
--- a/dev-java/commons-pool/Manifest
+++ b/dev-java/commons-pool/Manifest
@@ -1,5 +1,3 @@
-DIST commons-pool-1.6-src.tar.gz 321409 BLAKE2B 2ed2bc6d7478217fde271bcc64feefae06aa7f946068e7fa3b2ae055e7c788b2431ba20ce202a2cc879c22d32d6d69cdcc4f8dca6794dc4588b11cda4f665934 SHA512 357dd4b1cab8fccb4116add2bee74036c19cf6102946a1e304dcd3049d3d93f1e405f85349e511a4cc71d0d91382696f97997c9e4014303822b386ac7fbfec93
DIST commons-pool2-2.2-src.tar.gz 163682 BLAKE2B b9a84b1387cd00eb46cc94726ae3295a73f2f47b824401aca525296eddbf04b6c978a4808014bf7e93c113014e0e2fb0db39d6b9ddb9c651bb385cecd05584a5 SHA512 a9c1a30f497f4a6c28b8b4b82d3b2f801b464fc329d1da4f5087dcd6b923c45bde9ac6f3dc9939025453462f9dfea9fff637db9b4334ed513770a546b4807256
-EBUILD commons-pool-1.6.ebuild 874 BLAKE2B 7f513c1f2526330f6c1e6f886c505d89e7179cdcfd1f9d67d884ac954badb217c27a49648210ea889da950560f5dbf58692a9029bdc45b7b13354dccbacc451c SHA512 66da5c550ae3c669c3ca5146f79b58f99f4ddd258d03827ff2c10a61c5dd8f23cd3587c17c18a6d46f7e792ff4fcbc10cf47583b2ed38a5503b79b9f314ec3a2
-EBUILD commons-pool-2.2.ebuild 1082 BLAKE2B 467590a33e977f283beaa9712c661a1be2330184bfcfadd21b400568ecd87f3017801189bc8e0cfddb1ad977633d103512ac6e0aa7496ec271727e8ef58355d5 SHA512 2cddcf9f36c29894531c5d12c8fdd14441bf6da00289418b8b800138037f79eaea043478dee98b4c4dc73bffe09e273b1e1560487e33523eaaa3f0e49d34af1d
+EBUILD commons-pool-2.2.ebuild 1081 BLAKE2B f14a83155a34530a1d8b04d30572cf622f5f7ee7d51fb67d677f2e659b62d6f3ad1938bed2cf7f178e83accc7ef0994153c8f38b140954b968ed85aa06fba538 SHA512 de717fe70ed9ee2298874a00d6ff1541e94cafb4f5c1c1711e288b4eabc6388a66959199a99df52e7b967c2d56050649db7df21618880e7907a34e7c717cbb38
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/commons-pool/commons-pool-1.6.ebuild b/dev-java/commons-pool/commons-pool-1.6.ebuild
deleted file mode 100644
index ad7179cfd030..000000000000
--- a/dev-java/commons-pool/commons-pool-1.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Provides general purpose object pooling API"
-HOMEPAGE="http://commons.apache.org/pool/"
-SRC_URI="mirror://apache/commons/pool/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris"
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
- test? (
- dev-java/ant-junit
- dev-java/junit:0
- )"
-
-S="${WORKDIR}/${P}-src"
-
-EANT_BUILD_TARGET="build-jar"
-
-src_test() {
- ANT_TASKS="ant-junit" eant -Dclasspath="$(java-pkg_getjars junit)" test
-}
-
-src_install() {
- java-pkg_newjar dist/${P}-SNAPSHOT.jar
- dodoc README.txt RELEASE-NOTES.txt
-
- use doc && java-pkg_dojavadoc dist/docs/api
- use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/commons-pool/commons-pool-2.2.ebuild b/dev-java/commons-pool/commons-pool-2.2.ebuild
index 1ab8287ac992..162292b43aa1 100644
--- a/dev-java/commons-pool/commons-pool-2.2.ebuild
+++ b/dev-java/commons-pool/commons-pool-2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://apache/commons/pool/source/${MY_P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 ppc64 x86"
COMMON_DEP="dev-java/cglib:3
dev-java/asm:4"
diff --git a/dev-java/commons-text/Manifest b/dev-java/commons-text/Manifest
index 4fe59d86d494..5d731ba7a250 100644
--- a/dev-java/commons-text/Manifest
+++ b/dev-java/commons-text/Manifest
@@ -1,3 +1,3 @@
DIST commons-text-1.9-sources.tar.gz 312764 BLAKE2B 44b628c418a910ff38b5a1fb3b4c9f14a1f9818afd12540f8c8cf8b1a99fd7abd365e704142bcec901e5e067b303ff44f9c992f8714eae68b94819780a270dd2 SHA512 53f993e79aaa6789d3388aa96b6b2a14cf646b27ff3774524390e511241a85288947cc929519eff61a8734578f25bdf3d9969d84da20c1a749b19d90a55da8ae
-EBUILD commons-text-1.9.ebuild 1139 BLAKE2B 0d2c35fdac869d03e9229af35cc554366e2d7f98ebb1e6fa83be8b031e1f47b119356874370a1aa7847ccc0b37bc5fe72eefe0012b48cbfb2964a66c31813b31 SHA512 aad8149870ddb4907710580babee7a27a609d335c41753404619beb7bd199dbf00f7d942bcc69ea1598d50074abeab1acdfc7909f96a0c09d9d7e0061f55658c
+EBUILD commons-text-1.9.ebuild 1146 BLAKE2B 9882537d8d97d5aca783eb51c077b1cd62f8206f4a3f533df0b35768f786cf3d545a5b4fc3cb22e3184be1f7a6b4562204c8990b305097ff5817e11d6b74b62d SHA512 9a344db49a970c045c1ff4ce1c26df2fa9f1c9e22fee584549d09d9902a64b0014d52f9e1c434eec6495d067b01ea0ddca890c3703626cc54dbf12516178cc9a
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/commons-text/commons-text-1.9.ebuild b/dev-java/commons-text/commons-text-1.9.ebuild
index 8671f21cf484..d62ffb66df8e 100644
--- a/dev-java/commons-text/commons-text-1.9.ebuild
+++ b/dev-java/commons-text/commons-text-1.9.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://commons.apache.org/proper/commons-text"
SRC_URI="https://downloads.apache.org//commons/text/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
# Common dependencies
# POM: pom.xml
diff --git a/dev-java/hawtjni-runtime/Manifest b/dev-java/hawtjni-runtime/Manifest
index c9abea93b8e7..a258ac2d8df6 100644
--- a/dev-java/hawtjni-runtime/Manifest
+++ b/dev-java/hawtjni-runtime/Manifest
@@ -1,5 +1,3 @@
-DIST hawtjni-project-1.10.tar.gz 1602839 BLAKE2B 7a6a37c4c208906fc7718bbd1aec566bb2392ef0e0dc082aa552127e97af896ad39b2ecfcd124ac370593daecd69185c184838fafc374173320beee72d87fccb SHA512 3bd94d20bf2d8953c60753aa404077c96c93704c2bd5bebfb5fe790fc29e15d97f6172706f06cea13c4806b652405ccfef824cccf76ff018dafb7262ff845490
DIST hawtjni-project-1.15.tar.gz 1606236 BLAKE2B 52357dbefde43ec82cf218ada90642d118ebaa6a6be173cc1f4f48377fda95b902f0a90dfb60822c02c144b9bf13d0800c94d67cc2f9c76e607bbbb80a80898e SHA512 1a93658bf8621c770cf97b546c6a5c0cf1821b06cb16dbc872ad0c830c599d3947ffe56b4cca16217a510d4e929ebcfc5eabdf4ad4364f5225b53d22c7d48abb
-EBUILD hawtjni-runtime-1.10.ebuild 698 BLAKE2B 8ebf66fa7c7e975e26cec25542089c005d14ffa03e3d326f9553516caead7d19ca21cab44a46067bf93ac7657c0d0850010c52c97ec30df92bcccc20d117d58f SHA512 c4a8179ea9c77c836118cd1f9d7340b689e840baf497dd23238ba4eb6baa2aa31f0ace2a08bfd9c05f8add8c2803c1c5a7622e0a9b86fee04eeab386376d3141
-EBUILD hawtjni-runtime-1.15-r1.ebuild 700 BLAKE2B 559e24e4c0042149edba78bb3d374f0fb57a127465c8f68d919514c9b35a62db1c7c06ee2aaeeb9c0d06f6ace327f079ed9b62ec3d0ef600bec4832edd8d789a SHA512 94c38519876053421c413f4720c4fef8af877e03e1d9da595c55f661a7bec2d74c14029bac7e964cf63feac742c426c27f2a8ce25bd7151707c311a4bb1adb51
+EBUILD hawtjni-runtime-1.15-r1.ebuild 699 BLAKE2B 55654b3ed4ea5517161da416ad5822b2fe340939aa04d188dc6919b18ec85a45aa56c04427adff654d6f5c89ed357617b25c98c261d68bb1a740888e0bca8058 SHA512 94df216678e394f5ca20a8566f318d325ba66088e526659015f89facafce89df9486495f91264efda0bc1cc4359695fecace04c188d308ed2ac9732daa6dfeef
MISC metadata.xml 329 BLAKE2B e78188cf60c43c68f0a74c8199be1b9fbca9d8db73a56ec2d7d4e820c4c483e4fe5eb6afe107524ae85960393f9ad5b07227f037ecba8b7562f92fa79af929f2 SHA512 20b714d09dfdd7430599b1d57d3a3831e86a22bbc3fb3b004dea2d0d9c6a230dcb74cbeeeb7301cf48493f0eb55ad736ab10cd247d329da4e4d02fa149566927
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
deleted file mode 100644
index a3f08d3ca88e..000000000000
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.10.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-MY_P="hawtjni-project-${PV}"
-
-DESCRIPTION="A JNI code generator based on the generator used by the Eclipse SWT project"
-HOMEPAGE="https://github.com/fusesource/hawtjni"
-SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
-
-S="${WORKDIR}/hawtjni-${MY_P}/${PN}/src"
-JAVA_SRC_DIR="main/java"
-
-src_install() {
- java-pkg-simple_src_install
- dodoc ../../{changelog,notice,readme}.md
-}
diff --git a/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild b/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
index 7c07b1bd7a7e..86fc84ec3978 100644
--- a/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
+++ b/dev-java/hawtjni-runtime/hawtjni-runtime-1.15-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/fusesource/hawtjni/archive/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.8:*"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/htmlcleaner/Manifest b/dev-java/htmlcleaner/Manifest
index 5c4aafb80ecc..ceb64022ab16 100644
--- a/dev-java/htmlcleaner/Manifest
+++ b/dev-java/htmlcleaner/Manifest
@@ -1,3 +1,4 @@
-DIST htmlcleaner-2.13-src.zip 346998 BLAKE2B 883a2550b9ddc0f56d88b1a412b2d9f809e0bb53d56827104aad99f15b4fc5c7f6c88b37cd10dbea5d05e27bc650d93f038142c66ea97ab0bb1bcea810bb40c5 SHA512 bf9cc014688ebb20b0bafba82fc710f25c1db8c173dd3e9f742c31c64f127c3c89b29b151e64a3368b04d278733cce8828831f297834ca9b872a60951e0a2d47
-EBUILD htmlcleaner-2.13.ebuild 1597 BLAKE2B 0f63cbc475912060956ad1dfbebbc639be55caf89a0cf59424c4ba86b25b798e3efd675fe2ac71fcb6b518461f10e530bb0d1e3a2531954abaf4694545357af0 SHA512 c6a686dde0292fe2a2eff15c11a51f6d11dae268af0e5a5e75b0e53668fff3dfc53c924862220753d6acf588203cf4516d7d2eb2c74f40631b02fa44d5b543ef
+AUX htmlcleaner-2.24-fix-tests.patch 1351 BLAKE2B 995c788b1e33d1997ee9e0f72f417d8d3c69e2f9b4e71ee666b62db40b0207c816af50a7af833974a22bebd6c4624723e5b3de9e13716043049737987b304499 SHA512 071f7f30a12e0d7a9f7e50b1412852efb030e6a076816606711935e2f79b9df0ce48a8197f1c0b4d294378de4af055f9cd829b28a6cf243524bfc9983a96dce0
+DIST htmlcleaner-2.24-src.zip 413806 BLAKE2B 26ac6d150607c3ee00a8afcf58fed313ac570178f84c52a0fe43b0d324e3b32bb60f63db9ae5f171e7a6a7517799c633f85abfeb64e3f7421d655842bb5a5610 SHA512 beb16e383b6d43d0dfd4697b919a30c1a74eea824976521475c458bdda6c5f0eb22f299eddae033cb190a2af4fafde7e7f2c8ab1378bd82f15842a3ca8ebaaff
+EBUILD htmlcleaner-2.24.ebuild 1671 BLAKE2B 150e6f7606158b72df11ab119df62d4760bb291807360df18bef0c5314d75262fb5c213a961f6d1e0b18e12e39d12a03657ffd1370c00165b316b0781777cfff SHA512 56aec335f34b873113c5c5547eb551b376bdce7b6d12100692980f74b59b0ef0dde6099453ec7523ab0e43c722cc702dc6559551ddc599bd26e26236323268bf
MISC metadata.xml 956 BLAKE2B e9aac65fc4b7ea06f1151cf3f09d1d9363770332ee2d3c711099591edb6d4ee09bd385fadefdd95512ef84f3a870407fae0e2e69bbabd16b24980341095ff7cc SHA512 def5b0f8710cfbd49e0c25f8a5623f0ef7a8e37fab31d4324540d9eeee257423767dd947475fab51f4b84100428c556aa0457c6a8b92076b9f267f35ee9475f0
diff --git a/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch
new file mode 100644
index 000000000000..0e10ccee4816
--- /dev/null
+++ b/dev-java/htmlcleaner/files/htmlcleaner-2.24-fix-tests.patch
@@ -0,0 +1,26 @@
+diff --git a/src/test/java/org/htmlcleaner/DomSerializerTest.java b/src/test/java/org/htmlcleaner/DomSerializerTest.java
+index b09c6d6..f4e83f0 100644
+--- a/src/test/java/org/htmlcleaner/DomSerializerTest.java
++++ b/src/test/java/org/htmlcleaner/DomSerializerTest.java
+@@ -132,7 +132,7 @@ public class DomSerializerTest extends AbstractHtmlCleanerTest {
+ + "</html>";
+
+ final String expectedOutput =
+- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
++ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ + "<html>\n" +
+ " <head/>\n" +
+ " <body>\n" +
+diff --git a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
+index 3e1d1e9..d406c40 100644
+--- a/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
++++ b/src/test/java/org/htmlcleaner/TraversalDomSerializerTest.java
+@@ -143,7 +143,7 @@ public class TraversalDomSerializerTest extends AbstractHtmlCleanerTest {
+ + "</html>";
+
+ final String expectedOutput =
+- "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
++ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ + "<html>\n" +
+ " <head/>\n" +
+ " <body>\n" +
diff --git a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
index 0d2f1e083023..72bceb361e04 100644
--- a/dev-java/htmlcleaner/htmlcleaner-2.13.ebuild
+++ b/dev-java/htmlcleaner/htmlcleaner-2.24.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=7
JAVA_PKG_IUSE="doc source"
@@ -21,19 +21,26 @@ CDEPEND="dev-java/jdom:2"
RDEPEND="
${CDEPEND}
- >=virtual/jre-1.5"
+ >=virtual/jre-1.8:*"
DEPEND="
${CDEPEND}
- app-arch/unzip
dev-java/ant-core:0
test? ( dev-java/junit:4 )
- >=virtual/jdk-1.5"
+ >=virtual/jdk-1.8:*"
+
+BDEPEND="
+ app-arch/unzip"
JAVA_SRC_DIR="src/main/java"
JAVA_GENTOO_CLASSPATH="jdom-2"
+PATCHES=(
+ "${FILESDIR}/${P}-fix-tests.patch"
+)
+
src_prepare() {
+ default
# Don't require default.xml to be in the current directory.
sed -i "s:\"default\.xml\":\"${JAVA_PKG_SHAREPATH}/default.xml\":g" \
src/main/java/org/htmlcleaner/ConfigFileTagProvider.java || die
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 9fdd2e2050f6..367c91c42af6 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -13,5 +13,5 @@ DIST icedtea-3.18-shenandoah-3.18.0.tar.xz 7279864 BLAKE2B 1d8cfccda9cf24a552286
DIST icedtea-3.18.0.tar.xz 1565468 BLAKE2B e6bffb9860ae8824a96e55970056025bc426453c26f91a7eb52f01f5ada7c0cb0bdcc4efa503186f514759f914d9053d08ba540bde7d15be81736037ce5d8db5 SHA512 e94c365513e5fa8a17d61fe7957db85018510567df9ba115c9bca98c658257ff1f4dff7967e88b73088630f07670beeaa8cbe49706d6bd02fb2804abad5d95b1
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 BLAKE2B 6b1be66ce19f491d49f1591babcd8c088e8e327f828dca3f30b8f8b04c132140f8b9f487ef6d91aed212aebab2c7c3052d79fa3f2d76d3832341d94d48e77089 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 BLAKE2B 1ca581a02be4cf5c09162687bbc90ec01b58b4910d866d11512cf17a1caff181fdc69e42f7498b2df9deb875ddc6efc6bc2888428f411da94bbc2313ddf5a2c9 SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6
-EBUILD icedtea-3.18.0.ebuild 12444 BLAKE2B 067eb985809926407278329743801f66839f4d669f72b8c8586af86421ebb18eb67f8d5da9754199c96e89f904001893ed244e88a13f71692c79ff77d1334b9b SHA512 4a29356a7ad8ff66cde98666ed494ec79581f6276e48ce44000c83fee027118ae48fe05689e052aae405dd510d53d725b4a2c864ee6ff637de086b2d3dab91d8
+EBUILD icedtea-3.18.0.ebuild 12385 BLAKE2B 1dd24c16d4c280249ce3adbc183b347318ed7f101fadfd11a04031a31e2957b0df438882bc200b6d8837358ab5f1cb7cf554b6fb666c5ded4fc1377d49b9158c SHA512 3dfaf9dd4bd5a7dd54ec71061561d94706ad27ec923aaf1e510a51b19b242a1fcad5d6b05f3cf5d90e599a6819b9ff1cb24eb80c26bf40eb359a1b723ee39f5e
MISC metadata.xml 2108 BLAKE2B 3160040a91a46f2b5dc9be02405ad35849b5c02ddfae81a17ec47a15bd9103cb17bcd0c1065a660e3ffcd4e8d815fffab4c020d3dfbe5e9936826bb15072e00d SHA512 fdcb8411daaabf953bbb75d8b58137ab1f7a3755a1c016ba431ab366177eb91e9cef365fc921d989384f076c589fc46358838d4a4c86cd50955cfcfc9b97dd74
diff --git a/dev-java/icedtea/icedtea-3.18.0.ebuild b/dev-java/icedtea/icedtea-3.18.0.ebuild
index 0ec907375811..505db1a198f0 100644
--- a/dev-java/icedtea/icedtea-3.18.0.ebuild
+++ b/dev-java/icedtea/icedtea-3.18.0.ebuild
@@ -69,7 +69,7 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="+alsa cacao +cups doc examples +gtk headless-awt
- jamvm +jbootstrap kerberos libressl pax_kernel +pch
+ jamvm +jbootstrap kerberos pax_kernel +pch
pulseaudio sctp selinux shenandoah smartcard +source +system-lcms test zero"
RESTRICT="!test? ( test )"
@@ -147,8 +147,7 @@ DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_
app-arch/zip
app-misc/ca-certificates
dev-lang/perl
- !libressl? ( dev-libs/openssl:0 )
- libressl? ( dev-libs/libressl:0 )
+ dev-libs/openssl:0
sys-apps/attr
sys-apps/lsb-release
x11-libs/libXt
diff --git a/dev-java/jackcess/Manifest b/dev-java/jackcess/Manifest
index 6919d34c3ab7..17e6c6bed909 100644
--- a/dev-java/jackcess/Manifest
+++ b/dev-java/jackcess/Manifest
@@ -1,6 +1,4 @@
AUX jackcess-4.0.0-fix-tests.patch 665 BLAKE2B 6e2cc60406b84c64e896478dbed520834b193749121241abd97ea1d54079a1faed4830347ab4d99623244e344ae502a10e8cadcdd4dbd1ffce83fdd273af3e33 SHA512 70a1325cbf955b032fada56a05635175f285e722c4c2a4c0a3d59401fec2b8261ff8c4717cf3e4c05cdbe53517a142ce348bd6309883334519fcf05e37afccce
-DIST jackcess-1.2.14.3-sources.jar 541095 BLAKE2B 60700a7ebb87f371a28d7cfcc588fbd61e28e4744e96a214e0923cd32c1b8e265b87d98048b277e8d9e5f1e582f17dc0962550ec8e5e7ede7adb83d0c417f25a SHA512 a0ccc39187ee94f550760d5640b736cf54d7523bad4eed715166608e18b30acad82a8db2d78f4c9da381c04876571c3d9fdb0418ee2585568c5da18b000f3b1b
DIST jackcess-4.0.0-sources.tar.gz 12140889 BLAKE2B 44bdd0ba74e9e462364506e563b2e5db8a6581686a0b1ab7d9995d2dfce164593eb533986ac666a7f79180478a8a16ccc8ef57a7af08045cb671a3a5269f84a6 SHA512 514ecf235943183e0b3813550adf801cc4ab1734137ae0b131f5e3dca9f774f2a866bec397ccc8d37d65e9c3f0c4c995baee091480eb8e2bb91e85894c2a27e6
-EBUILD jackcess-1.2.14.3.ebuild 751 BLAKE2B 568a4f0c4e993546100d1ac6e50f69eebd1f276b812e53bcf4cb0759eba938846cd83f891e547b95c229df013318b7e01af6f014f8f24c5edb2fc1d05f188345 SHA512 5bc0776e1128df3619f30a43bd140428f0755547b4a3513724ea7e8b8bfa87bdda1ed7b1adfa709c399e78149605308d5c77d4479a54647ae78cd5b7a31b9475
EBUILD jackcess-4.0.0.ebuild 1993 BLAKE2B 7c8ff43075e2a443cc3e46d7f5add73c7805e2361f5a55b034133bfee0cc6c4a617f23ff3102429f2ca270896e6194b64883d5df1e06c063901b4ab2b448d2b9 SHA512 037fffd468c3b27c9a3ac90bf284f3efeb5671dcb9541c9dd01c4880e1e3685354ddbf7ac435771e549cc355e660b29fa8aebd587081a6b81884cc3e80ec25e1
MISC metadata.xml 314 BLAKE2B 0a48c521ff5b9916de7132a86ece393d4c01e648eadfc633bc0e5cea8fe64cc4a1163258b36c0c1e35743fac87224101f5661255bc6c8ca2ba31c59325d75c44 SHA512 84fc5b3b58171d3e96ab9cd24fad7df6ad3181e8099d1e597ad2c5e08e390fc598e5c7d210d05f722c001e4939a73052781c76322e52612d3ff4df126e5c4460
diff --git a/dev-java/jackcess/jackcess-1.2.14.3.ebuild b/dev-java/jackcess/jackcess-1.2.14.3.ebuild
deleted file mode 100644
index e35244013eca..000000000000
--- a/dev-java/jackcess/jackcess-1.2.14.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Pure Java library for reading from and writing to MS Access databases"
-HOMEPAGE="http://jackcess.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sources.jar"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-CP_DEPEND=">=dev-java/commons-lang-2.6:2.1
- >=dev-java/commons-logging-1.1.3:0
- >=dev-java/log4j-1.2.7:0"
-
-DEPEND=">=virtual/jdk-1.7
- app-arch/unzip
- ${CP_DEPEND}"
-
-RDEPEND=">=virtual/jre-1.7
- ${CP_DEPEND}"
-
-src_compile() {
- java-pkg-simple_src_compile
- java-pkg_addres "${PN}.jar" .
-}
diff --git a/dev-java/jansi/Manifest b/dev-java/jansi/Manifest
index 43a9c325f4aa..120cc4e239de 100644
--- a/dev-java/jansi/Manifest
+++ b/dev-java/jansi/Manifest
@@ -1,6 +1,4 @@
AUX jansi-1.11-build.xml 14529 BLAKE2B ea9358a4a64e077ba9173f6f0d0548647489980cff2626760b6c92df9774117bc6ff32f4647c8b89b21b4e37722f018e4f1fd0ca2cfa5915a83e253f9c18d250 SHA512 cc60a9f48f220ee13a22ed814409126524d22f2329c574e61974e26fd70b9a53f703ade06bb6921c13f370016be79c00d111368018132abee20780e99096c0a5
DIST jansi-1.11.tar.gz 252095 BLAKE2B 72b22392fa6731f49ebb5c2e94cdf7918ca37d5c73ccb14d8810402c9ec120b1220a739e54516eeb5355ad4dd74d01ae398a6003679c60b1dd6f1648691b2efa SHA512 4a19d52055da3ce08b6d797fb8e8241af86f1b9b30e12f4de24655edbd72d256b310d58fc6e106cae1384f9b0ab99cd7f2128d53296875fba5422bfc0e8410f1
-DIST jansi-1.5.zip 211616 BLAKE2B 754105218e62d095f9f070ba7f66b68dd2cfbf1b7d8f95ea6dc40f01e536fd8997e2bfca481a4c57cafabc6fe044de5de171b51429e07081ebe1824a5cd5d3d0 SHA512 784c01b7ab48307cf881439d5c3531949a6459e8a90667f1ee7a73f9cbce72710fcf4af8b4cae610d15085641567c0d51cab487488daa0c1b0a4605864de2775
-EBUILD jansi-1.11-r2.ebuild 1152 BLAKE2B 6b0cc2ccc3f4c85455015154a7ee4c2193914084a33a40a286af62f88a032c492807e23618337eedf960dce1ace6452ea4e3798c256594fe5707fedabdd72aed SHA512 a0e1e7424615ce5228acbb4f549e14311c627792b2992cd84d33f95d6460b0f0f17652f325b7c7b7326982abb0f444f460aeebe4d6deaa1a793bebb16067c5dc
-EBUILD jansi-1.5-r2.ebuild 674 BLAKE2B bd3b686e6c35721f33d73357434a37800519b0b370edeb97288be68a98e95b04045c397700fbf78e0d3aa4dad82da714e20dcc30f0bcde1fdd9f666fbd302b19 SHA512 07dd8bc9d822b963be6db3ca5e39bc160ace104741ef0786de3a8482eeb7f075c67fbc60d4f6e5cc46c4ef58f4263960f796c1c0373c07baa0149f09cace0910
+EBUILD jansi-1.11-r2.ebuild 1151 BLAKE2B 6b7c02eb60055900d4ae9a2364e0615d70f8b4945e0b15a001dfd35db22d6c59fe1867f0ac4982bfe9b713006a9a8c0f9e01a0526d7836ce07ba1fc534828331 SHA512 aba4591b29d248fb320ccd8736c1b16ee67ee79b8608dad3acd7a44afeab1d75e562072741fe35d361bfc7e14bc7af94306d9f8871093a92015fe78ec5684949
MISC metadata.xml 491 BLAKE2B 57979797604525188358a5e2bbf92bd7cc40e9513710d9907302df960f0fb0961b3c8eca15bc09b53cae259dbe3b512d149a4e9fb2bb5e3b1ad6a13700af3c4b SHA512 46a12388363e4b59001bf8cf67923a4f38d8a4409fe158a813c9403e0da6067a8aff418cda7e0d02dc905e38591ded15e46b8f8095acb62d0a83a65146550669
diff --git a/dev-java/jansi/jansi-1.11-r2.ebuild b/dev-java/jansi/jansi-1.11-r2.ebuild
index 0c1149bbd7b2..8006241e27d0 100644
--- a/dev-java/jansi/jansi-1.11-r2.ebuild
+++ b/dev-java/jansi/jansi-1.11-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/fusesource/${PN}/archive/${PN}-project-${PV}.tar.gz
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
CDEPEND="dev-java/jansi-native:0"
diff --git a/dev-java/jansi/jansi-1.5-r2.ebuild b/dev-java/jansi/jansi-1.5-r2.ebuild
deleted file mode 100644
index 42ff134dafcb..000000000000
--- a/dev-java/jansi/jansi-1.5-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="source doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java library to output ANSI escape sequences in console"
-HOMEPAGE="http://jansi.fusesource.org/"
-SRC_URI="https://github.com/fusesource/${PN}/archive/${P}.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CDEPEND="dev-java/jansi-native:0"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_GENTOO_CLASSPATH="jansi-native"
-JAVA_SRC_DIR="src"
-
-src_prepare() {
- default
- rm -rv src/test || die
-}
diff --git a/dev-java/jaxen/Manifest b/dev-java/jaxen/Manifest
index d9d80b02585a..cc8457e5fa9c 100644
--- a/dev-java/jaxen/Manifest
+++ b/dev-java/jaxen/Manifest
@@ -3,6 +3,6 @@ DIST jaxen-1.1.4-src.tar.gz 268493 BLAKE2B ff51cf3b6507f19549ab864fa4cd53d0b2d0c
DIST jaxen-1.1.6.jar 409677 BLAKE2B 55e03939420c103fb5a6d323595ff0cb7653885eb9ba233fd581c5376d2ac90eecde7aa5576f602cdc459cfd9ba9e79c6bb5bfab3ed7805e717a21670a5748ee SHA512 979044fe959493eb6d66fa92b420251cd9c12414051ff6956d5835888a8999d4f337c18646c53806fc19203cef744f53b7597850cd2f695910c90df7a9725b48
DIST jaxen-1.2.0.tar.gz 282829 BLAKE2B 4d89d4fd3dfd8c4113fe7ecc05597ea9dd743d9c871f320936809016ae8cb3a3d4fb3f935de19463e6c99db1b67eff3545e909b707e81f4c0f114ec0f0e7bb97 SHA512 cecfc62eab1cf6586b28594855bd983679a932dbdc6cbdd07d85a9a9458e78b2e784dfd6287e6e87e4f4443239eefbeac59a7316dae53b818379daaccae56b53
EBUILD jaxen-1.1.4-r1.ebuild 1082 BLAKE2B 5a63323c265e84a70008b4f44788ab50f0c370906f63d46aecd4e476b23c31aa37162b21d9d6ad950c3e59e758ffd711d204b8d8bf05fe1ee3e4076ec07d5daf SHA512 82a7a8b205958e9e81d28887c747a9731077458f213af8c30551fd9eed78cdcf9cd7e29fe385e3c9513f3421fb222c4aad8f959bc1c59d1e42da38847e3e1f0d
-EBUILD jaxen-1.1.6-r2.ebuild 864 BLAKE2B b13a456435ae9c5bf982e89c6f6bb84ed44d074e26d8efc762de0bd219d31850561455093e9538b53e0982ab9c4041bdc8f87559cb8da22b9420bb8742691fe0 SHA512 507cc60f4c7f85e6f87f9d1c198a75e04cdf6936f541923c7b0ff8606e0f5fbb9a040a52f4339925e70c9e696a0b59ce92356389c2fbd19ee49df15f57209e17
+EBUILD jaxen-1.1.6-r2.ebuild 863 BLAKE2B 859d58fd895b3ace5e8362ee646ab092b832c7b4e91f7cac23e14e9032fd13d34d6aa054b21dcb903d71464496138ae135dfb0ccd8028a97ccbc9f565203a571 SHA512 7ffdeaf9cde0f3c0f2129eef7c78166544abcd8f37a1d1a56eec06ba1566e9c0eacba19f812b821b3aa7241ecf9c08e519e268ac66b936285f6d4a5ea8487ef5
EBUILD jaxen-1.2.0-r1.ebuild 1919 BLAKE2B 90a69225c4086bf95f16cb8308842f703970cdc0ebd95e354d6868d29172ec6b9af479fa3ef546f1f8432afc807643bcf2de6ea937524fd32ee26a7f10807d8b SHA512 51df4c02d9ff569fb37b2f4629f2ea9b7817fdb3030d303728401c424f0feec73528b328af05e910de5a9b7b1dee7e48cda55e5662a903a0c0272df842ef3990
MISC metadata.xml 718 BLAKE2B 14654870dfbaef53f3fc46124c5df04970de2699ed0d3f453a1b98603dee6f805fc6018477b08ea82c01617d17969a06233c0cc1e41038dc43c5ae4ffe3d16b8 SHA512 d37502fe1c0e32f28599da74657433561cddb87d15b80c3fe05242cbb0032a7abcb04180890126f89ff5c30b39f9614b1eb255bce7af01ca51eda3807902aafa
diff --git a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
index e8fcb57853e0..5f921311ff48 100644
--- a/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
+++ b/dev-java/jaxen/jaxen-1.1.6-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://repo1.maven.org/maven2/${PN}/${PN}/${PV}/${P}-sources.jar -> ${
LICENSE="JDOM"
SLOT="1.1"
-KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x86"
RDEPEND="
${CDEPEND}
diff --git a/dev-java/json-simple/Manifest b/dev-java/json-simple/Manifest
index 7170972d1a20..2dfb9c5337a8 100644
--- a/dev-java/json-simple/Manifest
+++ b/dev-java/json-simple/Manifest
@@ -1,3 +1,3 @@
DIST json-simple-1.1.tar.gz 22154 BLAKE2B 594717df45d56b4e70cee9aadca661a9da7e19c2a77e5ab2176396c48bdf061f25db0e4cbf5b93b12dc862dfca593a71dcd154f24c914a4d2ff510e3f4b11570 SHA512 f09cb298254a8f35b534670d6a1801eeaf58385529f459f413aed556df1ac577bea6e678a32065077abc851dc310b3af38b818f1737bd255f05e756d7e2da066
-EBUILD json-simple-1.1-r1.ebuild 591 BLAKE2B 5dd45bf8dead68b43cd9c28a2a55ad9e13a46d14956edb95b6560d6f0c07b4c960a55b71ddff8fe99898fe812272b01ee7b8bb27dcc468234afbdee964b0a846 SHA512 e1f5bfaa2d7ae6cb525cd1c129d10661e62a702362f3a6ad8977c409094feab9d90be0268b50050310665003e4dc6d4defa60a01655300b2db1028d792c52ac8
+EBUILD json-simple-1.1-r2.ebuild 592 BLAKE2B 8b9ded6bf2fa2350ddde5910836999bbdc2e10a5d6a19acd31bd76b523060bebb5df8489507ee089074a3d6ed3ce48cfbcb8f9829689b25a38c56f856451326e SHA512 f5bf630f85bf7347ae5dff5d2877e0b3a79632fc58309da7132d08ba34d146a332778af006ad6cb6c658713060c1f2e9e168d3e071c29096444599b0d2f9679d
MISC metadata.xml 884 BLAKE2B 93c8109aa04543cfda3354252a56ffd6520106daae5eaca5c428e6a001a8b2d87a3ce3d416c70fb06fb28e22f2b399be0d0911ee59856a9feaa26614f39c0ef5 SHA512 c62d038f6913bb8beb903930ed6d354c89b9b5fa231d9096690d263ee35812aad52696a3d15d74c83d99c02392f5ed3ab997bc6e9d2532cbb4ea12cbaab1ebe9
diff --git a/dev-java/json-simple/json-simple-1.1-r1.ebuild b/dev-java/json-simple/json-simple-1.1-r2.ebuild
index a91c4fbc828d..d73b7b55ba0c 100644
--- a/dev-java/json-simple/json-simple-1.1-r1.ebuild
+++ b/dev-java/json-simple/json-simple-1.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
JAVA_PKG_IUSE="source doc"
@@ -17,8 +17,8 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="amd64 ppc64 x86"
-DEPEND=">=virtual/jdk-1.6"
-RDEPEND=">=virtual/jre-1.6"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/${PN}-${MY_P}"
diff --git a/dev-java/libg/Manifest b/dev-java/libg/Manifest
index a4108039fffa..a543f093a7e8 100644
--- a/dev-java/libg/Manifest
+++ b/dev-java/libg/Manifest
@@ -1,3 +1,3 @@
DIST bndlib-2.1.0.tar.gz 123217291 BLAKE2B ab8e6876b13db538746f77aa1fe7800e5a3b5e539e1980da78f69c64344f4964bf0a21f2329f7684b055d0de39a10c8df36e030922e9933b29fccb9a35aa669a SHA512 6965143ced45c15fc2316716de32e80506cc411d52309b24313fff37e0713a45ad200d5b3701f0d47a131a3163ec266ed8acb4544884cd1c59c9716c7a2b285e
-EBUILD libg-2.1.0-r1.ebuild 1369 BLAKE2B 7703fc056c22d0c5417a7cdced6851f71836c4fb4bd52e635c40ede56f6aac2c94ad2937d5aa152ab2fd3ae4ba4f2e7e30fe53639cc3ab6e60dcf561872019c1 SHA512 286f20fec71db18023e3301d737bc178cfbb77c7712befb922b09807af6c8137d9aaadf97533bb943b596c5b95ee3bef5f0c4c44694990ed153196b2b6494ad7
+EBUILD libg-2.1.0-r2.ebuild 1376 BLAKE2B 53aeda061084ec9e78ed47f28cfcec3ea62edc88de2e151df4ab6256add9599364d5aed18062822e1e90f7e0fa4f409b8d2567e8780c18a2c79afac9cb507894 SHA512 08eaa56bd92176b705d6551485c2f36070f2e18053f72131f819b311946cddb58012a99b7b49f8261b3c3ead4afa4109ce7ec889f82391fec3b0a9700dffde2c
MISC metadata.xml 323 BLAKE2B b7a6a3bf3330da14a229f4b8e178c7f5da2bdab8d7249b92daa4a6d414471b001d21441465852b21f9abbbb6bdff229a8c7dbe162e4ae820d5feccf2684c19f8 SHA512 b9affc0513759478d6db10968d574cc820ac19476a539d27e279884314805f663f0807abd01ce8107154fae445ad3e4fd37f485004130f04aa890c0607f85fcf
diff --git a/dev-java/libg/libg-2.1.0-r1.ebuild b/dev-java/libg/libg-2.1.0-r2.ebuild
index 8b7b14cea8d2..4ac55d9243ba 100644
--- a/dev-java/libg/libg-2.1.0-r1.ebuild
+++ b/dev-java/libg/libg-2.1.0-r2.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
JAVA_PKG_IUSE="test"
inherit java-pkg-2 java-ant-2
DESCRIPTION="Lots of small utilities for bndlib, a swiss army knife for OSGi"
-HOMEPAGE="http://www.aqute.biz/Bnd/Bnd"
+HOMEPAGE="https://bnd.bndtools.org/"
SRC_URI="https://github.com/bndtools/bnd/archive/${PV}.REL.tar.gz -> bndlib-${PV}.tar.gz"
LICENSE="Apache-2.0"
@@ -22,14 +22,15 @@ KEYWORDS="amd64 ~ppc64 x86"
# build biz.aquite.bndlib and biz.aqute.junit in this package.
RESTRICT="test"
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
S="${WORKDIR}/bnd-${PV}.REL/aQute.${PN}"
EANT_BUILD_TARGET="build"
-java_prepare() {
+src_prepare() {
+ default
# Move the correct build.xml into place, needed for testing.
cp ../cnf/build.xml . || die "Failed to move build file into the right place."
diff --git a/dev-java/miglayout/Manifest b/dev-java/miglayout/Manifest
index ebf913d60139..f5cd1c7c0c36 100644
--- a/dev-java/miglayout/Manifest
+++ b/dev-java/miglayout/Manifest
@@ -1,3 +1,3 @@
DIST miglayout-4.0-sources.jar 194675 BLAKE2B 9d0a4fce1b76e49f4a2962fccf323676172fc9fa084060d8b3507031635b7979d8b29ce598a0a484e3707eefdf90721162e67d36be5702e9309ef067fd39aab3 SHA512 27284ceac254707428351fb2451ffd5f2ebd580374df59624bb6af06011f70d87b27849900c2573aff782ebe6d84e1806c18a59741213948f0b238ee5a51ec2f
-EBUILD miglayout-4.0.ebuild 1270 BLAKE2B efd260a4edba737f9191d3a68412fc08ed14478ae69d26848f3e240a53a8f5144c48e4ca4d3a29e96a969b626addf572134316c0d3542994fa2c8b8234c7dd5d SHA512 ca4f22b9cfbba769e0935aeb25faf3f80579873b86f57ddbaf36284b11d410cd93894d4cafeded2b516f936a4aa7ee1e82840f73afdbe2b1e3861e9118c4ee10
+EBUILD miglayout-4.0-r1.ebuild 1274 BLAKE2B 8d7d2db7d2fe14b4a827ff1f089083476fee8daf84c5ce96cae6ebc886d37234e106da7d8f72693d77a321d5675c6b6e99ba58d2f06ac7cfeeea0f71e4862ee9 SHA512 a51a700c956e4693eded18a36c848da2b8e6582c5527b75ada686f00fb8ad95b313f6fcd3de725d46f113bfacdcc9d62b7e06f3e7e7f6c5d920cd0b02ec5d572
MISC metadata.xml 751 BLAKE2B 2fdfc28e91176b4c7e1dcc4a1d61c491c1e7a5d835fb1bdc89e340db57dcabbf951da958ac0ae728658fffcc6aada76194745282245a066adc8d9c792ac09a49 SHA512 b097936cfa00fa8468489722f2d9557ee93efdf0d9ac852fbcf745814d35b294d0a8b5f559c4aecc62480c6f59e8329013e133a7dc7618c4f665b79c3b03375d
diff --git a/dev-java/miglayout/miglayout-4.0.ebuild b/dev-java/miglayout/miglayout-4.0-r1.ebuild
index 83297335bfb2..d451c751b91f 100644
--- a/dev-java/miglayout/miglayout-4.0.ebuild
+++ b/dev-java/miglayout/miglayout-4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -20,11 +20,11 @@ COMMON_DEPEND="swt? ( dev-java/swt:3.7 )"
BDEPEND="app-arch/unzip"
RDEPEND="
${COMMON_DEPEND}
- >=virtual/jre-1.5
+ >=virtual/jre-1.8:*
"
DEPEND="
${COMMON_DEPEND}
- >=virtual/jdk-1.5
+ >=virtual/jdk-1.8:*
"
S="${WORKDIR}"
diff --git a/dev-java/openjdk-bin/Manifest b/dev-java/openjdk-bin/Manifest
index 21a4eda96c04..8f934b4e443f 100644
--- a/dev-java/openjdk-bin/Manifest
+++ b/dev-java/openjdk-bin/Manifest
@@ -9,6 +9,7 @@ DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u272b10.tar.gz 103598972 BLAKE2B 34ee2
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_8u292b10.tar.gz 102423506 BLAKE2B dab839491d359e4366d316fd1a0eb3b7009e1739d7c6d4dc3ded47bd44fc7af36068d76183d9656d748beec0117bf95f09a78e577c3e1f685f0fb3c2e2d45e28 SHA512 6ca2dddd371223c0bae6caea1f4841d7d718b9ea812d914ec8fe3f03671e2176454ca094c05e55286ba0560e2897a515714bf607e868b4b0405b6bce03c5c22c
DIST OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz 102312570 BLAKE2B b4280d8c1e2132956ec103899defb9000bfda303350b72c9797cc1634429cefe173b17617f687eadcb7c8259d7423cef8b68ce9c89e2b31340fa9e3c6e8ad265 SHA512 d2e6795daa7b413d7ee0fb217d3210b809ac87df11e2ecb3a9befaabc7cd501b67c5526b1498666476a3a7526648d85f43a28a170fa870b3e738daecbc8c41a5
DIST OpenJDK8U-jdk_arm_linux_hotspot_8u272b10.tar.gz 99368824 BLAKE2B 970a0859a09002978b7603beb9cd94556fcdbb8923a88e48dca167e5ecc1495fddd00c786c7b9c0e608de48d485b2e8b4da7491d4e85e488fd1baf7ddc021951 SHA512 6974c06644aed4c7fb8f6004f4d8fd7790252e148ecfb3e1d29a7251429e413e8adbd910231b3cd5b9dd195a570b3fbeb95e6ab09b3ae318f3f842eb7ac418c6
+DIST OpenJDK8U-jdk_arm_linux_hotspot_8u292b10.tar.gz 98376195 BLAKE2B 55ae7181b8e4aa5d3097bee40a5acfaee48a2f208e4362e74cdec1647460770efe49b774b22188c78ca6816716ef20173471b881ce3f75b0d90e95740049f4c7 SHA512 d2c88712a95bcc96172b6b589493038d8e721eb7ec4ae546dd998d82a5148dd5ada6e22c92bacaec2ef88e47a75761d283d1f73983f1848a631e00c5833901ee
DIST OpenJDK8U-jdk_arm_linux_hotspot_jdk8u282-b08.tar.gz 98247854 BLAKE2B de96234507ae2831548c8bfc04d46ddca19d17dad6292cc51021f6001338ddd0722e16bba886cf06187f5df7e8dca34a972696be74dc1ba23be7dbad91c8d3ce SHA512 9cc2240c04f0945beb75536ee85b8e1d19acc9357e2ba844000db7e9f64c6247bd57cd0193c1ac66cbbd79e6f1197d68604519689fdff88a8b90193dba3237ef
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u272b10.tar.gz 100818464 BLAKE2B b2666ed3bf564bdbac874320805f622a1bd80809cf2c402ee393ed585c7ae9e7aa6fcf0e69f70fde16ef5d3a2059ff2979013865112c455cb64761c521a04578 SHA512 bfc138bbb979c23fdb154fa3f7e61ae71b0703a839c9495a470544205c80511ab090f0e52e228050e38606e24c2912092ef601347a9a3979f3a7a25d1ca15ce3
DIST OpenJDK8U-jdk_ppc64le_linux_hotspot_8u282b08.tar.gz 100365310 BLAKE2B 0b7621ba2f5a68d936039d20228b8c7cdddfa528a2b0e5471952ab96ff4d91f30a5892f5deca9b1e1ef88ce334fee5720f0e06bfed67ad9cd170ee0cbb6e65a5 SHA512 36b5fb22c1859710f520255bb6a2c8d4e6b650f77ac2ce988cb9dca570622753c8eae9d27c2955af2f37e6379532babd942ff82863cd771d3f4e247b57a93f84
@@ -21,5 +22,5 @@ DIST OpenJDK8U-jdk_x64_mac_hotspot_8u292b10.tar.gz 103785976 BLAKE2B 81f4b24f2b2
EBUILD openjdk-bin-11.0.11_p9-r1.ebuild 3625 BLAKE2B 4397d7271d15583b6f47fa5235ea55a240e53bcdbf23a59df15a0be7087278de2bb28776922243702ae2ca2bb750f2d85358c6704ac9e47ae65e20440c60596a SHA512 d8a7aff506f41ecd1f69c13ba36d64e33b93b96879740c3cf00f2af16a5a12381f2743c7613d96b392f1bccc85d23afc0eb722a1538412050408a09164a5fc38
EBUILD openjdk-bin-8.272_p10.ebuild 2150 BLAKE2B e5491e066b77dba9da871523bfbcda4c54ae8c1a81b714fecaf8e9dba08a4a13034ad512e0fa1bae65e4d6148015a8118a314b8fc1476acc1a66e9649a7545fe SHA512 406c0f47ec88471786a7742290ee20723b66e09fcff0ec867bc010085144a643d22cd69d208e1466f6475daf2a3f8e8878cffff03a392bfb6c988f97bc68fafd
EBUILD openjdk-bin-8.282_p08.ebuild 3021 BLAKE2B 735b8008dfc7ebaf4fe04eeeed41fb1f3f4a4ce511aa5df1872f06cecf5adf1358c73b32bf9dd66196a081951eb8bb0c4e171935f329bd41416da40f55b34e3c SHA512 4d8465e324810fa5f828a6aca1a6bb3a8547741ba87e59e80bf722398106a97bbbd0ab3bc81099795052fac78c5a3a492ebe1fcd300cc51002e6d0a41432f51c
-EBUILD openjdk-bin-8.292_p10.ebuild 2970 BLAKE2B 93bd2ef441bbf89f2d71a80028e6788eeed179d9d8a038f2b09d2e4df9f1cef5723c02a8497cc6df46a5a191714e4c5a80a9487ea9d4d1507ecc23e1ddff2459 SHA512 a67a1adc40d1efdfd5650549c302659d27545f452d270fcae7391972daac04bf7af9db533aa840afc6e2e8834610e3bb6e80ab2531924d52ec9fc127a18e8e59
+EBUILD openjdk-bin-8.292_p10.ebuild 2991 BLAKE2B 32ed8e5a2a2ebd637a6f7dcc1e9c12b5689dca7d51008b297fce4fc169fd343f95e0c13818b21f1ff9f1969eb7151144bd00db1c251a11616aff4ed8a2f32bab SHA512 eb66ab3117ce8dde396d04972f9d2525ada57c73d581dd23b5ff9d79f9edb3d2676dff239c202b6c84e524f505ba781f6299258a2e46531eea3146e4deefa34d
MISC metadata.xml 940 BLAKE2B 0b643a9707b0f85db0717d766c1491a4a6110342024a3fcca4455852d96c73e62e44607fdbc7f7069514d796134f1b0b82a36d1c88e166a4d2506646f17dc9f0 SHA512 990f19188c833dbcc6a4dac9f63e8d20604bf4ba1c74f6d42227e1f41528447cf5ea040b55cd813d073dfcd80c12f5ad626f97014fca99365fadc8539d446b2c
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
index fe4ec8f15061..3e3c69836295 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.292_p10.ebuild
@@ -27,13 +27,14 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by AdoptOpenJDK"
HOMEPAGE="https://adoptopenjdk.net"
SRC_URI="
$(abi_uri aarch64 arm64)
+ $(abi_uri arm)
$(abi_uri ppc64le ppc64)
$(abi_uri x64 amd64)
$(abi_uri x64 x64-macos)
"
LICENSE="GPL-2-with-classpath-exception"
-KEYWORDS="amd64 ~arm64 ppc64 ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 ~x64-macos"
IUSE="alsa cups examples headless-awt selinux source"
diff --git a/dev-java/osgi-compendium/Manifest b/dev-java/osgi-compendium/Manifest
index 7dc05e509d59..09319ed62caf 100644
--- a/dev-java/osgi-compendium/Manifest
+++ b/dev-java/osgi-compendium/Manifest
@@ -1,3 +1,3 @@
DIST osgi.cmpn-4.3.1.jar 741615 BLAKE2B 6f6058c07fd7744f0369d05cdf607b4d4fe51bbdf567c6a6c951413b0627eb1dbb6e56f65641a8472198d0aedca378da4715c26ebe05aa4e7ef80adb1020175f SHA512 803e929b4b7cfee13a3ffa2c60ad03775afd8409c972bf26e3f79abc590466c2d885bdc339d9af2a3e8fda9cdf082d23a298362ac37935b0ede0719dee27e9f9
-EBUILD osgi-compendium-4.3.1.ebuild 841 BLAKE2B 8e4ac270b156bd54e69922653f8da7921244657e069a028bd005e8087522ac41b180e14f7cc20244d1d5aea8ba0f61b659e9f5c71ccd31f1671dce3dc11e5757 SHA512 20dbe33a8c648312bec5474dcd571400f545b98c197df0936ba7d5a0896f8faaa1b2756cdfe96df2c55f8630c99b31731e231b64e870f30e6fa7cb6d3d1b5d51
+EBUILD osgi-compendium-4.3.1-r2.ebuild 861 BLAKE2B a9954368f03bf3dcea5f246da5b91e0214df99b0858846eda4ad12ba0e8ba9bd5479a0ac36b9576efccb425a0f39a40ae2f83e803c0cd0aefef5777a05c11464 SHA512 b79540fd36ad6bfda11966dfceda4e162579921f0b4e9785ada2fc0ea13e243c7bac2f48b1d9e1448e830ed65db2991a392c06358a0d08552f69e8b48c9b0c38
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
index 058539ddac15..f2cd70ced9b0 100644
--- a/dev-java/osgi-compendium/osgi-compendium-4.3.1.ebuild
+++ b/dev-java/osgi-compendium/osgi-compendium-4.3.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
JAVA_PKG_IUSE="doc source"
@@ -18,14 +18,15 @@ KEYWORDS="amd64 ~ppc64 x86"
CDEPEND="dev-java/glassfish-persistence:0
dev-java/osgi-core-api:0
dev-java/osgi-foundation:0
- dev-java/tomcat-servlet-api:3.0"
+ dev-java/tomcat-servlet-api:4.0"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.5
- app-arch/unzip"
+ >=virtual/jdk-1.8:*"
RDEPEND="${CDEPEND}
- >=virtual/jre-1.5"
+ >=virtual/jre-1.8:*"
+
+BDEPEND="app-arch/unzip"
JAVA_SRC_DIR="OSGI-OPT/src"
@@ -33,9 +34,10 @@ JAVA_GENTOO_CLASSPATH="
osgi-core-api
osgi-foundation
glassfish-persistence
- tomcat-servlet-api-3.0
+ tomcat-servlet-api-4.0
"
-java_prepare() {
+src_prepare() {
+ default
rm -r org || die
}
diff --git a/dev-java/osgi-foundation/Manifest b/dev-java/osgi-foundation/Manifest
index f8b5c84d94ad..19a882c335e4 100644
--- a/dev-java/osgi-foundation/Manifest
+++ b/dev-java/osgi-foundation/Manifest
@@ -1,4 +1,4 @@
AUX osgi-foundation-1.2.0-build.xml 9886 BLAKE2B aacff8e000b02c742ee7e5d03d2c057b6baf56bce9cc1b9cd0031c39550e9ef07bcf85a7d89dd265cc523d638063e425b1553f146b5ce6af107440b1e0d61d43 SHA512 5f106bd612a65033e35beb4fb635d07199e10b69e692db5949424ecf7a8baf2bd6af0f35898bd465334356333d82d5c4941ef6ce7ce16c3939f425f4e58c6fcc
DIST osgi-foundation-1.2.0.tar.xz 45176 BLAKE2B 4b5432dfaad9134f402b5f448a8d7ba5f626a7b160bbc953914352a28f745725da851b6c5f2122f820b52f2fd8ad463c2df5c8ae3e2b46ef8bb9d56d89d90f1b SHA512 6523dd6b4cd8205aa3359fae4640ff6b17a1944aec6bf23acf0d6e4eb33839a9b9049e8df0c55a4f35013b40b1df2391a53ed68df682a317c35dca504e9b996b
-EBUILD osgi-foundation-1.2.0-r1.ebuild 638 BLAKE2B ee50d921757639f377331bc2fe39b08d4580bd2aafe556088576b2924a8f825418974f9ae2052e747300627fad3cc0c544d6cc4bc1eb79ede9dbe2a781d13f53 SHA512 c1c038eebe4686d90d2745bdfb23d813d1c4fe4f20b1cc4497ecb1e66f85baaadf99f33d2bb8fb8776bc1656245861d83b30f1f19ab2a9bda693ad3808a6a766
+EBUILD osgi-foundation-1.2.0-r2.ebuild 648 BLAKE2B 326fe5d303ae073c1e8d516d2d22feabe378dbba63e759d95c3b78ff5c89803b5b53bdbc14b5cc94593347737d35f4ea6579f9da6c6f49e123b4c96c80f14d44 SHA512 046823fb6b8e21a0ed26ddd8361b6c7fe0af4617608fcb11c01e39204f01ace3783d2c5bd205ad779c8d50d464202650b908520894f37c463a7e16f1e2afb6a3
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
index ee652a6205c6..3e37ca69434e 100644
--- a/dev-java/osgi-foundation/osgi-foundation-1.2.0-r1.ebuild
+++ b/dev-java/osgi-foundation/osgi-foundation-1.2.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
JAVA_PKG_IUSE="doc source"
@@ -15,10 +15,11 @@ LICENSE="Apache-2.0 OSGi-Specification-2.0"
SLOT="0"
KEYWORDS="amd64 ~ppc64 x86"
-DEPEND=">=virtual/jdk-1.5"
-RDEPEND=">=virtual/jre-1.5"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
-java_prepare() {
+src_prepare() {
+ default
cp "${FILESDIR}"/${P}-build.xml "${S}"/build.xml || die
}
diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest
index d47f8bf94870..64510d8351e3 100644
--- a/dev-java/protobuf-java/Manifest
+++ b/dev-java/protobuf-java/Manifest
@@ -19,6 +19,6 @@ EBUILD protobuf-java-3.15.4.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1
EBUILD protobuf-java-3.15.5.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
EBUILD protobuf-java-3.15.6.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
EBUILD protobuf-java-3.15.7.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
-EBUILD protobuf-java-3.15.8.ebuild 1480 BLAKE2B f9fe3366da0b17ab82f34c9afe6fa4e1f0c99e4b67429b5d205adccc714a3cd8f994f0cfb961e5b0f6fc6fd7f9a0ca2b28b9ef01ad151bdafd81f21dbfff21fe SHA512 5cb8996f94ee127f5fed684e3723d39e09879f72f8b89f16e6f5cc3bd87fccec0bcee98e1f768e79d86e7387b18864263816a8fb479bfa57c40838b13f5682bb
+EBUILD protobuf-java-3.15.8.ebuild 1479 BLAKE2B 0b0d29422b63396fcaf19acd989294dfc2fd516adc5b43481b65529180f7fa9b954d1f306533d55e0a6c07d3dbb7b24a51b08f949eeda820f81e734fa56287b0 SHA512 edcebe15e9e41d0d8cb624d36f2930ff80c0212fc9dfa610c2ca763ac3dc7dc80f3bb47afe5082cd98c70eef3b8c5a121de888d9666d76cd7fa572d50752e07e
EBUILD protobuf-java-9999.ebuild 1415 BLAKE2B 2b9a19943db37248fefd4fe65c15e2a3ced5748a5340f572108e3b0f9013aa46982421d3e7a4b044a0949742b90dd9014045486761ee2d8654c70fa605c06e14 SHA512 c4f6d08af080dcb0c93c5f03242bca8662db069aeebd0d42c06dc80386c17867021db7f67104405d9d58a71659a94c3fbcef8bd5463d44c647e2f21bdcdb976d
MISC metadata.xml 549 BLAKE2B 3b081008d6ff92b24f670c1b8861400871454e96c5f0ca170c3825d6dda8d356f341fbfad7b5a9f330a7f9891d0e3b91a9f4842c480ee8a74f6aaf371884dcc2 SHA512 37ecf8aa151f5d08443a07c40188ec7061947a06453e39d07fa9b0da0cbeb2ccb76e517e7e2c2e3a2afe07874c817cf644dcd8775ad78f18b5f55496bc198b72
diff --git a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
index dfd68dd9ecf0..2186254f699e 100644
--- a/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
+++ b/dev-java/protobuf-java/protobuf-java-3.15.8.ebuild
@@ -23,7 +23,7 @@ fi
LICENSE="BSD"
SLOT="0/26"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
IUSE=""
BDEPEND="~dev-libs/protobuf-${PV}
diff --git a/dev-java/resin-servlet-api/Manifest b/dev-java/resin-servlet-api/Manifest
index 1f6705bb8574..4d51dc967c29 100644
--- a/dev-java/resin-servlet-api/Manifest
+++ b/dev-java/resin-servlet-api/Manifest
@@ -2,7 +2,7 @@ DIST resin-3.0.25-src.zip 10690692 BLAKE2B dde17819f958053bfe2e1ac0068db0a56c068
DIST resin-4.0.27-src.zip 17990178 BLAKE2B 2da8c4bae7328f0a39fc7cc84c2d7a25408a8242150a9b324cc34a15e0342ed709b9e1db8773873d804d59b47f0c62945433d211fe06ded03db1aad39c46a6d6 SHA512 ce1d7eb19ab722c2942d82b6ce80ddd193907d6062df361501d28adbbe57e6b7a2effc734e7820bc73d7743b2546799bc6badbcc2187c7da75cab0b9294b8a53
DIST resin-4.0.46-src.zip 40400255 BLAKE2B e31505ba82a8e87ea0b28634b3055c3a01d6629483c2d5ab6af4b428c9cb5d7803b7ed7de58181222bae669412c239458c43be35f23922f3414ce7ac0173ee56 SHA512 49f468706a3269f851a6b359d6020b01dadb312890c97208b1a66353fb82b2d95625947a472d8d3e535d0c52ec6ad3e110eb4d227014fe7a89f313ae1df6970f
DIST resin-gentoo-patches-3.0.25.tar.bz2 4781 BLAKE2B df087e05a80442c44969ccd20099ad5ff5d1e6ab92886255cfa262bcce73043f07b01109e84e224dd991c43730d6c0795bf63bde3b8aaa5fa6dbf749dfbb78f5 SHA512 23ce290e97f18248e08e0b3b7ccf37f60a4b0bf2c3aa28d856384295a286b3eeb9636e299e0620c2c858f8e523806707fe1d4531070ee7ffb4037ad483e6d035
-EBUILD resin-servlet-api-3.0.25.ebuild 801 BLAKE2B 0eabeabd467f5c5d52583b8c386566e74276e49d45618932943eb2dddbffb2013c65bc1c8b49aaea9886de721d153c2b388ce8d49c7ea550f2909cecb5bddaa0 SHA512 b81768a2a58de1a31950862cf64e995391dff3da48b75bd66b29b2db470239e0d5535ed5e72510d544acb7e6121e44b6fcd4aa12b41e96a0b35564547215fa0d
+EBUILD resin-servlet-api-3.0.25-r1.ebuild 809 BLAKE2B 3abb178b156dff27a40a39ad9764b9ae1b13cef98b5bc87ec66455e4bffa386e2d787ee07bce268cc7993f3095502addec8684b3bf75e87d0eeb597d480ecc04 SHA512 14afa86b24af0a961600a50904f02cf2fca0b8d87456265e77868c749228140a481eab377ee229abd37c79886ddb31c44f2d799c6a8d6159eeee43982759bf63
EBUILD resin-servlet-api-4.0.27.ebuild 1127 BLAKE2B ef2e0779a6ba6ec6bc211fdbffb138aa6dc2442b8c556120e3d3b73abe79942851c3ddc19b560e26037ac04c4e900aaf0e6ea25147237586b7fc14a8260730b1 SHA512 c76c4f45a84e7b1806bdd2b0348e7251e84f4e571ad4c3651a42c5a49672257939a7e9e4a70230d63be6c240d1a4b79d291da5fa7bd94743cbb07332294083db
EBUILD resin-servlet-api-4.0.46.ebuild 1130 BLAKE2B 2f6725b53f1474c6c02150b70c30f89087ded68f61f0510217203c2a8ecb5327ca5b2886e793163084d9e4839cc8cb7319912520d45b819ec0af0e2407ed68db SHA512 2dd96a756b7433887aa4f9b521c4e385a1dc1e5c887acd73525a42df41e28807ef1070e233f40081eb2d0cac9d0820a145bd95923344e549aaad8503f18e9f9c
MISC metadata.xml 242 BLAKE2B 6bf5b48906c64a18d9f27e7ecec168ed039f8d390792d62aedb8c86627a13ff09d583a736982057d245fe5db27c4016257125d69792d6bbe424e7d2a35067675 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f
diff --git a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
index 9f6176116360..aacd27267893 100644
--- a/dev-java/resin-servlet-api/resin-servlet-api-3.0.25.ebuild
+++ b/dev-java/resin-servlet-api/resin-servlet-api-3.0.25-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,22 +15,23 @@ SRC_URI="http://www.caucho.com/download/resin-${PV}-src.zip
LICENSE="GPL-2+"
SLOT="2.4"
KEYWORDS="amd64 ppc64 x86"
-IUSE=""
-RDEPEND=">=virtual/jre-1.4:*"
-DEPEND=">=virtual/jdk-1.4
- app-arch/unzip"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"
S="${WORKDIR}/resin-${PV}"
EANT_BUILD_TARGET="jsdk"
EANT_DOC_TARGET=""
+PATCHES=(
+ "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
+)
+
src_prepare() {
default
-
mkdir lib || die
- eapply "${WORKDIR}/${PV}/resin-${PV}-build.xml.patch"
}
src_install() {
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 0ba7144e5b2f..7025c6b6912c 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -8,8 +8,6 @@ AUX swt-3.8-manifest 750 BLAKE2B 46ff2102bf58343aa6443accc445c1531920f5913876189
AUX swt-3.8.2-gthread.patch 1225 BLAKE2B 44dd188433a0e3f70ae53c2df79ffe1fe9839e82847568f611e1c04d380b6cd5837c7f96055ea3132c401de3e73f4b41e6b9bf070f515778cf0b5ddbdaa8942f SHA512 035ea3dda893481f67ac0447e0c7382a9761eb3ee77b65ca77038bd17117b68a2d93058c8414d9b2656ceeecde3e6ebc06c0f27e044f217fe8f44945104dcbd4
AUX swt-4.10-as-needed-and-flag-fixes.patch 2647 BLAKE2B 003a92de886b9c11dcba89f0fc6862ba4211359025f95c07d13e5a68bb151667bd0fa36137a28f144f6bb2b8c2905243a6402dd0136a9d9fe080c5e8d4dfedd5 SHA512 fd39fa82aa63de13904b9b2e535983de1be1129cb471e49fc2f76e0fdf2b3dc45a7bcddfce6c77447a8a5863ee590cffa3d29509fb12b30369dff1360f88493a
AUX swt-4.10-manifest 739 BLAKE2B d70c6bbecc6741cff4889005f13adab95d59ef7ff4604bf0ca4482422cb6d4e6f0766e1a01bd9779c3acab3d5b1d382b193b93c44f00ad37317aa6b9308f1088 SHA512 dba2b208fb925cdc43dd64c0900b5c8e8d2ffdea06a9f4f49648d9aa6625481b8316c654d07a1b059385c9546f4929a747a69107415028b0fa0247a7619538ce
-AUX swt-4.2-as-needed-and-flag-fixes.patch 7840 BLAKE2B 96edb84193506ed8c4c293970def5c1c38fb0cd66561030e1e07f214a70f84c657260e1adbdf41f2eb404d4069794cca9b5422dea344ceaf028fbc75cf9aaa26 SHA512 00cc50a0432bb17272a40c3606c9a5729171708af5581c861a5bfae3d1b694289de92164961bfceb841813fb9161befdc2114616556296e81401f133f07c1db1
-AUX swt-4.2-manifest 739 BLAKE2B 031d2e59e4b20c8aacdb4c5b03ff3bdfd14f9373386766993efeb833995d4858b09ac157bdc847820271bd0a354f5c0280aa0746eb0038413782c5cf59f7ba4c SHA512 f17bdc21083c70896d82d12d6918bb121db838b895d1db95dbbf9bbc0368b1b26e6b6acf5a90b709ff961f3640911111932391fa45ae898d1de8a387d17594b1
DIST swt-3.7.2-gtk-linux-ppc64.zip 5688113 BLAKE2B bb102da40a3f63d63ca6a56d4c57ade55d7fe8d6206acf9e60caa0a8600b5c2cec6c0304cd2ab532948f03ff0706e8b2928ae9e93ef0019051044dad3fe7b1c0 SHA512 750aaa43560bbf6f82f7f8cd9338abc88578f4f0b9aadaec9bc8a5c3d1ad593619cdf01d202cbf06766090ee977989ea7904643669c61971973951d8428b57d0
DIST swt-3.7.2-gtk-linux-x86.zip 5374609 BLAKE2B 04d44b9fffcedc6ce255e2651377ac6968bb41c44cee403f063c159962d9d43a5c9529026819ddb1c8eea98cd11ed818075c37f4e9851d2e95532dc166e570ce SHA512 9f58864d05eba2648e4b5d5c958172f5c0c7c730209525b3d6f607586daaefea4d5ba1013e80c0c11948f01c553044b0a98c81688b33c14114ba79c7ce620426
DIST swt-3.7.2-gtk-linux-x86_64.zip 5671443 BLAKE2B 953fc9eab6d1f2750b1a1345cddf4aa6969567cb75977f87ee50668d367e55dda8be2ff836d87b780005c22132fa783b475f422c093617fd02f478eadd96076d SHA512 d60ae1d3f3b0577f7e3018139f93069c89d021064fec2f3f4074f95cfae56abdc0c7d531cb904ad3911482543cddcc3f6646ff47192073f4bde97c79e13612b7
@@ -18,11 +16,7 @@ DIST swt-3.8.2-gtk-linux-x86.zip 5558694 BLAKE2B 8dd0ce9f2c6b8dc448c85a6c509f39e
DIST swt-3.8.2-gtk-linux-x86_64.zip 5865160 BLAKE2B 45d60d334eb99f407cf9101a06f65e48543538a386103767700fb0af5ea0cf3da73eefe57b8cc6b3d78cb8f29345869f5474513648560395a69cbd4c9b8ee8a4 SHA512 43a27cb6fc891d7da35f5fcfc6ccb689d2b2c58de70b628b1e7cf07131f0641598b627eeedafb6a8dca715a336a7fb4fb6a03bb29fea3e115a4af571b1574cf8
DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936f3bcb49aebed54fe242427c3737bf6761e8f77d049c376f30ca0fc33e74a1e8a48b6aff6d9863775ee9c33fea7cb2edd1309 SHA512 1b3ede58c2b41abae76f58a303bd3fbf1849ba8be3fd6518325bc22400e960c3ab542e7351b1bc08053e2746ea3e28812e04c2d1789cb1e19ea28745c8a5f39a
DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
-DIST swt-4.2-gtk-linux-ppc64.zip 5935799 BLAKE2B 6b1ca0d25d81134239e56ead673303075b6d9c5f20e4ab07fb7b5b87d54582023d02c28a1d330fd40d647bdbc27823ca7b184837cb974706ee13809ebdfd2db4 SHA512 bedd64099380980a6dbe47b86f4719666366680f7580150f97282c6f6b6acc95822493469e950e8fcbc9c584f6fca9f35a59937551ae8b6e799b188dc3751e9d
-DIST swt-4.2-gtk-linux-x86.zip 5561088 BLAKE2B cf8bda6a48d5d8e389c387162bf2aafde5a95c43d76e444a4b79008e1154348d2c99850851b3d0e428890e6b2da1e4bec53a7f9050169ad4866a5a8352e9ed2b SHA512 e3d53bcd0521411c40f4c37719917f3570a17fb3ea5c617560986273fd155b99d9b0790ba27c57da26663d49ebec4c6a8387b41bd01b0ba934b21724ba98e133
-DIST swt-4.2-gtk-linux-x86_64.zip 5867140 BLAKE2B 994bf18799297529329637c1b9ebf15638187339b4f56bf8cc1dedfc97c25a1ea4a1664605cac1374fe3d79b321dc450c6129ebef00ddd6f9507f238b7836316 SHA512 56c5ec4ca2ddeed5256dd6ff350dc3911034ecbc414a06ba879f04ab53d6380ca9da9037097f76228ca8182f6076bcd9cc4cb9b01c10766c10048e6576fc5f50
EBUILD swt-3.7.2-r3.ebuild 4437 BLAKE2B f488c4f50f7019580f29cbbc374d440444a699934193db8f6251d76c2342c5a26a5b65cc7c993ffb90155f771bc9039075b6a202c06d98abbdf7a2ff5959f63a SHA512 afdf8e0de244d457b4aa857bc1f045d0a3aa304158ece0a147c7b20308a27c79b5f614dd7ab0143c4372f7155679019cd972ab28a997cd9fe666f0d2985ea21b
EBUILD swt-3.8.2-r3.ebuild 4240 BLAKE2B 3c08a0ee771d859e07af9d01c9796571ec9295bc0be4058abb330bd62194f20c77744795fcd27412a7397e7a341b7556080d3a7589faa9548ab1f1ac97433005 SHA512 f5c8f79cb9c801062d21d17f6ccdc30b28d5d1716e63ecae00872fce2c7c1b8a6152882ab90ddf6a39d4f525429462415cef6597a9425ec59060d6d0fdbe5099
EBUILD swt-4.10.ebuild 4613 BLAKE2B b666b2a3bc964012c12b568c24f3a9239b9de956df76c804a76029ad30a0279f240d2b967ac86e51500a8f524dca31c4982b77be3268fcfaada4dc8212de7416 SHA512 b4b1c33f0cb51603730ae2b950c652b27bd1e669ad2e6b62e08c4d640ae98393d442b41a2eb88f42a136c2952582f9240154f7ffc06ebca9a943b71248bffab8
-EBUILD swt-4.2-r4.ebuild 4489 BLAKE2B 29fe9c52dcb4ac30c65bc460fd11ac733c72de267cc34a126598ab7684a116f55398d5a0828c513c7ab2464ff6d75c151d810af8a4b7794973afce382a5fc0dc SHA512 0232bf5353f6ca2bbb1705377c2b6de7b946271c93df5acb9a258c06dac0115edfadb3b372b27d39497f52b0fda69b02e99647ca57428fd90723b235c31fa6a6
MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch b/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch
deleted file mode 100644
index 98773c155697..000000000000
--- a/dev-java/swt/files/swt-4.2-as-needed-and-flag-fixes.patch
+++ /dev/null
@@ -1,243 +0,0 @@
---- make_linux.mak- 2012-07-02 00:49:48.729100052 +0000
-+++ make_linux.mak 2012-07-02 00:53:16.753499389 +0000
-@@ -66,7 +66,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
-
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS = $(CXXFLAGS) \
- -DSWT_VERSION=$(SWT_VERSION) \
- $(NATIVE_STATS) \
- -DMOZILLA_STRICT_API=1 \
-@@ -106,7 +106,7 @@
- WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
-
--CFLAGS = -O -Wall \
-+CFLAGS += \
- -DSWT_VERSION=$(SWT_VERSION) \
- $(NATIVE_STATS) \
- -DLINUX -DGTK \
-@@ -130,13 +130,13 @@
- make_swt: $(SWT_LIB) $(SWTPI_LIB)
-
- $(SWT_LIB): $(SWT_OBJECTS)
-- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-
- callback.o: callback.c callback.h
- $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
-
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
-- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-
- swt.o: swt.c swt.h
- $(CC) $(CFLAGS) -c swt.c
-@@ -155,7 +155,7 @@
- make_cairo: $(CAIRO_LIB)
-
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
-- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-
- cairo.o: cairo.c cairo.h swt.h
- $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -171,7 +171,7 @@
- make_cde: $(CDE_LIB)
-
- $(CDE_LIB): $(CDE_OBJECTS)
-- $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-
- #
- # AWT lib
-@@ -179,7 +179,7 @@
- make_awt:$(AWT_LIB)
-
- $(AWT_LIB): $(AWT_OBJECTS)
-- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-+ $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-
- #
- # Atk lib
-@@ -187,7 +187,7 @@
- make_atk: $(ATK_LIB)
-
- $(ATK_LIB): $(ATK_OBJECTS)
-- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-
- atk.o: atk.c atk.h
- $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -204,7 +204,7 @@
- make_gnome: $(GNOME_LIB)
-
- $(GNOME_LIB): $(GNOME_OBJECTS)
-- $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-
- gnome.o: gnome.c
- $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -221,7 +221,7 @@
- make_mozilla:$(MOZILLA_LIB)
-
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-
- xpcom.o: xpcom.cpp
- $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -242,7 +242,7 @@
-
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
- echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so
-- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
- xpcomxul.o: xpcom.cpp
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -262,7 +262,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
-
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
-- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
- xpcominit.o: xpcominit.cpp
- $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -279,7 +279,7 @@
- make_webkit: $(WEBKIT_LIB)
-
- $(WEBKIT_LIB): $(WEBKIT_OBJECTS)
-- $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS)
-
- webkit.o: webkitgtk.c
- $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o
-@@ -296,7 +296,7 @@
- make_glx: $(GLX_LIB)
-
- $(GLX_LIB): $(GLX_OBJECTS)
-- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-
- glx.o: glx.c
- $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
---- make_freebsd.mak- 2012-07-02 00:53:28.553351871 +0000
-+++ make_freebsd.mak 2012-07-02 00:55:37.369741444 +0000
-@@ -64,7 +64,7 @@
- # Uncomment for Native Stats tool
- #NATIVE_STATS = -DNATIVE_STATS
-
--MOZILLACFLAGS = -O \
-+MOZILLACFLAGS += \
- -DSWT_VERSION=$(SWT_VERSION) \
- $(NATIVE_STATS) \
- -DMOZILLA_STRICT_API=1 \
-@@ -91,7 +91,7 @@
- XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o
- GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o
-
--CFLAGS = -O -Wall \
-+CFLAGS += \
- -DSWT_VERSION=$(SWT_VERSION) \
- $(NATIVE_STATS) \
- -DFREEBSD -DGTK \
-@@ -115,13 +115,13 @@
- make_swt: $(SWT_LIB) $(SWTPI_LIB)
-
- $(SWT_LIB): $(SWT_OBJECTS)
-- $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS)
-
- callback.o: callback.c callback.h
- $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c
-
- $(SWTPI_LIB): $(SWTPI_OBJECTS)
-- $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS)
-
- swt.o: swt.c swt.h
- $(CC) $(CFLAGS) -c swt.c
-@@ -140,7 +140,7 @@
- make_cairo: $(CAIRO_LIB)
-
- $(CAIRO_LIB): $(CAIRO_OBJECTS)
-- $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS)
-
- cairo.o: cairo.c cairo.h swt.h
- $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c
-@@ -156,7 +156,7 @@
- make_cde: $(CDE_LIB)
-
- $(CDE_LIB): $(CDE_OBJECTS)
-- $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS)
-
- #
- # AWT lib
-@@ -164,7 +164,7 @@
- make_awt:$(AWT_LIB)
-
- $(AWT_LIB): $(AWT_OBJECTS)
-- $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-+ $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS)
-
- #
- # Atk lib
-@@ -172,7 +172,7 @@
- make_atk: $(ATK_LIB)
-
- $(ATK_LIB): $(ATK_OBJECTS)
-- $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS)
-
- atk.o: atk.c atk.h
- $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
-@@ -189,7 +189,7 @@
- make_gnome: $(GNOME_LIB)
-
- $(GNOME_LIB): $(GNOME_OBJECTS)
-- $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS)
-
- gnome.o: gnome.c
- $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
-@@ -206,7 +206,7 @@
- make_mozilla:$(MOZILLA_LIB)
-
- $(MOZILLA_LIB): $(MOZILLA_OBJECTS)
-- $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS}
-
- xpcom.o: xpcom.cpp
- $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp
-@@ -226,7 +226,7 @@
- make_xulrunner:$(XULRUNNER_LIB)
-
- $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS)
-- $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
- xpcomxul.o: xpcom.cpp
- $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
-@@ -252,7 +252,7 @@
- make_xpcominit:$(XPCOMINIT_LIB)
-
- $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS)
-- $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-+ $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS}
-
- xpcominit.o: xpcominit.cpp
- $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp
-@@ -269,7 +269,7 @@
- make_glx: $(GLX_LIB)
-
- $(GLX_LIB): $(GLX_OBJECTS)
-- $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-+ $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS)
-
- glx.o: glx.c
- $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c
diff --git a/dev-java/swt/files/swt-4.2-manifest b/dev-java/swt/files/swt-4.2-manifest
deleted file mode 100644
index 36736a0db72d..000000000000
--- a/dev-java/swt/files/swt-4.2-manifest
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Fragment-Host: org.eclipse.swt; bundle-version=4.2.0
-Bundle-SymbolicName: org.eclipse.swt.gtk.linux.SWT_ARCH; singleton:=true
-Bundle-Version: 4.2
-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=SWT_ARCH))
-Export-Package: org.eclipse.swt.internal.accessibility.gtk; x-internal:=true,
- org.eclipse.swt.internal.cairo; x-internal:=true,
- org.eclipse.swt.internal.cde; x-internal:=true,
- org.eclipse.swt.internal.gnome; x-internal:=true,
- org.eclipse.swt.internal.gtk; x-internal:=true,
- org.eclipse.swt.internal.opengl.glx; x-internal:=true
- org.eclipse.swt.internal.webkit; x-internal:=true
diff --git a/dev-java/swt/swt-4.2-r4.ebuild b/dev-java/swt/swt-4.2-r4.ebuild
deleted file mode 100644
index 3b48a85ba055..000000000000
--- a/dev-java/swt/swt-4.2-r4.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit epatch flag-o-matic java-pkg-2 java-ant-2 toolchain-funcs java-osgi
-
-MY_PV="${PV/_rc/RC}"
-MY_DMF="http://archive.eclipse.org/eclipse/downloads/drops4/R-${MY_PV}-201206081400"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="GTK based SWT Library"
-HOMEPAGE="http://www.eclipse.org/"
-SRC_URI="
- amd64? ( ${MY_DMF}/${MY_P}-gtk-linux-x86_64.zip )
- ppc? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
- ppc64? ( ${MY_DMF}/${MY_P}-gtk-linux-ppc64.zip )
- x86? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )
- x86-fbsd? ( ${MY_DMF}/${MY_P}-gtk-linux-x86.zip )"
-
-LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
-SLOT="4.2"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="cairo opengl"
-
-COMMON_DEPEND="
- >=dev-libs/atk-1.10.2
- >=dev-libs/glib-2.32
- >=x11-libs/gtk+-2.6.8:2
- x11-libs/libXtst
- cairo? ( >=x11-libs/cairo-1.4.14 )
- opengl? (
- virtual/glu
- virtual/opengl
- )"
-DEPEND="${COMMON_DEPEND}
- app-arch/unzip
- virtual/jdk:1.8
- virtual/pkgconfig
- x11-base/xorg-proto
- x11-libs/libX11
- x11-libs/libXrender
- x11-libs/libXt
- >=x11-libs/libXtst-1.1.0"
-RDEPEND="${COMMON_DEPEND}
- >=virtual/jre-1.4"
-
-S="${WORKDIR}"
-
-# JNI libraries don't need SONAME, bug #253756
-QA_SONAME="usr/$(get_libdir)/libswt-.*.so"
-
-src_unpack() {
- local DISTFILE=${A}
- unzip -jq "${DISTDIR}"/${DISTFILE} "*src.zip" || die "Unable to extract distfile"
- unpack "./src.zip"
-
- # Cleanup the redirtied directory structure
- rm -rf about_files/ || die
-}
-
-java_prepare() {
- # Replace the build.xml to allow compilation without Eclipse tasks
- cp "${FILESDIR}/build.xml" "${S}/build.xml" || die "Unable to update build.xml"
- mkdir "${S}/src" && mv "${S}/org" "${S}/src" || die "Unable to restructure SWT sources"
-
- # Fix Makefiles to respect flags and work with --as-needed
- epatch "${FILESDIR}"/${P}-as-needed-and-flag-fixes.patch
-
- # Define missing g_thread_supported() to be 0.
- sed -i '1s/^/#define g_thread_supported() 0\n\n/' "${S}"/os_custom.h || die
-}
-
-src_compile() {
- # Drop jikes support as it seems to be unfriendly with SWT
- java-pkg_filter-compiler jikes
-
- local AWT_ARCH
- local JAWTSO="libjawt.so"
- if [[ $(tc-arch) == 'x86' ]] ; then
- AWT_ARCH="i386"
- elif [[ $(tc-arch) == 'ppc' ]] ; then
- AWT_ARCH="ppc"
- elif [[ $(tc-arch) == 'ppc64' ]] ; then
- AWT_ARCH="ppc64"
- else
- AWT_ARCH="amd64"
- fi
- if [[ -f "${JAVA_HOME}/jre/lib/${AWT_ARCH}/${JAWTSO}" ]]; then
- export AWT_LIB_PATH="${JAVA_HOME}/jre/lib/${AWT_ARCH}"
- elif [[ -f "${JAVA_HOME}/jre/bin/${JAWTSO}" ]]; then
- export AWT_LIB_PATH="${JAVA_HOME}/jre/bin"
- elif [[ -f "${JAVA_HOME}/$(get_libdir)/${JAWTSO}" ]] ; then
- export AWT_LIB_PATH="${JAVA_HOME}/$(get_libdir)"
- else
- eerror "${JAWTSO} not found in the JDK being used for compilation!"
- die "cannot build AWT library"
- fi
-
- # Fix the pointer size for AMD64
- [[ ${ARCH} == "amd64" || ${ARCH} == "ppc64" ]] && export SWT_PTR_CFLAGS=-DJNI64
-
- local platform="linux"
-
- use elibc_FreeBSD && platform="freebsd"
-
- # Bug #461784, g_thread_init is deprecated since glib-2.32.
- append-cflags -DNO__1g_1thread_1init
-
- local make="emake -f make_${platform}.mak NO_STRIP=y CC=$(tc-getCC) CXX=$(tc-getCXX)"
-
- einfo "Building AWT library"
- ${make} make_awt
-
- einfo "Building SWT library"
- ${make} make_swt
-
- einfo "Building JAVA-AT-SPI bridge"
- ${make} make_atk
-
- if use cairo ; then
- einfo "Building CAIRO support"
- ${make} make_cairo
- fi
-
- if use opengl ; then
- einfo "Building OpenGL component"
- ${make} make_glx
- fi
-
- einfo "Building JNI libraries"
- eant compile
-
- einfo "Copying missing files"
- cp -i "${S}/version.txt" "${S}/build/version.txt"
- cp -i "${S}/src/org/eclipse/swt/internal/SWTMessages.properties" \
- "${S}/build/org/eclipse/swt/internal/" || die
-
- einfo "Packing JNI libraries"
- eant jar
-}
-
-src_install() {
- swtArch=${ARCH}
- use amd64 && swtArch=x86_64
- use x86-fbsd && swtArch=x86
-
- sed "s/SWT_ARCH/${swtArch}/" "${FILESDIR}/${PN}-${SLOT}-manifest" > "MANIFEST_TMP.MF" || die
- use cairo || sed -i -e "/ org.eclipse.swt.internal.cairo; x-internal:=true,/d" "MANIFEST_TMP.MF"
- sed -i -e "/ org.eclipse.swt.internal.gnome; x-internal:=true,/d" "MANIFEST_TMP.MF"
- use opengl || sed -i -e "/ org.eclipse.swt.internal.opengl.glx; x-internal:=true,/d" "MANIFEST_TMP.MF"
- sed -i -e "/ org.eclipse.swt.internal.webkit; x-internal:=true,/d" "MANIFEST_TMP.MF"
- java-osgi_newjar-fromfile "swt.jar" "MANIFEST_TMP.MF" "Standard Widget Toolkit for GTK 2.0"
-
- java-pkg_sointo /usr/$(get_libdir)
- java-pkg_doso *.so
-
- dohtml about.html
-}
diff --git a/dev-java/validation-api/Manifest b/dev-java/validation-api/Manifest
index 2c7aa3854cc8..0bc1d5d0403d 100644
--- a/dev-java/validation-api/Manifest
+++ b/dev-java/validation-api/Manifest
@@ -1,5 +1,5 @@
DIST validation-api-1.0.0.GA-sources.jar 65220 BLAKE2B cee01d9979671bc2d64a22f21d608d50ddf6eca730a7c0d1fee3c4c05fab0af200153a48491b8d54a5a29b84a220f841c85264446117e25e89bd306bdd764843 SHA512 88bcde2fc9446b09cb24e73137cd16ed54953a6d93f33e8500ca196e4cec07ac03ebc446f4629291e6437d2f3757802236e56974cd3023bb25886e69e2330fc0
DIST validation-api-1.1.0.jar 94671 BLAKE2B c28f6b2ca52094f33e82d2e7c71e52ef57c503c5d50f34646ee28a9f61ea7e4da7f494f41b5f8a34ce6108ca1b75fa2d0f08eb9aab15cf033e825afc2eefdf19 SHA512 aa15184ff004357f1cdee693008587a3aa180a8f24392847258672c4a2e5a537cf189049ef95febb1a87968a42223f7736e22e00fe9307678c117f7ab6b944a8
-EBUILD validation-api-1.0.0.ebuild 583 BLAKE2B 04bce00b1bf1ce957a655b9cc6cf3db960ed79356dea5962f60fcfaca832ff4af16a2ad841e0d625739a208b0833a9d83a0fe38a45041bc495d214c44f36e20b SHA512 87b346c5454661c46a9966d0b91d165397e25c344eee2b955267cf951663786e1f92845b7c91497d21d16fe896865dba54f4ccda5a59048e5895cf3b38569654
+EBUILD validation-api-1.0.0-r1.ebuild 587 BLAKE2B 1ed179648b714bbe5ff08da42f4765ae7815fdc8e3740f3d510ba60c4b659144fd02808f76baf62797c129433ba2db948d73b0d369b6c149867cd7c87669ed55 SHA512 bf0acfb024e931bcc07e1076a91d40736f36be26bb8910be28856f0964ee4a1e99fa9f7d2725c6d6e0165bb9e5bea102022883cb319182b3cb942662f690300e
EBUILD validation-api-1.1.0-r1.ebuild 563 BLAKE2B f530bb1707a6b29d347a68cb9160493e9d5afea2bb60c19dcf3c5e25fab42e539bec572472981c11741663063d16114fc0bc9faa81ee5234a423491b726ab338 SHA512 323466c2e62862decf9d77285433b066fb0599585e5db2818d54345b8f7cbe2c4bf53aa82764abe6c52b7af924375b24b5c0b0733b73b4424676f3b0cbd63786
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/validation-api/validation-api-1.0.0.ebuild b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
index 4cb2cbe31147..d7887694dca4 100644
--- a/dev-java/validation-api/validation-api-1.0.0.ebuild
+++ b/dev-java/validation-api/validation-api-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,8 +15,6 @@ LICENSE="Apache-2.0"
SLOT="1.0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=virtual/jre-1.5"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip"
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+BDEPEND="app-arch/unzip"