diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-16 13:07:24 +0100 |
| commit | 0c100b7dd2b30e75b799d806df4ef899fd98e1ea (patch) | |
| tree | 464c922e949c7e4d5d891fb2cdda5daee5612537 /dev-java/fop | |
| parent | e68d405c5d712af4387159df07e226217bdda049 (diff) | |
gentoo resync : 16.04.2022
Diffstat (limited to 'dev-java/fop')
| -rw-r--r-- | dev-java/fop/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/fop/fop-2.7.ebuild | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest index a637501f4cbd..c6d39023f5ea 100644 --- a/dev-java/fop/Manifest +++ b/dev-java/fop/Manifest @@ -4,5 +4,5 @@ AUX headless-launcher.bash 67 BLAKE2B 29ea0750d057e9a914ce26a14f1d6d1c4d49967aa5 DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395 SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a DIST fop-2.7-src.tar.gz 26799877 BLAKE2B 00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a SHA512 bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633 EBUILD fop-2.0-r3.ebuild 3050 BLAKE2B 99e24888912fda8f6d9d2ca37ad03d6af2b4631e8bbf6d3fd3f2398c92636612afba50127fa1c627401b4a41b7f8c03632aea486e92c3c3c493a083a0b9d15b2 SHA512 debaeea4df79a274fe79c531e808e331f1995deb23c981224fe3f8dde57dd62c911494c86a578d314d373289d286d0475c96ad8bbeedf9227f87a4679c21ea45 -EBUILD fop-2.7.ebuild 4101 BLAKE2B 8c2fd3cf9077539fd68beda97cdb19dbd7a3a528c7516712739c7372be57009313008e8a0edf19ee84f9a4df8671e08baaa8bc00fd124069596ca42d1979f0ba SHA512 89776b3f7bc2d4b5e54f7679f9a98c3656bb7dfa0fc64eb86d96f9340438128f88df033e0920a0c63766665a951d48c04b6ac4267412258d0f9b439c725a3751 +EBUILD fop-2.7.ebuild 4136 BLAKE2B 03c747bd16ae9a34e55e6ef90bf3655f3626b97a781bdd015ccaf938fafe1351f04d6fc7f855f401a9e6ea8b126b37deb7b30d3fea6d64dd0b9f71b11b241816 SHA512 3a0ee2ccf107c2e8925f6e6df6cdaef46bebaea64b45c79955409736d0e81c5eb3cd0fdfdfe112067fc8adeb127c0ab17e0d18ce9ced30924defa308412327a2 MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4 diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild index b6bc2ad9ebca..e6aa1be68d31 100644 --- a/dev-java/fop/fop-2.7.ebuild +++ b/dev-java/fop/fop-2.7.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/xmlgraphics/fop/source/fop-${PV}-src.tar.gz" LICENSE="Apache-2.0" SLOT="2.7" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" CP_DEPEND=" dev-java/batik:1.14 @@ -31,7 +31,7 @@ DEPEND="${CP_DEPEND} dev-java/ant-core:0 dev-java/sun-jai-bin:0 test? ( - dev-java/mockito:0 + dev-java/mockito:4 dev-java/pdfbox:0 dev-java/xmlunit:1 ) @@ -119,7 +119,7 @@ src_compile() { } src_test() { - JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito,pdfbox,xmlunit-1" + JAVA_TEST_GENTOO_CLASSPATH="junit-4,mockito-4,pdfbox,xmlunit-1" JAVA_TEST_SRC_DIR="fop-events/src/test/java" JAVA_TEST_RUN_ONLY="org.apache.fop.events.BasicEventTestCase" @@ -130,13 +130,14 @@ src_test() { java-pkg-simple_src_test + sed \ + -e 's:verifyZeroInteractions:verifyNoInteractions:' \ + -i fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java || die + JAVA_TEST_SRC_DIR="fop-core/src/test/java" JAVA_TEST_RESOURCE_DIRS="fop-core/src/test/resources" - # Testing fop-core seems to want a newer mockito: - # error: cannot find symbol - # import static org.mockito.ArgumentMatchers.anyInt; -# java-pkg-simple_src_test + java-pkg-simple_src_test } src_install() { |