New Java scheme

14 files changed, 85 insertions, 122 deletions

diff --git a/dev-java/ant/ant-1.4.1-r1.ebuild b/dev-java/ant/ant-1.4.1-r1.ebuild
index 4d0357b41ee2..4bfb1f833fba 100644
--- a/dev-java/ant/ant-1.4.1-r1.ebuild
+++ b/dev-java/ant/ant-1.4.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r1.ebuild,v 1.2 2001/12/13 00:17:00 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ant/ant-1.4.1-r1.ebuild,v 1.3 2002/01/23 20:06:16 karltk Exp $
 
 A="jakarta-ant-${PV}-src.tar.gz"
 S=${WORKDIR}/jakarta-ant-${PV}
@@ -23,14 +23,7 @@ src_install() {
 	exeinto /usr/bin
 	doexe src/ant
 
-	insinto /usr/share/ant
-	doins build/lib/*.jar lib/*.jar
-	insinto /usr/share/ant
-
-	ls ${D}/usr/share/ant/*.jar | \
-		tr '\n' ':' \
-		> ${D}/usr/share/ant/classpath.env
-	dosed usr/share/ant/classpath.env
+	dojar build/lib/*.jar lib/*.jar
 	
 	dodoc LICENSE README WHATSNEW KEYS
 	dohtml -r docs/*
diff --git a/dev-java/ant/files/gentoo-ant-1.4.1 b/dev-java/ant/files/gentoo-ant-1.4.1
index 138749f411b2..ecd694f34961 100644
--- a/dev-java/ant/files/gentoo-ant-1.4.1
+++ b/dev-java/ant/files/gentoo-ant-1.4.1
@@ -30,7 +30,7 @@ if [ -n "$CLASSPATH" ] ; then
 fi
 
 # add in the dependency .jar files
-DIRLIBS=${ANT_HOME}/*.jar
+DIRLIBS=${ANT_HOME}/lib/*.jar
 for i in ${DIRLIBS}
 do
     # if the directory is empty, then it will return the input string
diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r1.ebuild
index c7ad0a2f4151..ed59fcb90515 100644
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r1.ebuild,v 1.1 2002/01/20 22:29:07 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.3.1-r1.ebuild,v 1.2 2002/01/23 20:06:16 karltk Exp $
 
 A=j2sdk-1.3.1-FCS-linux-i386.tar.bz2
 S=${WORKDIR}/j2sdk1.3.1
@@ -20,7 +20,7 @@ src_install () {
 
 	dodir /opt/${P}
 
-	cp -R ${S}/{bin,jre,lib,man,include,include-old} ${D}/opt/${P}
+	cp -dpR ${S}/{bin,jre,lib,man,include,include-old} ${D}/opt/${P}
 
 	dodir /opt/${P}/share/java
 	cp -R ${S}/{demo,src.jar} ${D}/opt/${P}/share
@@ -32,10 +32,14 @@ src_install () {
 		dosym /opt/${P}/jre/plugin/i386/mozilla/javaplugin_oji.so /usr/lib/mozilla/plugins/javaplugin_oji.so
 	fi	
 
+	find ${D}/opt/${P} -type f -name "*.so" -exec chmod +x \{\} \;
+	
 	dodir /etc/env.d	
 	echo "PATH=/opt/${P}/bin" > ${D}/etc/env.d/20java
 	echo "JAVA_HOME=/opt/${P}" >> ${D}/etc/env.d/20java
+	echo "ROOTPATH=/opt/${P}/bin" >> ${D}/etc/env.d/20java
 	echo "CLASSPATH=/opt/${P}/jre/lib/rt.jar" >> ${D}/etc/env.d/20java
+	echo "LDPATH=/opt/${P}/jre/lib/i386:/opt/${P}/jre/lib/i386/client" >> ${D}/etc/env.d/20java
 }
 
 pkg_postinst () {
diff --git a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r3.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r3.ebuild
index 6ca9a55bddcf..034f1e4951e9 100644
--- a/dev-java/blackdown-jre/blackdown-jre-1.3.1-r3.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.3.1-r3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r3.ebuild,v 1.1 2002/01/20 22:29:07 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.3.1-r3.ebuild,v 1.2 2002/01/23 20:06:16 karltk Exp $
 
 A=j2re-1.3.1-FCS-linux-i386.tar.bz2
 S=${WORKDIR}/j2re1.3.1
@@ -140,7 +140,9 @@ src_install () {
 	dodir /etc/env.d
 	echo "PATH=/opt/${P}/bin" > ${D}/etc/env.d/20java
 	echo "JAVA_HOME=/opt/${P}" >> ${D}/etc/env.d/20java
+	echo "ROOTPATH=/opt/${P}/bin" >> ${D}/etc/env.d/20java
 	echo "CLASSPATH=/opt/${P}/lib/rt.jar" >> ${D}/etc/env.d/20java
+        echo "LDPATH=/opt/${P}/lib/i386:/opt/${P}/lib/i386/client"      
 }
 
 pkg_postinst () {
diff --git a/dev-java/fesi/fesi-1.ebuild b/dev-java/fesi/fesi-1.ebuild
index 805001ecd763..f9b9adff49d0 100644
--- a/dev-java/fesi/fesi-1.ebuild
+++ b/dev-java/fesi/fesi-1.ebuild
@@ -1,42 +1,32 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi/fesi-1.ebuild,v 1.4 2000/11/02 08:31:50 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fesi/fesi-1.ebuild,v 1.5 2002/01/23 20:06:16 karltk Exp $
 
 P=fesi
 A="fesikit.zip"
 S=${WORKDIR}/${P}
-DESCRIPTION="JavaScript Interpreter writte in Java"
+DESCRIPTION="JavaScript Interpreter written in Java"
 SRC_URI="http://home.worldcom.ch/jmlugrin/fesi/fesikit.zip"
 
-DEPEND=">=dev-lang/jdk-1.2.2"
+DEPEND=">=virtual/jre-1.2.2"
 
+echo $PATH
 src_unpack() {
-#  jar -xf ${DISTDIR}/fesisrc.zip
-  jar -xf ${DISTDIR}/fesikit.zip
+	jar -xf ${DISTDIR}/fesikit.zip
 }
 
 src_compile() {                           
-  cd ${S}
+	cd ${S}
 }
 
 src_install() {                               
-  cd ${S}
-  insinto /usr/lib/java
-  doins fesi.jar
-  into /usr
-  dodoc COPYRIGHT.TXT Readme.txt 
-  docinto html
-  dodoc doc/html/*.html doc/html/*.gif doc/html/*.txt
-  docinto html/api
-  dodoc doc/html/api/*.html doc/html/api/*.css
-  for i in AST awtgui ClassFile Data Exceptions Extensions Interpreter jslib Parser Tests
-  do
-    docinto html/api/FESI/$i
-    dodoc doc/Design/api/FESI/$i/*.html
-  done
 
+	dojar fesi.jar
 
+	into /usr
+	dodoc COPYRIGHT.TXT Readme.txt 
+	dohtml -r doc/html/*
 }
 
 
diff --git a/dev-java/java-config/files/java-config b/dev-java/java-config/files/java-config
index 79f59efc6d98..b7dc661198b6 100644
--- a/dev-java/java-config/files/java-config
+++ b/dev-java/java-config/files/java-config
@@ -4,11 +4,13 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config,v 1.1 2002/01/20 22:30:04 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config,v 1.2 2002/01/23 20:06:16 karltk Exp $
 
 version=0.1.1
 
+oldpath=$PATH
 . /etc/env.d/20java
+PATH=$oldpath:$PATH
 
 usage() {
         cat <<EOF
diff --git a/dev-java/jaxp/jaxp-1.1.3.ebuild b/dev-java/jaxp/jaxp-1.1.3.ebuild
index 21bb3d1b3cc7..7da73f3674da 100644
--- a/dev-java/jaxp/jaxp-1.1.3.ebuild
+++ b/dev-java/jaxp/jaxp-1.1.3.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.1.3.ebuild,v 1.1 2001/12/15 01:43:43 karltk Exp $
+# Maintainer: Tools Team <tools@gentoo.org>
+# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.1.3.ebuild,v 1.2 2002/01/23 20:06:16 karltk Exp $
 
-At=java_xml_pack-fall01.zip
-S=${WORKDIR}/java_xml_pack-fall01
+At=java_xml_pack-winter01.zip
+S=${WORKDIR}/java_xml_pack-winter01
 DESCRIPTION="Java API for XML parsing"
 SRC_URI=""
 HOMEPAGE="http://java.sun.com/xml/"
@@ -17,19 +18,15 @@ RDEPEND=">=virtual/jdk-1.3"
 
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
-		echo "!!! Please download ${At} from ${HOMEPAGE}"
-		die
+		die "!!! Please download ${At} from ${HOMEPAGE}"
 	fi
-	${JAVA_HOME}/bin/jar -xf ${DISTDIR}/${At}
+	jar -xf ${DISTDIR}/${At}
 }
 
-src_install() {                      
-	insinto /usr/share/jaxp
-	doins jaxp-1.1.3/crimson.jar jaxp-1.1.3/xalan.jar
+src_install() {                
+	dojar jaxp-1.1.3/crimson.jar jaxp-1.1.3/xalan.jar
 	dohtml -r jaxp-1.1.3/docs/*
 	cp -r jaxp-1.1.3/examples ${D}/usr/share/doc/${PF}/
-	echo "/usr/share/jaxp/crimson.jar:/usr/share/jaxp/xalan.jar" \
-		> ${D}/usr/share/jaxp/classpath.env
 }
 
 
diff --git a/dev-java/jaxp/jaxp-1.2.ebuild b/dev-java/jaxp/jaxp-1.2.ebuild
index bb41e14eb5dc..74ee69517578 100644
--- a/dev-java/jaxp/jaxp-1.2.ebuild
+++ b/dev-java/jaxp/jaxp-1.2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.2.ebuild,v 1.1 2002/01/15 14:45:06 gbevin Exp $
+# Maintainer: Tools Team <tools@gentoo.org>
+# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.2.ebuild,v 1.2 2002/01/23 20:06:16 karltk Exp $
 
 At=java_xml_pack-winter01-dev.zip
 S=${WORKDIR}/java_xml_pack-winter-01-dev
@@ -17,19 +18,15 @@ RDEPEND=">=virtual/jdk-1.3"
 
 src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
-		echo "!!! Please download ${At} from ${HOMEPAGE}"
-		die
+		die "Please download ${At} from ${HOMEPAGE}"
 	fi
-	${JAVA_HOME}/bin/jar -xf ${DISTDIR}/${At}
+	jar -xf ${DISTDIR}/${At}
 }
 
 src_install() {                      
 	cd ${S}
-	insinto /usr/share/jaxp
-	doins jaxp-1.2-ea1/xerces.jar jaxp-1.2-ea1/xalan.jar
+	dojar jaxp-1.2-ea1/xerces.jar jaxp-1.2-ea1/xalan.jar
 	dohtml -r jaxp-1.2-ea1/docs/*
-	echo "/usr/share/jaxp/xerces.jar:/usr/share/jaxp/xalan.jar" \
-		> ${D}/usr/share/jaxp/classpath.env
 }
 
 
diff --git a/dev-java/jndi/jndi-1.2.1-r2.ebuild b/dev-java/jndi/jndi-1.2.1-r2.ebuild
index cf9b10cd8dad..65d770735337 100644
--- a/dev-java/jndi/jndi-1.2.1-r2.ebuild
+++ b/dev-java/jndi/jndi-1.2.1-r2.ebuild
@@ -1,39 +1,36 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jndi/jndi-1.2.1-r2.ebuild,v 1.2 2001/12/15 01:20:18 karltk Exp $
+# Maintainer: Tools Team <tools@gentoo.org>
+# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jndi/jndi-1.2.1-r2.ebuild,v 1.3 2002/01/23 20:06:16 karltk Exp $
 
-Arse=jndi1_2_1.zip
+At=jndi1_2_1.zip
 P=jndi-1.2.1
 S=${WORKDIR}/${P}
 DESCRIPTION="Java Naming and Directory Interface"
 HOMEPAGE="http://java.sun.com/products/jndi/"
-#SRC_URI="" 
-#error:You must download ${A} from $HOMEPAGE yourself"
+SRC_URI="" 
 
 DEPEND=">=virtual/jdk-1.2"
 
 src_unpack() {
-	echo ${Arse}
-	if [ ! -f ${DISTDIR}/${Arse} ] ; then
-		echo "!!! You must download ${Arse} from ${HOMEPAGE} yourself"
-		die
+	echo ${At}
+	if [ ! -f ${DISTDIR}/${At} ] ; then
+		die "You must download ${At} from ${HOMEPAGE} yourself"
 	fi
 	mkdir ${S}
 	cd ${S}
-	${JAVA_HOME}/bin/jar -xf ${DISTDIR}/${Arse}
+	jar -xf ${DISTDIR}/${At}
 }
 
 src_compile() {                           
 	cd ${S}
 }
 
-src_install() {                               
-	insinto /usr/share/jndi
-	doins lib/jndi.jar
+src_install() {           
+	dojar lib/jndi.jar
 	dodoc COPYRIGHT README.txt 
 	dohtml -r doc/*
-	echo "/usr/share/jndi/jndi.jar" > /usr/share/jndi/classpath.env
 }
 
 
diff --git a/dev-java/jsse/jsse-1.0.2-r1.ebuild b/dev-java/jsse/jsse-1.0.2-r1.ebuild
index ffd4dc94f530..c1545915da9b 100644
--- a/dev-java/jsse/jsse-1.0.2-r1.ebuild
+++ b/dev-java/jsse/jsse-1.0.2-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Karl Trygve Kalleberg
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jsse/jsse-1.0.2-r1.ebuild,v 1.4 2001/12/17 00:27:58 karltk Exp $
+# Maintainer: Tools Team <tools@gentoo.org>
+# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jsse/jsse-1.0.2-r1.ebuild,v 1.5 2002/01/23 20:06:16 karltk Exp $
 
 At=jsse-1_0_2-gl.zip
 S=${WORKDIR}/jsse1.0.2
@@ -17,21 +18,16 @@ src_unpack() {
 	if [ ! -f ${DISTDIR}/${At} ] ; then
 		die "Please download ${At} from ${HOMEPAGE} into ${DISTDIR}"
 	fi
-	${JAVA_HOME}/bin/jar -xf ${DISTDIR}/${At} || die
+	jar -xf ${DISTDIR}/${At} || die
 }
 
 src_install() {                               
-	insinto /usr/share/jsse/lib
-	doins lib/*.jar
+	dojar lib/*.jar
 
 	dodoc *.txt 
 	dohtml *.html
 	dohtml -r doc/*
 	
-	ls ${D}/usr/share/jsse/lib/*.jar | tr '\n' ':' \
-		> ${D}/usr/share/jsse/classpath.env
-	dosed /usr/share/jsse/classpath.env
-	
 	dodir /etc/env.d
 	echo "JSSE_HOME=/usr/share/jsse" > ${D}/etc/env.d/21jsse
 }
diff --git a/dev-java/makeme/makeme-0.02-r1.ebuild b/dev-java/makeme/makeme-0.02-r1.ebuild
index 5fb069cd9def..8034b530a99f 100644
--- a/dev-java/makeme/makeme-0.02-r1.ebuild
+++ b/dev-java/makeme/makeme-0.02-r1.ebuild
@@ -1,19 +1,18 @@
 # Copyright 1999-2001 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/makeme-0.02-r1.ebuild,v 1.2 2001/12/15 01:20:18 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/makeme/makeme-0.02-r1.ebuild,v 1.3 2002/01/23 20:06:16 karltk Exp $
 
 S=${WORKDIR}/${P}
-
 DESCRIPTION="Make utility written in Java"
-
 SRC_URI="http://prdownloads.sourceforge.net/makeme/makeme-0.02.tar.gz"
-
 HOMEPAGE="http://makeme.sf.net"
 
 DEPEND=">=virtual/jdk-1.2
         >=dev-java/jikes-1.13
         >=dev-java/antlr-2.7.1-r1"
+RDEPEND=">=virtual/jdk-1.2
+	>=dev-java/antlr-2.7.1-r1"
 
 src_unpack() {
 	unpack makeme-0.02.tar.gz
@@ -23,10 +22,6 @@ src_unpack() {
 }
         
 src_compile() {
-	if [ -z "$CLASSPATH" ] ; then
-		echo "!!! CLASSPATH is unset"
-		die
-	fi
 	make build || die
 }
 
diff --git a/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild b/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild
index 44a7a907eecf..52af434bc07c 100644
--- a/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild
+++ b/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild,v 1.3 2000/11/02 08:31:50 achim Exp $
+# Author: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/mysql-jdbc/mysql-jdbc-1.2.3-r1.ebuild,v 1.4 2002/01/23 20:06:16 karltk Exp $
 
 P=mysql-jdbc-1.2c
 A=mm.mysql.jdbc-1.2c.tar.gz
@@ -10,32 +10,21 @@ DESCRIPTION="JDBC Driver for MySQL"
 SRC_URI="http://www.mysql.com/Downloads/Contrib/"${A}
 HOMEPAGE="http://www.mysql.com/"
 
-DEPEND=">=dev-lang/jdk-1.2.2"
+DEPEND=">=virtual/jdk-1.2.2"
 
 src_unpack() {
-  unpack ${A}
+	unpack ${A}
 }
 
 src_compile() {                           
-  cd ${S}
-  jar -cf mysql-jdbc.jar org
+	jar -cf mysql-jdbc.jar org
 }
 
 src_install() {                               
-  cd ${S}
-  insinto /usr/lib/java
-  doins  mysql-jdbc.jar
-  cd doc
-  docinto html
-  dodoc *.html *.gif
-  docinto html/mm.doc
-  dodoc mm.doc/*.html mm.doc/*.css
-  docinto html/mm.doc/stylesheet-images
-  dodoc mm.doc/stylesheet-images/*.gif
-  docinto html/apidoc
-  dodoc apidoc/*.html apidoc/*.css
-  docinto html/apidoc/org/gjt/mm/mysql
-  dodoc apidoc/org/gjt/mm/mysql/*.html
+	cd ${S}
+	dojar mysql-jdbc.jar
+
+	dohtml -r doc/*
 }
 
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.3.1.ebuild b/dev-java/sun-jdk/sun-jdk-1.3.1.ebuild
index 6d4dedb5b26f..b0f32e167d3b 100644
--- a/dev-java/sun-jdk/sun-jdk-1.3.1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.3.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Tools Team <tools@gentoo.org>
 # Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.ebuild,v 1.1 2002/01/13 01:08:39 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.3.1.ebuild,v 1.2 2002/01/23 20:06:16 karltk Exp $
 
 At="j2sdk-1_3_1_02-linux-i386.bin"
 S=${WORKDIR}/jdk1.3.1_02
@@ -10,7 +10,8 @@ SRC_URI="$At"
 DESCRIPTION="Sun's J2EE Development Kit"
 HOMEPAGE="http://java.sun.com/j2se/1.3/download-linux.html"
 
-DEPEND="virtual/glibc"
+DEPEND="virtual/glibc
+	>=java-config-0.1.1"
 RDEPEND="$DEPEND"
 
 PROVIDE="virtual/jre-1.3
@@ -49,7 +50,9 @@ src_install () {
 	fi                            
 	
 	dodir /etc/env.d
-        echo "JAVA_HOME=/opt/${P}" > ${D}/etc/env.d/20java                      
+	echo "PATH=/opt/${P}" > ${D}/etc/env.d/20java
+	echo "ROOTPATH=/opt/${P}" >> ${D}/etc/env.d/20java
+        echo "JAVA_HOME=/opt/${P}" >> ${D}/etc/env.d/20java                      
 	echo "CLASSPATH=/opt/${P}/jre/lib/rt.jar" >> ${D}/etc/env.d/20java 
 }
 
diff --git a/dev-java/xt/xt-1.ebuild b/dev-java/xt/xt-1.ebuild
index b256b62ad890..c22874c9659c 100644
--- a/dev-java/xt/xt-1.ebuild
+++ b/dev-java/xt/xt-1.ebuild
@@ -1,28 +1,26 @@
 # Copyright 1999-2000 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-1.ebuild,v 1.4 2001/12/15 02:19:52 karltk Exp $
+# Maintainer: Tools Team <tools@gentoo.org>
+# Author: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-1.ebuild,v 1.5 2002/01/23 20:06:16 karltk Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Java Implementation of XSL-Transformations"
-SRC_URI="ftp://ftp.jclark.com/pub/xml/${P}.zip
+SRC_URI="ftp://ftp.jclark.com/pub/xml/${PN}.zip"
 
 DEPEND=">=virtual/jdk-1.2.2"
 
 src_unpack() {
 	mkdir ${S}
 	cd ${S}
-	${JAVA_HOME}/bin/jar -xf ${DISTDIR}/${P}.zip
+	jar -xf ${DISTDIR}/${PN}.zip
 }
 
-src_install() {                               
-	insinto /usr/share/xt
-	doins xt.jar sax.jar
+src_install() {              
+	dojar xt.jar sax.jar
 	dohtml xt.html
 	docinto demo
 	dodoc demo/*
-	echo "/usr/share/xt/xt.jar:/usr/share/xt/sax.jar" \
-		> ${D}/usr/share/xt/classpath.env
 }