New Java scheme

5 files changed, 39 insertions, 26 deletions

diff --git a/dev-java/xt/xt-1.ebuild b/dev-java/xt/xt-1.ebuild
index f9205df3ca8e..b256b62ad890 100644
--- a/dev-java/xt/xt-1.ebuild
+++ b/dev-java/xt/xt-1.ebuild
@@ -1,34 +1,28 @@
 # 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.3 2000/11/02 08:31:51 achim Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-1.ebuild,v 1.4 2001/12/15 02:19:52 karltk Exp $
 
-P=xt
-A=${P}.zip
 S=${WORKDIR}/${P}
 DESCRIPTION="Java Implementation of XSL-Transformations"
-SRC_URI="ftp://ftp.jclark.com/pub/xml/"${A}
+SRC_URI="ftp://ftp.jclark.com/pub/xml/${P}.zip
 
-DEPEND=">=dev-lang/jdk-1.2.2"
+DEPEND=">=virtual/jdk-1.2.2"
 
 src_unpack() {
-  mkdir ${S}
-  cd ${S}
-  jar -xf ${DISTDIR}/${A}
-}
-
-src_compile() {                           
-  cd ${S}
+	mkdir ${S}
+	cd ${S}
+	${JAVA_HOME}/bin/jar -xf ${DISTDIR}/${P}.zip
 }
 
 src_install() {                               
-  cd ${S}
-  insinto /usr/lib/java
-  doins xt.jar sax.jar
-  docinto html
-  dodoc xt.htm
-  docinto demo
-  dodoc demo/*
+	insinto /usr/share/xt
+	doins 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
 }
 
 
diff --git a/dev-lang/php/php-4.0.6-r3.ebuild b/dev-lang/php/php-4.0.6-r3.ebuild
index 20eac496b1d4..e5b022aceef8 100644
--- a/dev-lang/php/php-4.0.6-r3.ebuild
+++ b/dev-lang/php/php-4.0.6-r3.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-lang/php/php-4.0.6-r3.ebuild,v 1.3 2001/12/07 19:18:16 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-4.0.6-r3.ebuild,v 1.4 2001/12/15 02:19:52 karltk Exp $
 
 A=${PN}-4.0.6.tar.gz
 S=${WORKDIR}/${PN}-4.0.6
@@ -35,7 +35,7 @@ DEPEND="virtual/glibc
 	imap? ( virtual/imap )
 	flash? ( media-libs/libswf media-libs/ming )
 	xml2? ( dev-libs/libxml2 )
-	java? ( dev-lang/jdk )"
+	java? ( virtual/jdk )"
 
 RDEPEND="virtual/glibc
 	>=dev-libs/gmp-3.1.1
@@ -57,7 +57,7 @@ RDEPEND="virtual/glibc
 	libwww? ( >=net-libs/libwww-5.3.2 )
 	xml2? ( dev-libs/libxml2 )
 	imap? ( virtual/imap )
-	java? ( dev-lang/jdk )"
+	java? ( virtual/jdk )"
 
 src_compile() {
 
diff --git a/kde-base/kdebindings/kdebindings-2.2.2.ebuild b/kde-base/kdebindings/kdebindings-2.2.2.ebuild
index 54454c0e2856..bf172c650934 100644
--- a/kde-base/kdebindings/kdebindings-2.2.2.ebuild
+++ b/kde-base/kdebindings/kdebindings-2.2.2.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 Dan Armak <danarmak@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-2.2.2.ebuild,v 1.1 2001/11/22 17:32:27 verwilst Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebindings/kdebindings-2.2.2.ebuild,v 1.2 2001/12/15 02:19:52 karltk Exp $
 . /usr/portage/eclass/inherit.eclass || die
 inherit kde-dist || die
 
@@ -11,7 +11,7 @@ NEWDEPEND=">=kde-base/kdebase-${PV}
 	>=x11-libs/gtk+-1.2.10-r4
 	sys-devel/perl
 	python? ( dev-lang/python )
-	java? (	dev-lang/jdk )
+	java? (	virtual/jdk )
 	>=x11-libs/gtk+-1.2.6
 	>=dev-libs/glib-1.2.6
 	>=kde-base/kdenetwork-${PV}"
diff --git a/net-www/mozilla/mozilla-0.9.6-r4.ebuild b/net-www/mozilla/mozilla-0.9.6-r4.ebuild
index 0140ccafa052..13b1fa75d33c 100644
--- a/net-www/mozilla/mozilla-0.9.6-r4.ebuild
+++ b/net-www/mozilla/mozilla-0.9.6-r4.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 Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.6-r4.ebuild,v 1.1 2001/12/13 04:48:54 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-0.9.6-r4.ebuild,v 1.2 2001/12/15 02:19:52 karltk Exp $
 
 S=${WORKDIR}/mozilla
 DESCRIPTION="The Mozilla Web Browser"
@@ -19,7 +19,7 @@ RDEPEND=">=gnome-base/ORBit-0.5.10-r1
 	x11-libs/gtk+"
 #	gtk?   ( x11-libs/gtk+ )
 #	mozqt? ( x11-libs/qt-x11 )
-#	java?  ( dev-lang/jdk )"
+#	java?  ( virtual/jdk )"
 
 DEPEND="${RDEPEND}
 	virtual/x11
diff --git a/profiles/package.mask b/profiles/package.mask
index c7eb119b5eaa..73f05bcbda3f 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -242,3 +242,22 @@ dev-libs/libiconv
 
 # Gamma branch
 >=app-editors/xemacs-21.4.5
+
+# Fails with new Java scheme
+net-www/cocoon-1.8
+net-www/cocoon-1.8.2
+net-www/tomcat-3.2.2
+net-www/tomcat-3.2.1
+net-www/tomcat-4.0.1
+net-www/jakarta-3.1-r2
+media-libs/pdflib-4.0.1
+dev-java/ant-1.3
+dev-java/ant-1.4
+dev-java/fesi-1
+dev-java/jaxp-1.1
+dev-java/jaxp-1.0.1
+dev-java/jndi-1.2.1-r1
+dev-java/jsse-1.0.2
+dev-java/mysql-jdbc-1.2.3-r1
+dev-lang/swig/swig-1.3_alpha5-r2
+