recommit, accidently commited slightly older versions of ebuilds

(Portage version: 2.0.51.19)

3 files changed, 17 insertions, 17 deletions

diff --git a/dev-java/batik/batik-1.5.1-r3.ebuild b/dev-java/batik/batik-1.5.1-r3.ebuild
index 8e4f67d57660..cd9564cd5d15 100644
--- a/dev-java/batik/batik-1.5.1-r3.ebuild
+++ b/dev-java/batik/batik-1.5.1-r3.ebuild
@@ -1,6 +1,6 @@
 # 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.2 2005/02/18 18:40:39 compnerd Exp $
+# $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
 
@@ -16,7 +16,7 @@ DEPEND=">=virtual/jdk-1.3
 		dev-java/ant"
 RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-1.1"
-SLOT="0"
+SLOT="1.5.1"
 KEYWORDS="x86 ~sparc ~ppc"
 
 S=${WORKDIR}/xml-batik
@@ -46,14 +46,14 @@ src_compile() {
 
 src_install () {
 	java-pkg_dojar ${P}/batik*.jar
-	insinto /usr/share/${PN}/lib/lib
+	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,xerces-2,rhino-1.5,fop) org.apache.batik.apps.svgbrowser.Main $*' >> ${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}
 
 }
diff --git a/dev-java/batik/batik-1.5.1-r4.ebuild b/dev-java/batik/batik-1.5.1-r4.ebuild
index f2c8de6db108..e785e54cef34 100644
--- a/dev-java/batik/batik-1.5.1-r4.ebuild
+++ b/dev-java/batik/batik-1.5.1-r4.ebuild
@@ -1,6 +1,6 @@
 # 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.1 2005/03/19 23:29:24 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r4.ebuild,v 1.2 2005/03/19 23:48:11 luckyduck Exp $
 
 inherit java-pkg
 
@@ -15,7 +15,7 @@ DEPEND=">=virtual/jdk-1.3
 		dev-java/ant"
 RDEPEND=">=virtual/jdk-1.3"
 LICENSE="Apache-1.1"
-SLOT="0"
+SLOT="1.5.1"
 KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 
 S=${WORKDIR}/xml-batik
@@ -47,17 +47,17 @@ src_install () {
 	do
 		java-pkg_dojar ${jar}
 		rm -f ${jar}
-		ln -s ${DESTTREE}/share/${PN}/lib/${jar} ${jar}
+		ln -s ${DESTTREE}/share/${PN}-${SLOT}/lib/${jar} ${jar}
 	done
 
 	cd ${S}
-	cp -ra ${P}/lib ${D}${DESTTREE}/share/${PN}/lib/
+	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}
-	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik,xerces-2,rhino-1.5) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}
-	dobin ${PN}
+	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}
+	dobin ${PN}${SLOT}
 
 }
diff --git a/dev-java/batik/batik-1.5.ebuild b/dev-java/batik/batik-1.5.ebuild
index 5ef239c3f2af..16ca91f789c5 100644
--- a/dev-java/batik/batik-1.5.ebuild
+++ b/dev-java/batik/batik-1.5.ebuild
@@ -1,6 +1,6 @@
 # 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.8 2005/03/19 23:29:24 luckyduck Exp $
+# $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
 
@@ -47,17 +47,17 @@ src_install () {
 	do
 		java-pkg_dojar ${jar}
 		rm -f ${jar}
-		ln -s ${DESTTREE}/share/${PN}/lib/${jar} ${jar}
+		ln -s ${DESTTREE}/share/${PN}-${SLOT}/lib/${jar} ${jar}
 	done
 
 	cd ${S}
-	cp -ra ${P}/lib ${D}${DESTTREE}/share/${PN}/lib/
+	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}
-	echo '${JAVA_HOME}/bin/java -classpath $(java-config -p batik,xerces-2,rhino-1.5) org.apache.batik.apps.svgbrowser.Main $*' >> ${PN}
-	dobin ${PN}
+	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}
 
 }