Added xml-commons dependency, xml-apis.jar doesnt belong to xerces. See #82561.

(Portage version: 2.0.51.22-r1)

9 files changed, 23 insertions, 198 deletions

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index eec301a17522..687419c06a0e 100644
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/batik
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.21 2005/05/18 18:10:44 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.22 2005/06/12 18:47:30 luckyduck Exp $
+
+  12 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org> -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 <luckyduck@gentoo.org> batik-1.5.1-r4.ebuild:
   stable on amd64, ppc and x86
diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index bc59a80c498f..4e6efa47b280 100644
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,20 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 abf071e9289c9c21e6f13071ee84145b batik-1.5.1-r3.ebuild 1737
-MD5 914f1ad23f39cbaa68716d2557b2c956 batik-1.5.1.ebuild 1050
-MD5 6281ce8e3c5cb53660c67ff2d54a27e9 ChangeLog 2569
+MD5 d5f51b631467d33b0c9d4b03bd78e981 ChangeLog 2793
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 d50d4a0651c208fba7ac5babaf17b0de batik-1.5.1-r4.ebuild 1710
-MD5 d2308fcfb3acb01163e6360a14dc4524 batik-1.5.ebuild 1716
-MD5 479ed0922a69b318b40b485614a6af16 files/digest-batik-1.5 63
-MD5 2773f6aa10bcb901bd07ea509571ccef files/digest-batik-1.5.1 66
-MD5 2773f6aa10bcb901bd07ea509571ccef files/digest-batik-1.5.1-r3 66
+MD5 e221cdf78d9060423e2c99949545da25 batik-1.5.1-r4.ebuild 1736
 MD5 2773f6aa10bcb901bd07ea509571ccef files/digest-batik-1.5.1-r4 66
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iD8DBQFCi4VC06ebR+OMO78RAltUAJ4k7ztiQpiAaE5QYzYsKqGJrwRR6wCeLjl5
-Hc2wwb6aEgMbc6pE488b228=
-=hS9+
------END PGP SIGNATURE-----
diff --git a/dev-java/batik/batik-1.5.1-r3.ebuild b/dev-java/batik/batik-1.5.1-r3.ebuild
deleted file mode 100644
index cd9564cd5d15..000000000000
--- a/dev-java/batik/batik-1.5.1-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r3.ebuild,v 1.3 2005/03/19 23:48:11 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Batik is a Java(tm) technology based 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."
-SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
-HOMEPAGE="http://xml.apache.org/batik/"
-IUSE="doc"
-DEPEND=">=virtual/jdk-1.3
-		=dev-java/rhino-1.5*
-		dev-java/fop
-		app-arch/unzip
-		>=dev-java/xerces-2.6.2-r1
-		dev-java/ant"
-RDEPEND=">=virtual/jdk-1.3"
-LICENSE="Apache-1.1"
-SLOT="1.5.1"
-KEYWORDS="x86 ~sparc ~ppc"
-
-S=${WORKDIR}/xml-batik
-
-src_unpack() {
-	jar xvf ${DISTDIR}/${PN}-src-${PV}.zip
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from rhino-1.5
-	java-pkg_jar-from fop
-}
-
-src_compile() {
-	if [ $(memory) -lt 262144 ] ; then
-		echo
-		ewarn "To build batik, atleast 256MB of RAM is recommended."
-		ewarn "Your system has less than 256MB of RAM, continuing anyways."
-		echo
-
-		export ANT_OPTS=-Xmx256m
-	fi
-
-	local antflags="jars"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install () {
-	java-pkg_dojar ${P}/batik*.jar
-	insinto /usr/share/${PN}-${SLOT}/lib/lib
-	doins ${P}/lib/batik*.jar
-
-	dodoc README LICENSE
-	use doc && java-pkg_dohtml -r ${P}/docs/
-
-	echo "#!/bin/sh" > ${PN}
-	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik-1.5.1,xerces-2,rhino-1.5,fop) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}
-	dobin ${PN}
-
-}
-
-function memory() {
-	cat /proc/meminfo | grep Memtotal | sed -r "s/[^0-9]*([0-9]+).*/\1/"
-}
diff --git a/dev-java/batik/batik-1.5.1-r4.ebuild b/dev-java/batik/batik-1.5.1-r4.ebuild
index b8508178f583..91e39eb47f00 100644
--- a/dev-java/batik/batik-1.5.1-r4.ebuild
+++ b/dev-java/batik/batik-1.5.1-r4.ebuild
@@ -1,31 +1,34 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r4.ebuild,v 1.3 2005/05/18 18:10:44 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r4.ebuild,v 1.4 2005/06/12 18:47:30 luckyduck Exp $
 
 inherit java-pkg
 
 DESCRIPTION="Batik is a Java(tm) technology based 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."
-SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
 HOMEPAGE="http://xml.apache.org/batik/"
+SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
+
+LICENSE="Apache-1.1"
+SLOT="1.5.1"
+KEYWORDS="x86 ~sparc ppc amd64"
 IUSE="doc"
+
 DEPEND=">=virtual/jdk-1.3
-	=dev-java/rhino-1.5*
 	app-arch/unzip
-	=dev-java/xerces-2.6*
 	dev-java/ant-core"
-RDEPEND=">=virtual/jdk-1.3"
-LICENSE="Apache-1.1"
-SLOT="1.5.1"
-KEYWORDS="x86 ~sparc ppc amd64"
+RDEPEND=">=virtual/jdk-1.3
+	=dev-java/rhino-1.5*
+	=dev-java/xerces-2.6*
+	dev-java/xml-commons"
 
 S=${WORKDIR}/xml-batik
 
 src_unpack() {
-	jar xf ${DISTDIR}/${PN}-src-${PV}.zip
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from xerces-2
+	unzip -q ${DISTDIR}/${A}
+
+	cd ${S}/lib && rm -f *.jar
 	java-pkg_jar-from rhino-1.5
+	java-pkg_jar-from xerces-2
 }
 
 src_compile() {
@@ -57,7 +60,7 @@ src_install () {
 	use doc && java-pkg_dohtml -r ${P}/docs/
 
 	echo "#!/bin/sh" > ${PN}${SLOT}
-	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik-1.5.1,xerces-2,rhino-1.5) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}${SLOT}
+	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik-1.5.1,xerces-2,xml-commons,rhino-1.5) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}${SLOT}
 	dobin ${PN}${SLOT}
 
 }
diff --git a/dev-java/batik/batik-1.5.1.ebuild b/dev-java/batik/batik-1.5.1.ebuild
deleted file mode 100644
index c176fa8525f2..000000000000
--- a/dev-java/batik/batik-1.5.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1.ebuild,v 1.4 2005/01/01 18:09:41 eradicator Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Batik is a Java(tm) technology based 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."
-SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
-HOMEPAGE="http://xml.apache.org/batik/"
-IUSE="doc"
-DEPEND=">=virtual/jdk-1.3
-		app-arch/unzip
-		dev-java/ant"
-RDEPEND=">=virtual/jdk-1.3"
-LICENSE="Apache-1.1"
-SLOT="0"
-KEYWORDS="x86 ~sparc ppc"
-
-S=${WORKDIR}/xml-batik
-
-src_unpack() {
-	jar xvf ${DISTDIR}/${PN}-src-${PV}.zip
-}
-
-src_compile() {
-	local antflags="jars"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install () {
-	java-pkg_dojar ${P}/batik*.jar
-	insinto /usr/share/${PN}/lib/lib
-	doins ${P}/lib/*.jar
-
-	dodoc README LICENSE
-	use doc && java-pkg_dohtml -r ${P}/docs/
-}
diff --git a/dev-java/batik/batik-1.5.ebuild b/dev-java/batik/batik-1.5.ebuild
deleted file mode 100644
index 16ca91f789c5..000000000000
--- a/dev-java/batik/batik-1.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.ebuild,v 1.9 2005/03/19 23:48:11 luckyduck Exp $
-
-inherit java-pkg
-
-DESCRIPTION="Batik is a Java(tm) technology based 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."
-SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
-HOMEPAGE="http://xml.apache.org/batik/"
-IUSE="doc"
-DEPEND=">=virtual/jdk-1.3
-		=dev-java/rhino-1.5*
-		app-arch/unzip
-		>=dev-java/xerces-2.6.2-r1
-		dev-java/ant"
-RDEPEND=">=virtual/jdk-1.3"
-LICENSE="Apache-1.1"
-SLOT="1.5"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-
-S=${WORKDIR}/xml-batik
-
-src_unpack() {
-	jar xf ${DISTDIR}/${PN}-src-${PV}.zip
-	cd ${S}/lib
-	rm -f *.jar
-	java-pkg_jar-from xerces-2
-	java-pkg_jar-from rhino-1.5
-}
-
-src_compile() {
-	export ANT_OPTS=-Xmx256m
-	local antflags="jars all-jar"
-	ant ${antflags} || die "compile problem"
-}
-
-src_install () {
-	java-pkg_dojar ${P}/batik*.jar
-
-	cd ${P}/lib
-	rm {js,x*}.jar
-
-	# needed because batik expects this layout:
-	# batik.jar lib/*.jar
-	# there are hardcoded classpathes in the manifest :(
-	for jar in *.jar
-	do
-		java-pkg_dojar ${jar}
-		rm -f ${jar}
-		ln -s ${DESTTREE}/share/${PN}-${SLOT}/lib/${jar} ${jar}
-	done
-
-	cd ${S}
-	cp -ra ${P}/lib ${D}${DESTTREE}/share/${PN}-${SLOT}/lib/
-
-	dodoc README LICENSE
-	use doc && java-pkg_dohtml -r ${P}/docs/
-
-	echo "#!/bin/sh" > ${PN}${SLOT}
-	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik-1.5,xerces-2,rhino-1.5) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}${SLOT}
-	dobin ${PN}${SLOT}
-
-}
diff --git a/dev-java/batik/files/digest-batik-1.5 b/dev-java/batik/files/digest-batik-1.5
deleted file mode 100644
index 75f845fbef96..000000000000
--- a/dev-java/batik/files/digest-batik-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 94d3e981014a5ed6f8c0e3fd80be3033 batik-src-1.5.zip 9234151
diff --git a/dev-java/batik/files/digest-batik-1.5.1 b/dev-java/batik/files/digest-batik-1.5.1
deleted file mode 100644
index cab50b8d6f96..000000000000
--- a/dev-java/batik/files/digest-batik-1.5.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a3ba8b76dcef9415216d6a5b9685a9c batik-src-1.5.1.zip 11474737
diff --git a/dev-java/batik/files/digest-batik-1.5.1-r3 b/dev-java/batik/files/digest-batik-1.5.1-r3
deleted file mode 100644
index cab50b8d6f96..000000000000
--- a/dev-java/batik/files/digest-batik-1.5.1-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8a3ba8b76dcef9415216d6a5b9685a9c batik-src-1.5.1.zip 11474737