From 0fd62365fc104d7e6d5f3ef67800df09225a4019 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Thu, 9 Mar 2023 12:02:14 +0000
Subject: gentoo auto-resync : 09:03:2023 - 12:02:14

---
 dev-java/hamcrest/Manifest               |  2 +-
 dev-java/hamcrest/hamcrest-2.2-r1.ebuild | 41 ++++++++++++++++++++++++++
 dev-java/hamcrest/hamcrest-2.2.ebuild    | 49 --------------------------------
 3 files changed, 42 insertions(+), 50 deletions(-)
 create mode 100644 dev-java/hamcrest/hamcrest-2.2-r1.ebuild
 delete mode 100644 dev-java/hamcrest/hamcrest-2.2.ebuild

(limited to 'dev-java/hamcrest')

diff --git a/dev-java/hamcrest/Manifest b/dev-java/hamcrest/Manifest
index c0826d1898fd..d0ff14eb103e 100644
--- a/dev-java/hamcrest/Manifest
+++ b/dev-java/hamcrest/Manifest
@@ -1,4 +1,4 @@
 AUX hamcrest-2.2-java-11.patch 6356 BLAKE2B 4950e452b7e785e575db862902c2deda6fd46575de46e5d429df116e642c9e95077a710f3e74069ec39d6eba177c498580cd81ac398a7f1395b6a9e278dcbf17 SHA512 d8240e2be33bb7594b570da8224f149ddbc36e55249b9e4ced0d03e2851d781a34b1763b8022b59345b90c0033f25c0d4a8a4e03b124abf08c183b30aa8eb556
 DIST hamcrest-2.2.tar.gz 603615 BLAKE2B b367fcb13be3314655e29e9196f3ae202200335801ea5bd8f97b5cd845bf7ecb39c4910b10e49938a373aa7897b62bc0935780490386bde1993add5b943b1eaf SHA512 8120e4f4ad83ff41b8b8ede1fe0817eb8fce6f13072e932aff7fc8c9f64689698753ae47b9f024922d5ab0a5bf7bb88b9e1998064d69a58b8c418ab89200e66a
-EBUILD hamcrest-2.2.ebuild 1184 BLAKE2B 5a9bcc2e9ad572cb328f0b1f350c06854162d6b965af673122f619c25b267f697d11b767758afc83f458b2d2b985f648b669d83487ef5eb939fb18d391511152 SHA512 e7eb28035804cba51ef39b2c92676d9ed25b7775a24d7f07fa3616a3c4a350a2bee17ad359d1e63aed3104b4768f92f9a5bede86e2f5e4d21a0658639f1aab2f
+EBUILD hamcrest-2.2-r1.ebuild 912 BLAKE2B c4efa76a1c6b935fd6abdc4bdcec98e1f5bde829aa6316b8fca97c7898f28d05acc22cb34f5affec327fcc5410551c3ef196f0fb6280f028f4adf7df400ed9ae SHA512 81a189bab441d2593cfa2091acdbc4a905ed080f5b86fb505b58c4f565be157c3b124e6b73c9804cf0c47887301a75ee5b1738e077accfec62af94bbe41efef5
 MISC metadata.xml 303 BLAKE2B b415b83e9cd87ea6d0c58b8096930a08d4f3732068be492e201820cfef6599045327972bdc36d5936fc2f04c49b5c82c16b64b808edc882f863047989c94256e SHA512 97de5ee8a7aa583829434d5768522c3d73cebbc70a44874cafc87f0827d595d01b6b545b9709ec24f034e3c62527627828c6c0b0ac158cc6a7c4a633bb26748f
diff --git a/dev-java/hamcrest/hamcrest-2.2-r1.ebuild b/dev-java/hamcrest/hamcrest-2.2-r1.ebuild
new file mode 100644
index 000000000000..401f297eddd3
--- /dev/null
+++ b/dev-java/hamcrest/hamcrest-2.2-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.hamcrest:hamcrest:2.2"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Core API and libraries of hamcrest matcher framework."
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JavaHamcrest-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+"
+
+PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch )
+
+DOCS=( {CHANGES,README}.md )
+
+JAVA_AUTOMATIC_MODULE_NAME="org.hamcrest"
+JAVA_SRC_DIR="hamcrest/src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="hamcrest/src/test/java"
+
+src_prepare() {
+	default
+	java-pkg-2_src_prepare
+}
diff --git a/dev-java/hamcrest/hamcrest-2.2.ebuild b/dev-java/hamcrest/hamcrest-2.2.ebuild
deleted file mode 100644
index 8660d4f26194..000000000000
--- a/dev-java/hamcrest/hamcrest-2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom hamcrest-2.2.pom --download-uri https://github.com/hamcrest/JavaHamcrest/archive/v2.2.tar.gz --slot 0 --keywords "~amd64" --ebuild hamcrest-2.2.ebuild
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="org.hamcrest:hamcrest:2.2"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Core API and libraries of hamcrest matcher framework."
-HOMEPAGE="http://hamcrest.org/JavaHamcrest/"
-SRC_URI="https://github.com/${PN}/JavaHamcrest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-"
-
-RDEPEND="
-	>=virtual/jre-1.8:*
-"
-
-PATCHES=( "${FILESDIR}"/hamcrest-2.2-java-11.patch )
-
-DOCS=( {CHANGES,README}.md )
-
-S="${WORKDIR}/JavaHamcrest-${PV}"
-
-JAVA_SRC_DIR="hamcrest/src/main/java"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="hamcrest/src/test/java"
-
-src_prepare() {
-	default
-	java-pkg-2_src_prepare
-}
-
-src_install() {
-	default # https://bugs.gentoo.org/789582
-	java-pkg-simple_src_install
-}
-- 
cgit v1.2.3