* [gentoo-commits] repo/gentoo:master commit in: dev-java/jmock/, dev-java/jmock/files/
@ 2015-08-28 9:52 Patrice Clement
0 siblings, 0 replies; 2+ messages in thread
From: Patrice Clement @ 2015-08-28 9:52 UTC (permalink / raw
To: gentoo-commits
commit: eee278a2b0820637106b9ce7d81fe427124283c2
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 28 10:46:32 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Aug 28 10:51:16 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eee278a2
dev-java/jmock: Change the compilation logic. Fixes bug 558908.
After yesterday's fix i.e. HOMEPAGE and SRC_URI pointing to new URLs, I wrongly
assumed the package structure was the same, which, unfortunately, isn't the case.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/jmock/files/1.1.0-build.xml.patch | 21 ----------
dev-java/jmock/files/1.1.0-junit-3.8.2.patch | 12 ------
dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch | 27 +++++++++++++
dev-java/jmock/jmock-1.2.0-r1.ebuild | 48 +++++++++++++++++++++++
4 files changed, 75 insertions(+), 33 deletions(-)
diff --git a/dev-java/jmock/files/1.1.0-build.xml.patch b/dev-java/jmock/files/1.1.0-build.xml.patch
deleted file mode 100644
index 22b47ee..0000000
--- a/dev-java/jmock/files/1.1.0-build.xml.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur jmock-1.1.0.old/build.xml jmock-1.1.0/build.xml
---- jmock-1.1.0.old/build.xml 2006-12-23 00:06:19.000000000 +0200
-+++ jmock-1.1.0/build.xml 2006-12-23 00:06:49.000000000 +0200
-@@ -116,7 +116,7 @@
- </junit>
- </target>
-
-- <target name="core.jar" depends="core.test.unit">
-+ <target name="core.jar" depends="core.compile">
- <mkdir dir="${build.dist.bin.dir}"/>
- <jar basedir="${core.build.dir}" destfile="${core.jar}" excludes="test/**" index="true"/>
- </target>
-@@ -181,7 +181,7 @@
- </junit>
- </target>
-
-- <target name="cglib.jar" depends="cglib.test.unit">
-+ <target name="cglib.jar" depends="cglib.compile">
- <mkdir dir="${build.dist.bin.dir}"/>
- <jar basedir="${cglib.build.dir}" destfile="${cglib.jar}" excludes="test/**" index="true"/>
- </target>
diff --git a/dev-java/jmock/files/1.1.0-junit-3.8.2.patch b/dev-java/jmock/files/1.1.0-junit-3.8.2.patch
deleted file mode 100644
index 411e242..0000000
--- a/dev-java/jmock/files/1.1.0-junit-3.8.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur jmock-1.1.0.old/core/src/org/jmock/expectation/AssertMo.java jmock-1.1.0/core/src/org/jmock/expectation/AssertMo.java
---- jmock-1.1.0.old/core/src/org/jmock/expectation/AssertMo.java 2006-12-22 23:56:07.000000000 +0200
-+++ jmock-1.1.0/core/src/org/jmock/expectation/AssertMo.java 2006-12-22 23:56:17.000000000 +0200
-@@ -73,7 +73,7 @@
- assertTrue("Should not have verified", threwException);
- }
-
-- static protected void failNotEquals( String message,
-+ static public void failNotEquals( String message,
- Object expected,
- Object actual ) {
- String formatted = "";
diff --git a/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
new file mode 100644
index 0000000..1e3a939
--- /dev/null
+++ b/dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch
@@ -0,0 +1,27 @@
+--- 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
+@@ -73,15 +73,15 @@
+ assertTrue("Should not have verified", threwException);
+ }
+
+- static protected void failNotEquals( String message,
+- Object expected,
+- Object actual ) {
+- String formatted = "";
+- if (message != null) {
+- formatted = message + " ";
+- }
+- fail(formatted + "\nExpected:<" + expected + ">\nReceived:<" + actual + ">");
+- }
++// static protected void failNotEquals( String message,
++// Object expected,
++// Object actual ) {
++// String formatted = "";
++// if (message != null) {
++// formatted = message + " ";
++// }
++// fail(formatted + "\nExpected:<" + expected + ">\nReceived:<" + actual + ">");
++// }
+
+ public static void notImplemented( String mockName ) {
+ throw new NotImplementedException("Not Implemented in " + mockName);
diff --git a/dev-java/jmock/jmock-1.2.0-r1.ebuild b/dev-java/jmock/jmock-1.2.0-r1.ebuild
new file mode 100644
index 0000000..fc191a9
--- /dev/null
+++ b/dev-java/jmock/jmock-1.2.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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/"
+
+LICENSE="BSD"
+SLOT="1.0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE=""
+
+CDEPEND="dev-java/junit:0"
+
+RDEPEND=">=virtual/jre-1.6
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}
+ app-arch/unzip"
+
+S="${WORKDIR}/${P}"
+
+JAVA_SRC_DIR="src"
+JAVA_GENTOO_CLASSPATH="junit"
+
+src_unpack() {
+ default
+ unpack ${A}
+ unzip "${S}"/"${PN}-core-${PV}.jar" -d src || die
+ mv src "${S}" || die
+}
+
+java_prepare() {
+ find -name "*.class" -delete || die
+ rm *.jar || die
+
+ # This patch isn't changing the behaviour if jmock per se.
+ # Only the formatting is altered.
+ epatch "${FILESDIR}"/"${P}-AbstractMo.patch"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jmock/, dev-java/jmock/files/
@ 2021-03-14 8:29 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2021-03-14 8:29 UTC (permalink / raw
To: gentoo-commits
commit: fc3876841567939d008e2894e16440b6382e4399
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Mar 12 12:52:30 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Mar 14 08:23:31 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc387684
dev-java/jmock: EAPI 7
Bug: https://bugs.gentoo.org/775635
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/19895
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/jmock/files/jmock-1.2.0-AbstractMo.patch | 4 +-
dev-java/jmock/jmock-1.2.0-r2.ebuild | 48 +++++++++++++++++++++++
dev-java/jmock/jmock-2.6.1-r1.ebuild | 43 ++++++++++++++++++++
3 files changed, 93 insertions(+), 2 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 1e3a939d26d..75b5195c37a 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-r2.ebuild b/dev-java/jmock/jmock-1.2.0-r2.ebuild
new file mode 100644
index 00000000000..f30beade3c0
--- /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 00000000000..150ebf8f03c
--- /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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-14 8:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-03-14 8:29 [gentoo-commits] repo/gentoo:master commit in: dev-java/jmock/, dev-java/jmock/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2015-08-28 9:52 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox