--- ant-1.5.3-r5.ebuild.old	2003-10-09 10:25:32.000000000 -0500
+++ ant-1.5.3-r5.ebuild	2003-10-09 11:51:34.000000000 -0500
@@ -16,6 +16,16 @@
 RDEPEND=">=virtual/jdk-1.3"
 IUSE="doc"
 
+pkg_setup() {
+	if [ -z "`java-config --jdk-home`" ] ; then
+		eerror "The JDK Java Virtual Machine is not currently selected."
+		eerror "Run 'java-config --list-available-vms' to get a list of VMs."
+		eerror "Then run 'java-config --set-system-vm=<vm-id>'."
+		eerror "Finally, follow the instructions from java-config."
+		die "${PN} ${PV} install aborted!"
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -30,7 +40,6 @@
 }
 
 src_compile() {
-	export JAVA_HOME=${JDK_HOME}
 	if [ `arch` == "ppc" ] ; then
 		# We're compiling _ON_ PPC
 		export THREADS_FLAG="green"