Adding metadata

6 files changed, 105 insertions, 14 deletions

diff --git a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
index 1e3a939d26d3..75b5195c37a2 100644
--- a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
+++ b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
@@ -1,5 +1,5 @@
---- src/org/jmock/expectation/AssertMo.java.orig	2015-08-28 10:15:13.490000000 +0000
-+++ src/org/jmock/expectation/AssertMo.java	2015-08-28 10:15:22.206000000 +0000
+--- a/src/org/jmock/expectation/AssertMo.java.orig	2015-08-28 10:15:13.490000000 +0000
++++ b/src/org/jmock/expectation/AssertMo.java	2015-08-28 10:15:22.206000000 +0000
 @@ -73,15 +73,15 @@
          assertTrue("Should not have verified", threwException);
      }
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
index 62eb3c443dfb..3d0abb03985f 100644
--- a/dev-java/jmock/jmock-1.2.0-r1.ebuild
+++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Library for testing Java code using mock objects"
-SRC_URI="http://www.${PN}.org/downloads/${P}-jars.zip"
-HOMEPAGE="http://www.jmock.org/"
+SRC_URI="http://${PN}.org/downloads/${P}-jars.zip"
+HOMEPAGE="http://jmock.org/"
 
 LICENSE="BSD"
 SLOT="1.0"
diff --git a/dev-java/jmock/jmock-1.2.0-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..f30beade3c05
--- /dev/null
+++ b/dev-java/jmock/jmock-1.2.0-r2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 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
+
+DESCRIPTION="Library for testing Java code using mock objects"
+HOMEPAGE="http://jmock.org/"
+SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="junit"
+
+PATCHES=(
+	# This patch isn't changing the behaviour if jmock per se.
+	# Only the formatting is altered.
+	"${FILESDIR}"/${P}-AbstractMo.patch
+)
+
+src_unpack() {
+	unpack ${A}
+	unzip "${P}"/jmock-core-"${PV}".jar -d src || die
+	mv src "${P}" || die
+}
+
+src_prepare() {
+	default
+	find -name "*.class" -delete || die
+	rm *.jar || die
+}
diff --git a/dev-java/jmock/jmock-2.6.1-r1.ebuild b/dev-java/jmock/jmock-2.6.1-r1.ebuild
new file mode 100644
index 000000000000..150ebf8f03ce
--- /dev/null
+++ b/dev-java/jmock/jmock-2.6.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 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
+
+DESCRIPTION="Library for testing Java code using mock objects"
+HOMEPAGE="http://jmock.org"
+SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+CDEPEND="dev-java/hamcrest-core:1.3
+	dev-java/hamcrest-library:1.3
+	dev-java/junit:4"
+
+RDEPEND=">=virtual/jre-1.8:*
+	${CDEPEND}"
+
+DEPEND="app-arch/unzip
+	>=virtual/jdk-1.8:*
+	${CDEPEND}"
+
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3,junit-4"
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}" || die
+	unzip ${P}.jar -d src || die
+	rm *.jar || die
+}
+
+src_prepare() {
+	default
+	find -name "*.class" -delete || die
+}
diff --git a/dev-java/jmock/jmock-2.6.1.ebuild b/dev-java/jmock/jmock-2.6.1.ebuild
index 750c4115862f..6761ae6b5229 100644
--- a/dev-java/jmock/jmock-2.6.1.ebuild
+++ b/dev-java/jmock/jmock-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,8 +8,8 @@ JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Library for testing Java code using mock objects"
-SRC_URI="http://www.jmock.org/downloads/${P}-jars.zip"
-HOMEPAGE="http://www.jmock.org"
+SRC_URI="http://jmock.org/downloads/${P}-jars.zip"
+HOMEPAGE="http://jmock.org"
 
 LICENSE="BSD"
 SLOT="2"
diff --git a/dev-java/junit/junit-4.13.1.ebuild b/dev-java/junit/junit-4.13.1.ebuild
index 72680398bed2..2e2f872db129 100644
--- a/dev-java/junit/junit-4.13.1.ebuild
+++ b/dev-java/junit/junit-4.13.1.ebuild
@@ -19,16 +19,16 @@ SLOT="4"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples"
 
-DEPEND="
+CDEPEND="
 	dev-java/hamcrest-core:1.3
 	dev-java/hamcrest-library:1.3
 	"
-RDEPEND="${DEPEND}
-	>=virtual/jre-1.8
-	"
-BDEPEND="${DEPEND}
-	>=virtual/jdk-1.8
-	"
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 JAVA_SRC_DIR="src/main/java"