commit: 8a1a75d34f4cd056daa686de3d8ba643d8e5e3ed Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Sun Apr 17 22:24:40 2022 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Sun Apr 17 22:27:07 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a1a75d3
dev-java/fop: remove binaries out of files/ Closes: https://bugs.gentoo.org/839042 Fixes: 55f3ec5078e3 ("dev-java/fop: Bump to 2.7") Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/fop/Manifest | 1 + dev-java/fop/files/fop-2.7-core-event-models.jar | Bin 8835 -> 0 bytes dev-java/fop/files/fop-2.7-test-event-model.jar | Bin 428 -> 0 bytes dev-java/fop/fop-2.7.ebuild | 9 ++++++--- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest index b65582322b79..27bd73277440 100644 --- a/dev-java/fop/Manifest +++ b/dev-java/fop/Manifest @@ -1,2 +1,3 @@ DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395 SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a +DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6 DIST fop-2.7-src.tar.gz 26799877 BLAKE2B 00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a SHA512 bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633 diff --git a/dev-java/fop/files/fop-2.7-core-event-models.jar b/dev-java/fop/files/fop-2.7-core-event-models.jar deleted file mode 100644 index 49bece365d93..000000000000 Binary files a/dev-java/fop/files/fop-2.7-core-event-models.jar and /dev/null differ diff --git a/dev-java/fop/files/fop-2.7-test-event-model.jar b/dev-java/fop/files/fop-2.7-test-event-model.jar deleted file mode 100644 index 7c2fff6a088d..000000000000 Binary files a/dev-java/fop/files/fop-2.7-test-event-model.jar and /dev/null differ diff --git a/dev-java/fop/fop-2.7.ebuild b/dev-java/fop/fop-2.7.ebuild index e6aa1be68d31..5c30a5a49912 100644 --- a/dev-java/fop/fop-2.7.ebuild +++ b/dev-java/fop/fop-2.7.ebuild @@ -11,7 +11,10 @@ inherit java-pkg-2 java-pkg-simple DESCRIPTION="XML Graphics Format Object Processor All-In-One" HOMEPAGE="https://xmlgraphics.apache.org/fop/"; -SRC_URI="mirror://apache/xmlgraphics/fop/source/fop-${PV}-src.tar.gz" +SRC_URI=" + mirror://apache/xmlgraphics/fop/source/${P}-src.tar.gz + https://dev.gentoo.org/~flow/distfiles/fop/${P}-jars.tar.xz +" LICENSE="Apache-2.0" SLOT="2.7" @@ -95,7 +98,7 @@ src_compile() { # Update "fop-core.jar" with "event-mode.xml" files produced manually # by running "mvn package". mkdir event-model && pushd $_ >/dev/null || die - jar -xf "${FILESDIR}/fop-2.7-core-event-models.jar" + jar -xf "${WORKDIR}/fop-2.7-core-event-models.jar" popd jar -uf "fop-core.jar" -C event-model . || die # Upstream does this with maven-antrun-plugin: @@ -126,7 +129,7 @@ src_test() { # This jar file was created manually from the output of "mvn test". # Upstream does this with maven-antrun-plugin - jar -xf ${FILESDIR}/fop-2.7-test-event-model.jar || die + jar -xf "${WORKDIR}/fop-2.7-test-event-model.jar" || die java-pkg-simple_src_test
