diff options
Diffstat (limited to 'dev-java/batik')
| -rw-r--r-- | dev-java/batik/Manifest | 5 | ||||
| -rw-r--r-- | dev-java/batik/batik-1.8-r3.ebuild | 124 | ||||
| -rw-r--r-- | dev-java/batik/batik-1.9.ebuild | 30 | ||||
| -rw-r--r-- | dev-java/batik/files/batik-1.9-ImportInfo.patch | 10 |
4 files changed, 31 insertions, 138 deletions
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest index 4dfd4e2d313b..ca15fe24798f 100644 --- a/dev-java/batik/Manifest +++ b/dev-java/batik/Manifest @@ -1,7 +1,6 @@ -DIST batik-src-1.8.tar.gz 14970684 SHA256 0f1175146d45445fc4940e214c3e1e5cfa0294ae6a9787859bda00964f97c2bd SHA512 352843fd0cec43c6d9d54426fe1c20a9bd2234798404b101f2e8d43f6089c0bf6bb5102cb5674de11d37a0d820a8bb79fe9dd854030b23fd8c68f3931eb12f1b WHIRLPOOL fa50d1f87257c6018f99076bf759066b2311f483d424ef743e45fe17c74c646a215c1211c5431b2a522913f23ff5f53934a1606d4d4a223e8298abd6ce94bb46 +AUX batik-1.9-ImportInfo.patch 439 SHA256 ee49a43fc6bdc8e47cd3d8fd6c3a5b5a3cfda9b40243ecd2a173331f1730fd0a SHA512 ff390670537fd631dbd0041a4496e0a33daa1bbd9390867285d2a817ee7794d19c0d634dbfcf4a1e777db072a0f1b6bc2b68e475bbe590bce825aa7b7d76f643 WHIRLPOOL 561a42cef0363a692d530b675d27252e5b0b693d8243d3eb50ca866043e20f098ee8c398c10cb5bdc1fb703e5f32c68264fa84ad58a62a9d05b1df0d2a7fdb6c DIST batik-src-1.9.tar.gz 16748072 SHA256 bef436c0b4ac9a499274a8df9a2769f42ddc6553451dac9a9514b4f55d06c6a3 SHA512 96a5c16bd3d61ea33ed5013fd0b00f1724470d9b667f0f84ef4a29dcaaa19b1cc8ffcc92dc49767f4e29d77a47f99df5afca479336ac5619778b51a6fb6cd952 WHIRLPOOL b389ec0d38e16d4619f0a1e933c357a018e0ae2a0c04900caf53f398180c5a2ca031bd8909ef50aeb2db5c12dd6981cb5d1ec466e4c5fbc0379d0c325f039b25 -EBUILD batik-1.8-r3.ebuild 3221 SHA256 8bcbd2978bed6caddcda654d446fa1d948f3bea289eb405be6a1ed9db08ceaa4 SHA512 b2525a0cf675fc161642c759dcf149dba654a683af50f6b931845cc6021495485b2a405bbc78238720c5fe140a35aa4e88902d907e2a5b0444989b3e2e6ec612 WHIRLPOOL d270887b84758d88e1622d3899e700ad0f8e4ba8dc4d55294e45032cf7f2af6d256711775b56924d33b63d1bf609d68703c4029ac2b2bcd45d6c56dd12914b91 -EBUILD batik-1.9.ebuild 2481 SHA256 79728ec12084bcb504a551214092df4243dfe5f340d6754e02c7f7954525d4d5 SHA512 838618876d2b74a71e2ee13473d156eb636d4b4e7ca20c5d7dbdecb6b49d83f073b0cecbdc0f7ff2815bdd0d5a7466220056664c0055c367a6e124b2ead58ab5 WHIRLPOOL 7aeef998737ffc9b310d024acb1e6486ad4d89baf7915d43d568d0f70f5be166789cff49d9e0cdab8dcb0eca0ef01a402d04698181142f15b0d8d67a156e0870 +EBUILD batik-1.9.ebuild 2608 SHA256 c58a4914f6a0be5ae24c48605c4643a51778c40f263c42aaa590f9741a26cedb SHA512 6dee45bb334ede236b28e376b68526d30c5347441c62687c9f2f062f888174ca59ebe382075df5d14e860384ccc103d1ebdc907dfd40d25d5e87fc78f05834b7 WHIRLPOOL 2f91b0d6cb53e4f1928adff59f961ea5a1da4318086c4da922fc8e26e26d6b7153398a0772474264afa7f8d02c38f46835adfd4335b8a89bc1fa7b35c6d38709 MISC ChangeLog 3620 SHA256 0b43cc1247da402248b67498fb9df4f36a0f605af8038570928295badbd45cde SHA512 c146c21cda7a3aeb594c8faa07700e4f00abe9fc09cf93684387f636b1a5a8f0f853c38b963d31ba0807887c4d8c8f0b48ad521304d46c3d91542f3357e3533f WHIRLPOOL cf2e350c01e7509de30d04a445201bbd05532924f6bc29e213e36f3508f1c24d2aab07a8f757915dfda78f5f27a0b07fbc9313627b3001cfeaa13f5ac9e30f3e MISC ChangeLog-2015 11934 SHA256 b4e2e276895ae399799cbd0b38c7f0e6cdf25d36f2edb18a18f7204d116544d0 SHA512 6360dd5b278ba7904c01f65b5d9a9d972d319619eb4b072f8d240300465818ef7970781481689eea1b68f2a074022f615017db63ccf35fad4eeeee3fedbb7112 WHIRLPOOL 4415633e4890b6ae8586143d4b35fc264ce4f47d3ea7fcd8d36c7fb6e0027ce096ab17da6bdb3982cfdffc16aa898db2489f5270513d8f5d4880209d0ee12e93 MISC metadata.xml 449 SHA256 959a37e00aaddd59eefd32174bb0673c788c6584b1db2efafda815e1b8122217 SHA512 e437217b578831129aa80be572fd1044db0ee1c0afb0af0538dbed3e7d2ba739062eca68053426c79433ec03128ea0116a4a92be4d1946e20968be3fe89a4e02 WHIRLPOOL e09cb97ce753b75a0d7e8533ceb8e09a84faa460b18cf59ae64558815424f9221388e6c223b0ede50efc4d8c5b5d5870e345c1ebd0c069446a5b5a17a5812d00 diff --git a/dev-java/batik/batik-1.8-r3.ebuild b/dev-java/batik/batik-1.8-r3.ebuild deleted file mode 100644 index 68d9e0c96d64..000000000000 --- a/dev-java/batik/batik-1.8-r3.ebuild +++ /dev/null @@ -1,124 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -JAVA_PKG_IUSE="doc" - -inherit java-pkg-2 java-ant-2 eutils - -DESCRIPTION="Java based SVG toolkit" -HOMEPAGE="https://xmlgraphics.apache.org/batik/" -SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/source/${PN}-src-${PV}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1.8" -KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" -IUSE="doc python tcl" - -CDEPEND=" - dev-java/xalan:0 - dev-java/rhino:1.6 - dev-java/xml-commons-external:1.3 - dev-java/xmlgraphics-commons:2 - python? ( - dev-java/jython:2.7 - ) - tcl? ( - dev-java/jacl:0 - ) - dev-java/ant-core:0" - -DEPEND=" - >=virtual/jdk-1.6 - ${CDEPEND}" - -RDEPEND=" - >=virtual/jre-1.6 - ${CDEPEND}" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH=" - xml-commons-external-1.3 - xmlgraphics-commons-2 - xalan - rhino-1.6 -" - -java_prepare() { - # bug #318323 - for file in build.xml contrib/rasterizertask/build.xml; do - java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m - done - - # Add some missing imports to avoid a compiling issue. - # https://bugs.gentoo.org/show_bug.cgi?id=551952 - # https://issues.apache.org/jira/browse/BATIK-1123 - local imports=() - imports+=(sources/org/apache/batik/script/jpython/JPythonInterpreterFactory.java) - imports+=(sources/org/apache/batik/script/jacl/JaclInterpreterFactory.java) - for import in ${imports[@]}; do - einfo "Fixing missing import in ${import}" - sed -i '23i import org.apache.batik.script.ImportInfo;' ${import} || die - eend $? - done - - cd lib || die - rm -v *.jar build/*.jar || die - use python && java-pkg_jar-from jython-2.7 - use tcl && java-pkg_jar-from jacl -} - -src_compile() { - # Fails to build on amd64 without this - if use amd64 ; then - export ANT_OPTS="-Xmx1g" - else - export ANT_OPTS="-Xmx256m" - fi - - eant jars all-jar $(use_doc) - cd contrib/rasterizertask || die - eant -Dgentoo.classpath="$(java-pkg_getjar ant-core ant.jar):../../classes" jar $(use_doc) - - # batik-all-1.8.jar is a all-in-one jar that contains all other jars. - # We don't want to package it. - # No actually we do. See bug 556062. - # cd "${S}"/"${P}/lib" || die - # rm -v ${PN}-all-${PV}.jar || die -} - -src_install() { - batik_unversion_jars() { - for jar in batik-*.jar; do - newj="${jar%-*}.jar" - java-pkg_newjar ${jar} ${newj} - done - } - - # First unversion jars in ${P}/lib - cd "${S}"/"${P}"/lib || die - batik_unversion_jars - - # Then, only those in ${P} - cd "${S}"/"${P}" || die - batik_unversion_jars - - # Proceed with documentation installation - cd "${S}" || die - dodoc README CHANGES - use doc && java-pkg_dojavadoc ${P}/docs/javadoc - - # pwd fixes bug #116976 - java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \ - --main org.apache.batik.apps.svgbrowser.Main - - # To find these lsjar batik-${SLOT} | grep Main.class - for launcher in ttf2svg slideshow svgpp rasterizer; do - java-pkg_dolauncher batik-${launcher}-${SLOT} \ - --main org.apache.batik.apps.${launcher}.Main - done - - # Install and register the ant task. - java-pkg_dojar contrib/rasterizertask/build/lib/RasterizerTask.jar - java-pkg_register-ant-task -} diff --git a/dev-java/batik/batik-1.9.ebuild b/dev-java/batik/batik-1.9.ebuild index 19ae6d955c94..ab95a4c9432a 100644 --- a/dev-java/batik/batik-1.9.ebuild +++ b/dev-java/batik/batik-1.9.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://apache.mirrors.ovh.net/ftp.apache.org/dist/xmlgraphics/${PN}/sou LICENSE="Apache-2.0" SLOT="1.9" -KEYWORDS="~amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="doc python tcl" CDEPEND=" @@ -26,28 +26,33 @@ CDEPEND=" dev-java/xml-commons-external:1.3" DEPEND=" - >=virtual/jdk-1.6 - ${CDEPEND}" + ${CDEPEND} + >=virtual/jdk-1.6" RDEPEND=" - >=virtual/jre-1.6 - ${CDEPEND}" + ${CDEPEND} + >=virtual/jre-1.6" JAVA_ANT_REWRITE_CLASSPATH="true" EANT_GENTOO_CLASSPATH=" xml-commons-external-1.3 xmlgraphics-commons-2 - xalan rhino-1.6 -" + xalan" -java_prepare() { - # bug #318323 +src_prepare() { + default + + # See bug 318323. + local file for file in build.xml contrib/rasterizertask/build.xml; do java-ant_xml-rewrite -f ${file} -c -e javadoc -a failonerror -v no -a maxmemory -v 512m done + # See bug 628812. + use tcl && epatch "${FILESDIR}/${P}-ImportInfo.patch" + cd lib || die rm -v *.jar build/*.jar || die use python && java-pkg_jar-from jython-2.7 @@ -66,6 +71,7 @@ src_compile() { src_install() { batik_unversion_jars() { + local jar for jar in batik-*.jar; do newj="${jar%-*}.jar" java-pkg_newjar ${jar} ${newj} @@ -85,11 +91,13 @@ src_install() { dodoc README CHANGES use doc && java-pkg_dojavadoc "${P}/docs/javadoc" - # pwd fixes bug #116976 - java-pkg_dolauncher batik-${SLOT} --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \ + # See bug #116976. + java-pkg_dolauncher "batik-${SLOT}" \ + --pwd "${EPREFIX}/usr/share/${PN}-${SLOT}/" \ --main org.apache.batik.apps.svgbrowser.Main # To find these lsjar batik-${SLOT} | grep Main.class + local launcher for launcher in ttf2svg slideshow svgpp rasterizer; do java-pkg_dolauncher batik-${launcher}-${SLOT} \ --main org.apache.batik.apps.${launcher}.Main diff --git a/dev-java/batik/files/batik-1.9-ImportInfo.patch b/dev-java/batik/files/batik-1.9-ImportInfo.patch new file mode 100644 index 000000000000..103b99e1b967 --- /dev/null +++ b/dev-java/batik/files/batik-1.9-ImportInfo.patch @@ -0,0 +1,10 @@ +--- a/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java 2017-10-28 17:24:11.401276868 +0000 ++++ b/batik-script/src/main/java/org/apache/batik/script/jacl/JaclInterpreterFactory.java 2017-10-28 17:27:13.314255999 +0000 +@@ -20,6 +20,7 @@ + + import java.net.URL; + ++import org.apache.batik.script.ImportInfo; + import org.apache.batik.script.Interpreter; + import org.apache.batik.script.InterpreterFactory; + |