From ec321939a77843497c860196ea06d7776d94b755 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Sep 2022 22:17:13 +0100 Subject: gentoo auto-resync : 02:09:2022 - 22:17:13 --- dev-java/Manifest.gz | Bin 52425 -> 52423 bytes dev-java/jffi/Manifest | 2 +- dev-java/jffi/jffi-1.3.9-r1.ebuild | 25 +- dev-java/jnr-ffi/Manifest | 6 +- dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch | 11 - dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml | 250 -------------------- dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild | 64 ------ dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild | 2 +- dev-java/jnr-posix/Manifest | 7 +- .../files/jnr-posix-3.1.15-FileTest.patch | 10 - dev-java/jnr-posix/files/jnr-posix_maven-build.xml | 256 --------------------- dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild | 54 ----- dev-java/jnr-posix/jnr-posix-3.1.15.ebuild | 29 ++- 13 files changed, 57 insertions(+), 659 deletions(-) delete mode 100644 dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch delete mode 100644 dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml delete mode 100644 dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild delete mode 100644 dev-java/jnr-posix/files/jnr-posix_maven-build.xml delete mode 100644 dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index bf9ec3efd77d..d488de4b1856 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest index a7114ed69f3c..f198d0f9e445 100644 --- a/dev-java/jffi/Manifest +++ b/dev-java/jffi/Manifest @@ -8,5 +8,5 @@ DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb11 DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10 EBUILD jffi-1.2.9-r1.ebuild 3008 BLAKE2B 1a6a1edc45678bdc3f8593a09fe1083988248f1b254b420bc1bed913b49626d6fff2023dbbe3481d7ac572b7bd73132593b9b3e0ef714821f2aaa22de537a0a6 SHA512 b7921f24dec2f0b18a44dbd57eef94deb4cd55d759d62b45f6d3a42004b3e7b82d4531f3a98a983936738d8576451a21ea4f849bcdaf46d945d6bf0747786a41 EBUILD jffi-1.3.6.ebuild 2454 BLAKE2B 0e988a67b31d18e96b6c0d8f550770c14bcefe22732ad989e567fa39bfc96e06f07d00771fc6228f3d3f0e122c1c06a4ea3d2a5ec45b74ab0b79ba3800ea24f0 SHA512 5314575e00a311389ccd290b20fe73852dd46769777de3278c748d2ec39c79ded428f157b36339273220d503e7ca810c15dfa3661b9ef778550c747a549847fb -EBUILD jffi-1.3.9-r1.ebuild 2476 BLAKE2B ec1250878aa248ec5553cbcbe9d3136a85d2e26fdf46530ef691400b573b8fba55ad190e13d9d87aa9c7076e43da039ad78f9dcbeb9f807ce80614617a63ee08 SHA512 b56176b99e06410d97fbccac17b668c5b8e960d85a9dec141af78fc0ac4df5fd05aaeaf2d865dbc8656e867c4ff28b75792151d447d8102bd046b4456e8797e3 +EBUILD jffi-1.3.9-r1.ebuild 3285 BLAKE2B df02b9374bbc00966b973dc761d28f6f635a92d0c619c2777559e299c2bc30cec58ff2813d92cce13c950685dd05bee3de9be8b0058363b3ebf65b3c1cf1c948 SHA512 d02a840a1182cb3de7a0a82a9dd804d6f7237e61fa50f4cd2055aaf43aa945dcce74a2e9e7a315a5c2e51ff85b6cabe0ad7236665865fef0880235fd64c70e37 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9 diff --git a/dev-java/jffi/jffi-1.3.9-r1.ebuild b/dev-java/jffi/jffi-1.3.9-r1.ebuild index e5267de9cd58..ee8168740ba4 100644 --- a/dev-java/jffi/jffi-1.3.9-r1.ebuild +++ b/dev-java/jffi/jffi-1.3.9-r1.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="1.3" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:* >=dev-libs/libffi-3.4.2-r2:=" @@ -51,6 +51,29 @@ src_prepare() { public static final int MICRO = $(ver_cut 3); } EOF + + # https://bugs.gentoo.org/829820 + if use arm; then + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/invokeHeapDO()/i @Ignore' \ + -e '/invokeHeapNO()/i @Ignore' \ + -e '/invokeHeapOD()/i @Ignore' \ + -e '/invokeHeapON()/i @Ignore' \ + -e '/invokeHeapOO()/i @Ignore' \ + -e '/invokeHeapO()/i @Ignore' \ + -e '/invokeNativeDO()/i @Ignore' \ + -e '/invokeNativeNO()/i @Ignore' \ + -e '/invokeNativeOD()/i @Ignore' \ + -e '/invokeNativeON()/i @Ignore' \ + -e '/invokeNativeOO()/i @Ignore' \ + -e '/invokeNativeO()/i @Ignore' \ + -i src/test/java/com/kenai/jffi/InvokerTest.java || die + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/returnDefaultF128HighPrecision/i @Ignore' \ + -i src/test/java/com/kenai/jffi/NumberTest.java || die + fi } src_compile() { diff --git a/dev-java/jnr-ffi/Manifest b/dev-java/jnr-ffi/Manifest index 5d0cf34e4622..d7b401c8702b 100644 --- a/dev-java/jnr-ffi/Manifest +++ b/dev-java/jnr-ffi/Manifest @@ -1,7 +1,3 @@ -AUX jnr-ffi-2.0.2-junit48.patch 467 BLAKE2B 1f1e76e18f425e1a38dfc0b1788239329a58fb9944958045877115d375c65437660a2fa114cec2bbc3ad3b74b94d38a6b34d6ea142ec0aa12f9ba88638d14894 SHA512 e7b5bb64d65b432a028fa709e4e050feccd4f3023fa6d940f89a2ef67f489f8eeb6dfb87c08eb056f47f4a5019c875225013ca559eb065cca105d54f51b5e884 -AUX jnr-ffi_maven-build.xml 11211 BLAKE2B 94c92f033d7cb90db11123846cffb1e7532d197eaa739cac6da256159fe030c1d90d57e991a292d9f1511e57800a37d6791037afd72349529e045a6db6572c1b SHA512 612b793b664b71e1a1b924aabe2da16c6b0b70947640b3d5b6d6994ffecfd7c0b30991b3a2bb711130052870dd63b9d41f43a54221e52017510119c5d3e4f359 -DIST jnr-ffi-2.0.2.tar.gz 170707 BLAKE2B fc4f1dcea51939b6098b980b4962380e58ba590ea9d4cdba7823c1372bd645d985ae25d8ebf1f0b575a0e4b5c192e5595094076d3cd44e4bb3c077dd838c170f SHA512 80a932408f5ceaf19fd7a399b786aa0d7b9251ea144bc2755bcf3cdc3aea85615a1faa001bbcd3072bc0eead2aaa30d0bbead5f96c82c4b9e455c1ed1379b4c0 DIST jnr-ffi-2.2.12.tar.gz 285324 BLAKE2B 32e866654b901ded7cdc82999d79873d49bd9d3599d265e9d029e7cf8ce1895f9e830a1af75b8c149c3debc5f3d256f6241d706ecbd94277ce1fa49a2868885c SHA512 420adb647c5d0547f0b18e4f8a21096da9aaebbdf0e50761ec1fd6be64ad29649c7af4d6daf0a8c4c38e02a05e0df836de6fdb7776f10c02d8bfd447a11882b3 -EBUILD jnr-ffi-2.0.2-r1.ebuild 1479 BLAKE2B 10de36e96180e2943bcf200bc49961c5258cb7dabcaf1536e79bdb2c0c5f58cc023d0c09e591746c889fc86e012c1337ef8a66c6ee8c181e1415a30ebc8869c0 SHA512 0d18e65d626dbcdd69c6f47d21e7505112e3ff98633137c3035d6e5e32536a5a36aed2a333a1f3d34e7da58b4f0e6a2225a6d7f88c3c58a23640170f4a48c9c3 -EBUILD jnr-ffi-2.2.12.ebuild 1193 BLAKE2B 6f1750bfc3c70e2cb5273ee4f5ec50479ffe044b0b8af1c3c056cfd97bc640e12d465c28cf569bcbe2cbd0e10e08e041991fa74315162baed56da65157701215 SHA512 394416355ced0f87b1f240faeb7b25c5e2b0b3bffff935b8334cb2a651f53973b1cba50a15ffe0d538ea9c289c104add204d483d6982a822e49ee8c6b069e672 +EBUILD jnr-ffi-2.2.12.ebuild 1198 BLAKE2B 1babeb69c3bd89a25a2a59c8afa9a1cf4e28ab6f3df5e86e003a06e66b822dc385689d89f226aecf34572de2609a7035f67fd2f32485627d9119e77689df7416 SHA512 b8e679f8c56ca04d92bcb362a91e73fae48466d993e493b0af5e10a6c33c89cbb2abc93958d2ed58303346b94774b41cfa7c54b76ec44f3f320792620abc127a MISC metadata.xml 323 BLAKE2B 377b6cae0335bb1d1160c22d684541576023a02984183c468689418ea3a1b2c6520a95ec7d18e86ea1b6c426d44d40bf6debea926c03c9c321d82dfc8874ee6e SHA512 f7503b3bbfc40eeda0e00cacd5a84723f17fdae5657594b8f44c9b7e7e059b6eeb23d034baab20aaeb554e35721a73ad1c0cac30aa67845a4e842f30348b79d6 diff --git a/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch b/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch deleted file mode 100644 index 92b4cb2bcfc3..000000000000 --- a/dev-java/jnr-ffi/files/jnr-ffi-2.0.2-junit48.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java -+++ b/src/test/java/jnr/ffi/ObjectReferenceManagerTest.java -@@ -35,7 +35,7 @@ - Pointer ptr = referenceManager.add(bar); - Pointer ptr2 = referenceManager.add(bar2); - assertNotSame(ptr, ptr2); -- assertNotEquals(ptr, ptr2); -+ assertTrue(!ptr.equals(ptr2)); - assertSame(bar, referenceManager.get(ptr)); - assertSame(bar2, referenceManager.get(ptr2)); - } diff --git a/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml b/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml deleted file mode 100644 index 0337f347bec0..000000000000 --- a/dev-java/jnr-ffi/files/jnr-ffi_maven-build.xml +++ /dev/null @@ -1,250 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild deleted file mode 100644 index 2c4a9a83197d..000000000000 --- a/dev-java/jnr-ffi/jnr-ffi-2.0.2-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="An abstracted interface to invoking native functions from java" -HOMEPAGE="https://github.com/jnr/jnr-ffi" -SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( Apache-2.0 LGPL-3 )" -SLOT="2" -KEYWORDS="~arm ppc64" - -# Fixing https://bugs.gentoo.org/736830 would cost too much time. -RESTRICT="test" - -COMMON_DEP=" - ~dev-java/jffi-1.2.9:1.2 - dev-java/jnr-x86asm:1.0 - dev-java/asm:4" - -RDEPEND="${COMMON_DEP} - >=virtual/jre-1.8:*" - -DEPEND="${COMMON_DEP} - >=virtual/jdk-1.8:* - test? ( - dev-java/ant-junit:0 - >=dev-java/junit-4.8:4 - )" - -src_prepare() { - default - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die - eapply "${FILESDIR}"/${P}-junit48.patch -} - -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc" -JAVA_ANT_ENCODING="UTF-8" - -EANT_GENTOO_CLASSPATH="asm-4,jffi-1.2,jnr-x86asm-1.0" -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" - -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" - -src_test() { - # build native test library - emake BUILD_DIR=build -f libtest/GNUmakefile - - _JAVA_OPTIONS="-Djnr.ffi.library.path=build" \ - java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar target/${PN}.jar - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild index 454c556a3aa5..7020f2331029 100644 --- a/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild +++ b/dev-java/jnr-ffi/jnr-ffi-2.2.12.ebuild @@ -19,7 +19,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="2" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" dev-java/asm:9 diff --git a/dev-java/jnr-posix/Manifest b/dev-java/jnr-posix/Manifest index 544272add0ca..0446d695fbec 100644 --- a/dev-java/jnr-posix/Manifest +++ b/dev-java/jnr-posix/Manifest @@ -1,7 +1,4 @@ -AUX jnr-posix-3.1.15-FileTest.patch 1520 BLAKE2B 7c9fc379977e98b01e2978f8e185942ce10d1641b7a58fac1d88ea9b3267c693ce5271da4584c2bd17805733060e408c89c98fd50d5a323071be36ad6f5a8507 SHA512 75e8fbaf976b5b548647b00502464b994c5f49929ccd767bb136d47f78eea0e4c7cde06f94b9e7ba86aad9334ee2d975a32e34ef4f332fbd2697b121566ea5b7 -AUX jnr-posix_maven-build.xml 11760 BLAKE2B ec75beb884ccb81dc28c38db22e64953a6f536726105e2fec5cd38f7be2286091054026d6cf77471d03f5095c44087d8f7fe9d3065d31df26b018988a843fe39 SHA512 ab3f6b00e08cd7fff5f44df1c2a0eb9e73d3ad7400e6e708dcd1432b6ad122bfb0b8dac6417eb67a02d0fc2d19477d81287d2b202275676826081610d3e27d8e -DIST jnr-posix-3.0.10.tar.gz 85912 BLAKE2B b87ff78ccf10718bd1faf9e308421ba3ab5e90dee5e244fb1b7f53592da8ad98973cc50e6469bcea59e1202ee82b3f77522eb95e23584ff70cc66099ef1c4266 SHA512 a282c164b0b9ace8aba508a48d08d53beb0ddcd4baf5389412941a1e1430d75df9bdd35935a6982d4bb1910c0fdad55910ba028b1b5388c55e19a6c4ed2ba6a1 +AUX jnr-posix-3.1.15-FileTest.patch 1195 BLAKE2B 57a88e8ce120954c7287dc063cc0ba5ebbb38eea404964c69f8f78a6b496b99bcffe2888e4b7ea895e5aa3cde95f52c11289f97f81201124d9234fb51fa546ff SHA512 0c180434266c1fe47d21d9412d8d13982fea6ea23b930b2c412200b9d2ce31bb15fc8e7785a3757f61be9841301e05aa7f84741f2cde70285ee039b91c35a5c8 DIST jnr-posix-3.1.15.tar.gz 120573 BLAKE2B 8035308440e444876d8d955ec3dd0b9d41f770436b53f964795a183ed7bd676dda8787c37425c488af2aa0accc948b86d1773e7e97ee5bcdaf209383dfda24a6 SHA512 6c8cd6d43c509ef7c16901d02983b823464b3437019233021398b2a9dfc85923db87c585e2f8248f080447a990e308feff25bbbf2a7261019dcae66c22e14a91 -EBUILD jnr-posix-3.0.10-r1.ebuild 1295 BLAKE2B f9ad7d57774afd7dfba2f22a774d2539332e474a85ffb0f601ba734127fb99644ea1e1912f245707d9b5d5e432d46d241d175f4fde7e9b168dc2f74b21aa52f8 SHA512 1ac23f843d6a1d3c5520fa464f6284573403e8b361eddb29647a81a938cc22e602508c1f04dc2a887042f99f0b0f8d21c1c4776c3dc14fcc25b306cfee296494 -EBUILD jnr-posix-3.1.15.ebuild 2249 BLAKE2B d6b4768a08780c6f37bb9610a98d9ff11266fbc04f9088cb744706cef7b7e578453738d65249a48882080e1192e55aeda2de1d0d0ef6656252ddbdd2fbad90e0 SHA512 735e0abfbc4e8ef1f94bb6e8708c9a0d87a55a39541d71849d6e1ad2c0e1e2bdf228163da76b61341b02c4a71a11f454c70accbde6cd756e1dac817f4f47ba31 +EBUILD jnr-posix-3.1.15.ebuild 3188 BLAKE2B 19e9153ec95e8dfe2566b6b0016f4fd5507f8b1992f704fe7ae50aa1ea00047b385053f8e0980915595e5412ffd0ff851708a76a1078b31d86111929a494736e SHA512 3e5382da3536dd6b5ba0484d07cdc2b44cd8fe23a27ab6e6ed06384e9b82efb37602c6466cc3382a5b5949e5497032c23fb56f9ec1eb8f6223d64c6ee0da655a MISC metadata.xml 325 BLAKE2B f40ca825a92205c1ef0e0be2e72c859b680593c0f852aec73c3d84356a9927f5f536ffcec7b7a365353ac56489677d7881f9f27431abc56cdf9cc24550493097 SHA512 ff2bae0526d5ae082ad290411e7d3cd95a197918e4d834a531cab016ff9a718197a27fb2c7a4f7426bb44a5b295e164a72dd36f5fac800bc20388fde0f52e0a4 diff --git a/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch b/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch index eba2a6fc450a..a186087c626d 100644 --- a/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch +++ b/dev-java/jnr-posix/files/jnr-posix-3.1.15-FileTest.patch @@ -1,15 +1,5 @@ -diff --git a/src/test/java/jnr/posix/FileTest.java b/src/test/java/jnr/posix/FileTest.java -index afadb07..7eb8af7 100644 --- a/src/test/java/jnr/posix/FileTest.java +++ b/src/test/java/jnr/posix/FileTest.java -@@ -8,6 +8,7 @@ import jnr.ffi.Pointer; - import jnr.posix.util.Platform; - import org.junit.BeforeClass; - import org.junit.Test; -+import org.junit.Ignore; - - import java.io.*; - import java.nio.ByteBuffer; @@ -215,7 +216,7 @@ public class FileTest { dir.delete(); } diff --git a/dev-java/jnr-posix/files/jnr-posix_maven-build.xml b/dev-java/jnr-posix/files/jnr-posix_maven-build.xml deleted file mode 100644 index 82260e156394..000000000000 --- a/dev-java/jnr-posix/files/jnr-posix_maven-build.xml +++ /dev/null @@ -1,256 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING =================================== - JUnit is not present in your $ANT_HOME/lib directory. Tests not executed. - =============================================================================== - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild b/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild deleted file mode 100644 index 8e1f57eabfc9..000000000000 --- a/dev-java/jnr-posix/jnr-posix-3.0.10-r1.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source test" -JAVA_ANT_REWRITE_CLASSPATH="yes" -JAVA_ANT_CLASSPATH_TAGS="${JAVA_ANT_CLASSPATH_TAGS} javadoc" -JAVA_ANT_ENCODING="UTF-8" - -EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}" -EANT_GENTOO_CLASSPATH="jnr-constants,jnr-ffi-2" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Lightweight cross-platform POSIX emulation layer for Java" -HOMEPAGE="https://github.com/jnr/jnr-posix" -SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="|| ( CPL-1.0 GPL-2 LGPL-2.1 )" -SLOT="3.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x86-solaris" - -CDEPEND="dev-java/jnr-constants:0 - dev-java/jnr-ffi:2" - -RDEPEND="${CDEPEND} - >=virtual/jre-1.8:*" - -DEPEND="${CDEPEND} - >=virtual/jdk-1.8:* - test? ( - dev-java/ant-junit4:0 - dev-java/junit:4 - )" - -src_prepare() { - default - - cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die -} - -src_test() { - ANT_TASKS="ant-junit4" eant test -DJunit.present=true -} - -src_install() { - java-pkg_dojar target/${PN}.jar - dodoc README.txt - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/* -} diff --git a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild index 5902204899ec..0fd709bffe6a 100644 --- a/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild +++ b/dev-java/jnr-posix/jnr-posix-3.1.15.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://github.com/jnr/${PN}/archive/${P}.tar.gz" LICENSE="EPL-2.0 GPL-2 LGPL-2.1" SLOT="3.0" -KEYWORDS="amd64 arm64 ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" CP_DEPEND=" >=dev-java/jnr-ffi-2.2.12:2 @@ -39,6 +39,10 @@ JAVA_TEST_GENTOO_CLASSPATH="junit-4" JAVA_TEST_SRC_DIR="src/test/java" src_test() { + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -i src/test/java/jnr/posix/FileTest.java || die + if use ppc64; then # Ignore testMessageHdrMultipleControl # https://bugs.gentoo.org/866199 @@ -49,6 +53,29 @@ src_test() { -i src/test/java/jnr/posix/LinuxPOSIXTest.java || die fi + if use arm; then + # https://bugs.gentoo.org/866692 + sed \ + -e '/utimensatRelativePath()/i @Ignore' \ + -e '/utimesDefaultValuesTest()/i @Ignore' \ + -e '/futimeTest()/i @Ignore' \ + -e '/utimesTest()/i @Ignore' \ + -e '/utimesPointerTest()/i @Ignore' \ + -e '/utimensatAbsolutePath()/i @Ignore' \ + -e '/futimens()/i @Ignore' \ + -i src/test/java/jnr/posix/FileTest.java || die + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/ioprioThreadedTest()/i @Ignore' \ + -e '/testPosixFadvise()/i @Ignore' \ + -i src/test/java/jnr/posix/LinuxPOSIXTest.java || die + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/testSetRlimitPointerLinux()/i @Ignore' \ + -e '/testGetRLimitPointer()/i @Ignore' \ + -i src/test/java/jnr/posix/ProcessTest.java || die + fi + JAVA_TEST_EXCLUDES=( # https://github.com/jnr/jnr-posix/blob/jnr-posix-3.1.15/pom.xml#L185 # **/windows/*Test.java -- cgit v1.2.3