summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/Manifest.gzbin76809 -> 76807 bytes
-rw-r--r--dev-java/antlr/Manifest5
-rw-r--r--dev-java/antlr/antlr-2.7.7-r7.ebuild44
-rw-r--r--dev-java/antlr/antlr-2.7.7-r9.ebuild2
-rw-r--r--dev-java/antlr/antlr-4.5.3-r1.ebuild (renamed from dev-java/antlr/antlr-4.5.3.ebuild)10
-rw-r--r--dev-java/jamvm/Manifest2
-rw-r--r--dev-java/jamvm/jamvm-2.0.0-r1.ebuild9
-rw-r--r--dev-java/javatoolkit/Manifest2
-rw-r--r--dev-java/javatoolkit/javatoolkit-0.6.7.ebuild28
-rw-r--r--dev-java/jss/Manifest14
-rw-r--r--dev-java/jss/files/jss-3.4-target_source.patch5
-rw-r--r--dev-java/jss/files/jss-4.2.5-use_pkg-config.patch13
-rw-r--r--dev-java/jss/files/jss-4.3-cflags.patch4
-rw-r--r--dev-java/jss/files/jss-4.3-javadoc.patch4
-rw-r--r--dev-java/jss/files/jss-4.3-secitem.patch56
-rw-r--r--dev-java/jss/files/jss-4.3.2-ldflags.patch4
-rw-r--r--dev-java/jss/jss-4.3.2.ebuild4
-rw-r--r--dev-java/mockito/Manifest3
-rw-r--r--dev-java/mockito/mockito-1.9.5-r1.ebuild42
-rw-r--r--dev-java/mockito/mockito-1.9.5-r2.ebuild2
-rw-r--r--dev-java/swt/Manifest2
-rw-r--r--dev-java/swt/swt-4.10-r1.ebuild2
-rw-r--r--dev-java/trident/Manifest2
-rw-r--r--dev-java/trident/trident-1.3-r1.ebuild2
-rw-r--r--dev-java/xmlgraphics-commons/Manifest4
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild63
-rw-r--r--dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild2
27 files changed, 107 insertions, 223 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 65e0af111580..e5dbe73934d6 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
Binary files differ
diff --git a/dev-java/antlr/Manifest b/dev-java/antlr/Manifest
index 0833c8818940..15de79a6518a 100644
--- a/dev-java/antlr/Manifest
+++ b/dev-java/antlr/Manifest
@@ -10,10 +10,9 @@ DIST antlr-4.5.1-complete.jar 1478820 BLAKE2B 7f6ab8d1bad6b75ede4930fe594a3302bd
DIST antlr-4.5.1.tar.gz 6158475 BLAKE2B 17cf84a60393c786d8b8addd93b87998178cea55f2a6bcc4ca244655a6d2aacc15226111b00fc0a8a6424f8a7c6eb3bfa49172e3b2149714a5c0c6ad69943cd9 SHA512 949306b0ee87a0c002664ee7ac0f32c43385c501b4e28f181417559ce09b07cc12a8441c3bb81f8a72feba3d4ccc693a3c03bcccad7fc81223cddb19e10468a9
DIST antlr-4.5.3-complete.jar 1485121 BLAKE2B 84d41b17bd30dfad7a79e9759802c76d986299cc592c7b2c859225ed00989bb2709b14635ee40c8ecfe79e2441ecb697b2d17b7e6e789a7549868b93a3876f77 SHA512 53dcadf3007c9bdbeb391ea72fb9bab7c086fa0b9d1d93b83050b2ebb726c2f52743b5ba944c68f6da513d915ab5e8721676d74d823c32484928ccad2a28f1e4
DIST antlr-4.5.3.tar.gz 6760401 BLAKE2B d436b4a964c527e230912a0ba23146af199478570cf5491eadeb5025e814642658cc71d71e6a09b5df3cc18e9b8991abf930cab70677d117a112e0922e046e07 SHA512 d0e61baebb338e5e4e8eaf87aa6ef52a568ec51bc86bc07acf8f82be0c173ea4f0f85978dfd034c2642505888c0849663f6b6fb030c4c19e0571f29277fb54f7
-EBUILD antlr-2.7.7-r7.ebuild 1076 BLAKE2B 49124667f298ebfad5989d19972baed8e3f66c0cdb6ff4027d4c0b1692430debbe2844d87fcfd04d885b728aeaa38554337bff7a1ec227151f43fccdb0559653 SHA512 b9fe195653c78a3bd7ae0ffcee143ccd8bfb770567fb83fe9ff9e7e2201c0ae4683520addaeddd759e0f82fcfb034788c1e933776b3d87e0206eb05cc5f60b08
-EBUILD antlr-2.7.7-r9.ebuild 1155 BLAKE2B c7b2ba6a11db4ed11ca61e716a800dcc7d285b2d021a22f638e007967a0bd95ebd91aa6464606b320e72f8dcf90b29ab54e1b266c478876b2b2028b3a301cf4e SHA512 cfcf41dd63df29abdde02f7333baa1982f875577ee2f32df5d7e8ac72c74f74d43e6a933c92ff6489a3008d793af7c210eac8767bb9f6a6a3b8c02bb8eabd250
+EBUILD antlr-2.7.7-r9.ebuild 1152 BLAKE2B 46708d1153f7d4bfc9a58f5e7f19b3c4129c23c8c0e038882f83c6da05d452fae2ce8ec5cd4c5f8f13d2c8893471ba6eeb9aa925f677d07b2d5582f47d604c13 SHA512 e484d133f9560694a030682a5a013e14ff58fe736d66975f65dbba7c6180b03c395d65bfb27fdf5a774679542d098886e3deb6357a047e350bc0e763b0213485
EBUILD antlr-3.2-r1.ebuild 3250 BLAKE2B c167679ccfd464a16bc0bdb59dc41ed59df58861bc2b38acbd042d9237d3ba6ca7d5b593d2edd4f9d9d61bace967490ddb7bea8d8b9f44a0243448f97b613dec SHA512 1df42dea6115d437fd875eb04571f3dad91ca95ce1299b20181faecad2a56277497093068d51c0fa537ac85f3c051524b9e2ffeeb911de5c104ba4f410e46195
EBUILD antlr-3.5.2-r1.ebuild 3022 BLAKE2B 6f3a8b1716d3206391d5f657f732ee1ffe9a02075560afb39ba33b452b03f70b75d953ead0b09a8fd0e96262ef470a39cdb9f852be2e31cfede284d2982d3b0d SHA512 9f19d2fa54a8cfcd0c3d7bc8d6fb0d23886435e0ca6b78da5db97a84598224d9e1a5b68db2d4a4521a3afa60f1e4faa15085d17507e87abe3cfff17417302f74
EBUILD antlr-4.5.1.ebuild 2467 BLAKE2B 176f21576d433466f221190f71bb27a7600904efef43d182a025698e30420345b244f5c2e353d49fb25937bceca683aa30e18d5ee3b0b44c5f89baf1e8bc742c SHA512 74174f4ee6fe803c4e243be51562339e530934a6aed38a8024ed687fbc888b2f01c942558e8de90d42f28a5ae0801d95b148497310304466686c087cd4eb8d7a
-EBUILD antlr-4.5.3.ebuild 2511 BLAKE2B d1e36cee6e8d101a265a337071c19020528f42a70976b554f2eecf8ec7200ab020e2d971fcc2f0bdcba0be0b4d96f738face2492df498ddf6012aec56a2f4c69 SHA512 ce63e0a89420501f9a7580c409fd30d5714d49ab18cc5f04ecbdba569f9b73307878f3617151146b0c099584eb142166c485dfb4ba24980c78a6ed453a6e4d19
+EBUILD antlr-4.5.3-r1.ebuild 2522 BLAKE2B 57b57fb24b9066d3491036acc4ad8e95ff456866a51882f1de869b5b01a8a027521bd91194d458d3658593be3a8ae41e41839dcc27bfa69c5b828b39ea7985f9 SHA512 2be264b788fde22e8225d8b4b2979820bc9cfbebf59f874a2cb8f847a76d5ece8d699311794dd1e01fe17e262d16f02589d2730130fed1a64a13563c6f470c0b
MISC metadata.xml 313 BLAKE2B 211bde607161c54e23a30950b17cda11291e84a9f745a2c44c17c7c224ad8ef309786ec4952f094e90cc569d86e0186bd2fa426fc1de6718541e207be12c3fd0 SHA512 01f11b9e45bc3c331d445213704287f1f034087930d4b55cbde700a483dcb64260d4805a4c2ec3686a99b59f3225999409d499cb63a40b3d8278d8a2e6213f57
diff --git a/dev-java/antlr/antlr-2.7.7-r7.ebuild b/dev-java/antlr/antlr-2.7.7-r7.ebuild
deleted file mode 100644
index dfa69c648825..000000000000
--- a/dev-java/antlr/antlr-2.7.7-r7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A parser generator for many languages"
-HOMEPAGE="https://www.antlr2.org/"
-SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples source"
-
-RDEPEND=">=virtual/jre-1.6"
-DEPEND=">=virtual/jdk-1.6
- source? ( app-arch/zip )"
-
-S="${WORKDIR}/${P}"
-JAVA_SRC_DIR="${S}/${PN}"
-
-java_prepare() {
- java-pkg_clean
-
- # Delete build files from examples.
- find examples \( -name Makefile.in -o -name shiplist \) -delete || die
-}
-
-src_configure() {
- : # Avoid configure script.
-}
-
-src_install() {
- java-pkg-simple_src_install
- java-pkg_dolauncher antlr --main antlr.Tool
- dodoc {CHANGES,README}.txt
-
- use doc && java-pkg_dohtml -r doc/*
- use examples && java-pkg_doexamples examples/java
- use source && java-pkg_dosrc antlr
-}
diff --git a/dev-java/antlr/antlr-2.7.7-r9.ebuild b/dev-java/antlr/antlr-2.7.7-r9.ebuild
index 5b7e3a5f797a..ed770ed14cf8 100644
--- a/dev-java/antlr/antlr-2.7.7-r9.ebuild
+++ b/dev-java/antlr/antlr-2.7.7-r9.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.antlr2.org/download/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples"
RDEPEND=">=virtual/jre-1.8:*"
diff --git a/dev-java/antlr/antlr-4.5.3.ebuild b/dev-java/antlr/antlr-4.5.3-r1.ebuild
index 3cd757f2a8eb..3c70f1210ae3 100644
--- a/dev-java/antlr/antlr-4.5.3.ebuild
+++ b/dev-java/antlr/antlr-4.5.3-r1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=7
JAVA_PKG_IUSE="source"
MAVEN_ID="org.antlr:antlr4:4.5.3"
@@ -12,6 +12,7 @@ DESCRIPTION="A parser generator for many languages"
HOMEPAGE="https://www.antlr.org/"
SRC_URI="https://github.com/${PN}/${PN}4/archive/${PV}.tar.gz -> ${P}.tar.gz
https://www.antlr.org/download/${P}-complete.jar" # Prebuilt version needed.
+
LICENSE="BSD"
SLOT="4"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -23,10 +24,10 @@ CDEPEND="dev-java/antlr:3.5
dev-java/treelayout:0"
RDEPEND="${CDEPEND}
- >=virtual/jre-1.6"
+ >=virtual/jre-1.8:*"
DEPEND="${CDEPEND}
- >=virtual/jdk-1.6
+ >=virtual/jdk-1.8:*
test? (
dev-java/hamcrest-core:1.3
dev-java/junit:4
@@ -39,7 +40,8 @@ src_unpack() {
unpack ${P}.tar.gz
}
-java_prepare() {
+src_prepare() {
+ default
java-pkg_clean
}
diff --git a/dev-java/jamvm/Manifest b/dev-java/jamvm/Manifest
index 09bb78762d40..95c19f7e7ae2 100644
--- a/dev-java/jamvm/Manifest
+++ b/dev-java/jamvm/Manifest
@@ -3,5 +3,5 @@ AUX jamvm-2.0.0-env.file 544 BLAKE2B 25197538a4c10d6ae1b0038113c094cdbca9a1a22b2
AUX jamvm-2.0.0-javac.in 1739 BLAKE2B ff167bfba594dbfb71dd1d09e41ce502ebfcc598fbcef0794cb967c00894745f8b16412adc7b4afbd167878defa29351e99b30a71b4377987c5c8a692f404e30 SHA512 65170b747012e114b072cd28a688089cdf2f54ddd151ba0cea92241b9b75fd0c7c410bfa4186cf9d233af4328bf962e13e8838a0cc09a1fbf2c28d29b13e36cb
AUX jamvm-2.0.0-noexecstack.patch 1387 BLAKE2B afd020772bf627c3dbd6b5da9e03d3b03e8f5c9dc3844279fe325183819cb11deadaedb4920ebfb0c6b25321daeee9f0e4fff45addd162e2b6c02e3f3ea12d31 SHA512 17c38ad0017e5659295dea7ed57f263eb0eee673bbc1f5d1e44e0c8fe588f4172a8a05c832a1fd41f3dc094779fade66aa710c8ce48c754412b0b6afdea6551a
DIST jamvm-2.0.0.tar.gz 741459 BLAKE2B 9b8b0f8cfd8f56c0b835144c07aaca709ef466fdfe5df18438d05c66cd8a07fecfebf27e1581c67658feb3674a96c2e916b85f13dc434baf2db9be4e4fbfd0cf SHA512 8ac27787ee94fa8fde962635d3c08d1dc1e5244c9d56bb693e73f3fd9b58e944ad3f7a0127afeed727d7c00d904a775d2c483157f5ac87e7eab6ecade1aad21d
-EBUILD jamvm-2.0.0-r1.ebuild 3684 BLAKE2B f364cc01b38278dfcc4afb285141d05e117071c9f224c4303d19df7f0c6f23fc4ad77d669090e20840f23decd6b7ee5e70bc07fb1caf88beb8173e9965cc15fa SHA512 0f28cfe291ede4102f41abeecc9e65ba30c09bee96b731f3d7e58f952733f6ee122d3372231a37dac4e7187be290810b2de0d3f946a53cfb453be8e4a11458f8
+EBUILD jamvm-2.0.0-r1.ebuild 3778 BLAKE2B 3ccab8f37b4ef44cc5dddbda241c9760e7ab487859d8abedd5afbceef13e6180e9601a5fccc5c0586de074b7bad3bd71aba1f6c5343ccbebba1cbcd181a25b25 SHA512 5f4d11339a748156d98d84d8cac4e01087bdab1c28412dbab38918c9689213127a5dd99a3f66b64b846db0bf75ef5ea4065d63f61b6327d365616701b35d547a
MISC metadata.xml 311 BLAKE2B f89901d2404c3d1004a7b53345d8e533059995634d1109f620d6685de9defd6126dc1e619f8c8ba0d8f53d57a1d7b1f2f51b0f93fc12b1afb179385b30b4d514 SHA512 3c73e7134e8adf35e0a1418dfcb0215082b5cfc7e3baabc11d89fb1044996a382c551309e5c04dbc54257a65173384b690ad951ceaec2b8569d89bb8a5e757ee
diff --git a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
index 4cf9882f3e5d..e5ceaa98f4af 100644
--- a/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
+++ b/dev-java/jamvm/jamvm-2.0.0-r1.ebuild
@@ -14,12 +14,17 @@ SLOT="0"
KEYWORDS="amd64 x86"
IUSE="debug libffi"
-DEPEND="dev-java/gnu-classpath:0.98
+RDEPEND="dev-java/gnu-classpath:0.98
|| ( dev-java/eclipse-ecj:* dev-java/ecj-gcj:* )
libffi? ( dev-libs/libffi:= )
ppc64? ( dev-libs/libffi:= )
sparc? ( dev-libs/libffi:= )"
-RDEPEND="${DEPEND}"
+DEPEND="
+ ${DEPEND}
+ ppc64? ( virtual/pkgconfig )
+ sparc? ( virtual/pkgconfig )
+ libffi? ( virtual/pkgconfig )
+"
PATCHES=(
"${FILESDIR}"/"${P}-classes-location.patch"
diff --git a/dev-java/javatoolkit/Manifest b/dev-java/javatoolkit/Manifest
index e3b436586d9c..f6e33ab265bf 100644
--- a/dev-java/javatoolkit/Manifest
+++ b/dev-java/javatoolkit/Manifest
@@ -1,3 +1,5 @@
DIST javatoolkit-0.6.5.tar.bz2 24380 BLAKE2B 69442b45e32e63e9f4f8104570ae644d6dd5571b6b909fd751a7060abddfedf84cc147f342a40ade8c4e04764f1a8362d853fae91353171708d5daf68ef3f8e1 SHA512 8a9cf0f2b7951bfe9ab544b48eecf5857ae4bddf129a1a0b928a2b37df7960b082495c44f42954cffe885d48f850b070781593352f09221d1b35b9a94ba5b55b
+DIST javatoolkit-0.6.7.tar.bz2 24514 BLAKE2B 5da4c95ac561b71a3019c265a5233eb825f5f57ae35e1dfefccc2fc26a5c967dcf562c321ff61f6ad4d702f4f656927cf21fa32eadb2454b18444505ba16ae91 SHA512 34e9e9d08ed486f57bbb33bed437ff7e4bbdcb6ff8f57c338e787db0ca5688a27eaf9e21f47b5d245279c58cbdaeab0d61b469b3f176ab37a18f122123c885d0
EBUILD javatoolkit-0.6.5.ebuild 808 BLAKE2B bc0814a2693d2012ab11b26da2fdccf2e61c82ed24ca780ca12c988662a0693595df12b075d4706b160bae280a76284673553a6ad58c35dd9f48d021f6dbc39a SHA512 c301680a55c8a60c2e333252317c5306db3962e4ee781799e3f85076c3041e8035b12402dc136e96ef30284decaf4480bb2e1682040026b49cef89928917f7c8
+EBUILD javatoolkit-0.6.7.ebuild 813 BLAKE2B df9e2456105da14944e73238d8146ba61901289ed2b19dd019df7ab70610fbdaeeb28e13e37b9d495fe0eab302efc49979428308e3988fe4f94040440c3969b3 SHA512 1d509cf24e9abc0105ce258b219d903a951ab2809308183a8d657f014a5402ac08aef40697bfa311dbef2b0b627448b3ec272f391d545d38e7186042adb94600
MISC metadata.xml 260 BLAKE2B b37eb6d2d2182a4b64e7c3a9881a08a7072533de1f0920927c3c197f53db2a0ad57a44bdf47cf75cf08a93d6c55b2f6e0694227bcf07a606e337345131719cee SHA512 c4b63e127973fa92d06e9e1efb5d42571a9963a23c60e50039d8a4fc31b2ddfeac407deae9e03c2c1636957b3b3c53ba3944c03978958bada06a7996337fbb7c
diff --git a/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
new file mode 100644
index 000000000000..5296dbc8e73e
--- /dev/null
+++ b/dev-java/javatoolkit/javatoolkit-0.6.7.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_REQ_USE="xml(+)"
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Collection of Gentoo-specific tools for Java"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+python_prepare_all() {
+ hprefixify src/py/buildparser src/py/findclass setup.py
+ distutils-r1_python_prepare_all
+}
+
+python_install() {
+ distutils-r1_python_install \
+ --install-scripts="${EPREFIX}"/usr/libexec/${PN}
+}
diff --git a/dev-java/jss/Manifest b/dev-java/jss/Manifest
index f6c6c2adb809..01ac01393907 100644
--- a/dev-java/jss/Manifest
+++ b/dev-java/jss/Manifest
@@ -1,9 +1,9 @@
-AUX jss-3.4-target_source.patch 633 BLAKE2B a28bc0629e20852554e569f24ae494690d96320265c7b41a29b3debb17aa11d7c4b85b6b495f6f37812d36f8c73ee1a39d55f5110ed4bae9047ca2dfbb69d0a7 SHA512 5e41d3c7ccebdf91394f8c2e341f2d4667ec1b8a77417abff69be950d41824409f065023a927fa9836c3301e8df5ff2183c259338636cb04c31c38a6385fb4ce
-AUX jss-4.2.5-use_pkg-config.patch 1004 BLAKE2B 9cacf1b6499d4b87ae4de80dc403815942063ff2859491ee35a875f47cca95dcd79ac44b4e91f9ceca9926b0571bd09b0fe504b38ab69dbdf91f2be796b7c7b0 SHA512 1e32d7d9b66b90ed4e974ad5e3e0bf35c5d36fc749fa8398597b17bab27f076c533d724620b57a2cabfe2020a2b9979aa393ea4736bacff86798814e94367559
-AUX jss-4.3-cflags.patch 511 BLAKE2B f8a9f86047432348d0e82da5d540db0ab58e25d83ed1b7ece3ff8e585bed07deb2e44dd40f656d164c0796278c15c7ec5acb037099978ea20ab50a15bb3adff8 SHA512 80d01093adf1006771a3e0d8a03e826b4f68819297c4d2f1ef28b9403a7c9d50a08929c1e84b3ca471bf0a56fd60de2bff8555bd25596f3d869daa102916d513
-AUX jss-4.3-javadoc.patch 660 BLAKE2B 775e482c8b50d6eaff279de62825bc64a2c4633665a4c06911839fc1fbd45d708c993b0a1330325b3a587cd631d4b08b8cd30507cc7cee3a754eb06a743bcfd3 SHA512 8ecc605934999a1c6d063b71345727561daff776c411147e8c2858c127ca8d430e79f155b19e7527a4be41e50d8b96f19f02788d2f2db673e87bbbaf9ca0f7ea
-AUX jss-4.3-secitem.patch 5259 BLAKE2B 7ddf49b8857bed0b6c5412104b076124d8a01c0d52d4ff0828532658e86921de855e3b74d4cd3637afa450cf6a162c0d5ca7d2092b1bf6d5d54263dee9528504 SHA512 16eedbfd311829e2fa73ff88767b2474fcd1f5750cf3351d3bc23efdcbcb2729f861a7f69d6589418e6308576846b93a8d7dc615095c0cadc0accb9f63f6850b
-AUX jss-4.3.2-ldflags.patch 465 BLAKE2B 77ecfcfaf39cfde7d15b7b23a78c9fec92db72eb4bfb336b7afd1b92ec2d5c03802205bc71afae0e7d6a83eb6d8a86339b46d3d6062aecb90c645852cc440c06 SHA512 19910a0aeb0b994d0f5c871d011a7b97a0d323f43dcc86d88442aed17561c1bab379e0eeae93961afaf595a2651d29c17a36daa28a2bbfe522fcd04955d82214
+AUX jss-3.4-target_source.patch 421 BLAKE2B 469c4ba398466b32d77dd3987b2215808e4b1a6675002c2e258b555ea3be34fb64b82cd2c07c50cd076c169e0616af2f09b1202578d23d8d8e39bbb9e66f2d02 SHA512 ced7c6246dd82f7e0c49f2ba403694941e62b5f786bfc3a126f496d44b2c7fd73c4ddbf0f654507ca985d60afaac315be93656e825ec1dfdaf481c4272b09475
+AUX jss-4.2.5-use_pkg-config.patch 851 BLAKE2B c833490023ff63ad6789c03faeb3238e20fc1bdb7804b73edf53696eee859a8837d168b3da72606000b8b41e222439bf5cf863206aac31de60167689dd09a359 SHA512 5087408b0b50f08e919668d193531530c37e9b0a4a27138c76377ab2efa9a00f5489c3b0029a7e75dfe0fee51aa0f647ab9a72c654395fab3445b8edc56f68de
+AUX jss-4.3-cflags.patch 441 BLAKE2B f09b352c6f69005882138126ea36c4ce6282e96630dddee2871a97c93904270690900a2d97f738c57b6b50b44eb13646bdccef1d7c41004bdfd52129f2dbb707 SHA512 83354a23dbe3e0e5874bed2cd9d240231ba37f5f2c886c0ed042e4e34380149c6d400c4206cda223f9d4a24d3220cf77d2408ad452501038351d1ecd8469de2f
+AUX jss-4.3-javadoc.patch 587 BLAKE2B ceebde6b399745acc4e922c078badc26bb3b456ec81d783f7a2a44b71825d62e1f322db9eb7db710bea15f7673fecadc0c066ed4b7cc0da325f5b26c4f5ffb90 SHA512 230b144bab6a3235f70baee7c4f8414f3a23b3ba11eb4ede22c2dd6a02dc718c198bb63df540b6e61a640526731fb788ce05a45cb976e195496c55351cfcdcc7
+AUX jss-4.3-secitem.patch 4251 BLAKE2B caa2f2445c90501aa8a656a7f4cd817cd29af782fa71ba8b9d7b3b59acb5c703b2fd7558eec05bb51974c8aef03c7df9c8a79664e1df86e069bdac71cbd96f15 SHA512 0c17388db50c82d80e77082d73cceadbdd1192936a33591c70e0fc2ce397cababd48eede0f5ab62a8b3c2e34738bbbe93a9e6e7d846d6380e530b5333e42f6d1
+AUX jss-4.3.2-ldflags.patch 392 BLAKE2B c4b93c84bf3ed54c4ae8f885d8995a5226b72fc3358a6a92b6d44becbd21420ea0492ce6c7c453d57eb207e961eaba67b6f3623fb40d2be924c249b0e16fdf72 SHA512 b62a949200b0cb301d2e82f425fe6b593a12c2f1e8f8de970ae43c2892ab1a818d99a1600eee24cbc6da8449153f30dbae91f28edd7be4756bbc66bd1ab35072
DIST jss-4.3.2.tar.bz2 435542 BLAKE2B 9623018e6e67654219fa439fdc907777cd286aa28b6bdbafee39a7082f949bc393d60dba32ca0b49178ecd423dcff0aa3ad411abb9db9332c6429d7751d89127 SHA512 3296da72f204fc4a0ea58dd889cf2721a4afa0ec7b5406312e64354cc67edcfc370140ad22a24f0dfcf11e438e69ebe9da45a70b5cbaa4026b40fd5fcf96c232
-EBUILD jss-4.3.2.ebuild 2759 BLAKE2B 8352d5e0e941de72fbecc4f9b47bdc6346500c65c13d861daf87f1e7412a2aefcf9c45e1bb8ef87321d687594e51ae8a758959cef1e7349d38069b1a501a6f72 SHA512 bf3369ab5385c7a36bbe51a0e4b4efa4358febe655e8d72b0ccc46eb0e8ad46d9054d78d9c1e19cb16f5348e352608c5ca247b4e07b96dc40352e586fbc1b830
+EBUILD jss-4.3.2.ebuild 2779 BLAKE2B 78d9c4c19b977a3346beb0a8d42f70c4437ae1646c9f0a0557b40ebf0175dcabe5796f0edf14b533d6e94af25dbc4228cf447f4e9521351a97e56f1b8784a673 SHA512 c00aa7a32d424ab09b0886aee25ab94d0a03752fd93d75e674f58a7f48ffdaa21ce47d7a6bc0b29ad349ed2235f29f1a544e4e3c2b6dc905c3f0db40839012a2
MISC metadata.xml 508 BLAKE2B 1c0a970c2297ce45006e6779871e7f9ea7035f3cc395b7b1dd7b5eb08594c3804f1b3024b8ac68fbdd8d9fdb841846c4f38006d361b66ceaabcadca566d9b0de SHA512 025f9d7f269f4c0dc744e6b705311b1efcb730bbe32e08a70233f2bb8a62a69e3d65de6cd2c3d3c8afdb383cee4bf76af180fff12b187dce7504d1e55fa56d4f
diff --git a/dev-java/jss/files/jss-3.4-target_source.patch b/dev-java/jss/files/jss-3.4-target_source.patch
index e024a0b8b622..5d5ce6409654 100644
--- a/dev-java/jss/files/jss-3.4-target_source.patch
+++ b/dev-java/jss/files/jss-3.4-target_source.patch
@@ -1,6 +1,5 @@
-diff -Nru jss-3.4-src/mozilla/security/jss/build_java.pl jss-3.4-src.patched/mozilla/security/jss/build_java.pl
---- jss-3.4-src/mozilla/security/jss/build_java.pl 2002-10-17 02:33:29.000000000 +0200
-+++ jss-3.4-src.patched/mozilla/security/jss/build_java.pl 2006-08-15 00:53:05.000000000 +0200
+--- a/mozilla/security/jss/build_java.pl
++++ b/mozilla/security/jss/build_java.pl
@@ -190,7 +190,7 @@
#
if( scalar(@source_list) > 0 ) {
diff --git a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
index a2c3a3e5ad93..adf2862c90e6 100644
--- a/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
+++ b/dev-java/jss/files/jss-4.2.5-use_pkg-config.patch
@@ -6,18 +6,17 @@ Upstream Status: #392775 UNCONFIRMED
Description: this patch adds pkgconfig support to jss coreconf
!!!! no check for NSS_PKGCONFIG NSPR_PKGCONFIG at the moment !!!!
-diff -Naur mozilla.orig/security/coreconf/location.mk mozilla/security/coreconf/location.mk
---- mozilla.orig/security/coreconf/location.mk 2006-02-27 21:18:31.000000000 +0000
-+++ mozilla/security/coreconf/location.mk 2007-10-06 10:10:17.000000000 +0000
+--- a/mozilla/security/coreconf/location.mk
++++ b/mozilla/security/coreconf/location.mk
@@ -67,6 +67,13 @@
GARBAGE += $(DEPENDENCIES) core $(wildcard core.[0-9]*)
+ifdef USE_PKGCONFIG
-+ NSPR_INCLUDE_DIR = `pkg-config --variable=includedir $(NSPR_PKGCONFIG)`
-+ NSPR_LIB_DIR = `pkg-config --variable=libdir $(NSPR_PKGCONFIG)`
-+ NSS_INCLUDE_DIR = `pkg-config --variable=includedir $(NSS_PKGCONFIG)`
-+ NSS_LIB_DIR = `pkg-config --variable=libdir $(NSS_PKGCONFIG)`
++ NSPR_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSPR_PKGCONFIG)`
++ NSPR_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSPR_PKGCONFIG)`
++ NSS_INCLUDE_DIR = `${PKG_CONFIG} --variable=includedir $(NSS_PKGCONFIG)`
++ NSS_LIB_DIR = `${PKG_CONFIG} --variable=libdir $(NSS_PKGCONFIG)`
+endif
+
ifdef NSPR_INCLUDE_DIR
diff --git a/dev-java/jss/files/jss-4.3-cflags.patch b/dev-java/jss/files/jss-4.3-cflags.patch
index 3298a2765fc1..8b9705ca1e3d 100644
--- a/dev-java/jss/files/jss-4.3-cflags.patch
+++ b/dev-java/jss/files/jss-4.3-cflags.patch
@@ -1,5 +1,5 @@
---- security/coreconf/command.mk 2007-10-23 23:55:00.000000000 +0200
-+++ security/coreconf/command.mk.b 2013-06-05 11:15:31.092383902 +0200
+--- a/security/coreconf/command.mk
++++ b/security/coreconf/command.mk
@@ -45,7 +45,7 @@
CCF = $(CC) $(CFLAGS)
LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS)
diff --git a/dev-java/jss/files/jss-4.3-javadoc.patch b/dev-java/jss/files/jss-4.3-javadoc.patch
index 891e1ff93838..87941029bcee 100644
--- a/dev-java/jss/files/jss-4.3-javadoc.patch
+++ b/dev-java/jss/files/jss-4.3-javadoc.patch
@@ -1,5 +1,5 @@
---- security/jss/build_java.pl.orig 2015-10-01 23:04:22.540035573 +0100
-+++ security/jss/build_java.pl 2015-10-01 23:11:41.413230402 +0100
+--- a/security/jss/build_java.pl
++++ b/security/jss/build_java.pl
@@ -323,7 +323,7 @@
ensure_dir_exists("$dist_dir/jssdoc");
my $targets = join(" ", @packages);
diff --git a/dev-java/jss/files/jss-4.3-secitem.patch b/dev-java/jss/files/jss-4.3-secitem.patch
index d9e7da394075..a215bc628ea7 100644
--- a/dev-java/jss/files/jss-4.3-secitem.patch
+++ b/dev-java/jss/files/jss-4.3-secitem.patch
@@ -1,5 +1,5 @@
---- a/security/jss/org/mozilla/jss/CryptoManager.c 2008-05-22 06:28:09.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/CryptoManager.c 2013-06-05 11:09:58.649080012 +0200
+--- a/security/jss/org/mozilla/jss/CryptoManager.c
++++ b/security/jss/org/mozilla/jss/CryptoManager.c
@@ -35,7 +35,7 @@
* ***** END LICENSE BLOCK ***** */
#include "_jni/org_mozilla_jss_CryptoManager.h"
@@ -9,8 +9,8 @@
#include <secmod.h>
#include <cert.h>
#include <certt.h>
---- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c 2003-12-19 20:36:30.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c 2013-06-05 11:09:58.585746684 +0200
+--- a/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
++++ b/security/jss/org/mozilla/jss/SecretDecoderRing/KeyManager.c
@@ -36,7 +36,7 @@
#include "_jni/org_mozilla_jss_SecretDecoderRing_KeyManager.h"
@@ -20,8 +20,8 @@
#include <jss_exceptions.h>
#include <jssutil.h>
#include <pk11func.h>
---- a/security/jss/org/mozilla/jss/crypto/PQGParams.c 2004-04-25 17:02:21.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c 2013-06-05 11:09:58.589080017 +0200
+--- a/security/jss/org/mozilla/jss/crypto/PQGParams.c
++++ b/security/jss/org/mozilla/jss/crypto/PQGParams.c
@@ -39,7 +39,7 @@
#include <nspr.h>
@@ -31,8 +31,8 @@
#include <secoidt.h>
#include <keyt.h> /* for PQGParams */
#include <pk11pqg.h>
---- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c 2002-01-08 20:38:46.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c 2013-06-05 11:09:58.585746684 +0200
+--- a/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
++++ b/security/jss/org/mozilla/jss/crypto/SecretDecoderRing.c
@@ -36,7 +36,7 @@
#include "_jni/org_mozilla_jss_crypto_SecretDecoderRing.h"
@@ -42,8 +42,8 @@
#include <pk11sdr.h>
#include <jss_exceptions.h>
#include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c 2004-04-25 17:02:22.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c 2013-06-05 11:09:58.632413347 +0200
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Cipher.c
@@ -40,7 +40,7 @@
#include <plarena.h>
#include <seccomon.h>
@@ -53,8 +53,8 @@
/* JSS includes */
#include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c 2006-02-23 02:21:42.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c 2013-06-05 11:09:58.595746684 +0200
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyPairGenerator.c
@@ -40,7 +40,7 @@
#include <pk11pqg.h>
#include <nspr.h>
@@ -64,8 +64,8 @@
#include <jssutil.h>
#include <pk11util.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2006-02-23 02:21:42.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c 2013-06-05 11:09:58.629080014 +0200
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11KeyWrapper.c
@@ -40,7 +40,7 @@
#include <plarena.h>
#include <seccomon.h>
@@ -75,8 +75,8 @@
#include <keyt.h>
/* JSS includes */
---- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c 2004-04-25 17:02:22.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c 2013-06-05 11:09:58.609080016 +0200
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11MessageDigest.c
@@ -40,7 +40,7 @@
#include <plarena.h>
#include <seccomon.h>
@@ -86,8 +86,8 @@
/* JSS includes */
#include <java_ids.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c 2006-04-25 03:26:42.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c 2013-06-05 11:09:58.609080016 +0200
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11PrivKey.c
@@ -43,7 +43,7 @@
#include <secerr.h>
#include <nspr.h>
@@ -97,8 +97,8 @@
#include <jss_bigint.h>
#include <jssutil.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c 2004-04-25 17:02:22.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c 2013-06-05 11:09:58.605746683 +0200
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Signature.c
@@ -35,7 +35,7 @@
* ***** END LICENSE BLOCK ***** */
@@ -108,8 +108,8 @@
#include <secoidt.h>
#include <secmodt.h>
#include <pk11func.h>
---- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c 2007-11-10 01:37:57.000000000 +0100
-+++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c 2013-06-05 11:09:58.622413348 +0200
+--- a/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
++++ b/security/jss/org/mozilla/jss/pkcs11/PK11Token.c
@@ -53,7 +53,7 @@
#include <jss_bigint.h>
#include <Algorithm.h>
@@ -119,8 +119,8 @@
#include "java_ids.h"
#include "pk11util.h"
---- a/security/jss/org/mozilla/jss/ssl/callbacks.c 2004-09-03 20:32:03.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/ssl/callbacks.c 2013-06-05 11:09:58.565746686 +0200
+--- a/security/jss/org/mozilla/jss/ssl/callbacks.c
++++ b/security/jss/org/mozilla/jss/ssl/callbacks.c
@@ -39,7 +39,7 @@
#include <nspr.h>
#include <java_ids.h>
@@ -130,8 +130,8 @@
#include <jssutil.h>
#include <certt.h>
#include <keythi.h>
---- a/security/jss/org/mozilla/jss/util/jssutil.c 2004-04-25 17:02:29.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/util/jssutil.c 2013-06-05 11:09:58.579080018 +0200
+--- a/security/jss/org/mozilla/jss/util/jssutil.c
++++ b/security/jss/org/mozilla/jss/util/jssutil.c
@@ -38,7 +38,7 @@
#include <nspr.h>
#include <plstr.h>
@@ -141,8 +141,8 @@
#include "jssutil.h"
#include "jss_bigint.h"
#include "jss_exceptions.h"
---- a/security/jss/org/mozilla/jss/util/jssutil.h 2004-04-25 17:02:29.000000000 +0200
-+++ b/security/jss/org/mozilla/jss/util/jssutil.h 2013-06-05 11:09:49.829080794 +0200
+--- a/security/jss/org/mozilla/jss/util/jssutil.h
++++ b/security/jss/org/mozilla/jss/util/jssutil.h
@@ -39,7 +39,7 @@
/* Need to include these first.
* #include <nspr.h>
diff --git a/dev-java/jss/files/jss-4.3.2-ldflags.patch b/dev-java/jss/files/jss-4.3.2-ldflags.patch
index fde2e26bf77c..11687fac4a09 100644
--- a/dev-java/jss/files/jss-4.3.2-ldflags.patch
+++ b/dev-java/jss/files/jss-4.3.2-ldflags.patch
@@ -1,5 +1,5 @@
---- security/coreconf/Linux.mk.orig 2010-01-15 22:19:00.000000000 +0000
-+++ security/coreconf/Linux.mk 2015-09-27 22:17:50.102547607 +0100
+--- a/security/coreconf/Linux.mk
++++ b/security/coreconf/Linux.mk
@@ -142,7 +142,7 @@
ARCH = linux
diff --git a/dev-java/jss/jss-4.3.2.ebuild b/dev-java/jss/jss-4.3.2.ebuild
index 077c3bf848fb..5c5137e81997 100644
--- a/dev-java/jss/jss-4.3.2.ebuild
+++ b/dev-java/jss/jss-4.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -53,6 +53,8 @@ src_compile() {
"BUILD_OPT=1"
)
+ tc-export PKG_CONFIG
+
export JAVA_GENTOO_OPTS="$(java-pkg_javac-args)"
use amd64 && export USE_64=1
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest
index 83871472ac6e..5772d873e75e 100644
--- a/dev-java/mockito/Manifest
+++ b/dev-java/mockito/Manifest
@@ -1,4 +1,3 @@
DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08d57d633d95a1eaba17f52d4306603f50f332df360d0a4880c85c65bad4503503df0acad8f7b437694a2b887 SHA512 93768992c74fbc2e2653b46b3afb526ab816b9c707cb5f9608564299ffd206e256182be146c590b4777a624379f576d7117ed7d43b11f8d2974e87c402eede51
-EBUILD mockito-1.9.5-r1.ebuild 844 BLAKE2B b8ed4f84aaece678fcf10167dc29df664f5d484a302cdb560f64337833bfc93c26094550be04adfbe69e49d35c5c7b794c02e82886ee5a0cfe25b5e0f7031d8b SHA512 2caa56ec15407184643ebd9204d19c2536773c371bfad8e936012957b84f79612fc75ef96c60b0f3756a2e4643d215c058f0f91a479c187242fa40c51b96b74f
-EBUILD mockito-1.9.5-r2.ebuild 889 BLAKE2B de1e4d6fcb98e23f7cf9b8f348bfb57500fbedcee6ec2665ce3aee51792408c2f6bd7b0497a95921ba6a86f135a7eb44c392295d322752e608c119df5f082084 SHA512 de23dc5c4dec5352ae22ce6892e4eae6c7d6746d520f3c13deb40589c058e2c3711b1865ee3280f7ba08a89891bd1cf234ad2bab68a513e3567b16c30ab8e671
+EBUILD mockito-1.9.5-r2.ebuild 888 BLAKE2B e843a3851147d08d44ca1f417e0629a2a21c55e855efa62730e3999b0c838658b98ed3f211aa7aa41eff5fefa504f1353e4f14392b4d5fee74db1d57a934f195 SHA512 b3a8e131a20b1e343b11050695bb0325bb8e93839116eac94b3d5f160f10fa9794e85fc8928fea55ac7536bdc93790efa193479799860e1f66012705bba5221b
MISC metadata.xml 368 BLAKE2B b76278732bfbed14a8ec62d1b339971836efbaf3565e6b93dd61a09c18749fa30c815c283f633321cf0ddbc818ccfbeb92fed293f6e43137eeb2d3b8efa9ed04 SHA512 371a02c769989a221b89405e852f627a4cd9953f1529b8e6890056b6ca83e2526a82752ab3ed9b36f40a3d88d460360e20762d2a4cdcba359116c036f1d7cc7b
diff --git a/dev-java/mockito/mockito-1.9.5-r1.ebuild b/dev-java/mockito/mockito-1.9.5-r1.ebuild
deleted file mode 100644
index bb99d5cb44b6..000000000000
--- a/dev-java/mockito/mockito-1.9.5-r1.ebuild
+++ /dev/null
@@ -1,42 +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
-
-DESCRIPTION="A mocking framework for Java"
-HOMEPAGE="https://github.com/mockito/mockito"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-IUSE=""
-
-CDEPEND="dev-java/junit:4
- dev-java/objenesis:0
- dev-java/hamcrest-core:0
- dev-java/ant-core:0"
-RDEPEND=">=virtual/jre-1.5
- ${CDEPEND}"
-DEPEND=">=virtual/jdk-1.5
- app-arch/unzip
- ${CDEPEND}"
-
-S="${WORKDIR}"
-
-JAVA_SRC_DIR="src"
-JAVA_GENTOO_CLASSPATH="junit-4,objenesis,hamcrest-core,ant-core"
-
-src_unpack() {
- unpack ${A}
- unzip "${S}"/sources/${PN}-core-${PV}-sources.jar -d src/ || die
-}
-
-java_prepare() {
- find "${S}" -name "*.jar" -delete || die
-}
diff --git a/dev-java/mockito/mockito-1.9.5-r2.ebuild b/dev-java/mockito/mockito-1.9.5-r2.ebuild
index 4c55def128e5..26ecb7d7d919 100644
--- a/dev-java/mockito/mockito-1.9.5-r2.ebuild
+++ b/dev-java/mockito/mockito-1.9.5-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.zip"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
CDEPEND="
dev-java/ant-core:0
diff --git a/dev-java/swt/Manifest b/dev-java/swt/Manifest
index 478eccdd018e..5bfd11d592ae 100644
--- a/dev-java/swt/Manifest
+++ b/dev-java/swt/Manifest
@@ -18,5 +18,5 @@ DIST swt-4.10-gtk-linux-ppc64le.zip 3848264 BLAKE2B 214861fde6987906fb24f3187936
DIST swt-4.10-gtk-linux-x86_64.zip 3844306 BLAKE2B 0e0ed21708acce347fd025920ee635f586c460f8a9c05a7067fd70eed9da999b4a62a5febd17f0c5546ab15198336038e4ab49a1bd588d49ffb39450353a1911 SHA512 9dd946cb7c11446f553f06b8af516167519bab00d4a89f626cd612be6d18e50023fc537aa3d844a8f7a56a767df00410efe4dd20e2bfd930639330a1e279a7a0
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-r1.ebuild 4629 BLAKE2B 6ec4fff913b3f0fb72615009644556e2ebfa1247619000c16a41025099f21948dc0c5a78f9f93ca0f380501ff6a00e834a050a9fc58b0938917d6eff678d64db SHA512 4a944f03e1ba887c5cc2fa638369e72638395558268c57b8a0a7d542eb2e34cf17b6b9a6fa79e10f99152186c88719ff730f1741f6989a80039c2501affec961
+EBUILD swt-4.10-r1.ebuild 4628 BLAKE2B 91201a8ef41b011d1727120b2bcd32daf3c7dd3e042f88e391b982234932751150425ff2cc119a82e0c5d58e4b9544f1e6568ce36f3a8a7ea69b522bbb2cf7d9 SHA512 826f37b9d626e79f22011a3f2dd64701a1899a9dc3009cac3fdbce2cf4ba0159133ec9355205eece0cc0ae6a6e6c6c98acd873a54fbf4a3080f00d92cc117cd0
MISC metadata.xml 518 BLAKE2B a325a8cd71c85886ffabde744769f9edfac99311d30be502937ff560e3cdced76c92a4a90979e0d46950fa2f345d2364d21902ee13fefa4d78477bb829e6298f SHA512 088a1c3b97e2496e801234ef5a99ce14bb259f8065545e4be1af65e6e5639c273a88a77ed50c414e35c20f62e7b5183c721321a0e463ffb990dba05ea271251e
diff --git a/dev-java/swt/swt-4.10-r1.ebuild b/dev-java/swt/swt-4.10-r1.ebuild
index 527f20631194..cf11ea7c5ebc 100644
--- a/dev-java/swt/swt-4.10-r1.ebuild
+++ b/dev-java/swt/swt-4.10-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
LICENSE="CPL-1.0 LGPL-2.1 MPL-1.1"
SLOT="4.10"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
IUSE="cairo opengl webkit"
COMMON_DEP="
diff --git a/dev-java/trident/Manifest b/dev-java/trident/Manifest
index 9a75933c7b7e..e7caaba2fd26 100644
--- a/dev-java/trident/Manifest
+++ b/dev-java/trident/Manifest
@@ -1,5 +1,5 @@
AUX 1.3-build.xml.patch 2112 BLAKE2B e014eb8632086256f7abf0068bc076b544dae4e4bcb1f8ffb7cd7ea132d87663f44e672aef93e6d18071d555486f9e526a70d2436d72c26c75592b82636310d1 SHA512 f4790f0f7551d2734c0db2495c1dff5f6580c1734aab596fd0e419447b8c085d3ba2b4010dea972e6e3c400141d619a10baed10a2d4b8f4135e9855e9ec9b6e6
DIST trident-1.3.zip 112050 BLAKE2B 62f5ae9266714524c50e92c00d3d13810d47727596b0247786c056490b5366015fd35b2e859925734eae26c01b8070474d24e0770ac2eb644024f32754a6c5b7 SHA512 2ecccf80c654ad8cff6a2907d4f81409034bd5cc07542e87db7b53a646fb63ee38a472eb778f6f77f6cf1885f8dc5b85d50a6a033ab430e7e03a07000463f68b
-EBUILD trident-1.3-r1.ebuild 1076 BLAKE2B b7fb0039969e284aeb48741725ff053f945a77e1f6f1cf1000c96be69341c6faa251c6294edd95a79dfccba01024f25eb591008cd0806b40abc0cc247642e5fb SHA512 32149bad27add78161bc7bfae10b5f12f277eba5c3743b19424105e8a461ac8f7fe04fc78ef1831205c9d2bc94ff5a360098e3fe0fe9e6a9edf580abd9455ded
+EBUILD trident-1.3-r1.ebuild 1075 BLAKE2B 39ad6c87ee1a0e8741d8a813df8a605105cc924a9dcf5ca27a39729017b23d2d8edc4195f83e0ee54197bbabf1e0e2ad95337f1f2e2aa66eabc743765ac725b9 SHA512 17cad181dc27fa9a80068d9a28413fd7f80bd41307b0be23195a1f280d2c5a7c09c875f7a4b56ea63e3f2aafda9ece1fcb71ee1533757a59f8feb85f2199a305
EBUILD trident-1.3.ebuild 998 BLAKE2B 8356f3bfcfc2e909b897738f4b40bf23e01eda8b8aa2aee5b8a62e8db2c6ff24ce849567e0a70260db1ca71a3a89e295ba7bf95884e1edc4c9bbdb3e790829ae SHA512 859285924da73f45e601a0cb9553e301f908718f79cce6ad104688fc8f9486f13324ea8cb8aaabe212184e0004671c01b9edede2ffcbc128787243159c804282
MISC metadata.xml 236 BLAKE2B 5a64c4404c26415501f50132968e687d4f1b852738cb0e1a5aef8cc4de9e4ea623066f46068fce3d80514ff122d85304e3fd12282c4b1513a4084523ef8bef07 SHA512 1755c2590e59060f697294c5ad125b83f2d50e05a71f7091b7de75953941914cd2db3a893bd6154a2c90fa4aff5e313e75e3e174dbba1edd5c112787da5be253
diff --git a/dev-java/trident/trident-1.3-r1.ebuild b/dev-java/trident/trident-1.3-r1.ebuild
index 8a029be2e54a..36ac31b42c4f 100644
--- a/dev-java/trident/trident-1.3-r1.ebuild
+++ b/dev-java/trident/trident-1.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://kenai.com/projects/trident/downloads/download/version%20${PV}%2
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
IUSE=""
RESTRICT="test"
diff --git a/dev-java/xmlgraphics-commons/Manifest b/dev-java/xmlgraphics-commons/Manifest
index 3cbcbfade7da..293b99ea8309 100644
--- a/dev-java/xmlgraphics-commons/Manifest
+++ b/dev-java/xmlgraphics-commons/Manifest
@@ -1,5 +1,3 @@
-DIST xmlgraphics-commons-2.0.1-src.tar.gz 2716982 BLAKE2B 52d878455886f85a04ec27d04568a6a0a955860978243d6840f61083fd13597a2f066cc9821f2fced27245c98c6cb6e09caa3ad200d45069f640166a7c772cbd SHA512 fca5c593ceec18b040a0a57b74ba5377d5e070030f48b7835285986382795b19072bdf6320fd7e37182e4127883b795249ee1cb4255bcdfb1b00da1cf6032018
DIST xmlgraphics-commons-2.6-src.tar.gz 2718577 BLAKE2B 7be3565d2224adcb1a804a089f6f52810852117a7c13129822bd1a9f27f7c10abf186b5b7d703c0351ef76d50ddb741fae65094af35d2037044ad56220989dfe SHA512 bdf7fb21d076ba722648da016b0686ed3ea6f56b8ba1a8cea34b517095bf91ff900a937e45aba0977389ab736b1815a5733908ad4242911246555dce61cf4cfd
-EBUILD xmlgraphics-commons-2.0.1.ebuild 1259 BLAKE2B 6e84d4113cee88f2c2e612df69cebb7356c61c57fa5d1c831bc5ea93801d394402c0a8a40282938f8f716c3290f068c28af04bc933e2a0299617c75d9c4e7a09 SHA512 ad47791391bec0367135dc564d8814ae920dd3a58a082ad862d5fc4cb7ab92067992653446717f4404b849102f942e2d9e1c7b8de080049fc40a91b9d3f7c2f9
-EBUILD xmlgraphics-commons-2.6.ebuild 2255 BLAKE2B 52dda6043721262c15b211d5e2f9185eddf2b75b2829c25064f930f5f925b4c5c2f9d34c4684a44a1f8049fe4a981ac9ff54ac482c641317771e1805a06ede35 SHA512 79c2debc7816ac0c1d3bdf2152c7cdbd2d9f3d56c4631aeb8283f72aeca3c740c10da688699bd785d45f4e0806f80a127a33329ff90250b4f164f1ab59d48852
+EBUILD xmlgraphics-commons-2.6.ebuild 2254 BLAKE2B 7ca08e13c790345faa8fe692f990d57844acfe3783c85c5bab81ca76d2228fade803134af6730f3d729410b7e52547b620b5a8e023049b9935d2fc49be73b2b3 SHA512 c43bcf61fff6a28b5acf844165ad3f574b23ed59cf77984b3accfc00da07158793a0123316e88c2840919971b698d044c340418d92c67b90ff93b4b148fe9c98
MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
deleted file mode 100644
index a7faa6d725e0..000000000000
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.0.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="A library of several reusable components used by Apache Batik and Apache FOP"
-HOMEPAGE="https://xmlgraphics.apache.org/commons/index.html"
-SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-
-CDEPEND="dev-java/commons-io:1
- >=dev-java/commons-logging-1:0"
-
-DEPEND=">=virtual/jdk-1.6
- test? (
- dev-java/mockito:0
- dev-java/ant-junit:0
- dev-java/xml-commons-resolver:0
- )
- ${CDEPEND}"
-
-RDEPEND=">=virtual/jre-1.6
- ${CDEPEND}"
-
-java_prepare() {
- find "${S}" -name '*.jar' -print -delete || die
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="true"
-EANT_BUILD_TARGET="jar-main"
-EANT_DOC_TARGET="javadocs"
-
-EANT_GENTOO_CLASSPATH="
- commons-io-1
- commons-logging
-"
-
-EANT_TEST_GENTOO_CLASSPATH="
- ${EANT_GENTOO_CLASSPATH}
- xml-commons-resolver
- mockito
-"
-
-EANT_TEST_TARGET="junit-basic"
-
-src_test() {
- EANT_ANT_TASKS="ant-junit" \
- java-pkg-2_src_test
-}
-
-src_install() {
- java-pkg_newjar build/${P}.jar
-
- use source && java-pkg_dosrc src/java/org
- use doc && java-pkg_dojavadoc build/javadocs
-}
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild
index 1af7926bc30c..b0f4e8365620 100644
--- a/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-2.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="2"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ppc64 x86"
# Common dependencies
# POM: /var/tmp/portage/dev-java/${P}/work/${P}/pom.xml