commit: b70ab544d738c4522d5ae675123ce51b91fd9a57 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Wed Jun 24 17:02:48 2015 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Wed Jun 24 17:02:48 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=b70ab544
batik-1.6 is no longer required and might even be vulnerable. dev-java/batik/ChangeLog | 253 --------------------- dev-java/batik/Manifest | 20 -- dev-java/batik/batik-1.6-r4.ebuild | 96 -------- .../batik/files/batik-1.6-dont-copy-deps.patch | 16 -- dev-java/batik/files/batik-1.6-jikes.patch | 30 --- dev-java/batik/metadata.xml | 10 - 6 files changed, 425 deletions(-) diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog deleted file mode 100644 index 9b2c851..0000000 --- a/dev-java/batik/ChangeLog +++ /dev/null @@ -1,253 +0,0 @@ -# ChangeLog for dev-java/batik -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.62 2009/07/23 13:14:44 ali_bush Exp $ - - 07 Jun 2012; Ralph Sennhauser <[email protected]> batik-1.6-r4.ebuild: - EAPI declaration must be first. #402167 - No stable keywords in java-overlay. - - 31 Dec 2011; Ralph Sennhauser <[email protected]> batik-1.6-r4.ebuild: - Remove ia64 support #345433 - - 03 Oct 2009; Vlastimil Babka <[email protected]> +batik-1.6-r4.ebuild, - +files/batik-1.6-dont-copy-deps.patch, +files/batik-1.6-jikes.patch, - +metadata.xml: - Move batik:1.6 from portage (no more reverse deps) to java-overlay (some - reverse deps). - - 23 Jul 2009; Alistair Bush <[email protected]> batik-1.6-r3.ebuild: - Constrain jython dependency so it doesn't pulling 2.5 slot. - - 19 Jul 2009; nixnut <[email protected]> batik-1.6-r4.ebuild, - batik-1.7-r2.ebuild: - ppc stable #274795 - - 04 Jul 2009; Brent Baude <[email protected]> batik-1.7-r2.ebuild: - Marking batik-1.7-r2 ppc64 for bug 274795 - - 28 Jun 2009; Markus Meier <[email protected]> batik-1.6-r4.ebuild: - amd64/x86 stable, bug #274796 - - 28 Jun 2009; Markus Meier <[email protected]> batik-1.7-r2.ebuild: - amd64/x86 stable, bug #274795 - -*batik-1.7-r2 (20 May 2009) - - 20 May 2009; Vlastimil Babka <[email protected]> +batik-1.7-r2.ebuild: - Version bump, bug #200851. - - 20 May 2009; Vlastimil Babka <[email protected]> batik-1.6-r4.ebuild: - Cleanup - -*batik-1.6-r4 (20 May 2009) - - 20 May 2009; Vlastimil Babka <[email protected]> +batik-1.6-r4.ebuild: - Revbump to add and register RasterizerTask. From java-overlay by serkan. - - 20 Jan 2008; Vlastimil Babka <[email protected]> -batik-1.5-r1.ebuild, - batik-1.6-r3.ebuild: - Remove security vulnerable 1.5 (bug #206651) as it turned out nothing - depends on it anymore. Fix quoting and don't dodoc LICENSE in 1.6. - - 15 Nov 2007; Petteri Räty <[email protected]> -batik-1.6-r1.ebuild, - -batik-1.6-r2.ebuild: - Delete old revisions. - - 11 Nov 2007; Samuli Suominen <[email protected]> batik-1.6-r3.ebuild: - amd64 stable wrt #195048, thanks to Kenneth Prugh for testing. - - 12 Oct 2007; Lars Weiler <[email protected]> batik-1.6-r3.ebuild: - stable ppc, bug #195048 - - 08 Oct 2007; Christian Faulhammer <[email protected]> batik-1.6-r3.ebuild: - stable x86, bug 195048 - - 08 May 2007; Raúl Porcel <[email protected]> batik-1.6-r3.ebuild: - Add ~ia64 wrt #177466 - - 14 Feb 2007; Markus Rothe <[email protected]> batik-1.5-r1.ebuild: - Added ~ppc64 - - 13 Feb 2007; Markus Rothe <[email protected]> batik-1.6-r3.ebuild: - Added ~ppc64; bug #153229 - - 03 Feb 2007; nixnut <[email protected]> batik-1.5-r1.ebuild: - Stable on ppc wrt bug 154185 - - 14 Jan 2007; Petteri Räty <[email protected]> batik-1.6-r3.ebuild: - Made jython dependency optional with the python use flag and added a tcl use - flag. - - 14 Jan 2007; Petteri Räty <[email protected]> -batik-1.5.1-r5.ebuild: - Removed 1.5.1 slot because nothing is using it. - -*batik-1.6-r3 (08 Jan 2007) - - 08 Jan 2007; Vlastimil Babka <[email protected]> - +files/batik-1.6-dont-copy-deps.patch, batik-1.5.1-r5.ebuild, - +batik-1.6-r3.ebuild: - Fix javadoc install location wrt bug #160835 by Alistair Bush - <[email protected]>. Don't install xdocs, we will need stylebook to - transform them to html first. Prevents copying jython.jar into own lib dir. - - 29 Nov 2006; Joshua Nichols <[email protected]> batik-1.5-r1.ebuild: - Added ~ia64. - - 29 Nov 2006; Joshua Nichols <[email protected]> -batik-1.5.ebuild, - -batik-1.5.1-r4.ebuild, -batik-1.6.ebuild: - Dropped old revisions with newer revisions with equivalent keywords. - - 23 Nov 2006; <[email protected]> batik-1.5-r1.ebuild, - batik-1.5.1-r5.ebuild, batik-1.6-r1.ebuild: - stable on amd64 - - 10 Nov 2006; nixnut <[email protected]> batik-1.5.1-r5.ebuild, - batik-1.6-r1.ebuild: - Stable on ppc wrt bug 154185 - - 06 Nov 2006; Christian Faulhammer <[email protected]> batik-1.5-r1.ebuild, - batik-1.5.1-r5.ebuild, batik-1.6-r1.ebuild: - stable x86, bug #154185 - -*batik-1.6-r2 (05 Nov 2006) - - 05 Nov 2006; Petteri Räty <[email protected]> +batik-1.6-r2.ebuild: - Added launchers for ttf2svg, slideshow, svgpp and rasterizer tools. - - 05 Nov 2006; Petteri Räty <[email protected]> batik-1.6-r1.ebuild: - Added missing dependency on dev-java/jython. - - 05 Oct 2006; Gustavo Zacarias <[email protected]> batik-1.5.ebuild, - batik-1.5-r1.ebuild, batik-1.5.1-r4.ebuild, batik-1.5.1-r5.ebuild, - batik-1.6.ebuild, batik-1.6-r1.ebuild: - Dropping sparc keywords, see #96229 - - 02 Oct 2006; Joshua Nichols <[email protected]> batik-1.5-r1.ebuild: - Added missing dependency on jython. - -*batik-1.6-r1 (20 Sep 2006) -*batik-1.5.1-r5 (20 Sep 2006) -*batik-1.5-r1 (20 Sep 2006) - - 20 Sep 2006; Vlastimil Babka <[email protected]> +batik-1.5-r1.ebuild, - +batik-1.5.1-r5.ebuild, +batik-1.6-r1.ebuild: - Revision bumps to use new generation-2 java eclasses. Fixes bug #146326 and - also #116976. - - 23 Jan 2006; Petteri Räty <[email protected]> +batik-1.5.ebuild: - Added batik-1.5 back because it is needed by dev-java/fop. - - 23 Jan 2006; Karl Trygve Kalleberg <[email protected]> -batik-1.5.ebuild: - Removed old revision. - - 08 Jan 2006; Joshua Nichols <[email protected]> batik-1.5.ebuild: - Marked stable on amd64. - - 08 Jan 2006; Petteri Räty <[email protected]> batik-1.5.ebuild: - Marked stable on x86. - - 11 Dec 2005; Joshua Nichols <[email protected]> batik-1.5.ebuild, - batik-1.5.1-r4.ebuild, batik-1.6.ebuild: - Loosened xerces dependency (bug #115158). - -*batik-1.6 (10 Sep 2005) - - 10 Sep 2005; Thomas Matthijs <[email protected]> - +files/batik-1.6-jikes.patch, +batik-1.6.ebuild: - Version bump, thanks too Josh Nichols in 101844 - - 26 Aug 2005; Diego Pettenò <[email protected]> batik-1.5.1-r4.ebuild: - Fix cp -a usage for Gentoo/FreeBSD. - - 12 Jul 2005; Thomas Matthijs <[email protected]> batik-1.5.ebuild, - batik-1.5.1-r4.ebuild: - Dep fixes - - 28 Jun 2005; Gustavo Zacarias <[email protected]> batik-1.5.1-r4.ebuild: - Stable on sparc - -*batik-1.5 (12 Jun 2005) - - 12 Jun 2005; Jan Brinkmann <[email protected]> +batik-1.5.ebuild: - Readded 1.5 - - 12 Jun 2005; Jan Brinkmann <[email protected]> -batik-1.5.ebuild, - -batik-1.5.1.ebuild, -batik-1.5.1-r3.ebuild, batik-1.5.1-r4.ebuild: - Added xml-commons dependency, xml-apis.jar doesnt belong to xerces. See #82561. - - 18 May 2005; Jan Brinkmann <[email protected]> batik-1.5.1-r4.ebuild: - stable on amd64, ppc and x86 - -*batik-1.5.1-r4 (20 Mar 2005) - - 20 Mar 2005; Jan Brinkmann <[email protected]> +batik-1.5.1-r4.ebuild, - +batik-1.5.ebuild: - version 1.5 is needed to remove the packed jar issue from dev-java/fop, see - #63262. now all jars are accessible by jar-from, java-config -p etc - - 18 Feb 2005; Saleem Abdulrasool <[email protected]> - batik-1.5.1-r3.ebuild: - Added memory check; Resolves bug #82377 - -*batik-1.5.1-r3 (29 Jan 2005) - - 29 Jan 2005; Jan Brinkmann <[email protected]> -batik-1.5.1-r2.ebuild, - +batik-1.5.1-r3.ebuild: - updated (R)DEPEND to reflect rhino SLOT changes. - - 03 Nov 2004; Thomas Matthijs <[email protected]> batik-1.5.1-r2.ebuild, - batik-1.5.1.ebuild: - depend on app-arch/unzip - -*batik-1.5.1-r2 (26 Oct 2004) - - 26 Oct 2004; Thomas Matthijs <[email protected]> -batik-1.5.1-r1.ebuild, - +batik-1.5.1-r2.ebuild: - add wrapper script #68147 - - 16 Oct 2004; Thomas Matthijs <[email protected]> batik-1.5.1-r1.ebuild, - batik-1.5.1.ebuild: - use java-pkg_dohtml instead of dohtml to also install the package-list in - case of api docs: #50740 - -*batik-1.5.1-r1 (19 Sep 2004) - - 19 Sep 2004; Thomas Matthijs <[email protected]> +batik-1.5.1-r1.ebuild: - no longer uses packed jars - - 13 Aug 2004; Chris Aniszczyk <[email protected]> -batik-1.5.ebuild: - Clean up - -*batik-1.5.1 (13 Aug 2004) - - 13 Aug 2004; Chris Aniszczyk <[email protected]> +batik-1.5.1.ebuild: - Version bump - - 27 Jun 2004; Chris Aniszczyk <[email protected]> batik-1.5.ebuild: - Marking stable on ppc - - 18 Apr 2004; Chris Aniszczyk <[email protected]> batik-1.5.ebuild: - Removing jikes from USE, jikes failed to build batik properly. Closes #47661 - - 05 Apr 2004; Chris Aniszczyk <[email protected]> batik-1.1.1.ebuild: - Clean up. - - 15 Feb 2004; Chris Aniszczyk <[email protected]> batik-1.5.ebuild: - Minor fix. - - 15 Feb 2004; Chris Aniszczyk <[email protected]> batik-1.5.ebuild: - Fixed Bug #29045 - -*batik-1.5 (15 Feb 2004) - - 15 Feb 2004; Chris Aniszczyk <[email protected]> batik-1.5.ebuild: - Version Bump + Misc Fixes. Bug #30308 - -*batik-1.1.1 (27 Apr 2003) - - 27 Apr 2003; Todd Berman <[email protected]> batik-1.1.1.ebuild: - Fixed up some small issues, and using ant jars instead of ant dist-tgz - - 27 Apr 2003; Todd Berman <[email protected]> batik-1.1.1.ebuild: - Initial import. - diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest deleted file mode 100644 index e0830d7..0000000 --- a/dev-java/batik/Manifest +++ /dev/null @@ -1,20 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX batik-1.6-dont-copy-deps.patch 425 RMD160 9d3b0eeacd146c7211404a264d89f78aa8fc5231 SHA1 fc5737e3b1c05ebdfda5e7e646bc3645ccd036b5 SHA256 47a51f54506512eeddd9efda60981205fcb10c207ecfbcd2cd8335db71099dc1 -AUX batik-1.6-jikes.patch 1738 RMD160 dad6e19c6be0ab4acddbe591212c1d3bdbbb7ea8 SHA1 306999c975f50b90a0c94a2a5b08599ee825ed05 SHA256 6aeb43feae39c7805abbc439e64f1db3d7696727e9d97cb443baa980b9f83355 -DIST batik-src-1.6.zip 10199668 RMD160 a6d32d881827fa47b294c57442b2e0efd87caf85 SHA1 d04ece76f29aad2a4ae1773b161f41a15011f61b SHA256 e1c69fb68e4b6710c246f44157bc4f3f021bdb2f2cedb8112bc025e3a4877a2c -EBUILD batik-1.6-r4.ebuild 2493 RMD160 09102dc91d687f5ffbfb6be621eb7f5b51d52143 SHA1 4c6c77673d3b81546491d35d1e5190da9699e755 SHA256 aaed6cc40df1aa0dc8a55ad3c119e4782245a218e7bb77fc8cd8ea3040537ec7 -MISC ChangeLog 8779 RMD160 d6c862b1450c9445d00b4024734e0856409bf14e SHA1 c0470f0f3630b698d75a7ce7ecad20ba3e6f4ea0 SHA256 784ff4c1f41b541975666a896d132273a79ab11c47fdce4bccf6fc095d6564e6 -MISC metadata.xml 374 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 SHA1 5626acb9b3091acbf59b8d69c0ba46f525ee0ce5 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iQEcBAEBAgAGBQJP0F/eAAoJEIUJ+svaV163r8UH/joFPxl+VcqDBruaz5ZVJDu3 -D6jW7hbLAEs2q0foZjV+i00pNbOTN1LiMorqHKrLG3uBSwkNiUaFZ5Ix5QpCi81+ -88QnjY3KrXYPX27uAR+X+ohKpclto78rWCw6do7nJ5g2lsFdKT6w32Rbksc9hl2o -aTNV+VQQHJi27m0L3VSztfQaX2H5Nlm1KqommbAt5LFePMvl54jAX6fFgHKPqX6E -+gRIHPpesssPK450EHsjh6bMZWY5lQFb0ZOkmcr709S/yMF6+ysTgBTf5SChFFri -Qz2nD75K3woSDqSp3mYLnfBYCXVDeNjwvbqBmLxFralQLTjAwiWsUNwXlaw5JyU= -=sanQ ------END PGP SIGNATURE----- diff --git a/dev-java/batik/batik-1.6-r4.ebuild b/dev-java/batik/batik-1.6-r4.ebuild deleted file mode 100644 index 4834e27..0000000 --- a/dev-java/batik/batik-1.6-r4.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r4.ebuild,v 1.4 2009/07/19 14:02:16 nixnut Exp $ - -EAPI=2 - -JAVA_PKG_IUSE="doc" -inherit java-pkg-2 java-ant-2 eutils - -DESCRIPTION="Java based SVG toolkit" -HOMEPAGE="http://xml.apache.org/batik/"; -SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip" - -LICENSE="Apache-2.0" -SLOT="1.6" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="python tcl" - -CDEPEND="dev-java/rhino:1.5 - dev-java/xerces:2 - dev-java/xml-commons-external:1.3 - python? ( dev-java/jython:0 ) - tcl? ( dev-java/jacl:0 ) - dev-java/ant-core" -DEPEND="=virtual/jdk-1.4* - app-arch/unzip - ${CDEPEND}" -RDEPEND=">=virtual/jre-1.4 - ${CDEPEND}" - -S="${WORKDIR}/xml-${PN}" - -java_prepare() { - epatch "${FILESDIR}/${P}-jikes.patch" - epatch "${FILESDIR}/${P}-dont-copy-deps.patch" - - java-ant_ignore-system-classes - java-ant_rewrite-classpath contrib/rasterizertask/build.xml - cd lib - rm -f *.jar build/*.jar - - java-pkg_jar-from xml-commons-external-1.3 - java-pkg_jar-from xerces-2 - # Can't make rhino optional because - # apps/svgbrowser needs it - java-pkg_jar-from rhino-1.5 - use python && java-pkg_jar-from jython - 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) -} - -src_install() { - java-pkg_dojar ${P}/batik*.jar - - cd ${P}/lib - - # needed because batik expects this layout: - # batik.jar lib/*.jar - # there are hardcoded classpaths in the manifest :( - dodir /usr/share/${PN}-${SLOT}/lib/lib/ - for jar in *.jar - do - java-pkg_dojar ${jar} - dosym ../${jar} /usr/share/${PN}-${SLOT}/lib/lib/${jar} - done - - cd "${S}" - dodoc README || die "dodoc failed" - use doc && java-pkg_dojavadoc ${P}/docs/javadoc - - # pwd fixes bug #116976 - java-pkg_dolauncher batik-${SLOT} --pwd "/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/files/batik-1.6-dont-copy-deps.patch b/dev-java/batik/files/batik-1.6-dont-copy-deps.patch deleted file mode 100644 index 5397b6e..0000000 --- a/dev-java/batik/files/batik-1.6-dont-copy-deps.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- build.xml 2007-01-08 11:44:12.000000000 +0100 -+++ build.xml 2007-01-08 11:46:19.000000000 +0100 -@@ -457,11 +457,13 @@ - rasterizer-jar, - rasterizer-ext-jar, - ttf2svg-jar"> -+ <!-- - <copy todir="${build}/lib"> - <fileset dir="${lib}"> - <include name="*.jar"/> - </fileset> - </copy> -+ --> - </target> - - diff --git a/dev-java/batik/files/batik-1.6-jikes.patch b/dev-java/batik/files/batik-1.6-jikes.patch deleted file mode 100644 index 25e3751..0000000 --- a/dev-java/batik/files/batik-1.6-jikes.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -ru xml-batik/sources/org/apache/batik/ext/awt/image/rendered/LRUCache.java xml-batik-patched/sources/org/apache/batik/ext/awt/image/rendered/LRUCache.java ---- xml-batik/sources/org/apache/batik/ext/awt/image/rendered/LRUCache.java 2004-08-18 03:14:08.000000000 -0400 -+++ xml-batik-patched/sources/org/apache/batik/ext/awt/image/rendered/LRUCache.java 2005-08-09 19:18:20.000000000 -0400 -@@ -33,12 +33,12 @@ - * should be remembered so it can be returned by - * <tt>lruGet</tt>. - */ -- public void lruSet(LRUNode nde); -+ public void lruSet(LRUCache.LRUNode nde); - /** - * Called to get the LRU node for this object. Should return the - * node passed in to lruSet. - */ -- public LRUNode lruGet(); -+ public LRUCache.LRUNode lruGet(); - /** - * Called to inform the object that it is no longer in the cache. - */ -diff -ru xml-batik/sources/org/apache/batik/script/rhino/RhinoInterpreter.java xml-batik-patched/sources/org/apache/batik/script/rhino/RhinoInterpreter.java ---- xml-batik/sources/org/apache/batik/script/rhino/RhinoInterpreter.java 2005-03-29 05:48:02.000000000 -0500 -+++ xml-batik-patched/sources/org/apache/batik/script/rhino/RhinoInterpreter.java 2005-08-09 19:16:33.000000000 -0400 -@@ -418,7 +418,7 @@ - public Object get(ScriptableObject so) { - Context ctx = Context.getCurrentContext(); - if (ctx == null ) return null; -- return ((ExtendedContext)ctx).getInterpreter().objects.get(name); -+ return ((RhinoInterpreter.ExtendedContext)ctx).getInterpreter().objects.get(name); - } - } - // The method to use for getting the value from the diff --git a/dev-java/batik/metadata.xml b/dev-java/batik/metadata.xml deleted file mode 100644 index d44ab74..0000000 --- a/dev-java/batik/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<herd>java</herd> -<longdescription> - Java toolkit for applications or applets that want to use - images in the Scalable Vector Graphics (SVG) format for various - purposes, such as viewing, generation or manipulation. -</longdescription> -</pkgmetadata>
