From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB890158096 for ; Mon, 5 Sep 2022 18:45:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE5F8E084A; Mon, 5 Sep 2022 18:45:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9026BE084A for ; Mon, 5 Sep 2022 18:45:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5DD98340824 for ; Mon, 5 Sep 2022 18:45:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9567C59E for ; Mon, 5 Sep 2022 18:45:07 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1662403500.c13990421b033c45b8782015b4f77a04f4ac4533.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/hamcrest-core/, dev-java/hamcrest-core/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/hamcrest-core/Manifest dev-java/hamcrest-core/files/hamcrest-core-1.3-r3-java-11.patch dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild X-VCS-Directories: dev-java/hamcrest-core/ dev-java/hamcrest-core/files/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: c13990421b033c45b8782015b4f77a04f4ac4533 X-VCS-Branch: master Date: Mon, 5 Sep 2022 18:45:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ea27bb29-84e7-41e9-9e49-7ae75a0cbf57 X-Archives-Hash: 7c95fb45d29b723c13f23b08acce1aa2 commit: c13990421b033c45b8782015b4f77a04f4ac4533 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Thu Aug 11 09:19:31 2022 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Mon Sep 5 18:45:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1399042 dev-java/hamcrest-core: slot 1.3 use SRC_URI from Github, update EAPI 7 -> 8 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Signed-off-by: Florian Schmaus gentoo.org> dev-java/hamcrest-core/Manifest | 1 + .../files/hamcrest-core-1.3-r3-java-11.patch | 26 +++++++++++ dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild | 53 ++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/dev-java/hamcrest-core/Manifest b/dev-java/hamcrest-core/Manifest index 6c4ab7fb2a33..26d456730a41 100644 --- a/dev-java/hamcrest-core/Manifest +++ b/dev-java/hamcrest-core/Manifest @@ -1,2 +1,3 @@ DIST hamcrest-1.3.tgz 3686096 BLAKE2B 38ff91a524064cb00b4d2e82c0a50a2df870bbb0a6e43055f33ce344a1dc8de3760530652691db26aa42890d8517940c038a570b5acaaf91b7e970aca7df3493 SHA512 5672bc627bc71d6fd64b6f776b89ac16ed68819fa4a0748c1250b57f1065c1e7e18ba184d9fe3392e54000ddeb353d0d8d67f4eecdf464974563f05c6b226fc2 DIST hamcrest-core-1.1.tar.gz 1247348 BLAKE2B 07b874ca2e61808cd1a30246cbfe7baa220a9c83df7be94dbb50c4df0279bcf906a32cc1b69aed0ebd81d51392af28050d070b7fabb50f8063964b0782b5e105 SHA512 d86080f1ef5982faee728e29675676a89b42a02c4b00783c67be948076e502e70a2b435568502d8ed3c5b1bcc5441b3cdd8817dab841cac537087edeee47632f +DIST hamcrest-java-1.3.tar.gz 2007925 BLAKE2B 7d54f056814ba30d669e171f00c31e71a0aaea37d345fa93d0c88afb8c3f916180ba699c2cee9219504c3e931b4f4548d708c927cf2caf483847f217c22c7cdf SHA512 4356df7b5b78f821847fde027b416b49b8456e84ab2ec98c2982adf54e2bdc01a5ca2c2b5425620c5ee34bfe3f95ea43c77190504f76ddc9f8b93b137a4ca54b 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.3-r3.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.3-r3.ebuild new file mode 100644 index 000000000000..26e415b9350e --- /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 ~ppc-macos ~x64-macos" + +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 +}