diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-22 20:47:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-22 20:47:41 +0100 |
| commit | 5deadca7219297a3c1f90eca00544a00e33efdbc (patch) | |
| tree | 1cf7fc930e051b39dbd0d7921edad5f94f729500 /dev-java/mockito | |
| parent | 614dee2f9d146b148d9c54dd480e7df81ba2f3a7 (diff) | |
gentoo auto-resync : 22:07:2022 - 20:47:41
Diffstat (limited to 'dev-java/mockito')
| -rw-r--r-- | dev-java/mockito/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/mockito/mockito-4.6.0-r1.ebuild (renamed from dev-java/mockito/mockito-4.6.0.ebuild) | 9 | ||||
| -rw-r--r-- | dev-java/mockito/mockito-4.6.1-r1.ebuild (renamed from dev-java/mockito/mockito-4.6.1.ebuild) | 24 |
3 files changed, 20 insertions, 17 deletions
diff --git a/dev-java/mockito/Manifest b/dev-java/mockito/Manifest index f15755d0229e..7cdf18288e99 100644 --- a/dev-java/mockito/Manifest +++ b/dev-java/mockito/Manifest @@ -2,6 +2,6 @@ DIST mockito-1.9.5.zip 6453870 BLAKE2B b577c4a82f03b5c345462ecc10e9fe25c03836d08 DIST mockito-4.6.0.tar.gz 1030497 BLAKE2B 0afc0f5874acbd290312a7eee2ce8b9f7d1a83da12338ff8851e02cd6a9ed0c99bfc109fade5ddfec5f9a5277ffaa0d04c53a726c31082dc53b512a2e551473b SHA512 18f76788e610ca169cf6b4eefd0fdd78c333b920122115d816d1f2ab94f0a84d5a9fd0d00d41d1c34e592c5634f7ac55f7f491061b7992d18aa69f3fc62561b6 DIST mockito-4.6.1.tar.gz 1031362 BLAKE2B 52768ead8770c701f5e5b698f9c35e8e189b57979d90b231b434aba57f6f1f167e5f1491eec53280ce29410add31ac41e81b3637257f58709162cc3c5307ed27 SHA512 f16454f3baba2e55a6da229d7719359357b2641cf4abaf3c0e5f5cac6999325ac4a9c08d815a02939c1ef62831745162935bb8d03177a27b0d972600a92fc1f7 EBUILD mockito-1.9.5-r2.ebuild 892 BLAKE2B 5efb72fdf28d793ad9cfd14ee41b58b4ef9d9bdd21b638657ea9ea77444443a68e51177a992b2f3f48e13c56ab68a3821368fd6eb287182d2f60ada628cf6ff0 SHA512 44e08dcbe481a4bcf964227cf2c741403aa799ef98065b7f8f490451d15daa286f01cc944546875cfbc92844427ad2ccb305e44ed5dfa06fa5f04e673146c8a1 -EBUILD mockito-4.6.0.ebuild 1233 BLAKE2B ce75b72ffe49e4d7e8d39614cbb78a60d90c4cae3874d5b432e66e16f8f28af3d3cf034114ca15e573c5f36de45d5bad98c58f2311af84d2484b286beef587ba SHA512 80cdd01513906a21fcb008ee9d5ba00a177b11fe14a4cbfa9d1ef6cb714e81c21271bab98345318d1ca3ddf81a16af6504963f6a8c1f457b174750609f7ca5bd -EBUILD mockito-4.6.1.ebuild 957 BLAKE2B 3894338d4b760bcdb9e3394122a5bc581e234eb3241af9415804f1af2d0a97ad10292663973374f4185d25eac5309b502d214ae95dc96b7c853601bfd1bdb169 SHA512 f5203b10e1f2a8389923d14ca3926b4dfdb4aa76a12428d3d6e88d37286614be5fecd887d39637b2f1c45fa35ea55017392e6abb39eb159640d50b99c11968b3 +EBUILD mockito-4.6.0-r1.ebuild 1158 BLAKE2B f2f341f0b9d4b957b0a7020deae5418e691694820543291192d5a5c8b5f6ae55b76d96b42127911ef0f692981c7e1d68b764105f5d4dc061f53a55cf6bbfe6b1 SHA512 2ab4a7d0b98cd44b59ded1bf0dcdc01599cb78ada0a427131f6fd1c235b70fd010f6d5d2fb22083416c3a38276431c7f7f6df66708177ce05970448faf9f6aac +EBUILD mockito-4.6.1-r1.ebuild 1192 BLAKE2B 545cdd92be86628c23e2e18eb4fac8f1a269bc832696058acd28870a21b153a8f971f2f32021d92d1921cbe2d2c855c2f66bccae0ebd8b5c284dba86ab1370cc SHA512 fa25aea9a07a475900df7491b5f485cb28104033ab13179f2801591db8661493d1ed327883ed0a4794c8d03814808c215df24fca19bb11cf880e5246b630d4cd MISC metadata.xml 317 BLAKE2B 209b27a429c1fdeca71c1e215f8fc43bfc66c961b1a3ad3dfcda16d5ea1df51e54cea248f4f152966aa1f91059b91c21fb734c6995f8033150dbda5e1813d121 SHA512 1f7be64d432b4004d2bbf1ec2c6776ec8618875356ea0308b8409f322d48bf3440d692732406ddb3fa7a273c9754c4cc5a6f6cd9808348d0ba8beb7159887a5b diff --git a/dev-java/mockito/mockito-4.6.0.ebuild b/dev-java/mockito/mockito-4.6.0-r1.ebuild index 64fd58db303e..bd3679411683 100644 --- a/dev-java/mockito/mockito-4.6.0.ebuild +++ b/dev-java/mockito/mockito-4.6.0-r1.ebuild @@ -24,8 +24,8 @@ KEYWORDS="amd64 ~arm arm64 ppc64 x86" # net.bytebuddy:byte-buddy-agent:1.12.8 -> >=dev-java/byte-buddy-agent-1.12.8:0 CP_DEPEND=" - dev-java/byte-buddy:0 - dev-java/byte-buddy-agent:0 + <=dev-java/byte-buddy-1.12.10:0 + <=dev-java/byte-buddy-agent-1.12.10:0 dev-java/junit:4 dev-java/objenesis:0 dev-java/opentest4j:0 @@ -48,8 +48,3 @@ RDEPEND=" S="${WORKDIR}/${P}" JAVA_SRC_DIR="src/main/java" - -src_install() { - java-pkg-simple_src_install - einstalldocs # https://bugs.gentoo.org/789582 -} diff --git a/dev-java/mockito/mockito-4.6.1.ebuild b/dev-java/mockito/mockito-4.6.1-r1.ebuild index 6b2aaec5f590..493246812dac 100644 --- a/dev-java/mockito/mockito-4.6.1.ebuild +++ b/dev-java/mockito/mockito-4.6.1-r1.ebuild @@ -19,14 +19,14 @@ SLOT="4" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" CP_DEPEND=" - dev-java/byte-buddy:0 - dev-java/byte-buddy-agent:0 + dev-java/asm:9 + >=dev-java/byte-buddy-1.12.12:0 dev-java/objenesis:0 - dev-java/opentest4j:0 " DEPEND=" dev-java/junit:4 + >=dev-java/opentest4j-1.2.0-r1:0 >=virtual/jdk-1.8:* ${CP_DEPEND} " @@ -38,10 +38,18 @@ RDEPEND=" S="${WORKDIR}/${P}" -JAVA_CLASSPATH_EXTRA="junit:4" -JAVA_SRC_DIR="src/main/java" +JAVA_CLASSPATH_EXTRA=" + junit-4 + opentest4j +" -src_install() { - java-pkg-simple_src_install - einstalldocs # https://bugs.gentoo.org/789582 +JAVA_SRC_DIR="src/main/java" +JAVA_AUTOMATIC_MODULE_NAME="org.mockito" + +src_prepare() { + default + sed \ + -e 's:net.bytebuddy.jar.asm:org.objectweb.asm:' \ + -i src/main/java/org/mockito/internal/creation/bytebuddy/MockMethodAdvice.java \ + -i src/main/java/org/mockito/internal/creation/bytebuddy/InlineBytecodeGenerator.java || die } |