Fixed bug #36922 (added check for JAVA_HOME), updated Copyright date.

5 files changed, 31 insertions, 11 deletions

diff --git a/app-editors/jedit/ChangeLog b/app-editors/jedit/ChangeLog
index b0b3d2cd70f1..664114f57b74 100644
--- a/app-editors/jedit/ChangeLog
+++ b/app-editors/jedit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/jedit
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.20 2003/12/30 06:14:15 anti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/ChangeLog,v 1.21 2004/01/01 05:55:02 anti Exp $
+
+  01 Jan 2004; Ray Russell Reese III <anti@gentoo.org> jedit-4.0.3-r2.ebuild,
+  jedit-4.1.ebuild, jedit-4.2_pre8.ebuild:
+  Added check for $JAVA_HOME, fixes #36922
 
 *jedit-4.2_pre8 (30 Dec 2003)
 
diff --git a/app-editors/jedit/Manifest b/app-editors/jedit/Manifest
index 50c6d33ba641..7a3394daeba9 100644
--- a/app-editors/jedit/Manifest
+++ b/app-editors/jedit/Manifest
@@ -1,8 +1,8 @@
 MD5 e25c84fd1a2a0c0e81cacb709f6cbbbe metadata.xml 260
-MD5 91558f73fa7115024645dbff3faff9ea jedit-4.0.3-r2.ebuild 1707
-MD5 674d9ce1ee17176eb546f5d0b3606db8 jedit-4.1.ebuild 1685
-MD5 13c09087aa81fe50128362ecba95ea0b jedit-4.2_pre8.ebuild 1694
-MD5 4824aaa8fe5cffeba34eff6e81da0dca ChangeLog 3364
+MD5 2a32988fa11c6624ed51bc7616a0ece3 jedit-4.0.3-r2.ebuild 1705
+MD5 2689ed15d7e11605ac223f58cea635af jedit-4.1.ebuild 1865
+MD5 9c1cdd23c2581d346a32cd1c507976b9 jedit-4.2_pre8.ebuild 1875
+MD5 39cd73ec92925d6fbbdfd5ace0ac89bf ChangeLog 3529
 MD5 8d7f7bff147c59acb0ea9c3e4163ecae files/digest-jedit-4.0.3-r2 67
 MD5 c29174550ae9f95fc60afd5cbf079f0c files/digest-jedit-4.1 66
 MD5 90d4525ec3c60d3ab5530c5229d187c0 files/digest-jedit-4.2_pre8 70
diff --git a/app-editors/jedit/jedit-4.0.3-r2.ebuild b/app-editors/jedit/jedit-4.0.3-r2.ebuild
index 41a3182487f4..64605140884b 100644
--- a/app-editors/jedit/jedit-4.0.3-r2.ebuild
+++ b/app-editors/jedit/jedit-4.0.3-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.0.3-r2.ebuild,v 1.6 2003/02/13 06:42:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.0.3-r2.ebuild,v 1.7 2004/01/01 05:55:02 anti Exp $
 
 MY_PV=${PV//.}
 S="${WORKDIR}/jEdit"
diff --git a/app-editors/jedit/jedit-4.1.ebuild b/app-editors/jedit/jedit-4.1.ebuild
index 8951681593a4..1dd0f3ac9ee4 100644
--- a/app-editors/jedit/jedit-4.1.ebuild
+++ b/app-editors/jedit/jedit-4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.1.ebuild,v 1.4 2003/08/12 23:11:58 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.1.ebuild,v 1.5 2004/01/01 05:55:02 anti Exp $
 
 MY_PV="41"
 
@@ -22,6 +22,14 @@ S="${WORKDIR}/jEdit"
 src_compile() {
 	local antflags
 
+	if [ -z "$JAVA_HOME" ]; then
+		einfo
+		einfo "\$JAVA_HOME not set!"
+		einfo "Please use java-config to configure your JVM and try again."
+		einfo
+		die "\$JAVA_HOME not set."
+	fi
+
 	antflags=""
 	if [ `use jikes` ] ; then
 		einfo "Please ignore the following compiler warnings."
diff --git a/app-editors/jedit/jedit-4.2_pre8.ebuild b/app-editors/jedit/jedit-4.2_pre8.ebuild
index 42c4084a4a0c..fbf5dda44e9f 100644
--- a/app-editors/jedit/jedit-4.2_pre8.ebuild
+++ b/app-editors/jedit/jedit-4.2_pre8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2_pre8.ebuild,v 1.1 2003/12/30 06:14:15 anti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/jedit/jedit-4.2_pre8.ebuild,v 1.2 2004/01/01 05:55:02 anti Exp $
 
 MY_PV="42pre8"
 
@@ -22,6 +22,14 @@ S="${WORKDIR}/jEdit"
 src_compile() {
 	local antflags
 
+	if [ -z "$JAVA_HOME" ]; then
+		einfo
+		einfo "\$JAVA_HOME not set!"
+		einfo "Please use java-config to configure your JVM and try again."
+		einfo
+		die "\$JAVA_HOME not set."
+	fi
+
 	antflags=""
 	if [ `use jikes` ] ; then
 		einfo "Please ignore the following compiler warnings."