From 0234994edb2122d4508c5a07122e774bcab9195b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 5 Sep 2022 22:25:21 +0100 Subject: gentoo auto-resync : 05:09:2022 - 22:25:20 --- dev-java/Manifest.gz | Bin 52591 -> 52581 bytes dev-java/hamcrest-core/Manifest | 7 ++- .../files/hamcrest-core-1.3-r3-java-11.patch | 26 +++++++++ dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild | 2 +- dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild | 2 +- dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild | 53 +++++++++++++++++++ dev-java/hamcrest-generator/Manifest | 2 + .../hamcrest-generator-1.3-r4.ebuild | 28 ++++++++++ dev-java/hamcrest-library/Manifest | 3 ++ .../files/hamcrest-library-1.3-r3-java-11.patch | 44 ++++++++++++++++ .../hamcrest-library-1.3-r3.ebuild | 58 +++++++++++++++++++++ dev-java/maven-bin/Manifest | 2 +- dev-java/maven-bin/maven-bin-3.8.6.ebuild | 2 +- 13 files changed, 223 insertions(+), 6 deletions(-) create mode 100644 dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch create mode 100644 dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild create mode 100644 dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild create mode 100644 dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch create mode 100644 dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index b676e48ac3b8..995fd943ffeb 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest index 0c44e8a4245e..effe875df1e3 100644 --- a/dev-java/hamcrest-core/Manifest +++ b/dev-java/hamcrest-core/Manifest @@ -1,7 +1,10 @@ AUX hamcrest-core-1.1-java-11.patch 1198 BLAKE2B 0c9610b9225a6eff96669dbc0c4e052a33ad0ef46d8982d39220e851584afcf67b7696a5770ffe2a61090020a7dc6925367e5eb13c4f0e3c6a621361825e1ac7 SHA512 21f5305ef9bb2b0c4c8f9eb5524dd31a621b6acad1447644f75afac5c87de6187617c3beb592cb934f6befe316735f1cfb72b34371fd4b7c09e893a99461a87a AUX hamcrest-core-1.3-java-11.patch 886 BLAKE2B eb6e3a1f3cd47d067987a436d947ab89732dfec0f73096b9b9a0be3213cb0bd7ee800f29ff2766e997c202f9309b766aeede966d399c080e1529c9f0d83c7e1d SHA512 82ead3c1344ac7a153992923e06bdb40dad2729202aa695e690c755937f570ad927c5aa832de13553050dfcce48bd84c6e73164c26c39890c134259c9ab67254 +AUX hamcrest-core-1.3-r3-java-11.patch 1188 BLAKE2B dd2da476e5aa44f48fbc049b53b44c0c9e9daf83ef0e73ebca173e3e5a2ef6b048d1f8d76cea4dd8b3a1609193e50e9e8ef180795421ee1cd43327e90ec2bef9 SHA512 29230981064580eae656bfc28ee8a2e14a7ef09f3182a206ed89d2e2bcc78ce76e9d7e0ad59b7e6c904d35c900a5511ddc49c31255755dfb231fb0ea5c20dd90 DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f -EBUILD hamcrest-core-1.1-r4.ebuild 821 BLAKE2B 30910ba60c0e94cfeb1f9c3d79b4dda9bd1066587256c52065414f82710505f9f97e5318e73ee27e34faa967f8832667423cbafa0bac535dd716c4e6c625b516 SHA512 0d28817e28f71b998c486191634716547422d1b69fa06c0669c2acd0c74fa955b97afcd91dc60138eb5a2611d419cfd9648757b64bdd849eccf5482d933e3d91 -EBUILD hamcrest-core-1.3-r2.ebuild 1437 BLAKE2B b1684d104029405966570710953c925611380e3097ff237df1c3360a8ecb1414ccae56b8270162ff9261814e230bab371f4ce1326d24ad0a312d9e85bd3a61c5 SHA512 aac0853eeda9017275e431c3d34295bcd0e0478b1445e9c2fe0fe2c16e74f377f4396f1b19c9166836af52d5c9c8bdeb43b92cc36a8cd5d6f503d2d01af0b584 +DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b +EBUILD hamcrest-core-1.1-r4.ebuild 822 BLAKE2B 2acba6df933c2683c10eba92c74c51a644959ff741b0682eb0b3515e5a86f1fe62dd9a3fb6567ea93e23a0828f9d217bdc42abeca4ac8de3be30e5a919b7aceb SHA512 ff6dbdd7aabb4399a6b9095fc3c3d73def8c0b5e440b4449e148662a96ac131506d0732915cd9731f9978e70a2712239ec0502caa61baf277650c86b0f451e37 +EBUILD hamcrest-core-1.3-r2.ebuild 1438 BLAKE2B 3670974af1592e9764547f8cb1f516b8ef209309b9943ca8a8d5953499f4fbc5f9e7d0756872a1263fab7c6c3243b0e77f93d934a0152def9c2adad5d421c01e SHA512 056d7b062e5150b035f4cd35c69c930f5930ac3157698998c92aff041e452cc68e0fda3d6ecf9403be7dde3b77605d4677ba318c0333152e6066449d3f262d79 +EBUILD hamcrest-core-1.3-r3.ebuild 1440 BLAKE2B 2c27e5a1f0db943e94855d4f79c2847e6091fdd53a4caf5c0bcdd8d97d4d9491771914b84b3bbb80d8924869ddc523c2fb643be1ec626e419e86fa1a8d1dad6c SHA512 094523a8fa94b4b18a071ab0ee10cbf62fb91c20aa71e25f0ec528d7ee2c1f8c2d4be1c2a975f2ab1a321d5c49fe38d797ac4cb05794b66e0da0dcb2b3eb5503 MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5 diff --git a/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch b/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch new file mode 100644 index 000000000000..21a957eb7212 --- /dev/null +++ b/dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch @@ -0,0 +1,26 @@ +diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +index a5daf94..23090b2 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AllOf.java +@@ -57,7 +57,7 @@ public class AllOf extends DiagnosingMatcher { + */ + @Factory + public static Matcher allOf(Matcher... matchers) { +- return allOf(Arrays.asList(matchers)); ++ return allOf((List>) Arrays.asList(matchers)); + } + + /** +diff --git a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +index de00677..fb551a2 100644 +--- a/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java ++++ b/hamcrest-core/src/main/java/org/hamcrest/core/AnyOf.java +@@ -47,7 +47,7 @@ public class AnyOf extends ShortcutCombination { + */ + @Factory + public static AnyOf anyOf(Matcher... matchers) { +- return anyOf(Arrays.asList(matchers)); ++ return anyOf((List>) Arrays.asList(matchers)); + } + + /** diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild index e8d9fbe997ec..d8b3c2e8df34 100644 --- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild +++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild @@ -11,7 +11,7 @@ MY_PN="hamcrest" MY_P="${MY_PN}-${PV}" DESCRIPTION="Library of matchers for building test expressions" -HOMEPAGE="http://hamcrest.org/JavaHamcrest/" +HOMEPAGE="https://hamcrest.org/JavaHamcrest/" SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD-2" diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild index 27f4ffa43866..dc0a524fea35 100644 --- a/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild +++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r2.ebuild @@ -13,7 +13,7 @@ MY_P="${MY_PN}-${PV}" S="${WORKDIR}/${MY_P}" DESCRIPTION="Core library of matchers for building test expressions" -HOMEPAGE="http://hamcrest.org/JavaHamcrest/" +HOMEPAGE="https://hamcrest.org/JavaHamcrest/" SRC_URI="mirror://gentoo/${MY_P}.tgz" LICENSE="BSD-2" diff --git a/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild new file mode 100644 index 000000000000..53e789b76cc3 --- /dev/null +++ b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.hamcrest:hamcrest-core:1.3" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Core library of matchers for building test expressions" +HOMEPAGE="https://hamcrest.org/JavaHamcrest/" +SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" +BDEPEND="dev-java/hamcrest-generator:1.3" + +DOCS=( {CHANGES,LICENSE,README}.txt ) + +PATCHES=( + # https://bugs.gentoo.org/751379 + "${FILESDIR}"/hamcrest-core-1.3-r3-java-11.patch +) + +S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}" + +JAVA_SRC_DIR="${PN}/src" + +src_prepare() { + default + java-pkg_clean +} + +src_compile() { + java-pkg-simple_src_compile + + # Need to add this in order to generate "CoreMatchers.java" as with java-ant-2 was triggered by "build.xml" + "$(java-config -J)" \ + -cp $(java-config --with-dependencies --classpath hamcrest-generator:1.3):${PN}.jar \ + org.hamcrest.generator.config.XmlConfigurator \ + core-matchers.xml \ + hamcrest-core/src/main/java \ + org.hamcrest.CoreMatchers \ + hamcrest-core/src/main/java + + # Compile again, this time including the freshly generated "CoreMatchers.java" + java-pkg-simple_src_compile +} diff --git a/dev-java/hamcrest-generator/Manifest b/dev-java/hamcrest-generator/Manifest index d83dde4685fc..db538b789987 100644 --- a/dev-java/hamcrest-generator/Manifest +++ b/dev-java/hamcrest-generator/Manifest @@ -1,4 +1,6 @@ AUX hamcrest-generator-1.3-no_jarjar.patch 982 BLAKE2B 4c09b64a6b824025771682dad6875b8c048f488fd777545d7c8f7219de04193fe40eaea63b7e319d5c00843175f66033e26216f68436c2d99e256fe06218daba SHA512 26b77758ab603b02dde03ec7a51f6b1f1077aa45580e8a21ffa671fc385c54ff00b3a79f8a3be037f28a8b77289d1290493469a1c8c856a9b61846d4cedac58f DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 +DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b EBUILD hamcrest-generator-1.3-r3.ebuild 1270 BLAKE2B 2f77de5d517a01a481d80eed57068d89b8a8cb89d627b6ee2976e1f0c845df993a3aae83e0740e9ee2a9a7a49e58c377d0f4f6de7f1833cdc83a5d77ee2d7a80 SHA512 d393b620bae221599e28cdfdf2f84071a782590936312aa41718af293588eb2527a8a586c5b0030ee27fb233a1a713b80faef38491af69dee018194f3676e32d +EBUILD hamcrest-generator-1.3-r4.ebuild 703 BLAKE2B 418afa5d17f3f36f70332207026d33143965cd958fb7e910672cac4033836d6aa23c22a43dfa5877916876e63e8391d573936874e009a8fd6c03f1da086c94cf SHA512 d6a3d9e430a6aa43eb085133e56a1ea3a2ec81e66310c95da80567ff1001f9b442dfa1b02d9a0deafcb2fd14e7ea7a82839509775197f8d44127fc5832d7e4c9 MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5 diff --git a/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild new file mode 100644 index 000000000000..401c4fb05f9a --- /dev/null +++ b/dev-java/hamcrest-generator/hamcrest-generator-1.3-r4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Code generator for Hamcrest's library of matchers for building test expressions" +HOMEPAGE="https://hamcrest.org/JavaHamcrest/" +SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~ppc-macos ~x64-macos" + +CP_DEPEND="dev-java/qdox:1.12" + +DEPEND=">=virtual/jdk-1.8:* + ${CP_DEPEND}" + +RDEPEND=">=virtual/jre-1.8:* + ${CP_DEPEND}" + +S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}" + +JAVA_SRC_DIR="${PN}/src/main/java" diff --git a/dev-java/hamcrest-library/Manifest b/dev-java/hamcrest-library/Manifest index 7e9c34147097..d3977ec4c38a 100644 --- a/dev-java/hamcrest-library/Manifest +++ b/dev-java/hamcrest-library/Manifest @@ -1,4 +1,7 @@ AUX hamcrest-library-1.3-java-11.patch 2323 BLAKE2B 6a16d58c3aadfbb7b6447b68f5d89ec17f82639b530f331e29276d1ebe947daa0c572e874efa328c03397058884ad6cc523c1ded08086fcfa42d1902624c948e SHA512 827966cf7ca175287df5005e35527575427986367013745ef49a7b1719fc3c6a0c7dd5697158726ff7d04122bc6e558bc402b71b6f2e9b932b87b61b5f71cecf +AUX hamcrest-library-1.3-r3-java-11.patch 2291 BLAKE2B 70f93e95538b3110fd4a70b68cd9eee562ebde899716e9c7706be308f917f26abe5ada399722815d873c7a8c99bff1d54b87a226eb94e1835f1912af85fe89b2 SHA512 1767eed42bda30fb799a4e3cb37382c5885eff194b2009fb8c1bf12ac76af903669944fcf581eb8440aca88315adf947297d6f893c18b276e99075398c2cddbb DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 +DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b EBUILD hamcrest-library-1.3-r2.ebuild 1503 BLAKE2B fb98d145b85162ac56a2a832f6e27008024c4f2125ee1e3bf4a1f4b4520c884c2c21377bfef9fbb07afe5b0235f7473b3583e9737d07896fe59b45301248d765 SHA512 334452a0d983ce4cd59fbdcb0738f54548604976f1724318d6cc2701e3496930987b0f65042e2d3e0df169fda2389fa6002839bb9d951dab20dac967d64cfc9e +EBUILD hamcrest-library-1.3-r3.ebuild 1444 BLAKE2B 1abf17fed83c9a593cc68526f205ecc824c2bda1dd0f250ae1c1032e7f5753d1b45b0b3a7d0a05a00484a44c2c446bb39c7809454746170480cf2878d23ca91b SHA512 e9734e74c20793277d07c743d1bda4b7ff138e7f82d424cda5f810d0a2fdedd869dbb68450d858a267f0245c27ce4b5b79f0c674d3b4d6c22eb495d85afb6f6c MISC metadata.xml 323 BLAKE2B f7c4c0d73758ceea718f9806b335dccdc09747708775fb0ca9978c0c4380e34f9c96045fa101093b25285f3fa0b66acb18a17bd3319a6889f3697e71e8175e95 SHA512 598d129d610f8a4c56237eeb09a72d1edb6bfe3b953836fb12353e7ceed679cda3009cd3b77d8f3c08f749e16c75a0ffb56a52aeaf42ac54b7668046fa906ed5 diff --git a/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch b/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch new file mode 100644 index 000000000000..5e1103d3fbfe --- /dev/null +++ b/dev-java/hamcrest-library/files/hamcrest-library-1.3-r3-java-11.patch @@ -0,0 +1,44 @@ +--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java ++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInAnyOrder.java +@@ -122,7 +122,7 @@ public class IsIterableContainingInAnyOrder extends TypeSafeDiagnosingMatcher + */ + @Factory + public static Matcher> containsInAnyOrder(Matcher... itemMatchers) { +- return containsInAnyOrder(Arrays.asList(itemMatchers)); ++ return containsInAnyOrder((List>) Arrays.asList(itemMatchers)); + } + + /** +--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java ++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsIterableContainingInOrder.java +@@ -138,7 +138,7 @@ public class IsIterableContainingInOrder extends TypeSafeDiagnosingMatcher Matcher> contains(Matcher... itemMatchers) { +- return contains(asList(itemMatchers)); ++ return contains((List>) asList(itemMatchers)); + } + + /** +--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java ++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInAnyOrder.java +@@ -55,7 +55,7 @@ public class IsArrayContainingInAnyOrder extends TypeSafeMatcher { + */ + @Factory + public static Matcher arrayContainingInAnyOrder(Matcher... itemMatchers) { +- return arrayContainingInAnyOrder(Arrays.asList(itemMatchers)); ++ return arrayContainingInAnyOrder((List>) Arrays.asList(itemMatchers)); + } + + /** +--- a/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java ++++ b/hamcrest-library/src/main/java/org/hamcrest/collection/IsArrayContainingInOrder.java +@@ -69,7 +69,7 @@ public class IsArrayContainingInOrder extends TypeSafeMatcher { + */ + @Factory + public static Matcher arrayContaining(Matcher... itemMatchers) { +- return arrayContaining(asList(itemMatchers)); ++ return arrayContaining((List>) asList(itemMatchers)); + } + + /** diff --git a/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild new file mode 100644 index 000000000000..c695c5a0b075 --- /dev/null +++ b/dev-java/hamcrest-library/hamcrest-library-1.3-r3.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="org.hamcrest:hamcrest-library:1.3" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Core library of matchers for building test expressions" +HOMEPAGE="https://hamcrest.org/JavaHamcrest/" +SRC_URI="https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-${PV}.tar.gz" + +LICENSE="BSD-2" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + +CP_DEPEND="dev-java/hamcrest-core:1.3" + +DEPEND="${CP_DEPEND} + >=virtual/jdk-1.8:*" + +RDEPEND="${CP_DEPEND} + >=virtual/jre-1.8:*" + +BDEPEND="dev-java/hamcrest-generator:1.3" + +JAVA_SRC_DIR="${PN}/src" + +DOCS=( {CHANGES,LICENSE,README}.txt ) + +PATCHES=( + "${FILESDIR}"/hamcrest-library-1.3-r3-java-11.patch +) + +S="${WORKDIR}/JavaHamcrest-hamcrest-java-${PV}" + +src_prepare() { + default + java-pkg_clean +} + +src_compile() { + java-pkg-simple_src_compile + + # Generate "Matchers.java" (java-pkg-simple does not use the "build.xml" file) + "$(java-config -J)" \ + -cp $(java-config --with-dependencies --classpath hamcrest-core:1.3,hamcrest-generator:1.3):${PN}.jar \ + org.hamcrest.generator.config.XmlConfigurator \ + matchers.xml \ + hamcrest-core/src/main/java,hamcrest-library/src/main/java \ + org.hamcrest.Matchers \ + hamcrest-library/src/main/java + + # Compile again, this time including the freshly generated "Matchers.java" + java-pkg-simple_src_compile +} diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest index f281490a2665..8114b0d55c7f 100644 --- a/dev-java/maven-bin/Manifest +++ b/dev-java/maven-bin/Manifest @@ -1,5 +1,5 @@ DIST apache-maven-3.8.3-bin.tar.gz 9042049 BLAKE2B 2709a47fddca340d9ddaa1f716990e5a4580667169552cedcda2f2017b190cacfc545e2d5b0d5aaae5f95172fb49201eefc4edaff1009f855fb93065e0de6919 SHA512 1c12a5df43421795054874fd54bb8b37d242949133b5bf6052a063a13a93f13a20e6e9dae2b3d85b9c7034ec977bbc2b6e7f66832182b9c863711d78bfe60faa DIST apache-maven-3.8.6-bin.tar.gz 8676320 BLAKE2B 7ad7695aaed86b478044dd0ce59d359c8eb3644ddf0bc3ea501a9eb5c373e2bdacbe8cdf8c85edab930d84d446ff1cb25975281bb7c9cb517a005accba9e413d SHA512 f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26 EBUILD maven-bin-3.8.3.ebuild 1372 BLAKE2B e31f57f1f30b411ae889b6b210cb0689c2b800e99f97de192648e828d78700201391269f4c9ac62c276699e1fe987a5e0421ff694aaed9299e65656d1e7ac704 SHA512 f742703fc9096acbd3f7edafa2040cafe74d2a6c4f0de7cbdafc1f07d4a57a60657f6a293e8523fb6678be9bc61e306d398b33e91f7af74319bc0da5a4455a30 -EBUILD maven-bin-3.8.6.ebuild 1373 BLAKE2B 68be88cb3cb39cf8bac9c1e53606046adfb2da00d97297e703d59dfe9f1449cf967e5bcc35e3f58e338600083a4c255898e662f36323fe338a407aa587455215 SHA512 55bf7da22b338069283c6a155897e29865f029b90fc9856bd7f0f03c8f0065725fdff99e7ba52ea316ba3dcb2cf319e1e9f9d3767d8f12286791c42349640d25 +EBUILD maven-bin-3.8.6.ebuild 1372 BLAKE2B 1297b0ab442c8498aa62588d80bf58d2891e0b1f6b798718708c7ce6971908f6a2953c0316f29b03bce194e24a3016b8ffd93a2c8e5b1d5b987c4ed74a21cb9a SHA512 9c3e9b68c8bfb0295167c3323681356edf205fd2dacd37e848b2e3818bae286cd64ff0e899fe47fe98440bfc8906c5db299c495ff11ebf65d7a2d46a7e011ea2 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff diff --git a/dev-java/maven-bin/maven-bin-3.8.6.ebuild b/dev-java/maven-bin/maven-bin-3.8.6.ebuild index b58f431e1e57..2866b9890bf2 100644 --- a/dev-java/maven-bin/maven-bin-3.8.6.ebuild +++ b/dev-java/maven-bin/maven-bin-3.8.6.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/" LICENSE="Apache-2.0" SLOT="3.8" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=" >=virtual/jdk-1.8:* -- cgit v1.2.3