Bumped to latest version in order to mend SLOTs and compile issues. Fix bug 546548.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.14/cvs/Linux i686
Manifest-Sign-Key: 0x93491BB8

diff --git a/dev-java/jmock/ChangeLog b/dev-java/jmock/ChangeLog
index 93ff6e85444423d68254301f7a075defcdae07d5..d649cc9af208aef7b03be115b4c66a75070224ea 100644 (file)
--- a/dev-java/jmock/ChangeLog
+++ b/dev-java/jmock/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/jmock
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/ChangeLog,v 1.25 2015/04/11 22:50:29 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/ChangeLog,v 1.26 2015/04/14 18:54:51 monsieurp Exp $
+
+*jmock-2.6.1 (14 Apr 2015)
+
+  14 Apr 2015; Patrice Clement <monsieurp@gentoo.org> +jmock-2.6.1.ebuild,
+  jmock-2.5.1.ebuild:
+  Bumped to latest version in order to mend SLOTs and compile issues. Fix bug
+  546548.
 
   11 Apr 2015; Patrice Clement <monsieurp@gentoo.org> jmock-2.5.1.ebuild:
   Adjust dev-java/hamcrest-* SLOTs.

diff --git a/dev-java/jmock/Manifest b/dev-java/jmock/Manifest
index 8f1b98b70419cc6befb9ca6d35a1ec96de3ad713..1c17d66697fa4a0845e2ac99421baedb27ef13cd 100644 (file)
--- a/dev-java/jmock/Manifest
+++ b/dev-java/jmock/Manifest
@@ -7,19 +7,21 @@ AUX 2.5.1-invokeAll-invokeAny.patch 1668 SHA256 61c3767fdd907d97cff0c9ab4ecf870b
 DIST jmock-1.1.0-src.zip 579355 SHA256 3f9fbfe322e2e09878a9418c86c9f440bf135ea09487e117d151f12cfc93050e SHA512 7728f23bdfb78b2989400e48d90c42aa72d8c95f678597cf8e234109d9df2c4abc36ebbf4edbe16167b38891ef624d14cc6aae9b7be33a31b41b4caaae157dd8 WHIRLPOOL 875d4988bd0a2d3dadf98c2e95d33f08eb37c35ae647d93d8a426a0d88c27983b039168b10e8bdb1d7f0dda7424d97b3fb5448a76490eca7d8d464036bfc9e7b
 DIST jmock-1.2.0-jars.zip 153318 SHA256 c98e8dd0e5ebb590578baf4eb095b0c69084cd448269cac6c7dd52075ced5b36 SHA512 7b854c462e04642444f8994875d496655986a094b113f888c8dd5f07149c41c4e97e23f8f0cf75822b4e8281ffb90054ac44024cacd3f6e55ef0659e463f0cc5 WHIRLPOOL b2563df867f481706a9a7ebf4b5535321bcb295c42233575fb657908c232cda8416d3e1a5c78b67d41a311efdb0760ad5984278ae9cc02ea81868184767cc88a
 DIST jmock-2.5.1-jars.zip 758019 SHA256 e5f8d704d732a4e0d2a7788d966e6c8cfc722707bf278b6c0618f9d46eae6e7a SHA512 97032dd3f7f2b8e4e310e04722af0f444a60b0908ca45111b0ad1578f92ddac411c9d66f6eb696f45134c8baced86c10194b5ebbd8974090a585e95583dd2a9c WHIRLPOOL 1e50a9da3f8a16f4f706f2631f2a9aee89a89067c1a365284c116e6bdd7a4e5c4ac9a828317e13e49d097ad59bb7cd4f7d49cf99ed47055a17b2faa418300f94
+DIST jmock-2.6.1-jars.zip 1249841 SHA256 e49a0f7628c6368e46de1c48dfd8aed084f03661d87cf3a78025fdec367021fb SHA512 7cd1d2e89dceb31c68ad3f702ad937b5de6ec77cc37e94be7aa53db2fc61d11aa40ec5aab225a3eeeba5064ad8384f10413ac05a9df97102c8e63f4209ea149e WHIRLPOOL e67be30e6718b998a34a52cdaa59ba7afc19969b5fe08529ea056867c0b8b3fad2628eb04b8b0b778bd215d29fe4aa962b0021afbb64835eac845f76c4b5987d
 EBUILD jmock-1.1.0-r2.ebuild 1437 SHA256 b2577dd4ef8f54cf47589890bad6030ed2d9079a3bf60932cf1a89758f1b00ee SHA512 bc36582cbed874e28c0010c5f1ec8639703c3efbddf0647554aaa15b3ad0ae803f570f93b21a2301d7f1e9defbc10b80c5f004b9d3b5b5ffce3ae6955bbe5d89 WHIRLPOOL e904a65441c8ea040965508928c8445f5e0e8e6e386a1cd6e94ea3ea2faf0a80ecee4625b8723ac9eed32e7fc96c5da30a4bb657158c96eabcca44f7d0426c6f
 EBUILD jmock-1.2.0.ebuild 950 SHA256 c9b7c0a0fa20d61fa174ea5f615034e438d442500ce8cdab5c44e151c6e538f5 SHA512 76612d3aa32ae21858e4a9f4badfcdc940df8555bf4a31b56bfe22b87a4ca2e47f76aa173518ad076d9ddc9730894403be0c633ee148c87a5392f29d27e2a087 WHIRLPOOL 058fd74e92c31f6eb97113970ef2941ec87fd850fae3163657be0066486795e7ab717b3ba01c6d95f5cdbf7814aca2f2861a13f3389a6453ae7bf18bda53a3ee
-EBUILD jmock-2.5.1.ebuild 947 SHA256 1dc823c2e060323ae3e00e6a2e9184be8c83f2521f52c9e9f16270d8648627b1 SHA512 b4c6a5c6f40f427183bdf15501a02cf5a5c9db15d0a1e6b39521fd570efe741d74f02feed15afa2bee2401b680f199ad72bd5370793d61a3b3f476a6c7241d2e WHIRLPOOL 79169e9e459aa195de89ba826ba82eddd3622c237a7e238b0b40a0d4c672f7552e6d5a19d0ec179bcb9db00610e93c36d314b84f6b4bf4efdc181133d513441a
-MISC ChangeLog 3484 SHA256 4294a97b1eeda3f37d0dd32f71683bce4a3f2490863c6f92422520121bcfdc79 SHA512 895761643fb6dc746bdcea12224ea469ac1fc37b7b40876d81aa12a75fdd8894aa62b19ea4f778bdc4c5ddc20dbdf574d307d1a618b84d3c050e6e4cca200a23 WHIRLPOOL 55ed708fab40cf09a21dbfda8a1bca03aebcf4e6601585629a7a84df73f574610cc344ad368961cbf45433c19603dcb546f55ba66ff689fdff157a6cd599010d
+EBUILD jmock-2.5.1.ebuild 955 SHA256 ec2f36af5ef09b7c369060c927ed5d885043551e2e6339df19d97dd3fceefa9e SHA512 e4e19b6f43bf24e180c5f11003ccfc161c79f25401ccb7ae8539d6022ff63bd846c399cb70354babf6fe18a234a5ef210c2311196bc29d5dc60c08c052caf17e WHIRLPOOL 378f48a92277623fea156b64eabf6f49331046a05e019e0bb5e14737d0b3c3ee73ee7307d10a3e29bf0384d6a89542fed37456faafca5ac36985b0510edf44cb
+EBUILD jmock-2.6.1.ebuild 921 SHA256 a9d7b99e131f355474468a7d8f364973d087986c8ad8a6d48ff38b589ffe1d4c SHA512 9beea27e2fee3580b2c0caaa0dfdf5ed257f6daac077e28fa04a7a3962fa00e6040bae71a387c6978d85ba6f0f2028cf81b5546e90aab29e23dbbaa6e59523f8 WHIRLPOOL 4854a05b5af08d990758986a8296e76b66eb4fbc087d1d936d05b69ba2e6bf915bf22a71027f8bf0c35bd594311414e01f9f0fc302b86e8b73cb593211546c1e
+MISC ChangeLog 3698 SHA256 2a9a59847b048736725d35e38479711f34a7564817236e83efe43d0d70ea48d6 SHA512 867655a10c2eaf876cfecaa702d0f0fae2b4db1f24640ac30a800a159d6a2f8b1ef7a9be247e58fc55171658c6384703894a683c3bb34c1931d81a030dcecd54 WHIRLPOOL 41a8bff63bcfa3611d276038837970536ae20d16df5686cc21428bd55040331f83584c1701b386b8429f76b0709c1a5f29aab8c762bff88764ea934daedb14ee
 MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVKaU4AAoJEJGRpfGTSRu4xskH/i9UTiSq+zcIOjZdEW6kmxQu
-LEbRhkZIZdD3WSbRij9OXwwohf6gZf/6I5Y7Sc7ogFbsTQor/Z4OzkE3f87THjB8
-ZvoAMm8D7633sg4OEOa9Uze1dM/Xi3tzun5tEF+baZIogJpC0dNBoAOql2fTaUel
-eBfW8D9g4770cb6imAF4/QOagf8YDNn2cYK+xX8RZP9CcWCuBehD5Eib3IONmNSr
-zxTA/SUOspRa7yFC2d6c0hTV2WXP3zoUELRGbBpHN2RGyHoNgh6+lxnmNiawRMrr
-eCezckLUmFp7YgX7zrLsBCcewI6lNWHr08KjADydyHIaLNdQChd0w3BtVPADbOM=
-=FuWl
+iQEcBAEBCAAGBQJVLWKuAAoJEJGRpfGTSRu4ERUH/1f/0TjvvjsDTMJOzD5OP1os
+plZ1CE0/k+bt4lQgNj0UM0JuuFVQ954ilGxAWIUs57aF/X98ok4XY4hLpugVyl/3
+2PtIWrqpqV8SxPDX493zrA5zzeAloYM/+TZQaYnYkxXHNJOl0LVl7JT+AeUetrBD
+dTQA9SzVd91W/JFQ/EQQCyJecb70sZ+AZ4hKLPz30WoEZaFzlv3JnBnBQgvt4WJj
+P2lyF+LdShOVbqmthIVoOluKei7O6PppdsI5A2Clin15iegNfGBDI12vkionPEhY
+A0NlQJ12WddHCEx3yye/FUQicQE0/hwqH6h5gB1MRCIPZkzBFUmNZJdJdCC8Vmc=
+=rri/
 -----END PGP SIGNATURE-----

diff --git a/dev-java/jmock/jmock-2.5.1.ebuild b/dev-java/jmock/jmock-2.5.1.ebuild
index cc661a1c62cfe01a4922e465344de5e4d3d58558..85201750190d62c91b8a5c3dbccad5f2ffa5e184 100644 (file)
--- a/dev-java/jmock/jmock-2.5.1.ebuild
+++ b/dev-java/jmock/jmock-2.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-2.5.1.ebuild,v 1.4 2015/04/11 22:50:29 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-2.5.1.ebuild,v 1.5 2015/04/14 18:54:51 monsieurp Exp $
 
 EAPI=5
 
@@ -27,7 +27,7 @@ DEPEND="virtual/jdk:1.6
        ${CDEPEND}
        app-arch/unzip"
 
-JAVA_GENTOO_CLASSPATH="hamcrest-core,hamcrest-library"
+JAVA_GENTOO_CLASSPATH="hamcrest-core-1.3,hamcrest-library-1.3"
 
 S="${WORKDIR}/${P}"
 

diff --git a/dev-java/jmock/jmock-2.6.1.ebuild b/dev-java/jmock/jmock-2.6.1.ebuild
new file mode 100644 (file)
index 0000000..e18055f
--- /dev/null
+++ b/dev-java/jmock/jmock-2.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jmock/jmock-2.6.1.ebuild,v 1.1 2015/04/14 18:54:51 monsieurp Exp $
+
+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.jmock.org/downloads/${P}-jars.zip"
+HOMEPAGE="http://www.jmock.org"
+
+LICENSE="BSD"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CDEPEND="dev-java/hamcrest-core:1.3
+       dev-java/hamcrest-library:1.3
+       dev-java/junit:4"
+
+RDEPEND="virtual/jre:1.6
+       ${CDEPEND}"
+
+DEPEND="virtual/jdk:1.6
+       ${CDEPEND}
+       app-arch/unzip"
+
+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() {
+       find -name "*.class" -delete || die
+}