diff options
Diffstat (limited to 'dev-java/fop')
| -rw-r--r-- | dev-java/fop/Manifest | 2 | ||||
| -rw-r--r-- | dev-java/fop/fop-2.9-r1.ebuild (renamed from dev-java/fop/fop-2.9.ebuild) | 15 |
2 files changed, 7 insertions, 10 deletions
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest index 17ad1e4586d2..75b88426b373 100644 --- a/dev-java/fop/Manifest +++ b/dev-java/fop/Manifest @@ -6,5 +6,5 @@ DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90 DIST fop-2.9-src.tar.gz 20642865 BLAKE2B 6ab265ddfb1c07b9266687930af21ac4653438800772da836dbceb14de126333dcff50c2cea1352ad77988ec7f7a3d4eef91341983edc13684abf2531634eb0a SHA512 d346c8fffd0d3ff5e803bea4233ce171972ded39b0c475b367333e37247da8f9e823c7e2e75fab735bf9282654d67befa2fa473f53a199cbd96b0f7305b3c093 DIST fop-2.9-src.tar.gz.asc 833 BLAKE2B 284f04d450bcfb6583d353ae21bbadad8da14b59d946e094453b564e700c8cfdcb448ed206a5a246b725b453a1b3feea69f96ff3b2a683320bce6743cc5a167f SHA512 404d5df54cf84ddb11c7f5ebc6772d61cd04fc434dea421429a9a270e1d0ca17f61df8a33600db5a41c6d45f828a67fc26becfa9b4ac18342e9dfb4781dd0bdc DIST fop-hyph-2.0.jar 6655933 BLAKE2B bfbefcc2ebd9a9a467c23a70d7cef256f83cf2335f6e17db6bbefceaf8a3cee78de0302f269d096eb3238b3f4883429e09cc640bed11a42da4ef67ab9f0cb164 SHA512 3d5f27623008c7beba5332387bd42c501b7ae1dddfc98014b3fb35273394ca5f0a4ce69e7726090ec468c9b4f7983fb8b1a5759f49e81ea342c81c61311d87b3 -EBUILD fop-2.9.ebuild 6080 BLAKE2B 46023c767789f0d701e7f143407356d1da4e32704270336e8844118089ed10dc76445bcb30f7448db3c852f2e17eef4a05aa1584cf08143a4b1bea8deaa18528 SHA512 5ca781265e070bc9c8d4693338d17483906edaa1018943f6afa16e63689a5c8714a13e4de56084c0ac4e53906998820e59982ff549a3a810eef3b4e78414299c +EBUILD fop-2.9-r1.ebuild 6147 BLAKE2B db0bbefcde63a6036dcf08b6ee91024deeb152870a2b38604b13cec8a9ce65fda7f1dde94294b13a2a7872857db3b93b424fdda1e4469f302c67aa0b7c57af1b SHA512 d5555e2186fa5f3c2e48d2d8d810e7cc389ad7f049a62ec19a41166ea3c188af8cddecb701e55e7480bbffc0bdd538b62110c324a5051e0f3895e842090e1d41 MISC metadata.xml 449 BLAKE2B 91dd2fd3b50581a408755aade7aa37406c527e9298bd0156cb18d363fef88cf60eb85f259ba443022fbd6c5377be0e0fc990cb2826d418347dc92bf7b6ff5ca9 SHA512 cf49f03d1ed992a7df7deebb7c00721895be45ff144da8c4b1777aecba5e17d86a7353a83ad8df8b356f70afda5fadcdc53350b2c5732a0f0469b18f501959d4 diff --git a/dev-java/fop/fop-2.9.ebuild b/dev-java/fop/fop-2.9-r1.ebuild index e691baf0a9e9..c9268c877d7d 100644 --- a/dev-java/fop/fop-2.9.ebuild +++ b/dev-java/fop/fop-2.9-r1.ebuild @@ -31,19 +31,19 @@ BDEPEND=" " CP_DEPEND=" + >=dev-java/ant-1.10.14-r3:0 dev-java/batik:1.16 dev-java/commons-io:1 dev-java/commons-logging:0 dev-java/fontbox:0 + dev-java/javax-servlet-api:2.2 dev-java/qdox:1.12 + dev-java/sun-jai-bin:0 dev-java/xmlgraphics-commons:2 " DEPEND="${CP_DEPEND} >=virtual/jdk-1.8:* - dev-java/ant-core:0 - dev-java/javax-servlet-api:2.2 - dev-java/sun-jai-bin:0 test? ( dev-java/mockito:2 dev-java/pdfbox:0 @@ -63,12 +63,6 @@ PATCHES=( "${FILESDIR}/fop-2.9-FO2StructureTreeConverterTestCase.patch" ) -JAVA_CLASSPATH_EXTRA=" - ant-core - javax-servlet-api-2.2 - sun-jai-bin -" - src_unpack() { if use verify-sig; then verify-sig_verify_detached "${DISTDIR}"/${P}-src.tar.gz{,.asc} @@ -83,6 +77,9 @@ src_prepare() { } src_compile() { + # while ant could install multiple jar files we only need ant.jar + JAVA_GENTOO_CLASSPATH_EXTRA=":$(java-pkg_getjar ant ant.jar)" + JAVA_JAR_FILENAME="fop-util.jar" JAVA_SRC_DIR="fop-util/src/main/java" java-pkg-simple_src_compile |