License fix to sun-bcla-j2ee and added run script for 3.4.1; closes #18928.

5 files changed, 42 insertions, 14 deletions

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 58833c6899e0..ff08281e4f60 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -1,12 +1,11 @@
-MD5 fa87a7b11b9516844203c57d659e1592 netbeans-3.4.ebuild 3369
-MD5 1cf88d56b6d5c4ca29dacde33fcd0560 netbeans-3.4.1.ebuild 3233
-MD5 7dd84aa4e3e608023c245f2b5c91bcb1 .netbeans-3.4.1.ebuild.swp 12288
-MD5 48751ee0b2a941da38b65b87f95d9f8c netbeans-3.3.2.ebuild 2352
-MD5 cb44ce313405ec0d2062e89df9d045ca ChangeLog 2478
+MD5 367eeb577c423abcac49ada636644942 netbeans-3.4.ebuild 3371
+MD5 1e213ec8022fef751f185b96b3b983de netbeans-3.4.1.ebuild 3237
+MD5 261c9b24dd0c354adbd1e7b41e7b2040 netbeans-3.3.2.ebuild 2355
+MD5 77a03c77b03cea73c8bfa6a6ff7592b9 ChangeLog 2482
 MD5 9c6f59bb154bdcd7242f4544b8feae6b files/netbeans-KDE.desktop 139
 MD5 21a78956bac04c98135ba5707b98da66 files/netbeans.png 2163
 MD5 d83c7003fb3386b304ff7cb5fe7d5e87 files/digest-netbeans-3.4 76
-MD5 cef1d239c27e0e7c01d1e68fcd4857c8 files/netbeans 687
+MD5 76d728d517fd5fd2e653aa2c6ed9998e files/netbeans 784
 MD5 e04a4eefe6510679e7cf06d0377e9e18 files/netbeans.desktop 103
 MD5 4b71d891d44fc4609b80a45d3c56dc68 files/digest-netbeans-3.3.2 76
 MD5 eba3a44af2a04cab3a7bf00ce982130e files/digest-netbeans-3.4.1 77
diff --git a/dev-util/netbeans/files/netbeans b/dev-util/netbeans/files/netbeans
new file mode 100644
index 000000000000..94aa1ae67630
--- /dev/null
+++ b/dev-util/netbeans/files/netbeans
@@ -0,0 +1,26 @@
+# Author: Dylan Carlson
+# May 2003
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/files/netbeans,v 1.1 2003/05/26 10:49:11 absinthe Exp $
+
+JAVA_HOME=`/usr/bin/java-config --jdk-home`
+if [ -z "${JAVA_HOME}" ] ; then
+        JAVA_HOME=`/usr/bin/java-config --jre-home`
+fi
+
+if [ ! -f ${JAVA_HOME}/bin/java ] ; then
+        echo " "
+        echo "I tried using the following Java Runtime:"
+        echo "${JAVA_HOME}/bin/java"
+        echo " "
+        echo "Java Runtime missing.  Please run java-config(1) and ensure"
+        echo "your environment is configured properly."
+        exit 1
+else
+        echo " "
+        echo "Using Java Runtime:"
+        echo "${JAVA_HOME}/bin/java"
+        echo " "
+        echo "Using CLASSPATH:"
+        echo "${CLASSPATH}"
+        echo " "
+fi
diff --git a/dev-util/netbeans/netbeans-3.3.2.ebuild b/dev-util/netbeans/netbeans-3.3.2.ebuild
index efda62c5ed47..2e7075de184c 100644
--- a/dev-util/netbeans/netbeans-3.3.2.ebuild
+++ b/dev-util/netbeans/netbeans-3.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-3.3.2.ebuild,v 1.9 2003/02/13 11:58:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-3.3.2.ebuild,v 1.10 2003/05/26 10:49:11 absinthe Exp $
 
 MY_P=NetBeansIDE-release332
 S=${WORKDIR}/${PN}
@@ -9,7 +9,7 @@ SRC_URI="http://www.netbeans.org/download/release332/night/build200206050332/${M
 HOMEPAGE="http://www.netbeans.org"
 
 SLOT="0"
-LICENSE="GPL-2 Apache-1.1 sun-bcla JPython SPL"
+LICENSE="GPL-2 Apache-1.1 sun-bcla-j2ee JPython SPL"
 KEYWORDS="x86 sparc "
 #still need to add JPython, Sun Public and DynamicJava licenses
 #sun-j2ee actually contains Sun Binary Code license
diff --git a/dev-util/netbeans/netbeans-3.4.1.ebuild b/dev-util/netbeans/netbeans-3.4.1.ebuild
index e271d5f7e490..39e7993e56a8 100644
--- a/dev-util/netbeans/netbeans-3.4.1.ebuild
+++ b/dev-util/netbeans/netbeans-3.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-3.4.1.ebuild,v 1.3 2003/02/15 07:31:23 gerk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-3.4.1.ebuild,v 1.4 2003/05/26 10:49:11 absinthe Exp $
 
-IUSE=""
+IUSE="kde gnome"
 
 MY_BUILD=200301202341
 MY_P=NetBeansIDE-release341
@@ -12,7 +12,7 @@ SRC_URI="http://www.netbeans.org/download/release341/night/build${MY_BUILD}/${MY
 HOMEPAGE="http://www.netbeans.org"
 
 SLOT="0"
-LICENSE="GPL-2 Apache-1.1 sun-bcla JPython SPL"
+LICENSE="GPL-2 Apache-1.1 sun-bcla-j2ee JPython SPL"
 KEYWORDS="x86 sparc alpha ppc"
 #still need to add JPython, Sun Public and DynamicJava licenses
 #sun-j2ee actually contains Sun Binary Code license
@@ -57,6 +57,9 @@ src_install() {
 	dohtml CHANGES.html CREDITS.html README.html netbeans.css
 	# note: docs/ are docs used internally by the IDE
 	cp -Rdp beans bin docs lib modules sources system ${D}/opt/${P}
+	cp ${FILEDIR}/netbeans ${S}/netbeans
+	echo "/opt/${P}/bin/runide.sh \$*" >> ${S}/netbeans
+	dobin ${S}/netbeans
 
 	# If either Gnome or KDE are installed, then install the icons.
 	if [ "`use gnome || use kde`" ] ; then
@@ -86,7 +89,7 @@ src_install() {
 		insinto ${DESKTOP_DIR}
 		doins ${FILESDIR}/${DESKTOP_FILE}
 		echo "Name=NetBeans ${PV}" >> ${D}/${DESKTOP}
-		echo "Exec=/opt/${P}/bin/runide.sh" >> ${D}/${DESKTOP}
+		echo "Exec=/usr/bin/netbeans" >> ${D}/${DESKTOP}
 		echo "Icon=/usr/share/pixmaps/netbeans.png" >> ${D}/${DESKTOP}
 		echo >> ${D}/${DESKTOP}
 	fi
diff --git a/dev-util/netbeans/netbeans-3.4.ebuild b/dev-util/netbeans/netbeans-3.4.ebuild
index e68e41f8c293..58a023170995 100644
--- a/dev-util/netbeans/netbeans-3.4.ebuild
+++ b/dev-util/netbeans/netbeans-3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-3.4.ebuild,v 1.6 2003/02/13 11:58:50 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/netbeans/netbeans-3.4.ebuild,v 1.7 2003/05/26 10:49:11 absinthe Exp $
 
 MY_BUILD=200208222340
 MY_P=NetBeansIDE-release34
@@ -10,7 +10,7 @@ SRC_URI="http://www.netbeans.org/download/release34/night/build${MY_BUILD}/${MY_
 HOMEPAGE="http://www.netbeans.org"
 
 SLOT="0"
-LICENSE="GPL-2 Apache-1.1 sun-bcla JPython SPL"
+LICENSE="GPL-2 Apache-1.1 sun-bcla-j2ee JPython SPL"
 KEYWORDS="x86 sparc alpha"
 #still need to add JPython, Sun Public and DynamicJava licenses
 #sun-j2ee actually contains Sun Binary Code license