From 7773197669f220bcfae37f6d867e737af4034da2 Mon Sep 17 00:00:00 2001
From: "Volkmar W. Pogatzki" <gentoo@pogatzki.net>
Date: Thu, 7 Nov 2024 09:54:26 +0100
Subject: dev-java/hamcrest-core: style update, update EAPI 7 -> 8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/39233/commits/59009d1f6030061bf9f6be0b79542eb797c91620
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
---
 dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild | 40 ----------------------
 dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild | 40 ++++++++++++++++++++++
 2 files changed, 40 insertions(+), 40 deletions(-)
 delete mode 100644 dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
 create mode 100644 dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild

(limited to 'dev-java')

diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
deleted file mode 100644
index 954a5e07b1ea..000000000000
--- a/dev-java/hamcrest-core/hamcrest-core-1.1-r4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2024 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
-
-MY_PN="hamcrest"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Library of matchers for building test expressions"
-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"
-SLOT="0"
-KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x64-solaris"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	source? ( app-arch/zip )"
-
-S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
-
-JAVA_SRC_DIR="${PN}/src"
-
-PATCHES=(
-	# https://bugs.gentoo.org/751379
-	"${FILESDIR}"/hamcrest-core-1.1-java-11.patch
-)
-
-src_prepare() {
-	default
-	java-pkg_clean
-}
diff --git a/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
new file mode 100644
index 000000000000..3d30d5dcadd7
--- /dev/null
+++ b/dev-java/hamcrest-core/hamcrest-core-1.1-r5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 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
+
+MY_PN="hamcrest"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Library of matchers for building test expressions"
+HOMEPAGE="https://hamcrest.org/JavaHamcrest/"
+SRC_URI="https://github.com/${MY_PN}/JavaHamcrest/archive/${MY_PN}-java-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/JavaHamcrest-${MY_PN}-java-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 arm64 ppc64 ~amd64-linux ~x64-solaris"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	source? ( app-arch/zip )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_SRC_DIR="${PN}/src"
+
+PATCHES=(
+	# https://bugs.gentoo.org/751379
+	"${FILESDIR}"/hamcrest-core-1.1-java-11.patch
+)
+
+src_prepare() {
+	default #780585
+	java-pkg-2_scr_prepare
+	java-pkg_clean
+}
-- 
cgit v1.2.3-65-gdbad