From bd7908c6630f38067350d396ac5d18c3cc2434a0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 29 Oct 2017 11:22:34 +0000 Subject: gentoo resync : 29.10.2017 --- dev-java/fop/Manifest | 2 +- dev-java/fop/fop-2.0-r2.ebuild | 129 ----------------------------------------- dev-java/fop/fop-2.0-r3.ebuild | 129 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 130 insertions(+), 130 deletions(-) delete mode 100644 dev-java/fop/fop-2.0-r2.ebuild create mode 100644 dev-java/fop/fop-2.0-r3.ebuild (limited to 'dev-java/fop') diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest index ff8c03e2c6bd..1c2b609ae663 100644 --- a/dev-java/fop/Manifest +++ b/dev-java/fop/Manifest @@ -1,6 +1,6 @@ AUX headless-launcher.bash 67 SHA256 aaa990229cbb46d8b290d1629d5ae2c6e99a0cb9e73f7761fbf32faa927d1319 SHA512 d3a6635105ea62a62f1ff690a457bfbdebe3d15f8fd220f5508a4ec20b8a5c46e66bf9189562661d5053c6ac31a6998d1f4a117e0ac6087b336a0475635d7d3a WHIRLPOOL b8b42ad063f00b67c12500e6eb76e9cc81c66ea7105d3e1db9e26e9d45d1ece90b1c25e85ab66bdbb0504b247a4926fb5b4ff4487b3ee43c0914866d58bcc7e6 DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7 -EBUILD fop-2.0-r2.ebuild 3076 SHA256 6479f5d8103d4802f976ff9b0b73f4c63377ee242bbb13ba61bf12a42ad52f2e SHA512 0be6bbbec5683edfcba7fca5742f25a599ce52fa3f654ace7321d376220726de7ed21cb9ae36cb078c1e2fb275b06b9ca0663deb4a001cbd403bd3e0487edec2 WHIRLPOOL 111d4e50105462ce1296ff6976576acc4e868bd15f2cd7f6e81321e61c29f33e32db28c4d04f5fc8394a92f1aebaec03259a0abc571c28c2e3d231556f778ab2 +EBUILD fop-2.0-r3.ebuild 3071 SHA256 e331df9b297c0772a6455cc067a29d78a16d0ed02e6b9b20baed8e0bc8acc99a SHA512 2c8379748ea5a75274037011089863951d3fbe23d95ac37d22c784f5432774d3f7addb877f21aeafeb73cce21e0a0b5720a82761033c0a69230ba7faf1046e98 WHIRLPOOL 86a169a76935013865f63debe6fe0852e4b5ce9a6472148e5ccc79b4d63619019626f5c69c32d792f2cb85ba11789af0429215a61601d1c1dc67d42f8fdd8ecb MISC ChangeLog 3308 SHA256 8430041148bf1688c89fa0cbf861503492ff9c9856e9277a24e52a82891eed86 SHA512 2235349e31d3b2f97fcba0109a1e51ab81dfde399b52407a63bebf9e6fdd847ebe521ecaaa1f8f6e164151164e23dac710f761bcdc3ede1ab4ccdcd86f69cda6 WHIRLPOOL 98618190307c6654134596eb9845ae978d324fe06f3fc0fe1b783a441ec21282a7e51e2ab05ddac5fd49932ceb004e8cb3bf8b28bfc3216550b0e83eca40011a MISC ChangeLog-2015 11496 SHA256 d8a6ae1439146b760f5086667b69ac8a5982fdaced5dee57fc7f37c5e48720fc SHA512 e3419f68bc302d6cc3fb77d9f39f99bbaba656b361aad14add3bbc92001087ffd3ab2789efb3e7bcd59b125df16e95911778c7c20b65b3d393cf84bd0cad6e9a WHIRLPOOL 27413d61ba3cd257e87ecd2a3e1c17ee3f857af23259ffac5f412b7c18145e737f94069cf9d345c7ee9d0f1021fe9865b9b13c385b4a2193091479a50266213e MISC metadata.xml 242 SHA256 653cd0d34675fe6c6201752e96e6b035bad682c39a376c236b0a8f70dbdcc1c9 SHA512 50f4d6219b995b723d6ebbb4f2a18adbf558a685f862aea00f072254dcc0fe6c1388e4aeaf21fb3ce0fb840a2ef4851807536d037c9682b21cb1986198715a4f WHIRLPOOL 12c33e00040d7a3f4c26a8b7a6a6eaf10007a9e29af9904d192f89db5120a2760a7174fa40c40068eb6066d6a4f0dbbc57a12e852581de95cc956e210351b705 diff --git a/dev-java/fop/fop-2.0-r2.ebuild b/dev-java/fop/fop-2.0-r2.ebuild deleted file mode 100644 index b24807e14b2a..000000000000 --- a/dev-java/fop/fop-2.0-r2.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot -# be built as it needs forrest which we do not have -# TODO: package and use optional dependency jeuclid - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" - -inherit eutils java-pkg-2 java-ant-2 - -DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL" -HOMEPAGE="http://xmlgraphics.apache.org/fop/" -SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip" - -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="" - -# Tests are broken even in 2.0 -RESTRICT="test" - -CDEPEND="dev-java/batik:1.8 - dev-java/ant-core:0 - dev-java/fontbox:1.7 - dev-java/commons-io:1 - dev-java/commons-logging:0 - java-virtuals/servlet-api:3.0 - dev-java/avalon-framework:4.2 - dev-java/xmlgraphics-commons:2 - dev-java/xml-commons-external:1.3 - dev-java/qdox:1.12" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip - ${CDEPEND}" - -# test? ( -# dev-java/ant-junit:0 -# dev-java/junit:4 -# dev-java/xmlunit:1 -# dev-java/mockito:0 -# )" - -JAVA_ANT_ENCODING="ISO-8859-1" -JAVA_ANT_REWRITE_CLASSPATH="true" - -EANT_GENTOO_CLASSPATH=" - ant-core - batik-1.8 - fontbox-1.7 - commons-io-1 - commons-logging - servlet-api-3.0 - avalon-framework-4.2 - xmlgraphics-commons-2 - xml-commons-external-1.3 -" - -TARGETS=( - resourcegen - jar-hyphenation - jar-sandbox - jar-main -) - -java_prepare() { - find "${S}"/lib -type f | xargs rm -v -} - -src_compile() { - # https://bugs.gentoo.org/show_bug.cgi?id=554386 - # http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively - java-pkg_jar-from --into lib qdox-1.12 qdox.jar - java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar - java-pkg_jar-from --into lib commons-logging commons-logging.jar - java-pkg_jar-from --into lib commons-io-1 commons-io.jar - java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar - java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar - java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar - java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar - java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar - - for target in ${TARGETS[@]}; do - EANT_BUILD_TARGET="${target}" \ - java-pkg-2_src_compile - done - - if use doc; then - sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml - EANT_BUILD_TARGET="javadocs" \ - java-pkg-2_src_compile - fi -} - -src_install() { - java-pkg_dojar \ - build/${PN}.jar \ - build/${PN}-sandbox.jar \ - build/${PN}-hyph.jar - - java-pkg_dolauncher \ - ${PN} --main org.apache.fop.cli.Main \ - -pre "${FILESDIR}/headless-launcher.bash" - - dodoc NOTICE README - - if use doc; then - java-pkg_dojavadoc \ - build/javadocs - fi - - if use examples; then - java-pkg_doexamples \ - examples/* conf - fi - - if use source; then - java-pkg_dosrc \ - src/java/org \ - src/sandbox/org - fi -} diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild new file mode 100644 index 000000000000..308735bc50b0 --- /dev/null +++ b/dev-java/fop/fop-2.0-r3.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot +# be built as it needs forrest which we do not have +# TODO: package and use optional dependency jeuclid + +EAPI="5" + +JAVA_PKG_IUSE="doc examples source test" + +inherit eutils java-pkg-2 java-ant-2 + +DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL" +HOMEPAGE="https://xmlgraphics.apache.org/fop/" +SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip" + +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +LICENSE="Apache-2.0" +SLOT="0" + +# Tests are broken even in 2.0 +RESTRICT="test" + +CDEPEND=" + dev-java/batik:1.9 + dev-java/ant-core:0 + dev-java/fontbox:1.7 + dev-java/commons-io:1 + dev-java/commons-logging:0 + java-virtuals/servlet-api:3.0 + dev-java/avalon-framework:4.2 + dev-java/xmlgraphics-commons:2 + dev-java/xml-commons-external:1.3 + dev-java/qdox:1.12" + +RDEPEND=">=virtual/jre-1.6 + ${CDEPEND}" + +DEPEND=">=virtual/jdk-1.6 + app-arch/unzip + ${CDEPEND}" + +# test? ( +# dev-java/ant-junit:0 +# dev-java/junit:4 +# dev-java/xmlunit:1 +# dev-java/mockito:0 +# )" + +JAVA_ANT_ENCODING="ISO-8859-1" +JAVA_ANT_REWRITE_CLASSPATH="true" + +EANT_GENTOO_CLASSPATH=" + ant-core + batik-1.9 + fontbox-1.7 + commons-io-1 + commons-logging + servlet-api-3.0 + avalon-framework-4.2 + xmlgraphics-commons-2 + xml-commons-external-1.3 +" + +TARGETS=( + resourcegen + jar-hyphenation + jar-sandbox + jar-main +) + +java_prepare() { + find "${S}"/lib -type f | xargs rm -v +} + +src_compile() { + # https://bugs.gentoo.org/show_bug.cgi?id=554386 + # http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively + java-pkg_jar-from --into lib qdox-1.12 qdox.jar + java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar + java-pkg_jar-from --into lib commons-logging commons-logging.jar + java-pkg_jar-from --into lib commons-io-1 commons-io.jar + java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar + java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar + java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar + java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar + java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar + + for target in ${TARGETS[@]}; do + EANT_BUILD_TARGET="${target}" \ + java-pkg-2_src_compile + done + + if use doc; then + sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml + EANT_BUILD_TARGET="javadocs" \ + java-pkg-2_src_compile + fi +} + +src_install() { + java-pkg_dojar \ + build/${PN}.jar \ + build/${PN}-sandbox.jar \ + build/${PN}-hyph.jar + + java-pkg_dolauncher \ + ${PN} --main org.apache.fop.cli.Main \ + -pre "${FILESDIR}/headless-launcher.bash" + + dodoc NOTICE README + + if use doc; then + java-pkg_dojavadoc \ + build/javadocs + fi + + if use examples; then + java-pkg_doexamples \ + examples/* conf + fi + + if use source; then + java-pkg_dosrc \ + src/java/org \ + src/sandbox/org + fi +} -- cgit v1.2.3