Add CACAO, Shark and VisualVM support for IcedTea6 1.3.

svn path=/java-overlay/; revision=7100

8 files changed, 189 insertions, 3 deletions

diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index 29b298dd..71407551 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -7,6 +7,6 @@ AUX 6.1/visualweb-JxpsSerializer.java-xerces-2.8.1.patch 2260 RMD160 262c5c7bc6d
 AUX 6.1/websvc.jaxws21-build.xml.patch 337 RMD160 8c217c1b7f7699be7a567ad4a471250355c686ac SHA1 6d779521f17d392643f2e56c752df4262d1c3eeb SHA256 3b5225b345596b05f8734757961624c499073e38900964d0308e28128dccefdb
 AUX 6.1/websvc.jaxws21api-build.xml.patch 346 RMD160 06a8fb2400812251621a13f642e7fc22ab7d4413 SHA1 f06d0ac3829983e3506e88638e43292ad4aaa15d SHA256 472f32352ca320a2522fe1096f3f8acdf619d6012e903dfe8f76e51e9806b662
 DIST netbeans-6.1-bundled.tar.bz2 222310744 RMD160 0da76fc5bd5c276c80f11b6e3b763e32ebe86748 SHA1 958ced3eebd563bc6faf09387e6b9fe7a0ad4040 SHA256 cc68db782a0be34134db525a77b70a8864cf174c94187e4c8ce92dbf182f5664
-EBUILD netbeans-6.1-r1.ebuild 16546 RMD160 cc441102de835e941939cf9569d46490a99fdba5 SHA1 4c2d36a5359b2bdedc0fbc909fa6ddb11f61c10d SHA256 02d4017f9e3db98a88e334624559b4a50c296aa38646c9ddaae1ed242c255fd8
+EBUILD netbeans-6.1-r1.ebuild 16534 RMD160 958625638380ae6d6da9b187f315b3b07b96e01d SHA1 c8d6282e15eba8c9b19d2c14af9f890bca1ad36e SHA256 b9fa11c3b5d5d515a3d1365f1111d4b6d3931e4ab961404a98fbad1f8c256bb1
 MISC ChangeLog 616 RMD160 f4a93502619f9226ea5270446fb27dd54230640d SHA1 b85d12319d2902c5763203fece0d07cf144376fe SHA256 096404d731a1adf685a42a89880ee414ef809984f84391b411bcebb17507e7b3
 MISC metadata.xml 1128 RMD160 9ba1b3fec0fedacd10416e7c61edfecada1912cd SHA1 997b3db42167a9e591c3667ffddd125bbb85fa98 SHA256 8c524b060fdbfc4aa432a528c2e78ad05eb20fcf4bc8973c1c8366699bb90b5a
diff --git a/dev-util/netbeans/netbeans-6.1-r1.ebuild b/dev-util/netbeans/netbeans-6.1-r1.ebuild
index 02c3ce63..6c183084 100644
--- a/dev-util/netbeans/netbeans-6.1-r1.ebuild
+++ b/dev-util/netbeans/netbeans-6.1-r1.ebuild
@@ -19,10 +19,10 @@ KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="+apisupport +cnd debug doc +gsf +harness +ide +identity +j2ee +java +mobility +nb +php +profiler +ruby +soa +uml +visualweb +xml linguas_de linguas_es linguas_ja linguas_pt_BR linguas_sq linguas_zh_CN"
 
 RDEPEND=">=virtual/jdk-1.5
-	>=dev-java/ant-core-1.7.1_beta2"
+	>=dev-java/ant-core-1.7.0"
 
 DEPEND="=virtual/jdk-1.5*
-	>=dev-java/ant-core-1.7.1_beta2"
+	>=dev-java/ant-core-1.7.0"
 
 BUILDDESTINATION="${S}/nbbuild/netbeans"
 ENTERPRISE="5"
diff --git a/dev-util/visualvm/ChangeLog b/dev-util/visualvm/ChangeLog
new file mode 100644
index 00000000..a66c8ed2
--- /dev/null
+++ b/dev-util/visualvm/ChangeLog
@@ -0,0 +1,9 @@
+# ChangeLog for dev-java/icedtea6
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*visualvm-1.0_p20080728 (16 10 2008)
+
+  16 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> visualvm-1.0_p20080728.ebuild:
+	Added (based on icedtea6-1.3).
+
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
new file mode 100644
index 00000000..366701b0
--- /dev/null
+++ b/dev-util/visualvm/Manifest
@@ -0,0 +1,9 @@
+AUX missing_zip-1.3.patch 2387 RMD160 9eff545c2ac6616b1af6f5d22372d545cb1ad4f6 SHA1 f0d0e6d6eb1b8b6e8308291da3abb64dc4fba99d SHA256 680842157f749b631ffe259d0694aae0657d158b580c201c29eebc0180e5b2dc
+AUX visualvm.clusters 19 RMD160 a8161acbae079a8d1857b9b09af9cd50c478e1f3 SHA1 00610db2193ac777b462d026e180c1ca10fb4b3c SHA256 8025e901b00ea8f092c63ba0a5aabcb85d8c271d2cdec85b26ba698ff0c669d7
+DIST icedtea6-1.3.tar.gz 5602066 RMD160 0249b620f816280df6e27e05534dcb15d8d89b15 SHA1 afbcc4e4e892d733ab03a71618e25f21fbc706c5 SHA256 2486672d9789fa2f7cbae5d02451c897939135f140d2115ce4e344e0a66ae976
+DIST netbeans-6.1-200805300101-basic_cluster-src.zip 85999885 RMD160 ade3c3a331ecd3587fcdca23c3b22f9cd359cd92 SHA1 c02b67e85982d0444e650ccd42a21bd59859d437 SHA256 7c0c2eec2729fd04b107bac3e71c3f6395fbe156dbea81774850417616420cf4
+DIST netbeans-profiler-visualvm_preview2.tar.gz 5512409 RMD160 0b8d88171d24ed00e353d1a3de0c04b50f05dd39 SHA1 212475e44d5592b33e90ee876bb816bd0c556fe2 SHA256 93d51e7049fc30de1e28b3da410f96c9c5408f52947e34824e088fb0b894df22
+DIST visualvm-20080728-src.tar.gz 7330350 RMD160 f8ce70d08e3c5d6d5230755de5a8343f723de0be SHA1 833008a7327c0909f63eb83ab7a562b69a82d322 SHA256 01eb356cc6d7a705f51515ec878a60d72ab54ad74b858bd6112ef8c64b871be7
+EBUILD visualvm-1.0_p20080728.ebuild 2538 RMD160 51eb0242cf2fbac7fd094c4a29eec664fc4be06a SHA1 e11de9b37b28c0b0a79549c93d7e63a8e22cbee5 SHA256 9eb4e7e0f2f1d4aa34fcc8449b434420defd91e7333e3876db2abf4907a4deb1
+MISC ChangeLog 282 RMD160 cddc008db616db0f7130e1aa369c30840f71e2a7 SHA1 8f91f6f924ddad72d6513ded317536ae88d74b72 SHA256 1842f7b5f4b503d327aab86076cc8edd5579aff2dbd03f2911447ee214cd6f8d
+MISC metadata.xml 376 RMD160 400defff92d0aa29672a5f9a25dd184904fff905 SHA1 3a1bedcce2b7789921cf3851d97d75e156ee4f8f SHA256 ca303aff216f2c2148d9c66a707e15f75fbaf91735311bb8c970fe37d0a5b7a0
diff --git a/dev-util/visualvm/files/missing_zip-1.3.patch b/dev-util/visualvm/files/missing_zip-1.3.patch
new file mode 100644
index 00000000..21567c91
--- /dev/null
+++ b/dev-util/visualvm/files/missing_zip-1.3.patch
@@ -0,0 +1,73 @@
+diff -r d6d04e2f4333 Makefile.am
+--- a/Makefile.am	Wed Oct 15 13:11:21 2008 -0400
++++ b/Makefile.am	Thu Oct 16 00:49:26 2008 +0100
+@@ -295,7 +295,12 @@
+ endif
+ 
+ NETBEANS_BASIC_CLUSTER_URL = http://nbi.netbeans.org/files/documents/210/2056/
+-NETBEANS_BASIC_CLUSTER_SRC_ZIP = netbeans-6.1-200805300101-basic_cluster-src.zip 
++
++if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
++  NETBEANS_BASIC_CLUSTER_SRC_ZIP = $(ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP)
++else
++  NETBEANS_BASIC_CLUSTER_SRC_ZIP = netbeans-6.1-200805300101-basic_cluster-src.zip 
++endif
+ 
+ NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/
+ 
+@@ -343,6 +348,8 @@
+ endif
+ endif
+ if WITH_VISUALVM
++if USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP
++else
+ 	if ! echo "$(NETBEANS_BASIC_CLUSTER_MD5SUM) $(NETBEANS_BASIC_CLUSTER_SRC_ZIP)" \
+ 	  | $(MD5SUM) --check ; \
+ 	then \
+@@ -353,7 +360,7 @@
+ 	$(WGET) $(NETBEANS_BASIC_CLUSTER_URL)$(NETBEANS_BASIC_CLUSTER_SRC_ZIP) \
+ 	  -O $(NETBEANS_BASIC_CLUSTER_SRC_ZIP) ; \
+ 	fi
+-
++endif
+ if USE_ALT_NETBEANS_PROFILER_SRC_ZIP
+ else
+ 	if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \
+diff -r d6d04e2f4333 acinclude.m4
+--- a/acinclude.m4	Wed Oct 15 13:11:21 2008 -0400
++++ b/acinclude.m4	Thu Oct 16 00:49:26 2008 +0100
+@@ -473,6 +473,23 @@
+   AC_SUBST(ALT_NETBEANS_PROFILER_SRC_ZIP)
+ ])
+ 
++AC_DEFUN([WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP],
++[
++  AC_MSG_CHECKING(netbeans basic cluster zip)
++  AC_ARG_WITH([netbeans-basic-cluster-src-zip],
++              [AS_HELP_STRING(--with-netbeans-basic-cluster-src-zip, specify the location of the netbeans basic cluster source zip)],
++  [
++    ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP=${withval}
++    AM_CONDITIONAL(USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP, test x = x)
++  ],
++  [ 
++    ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP="not specified"
++    AM_CONDITIONAL(USE_ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP, test x != x)
++  ])
++  AC_MSG_RESULT(${ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP})
++  AC_SUBST(ALT_NETBEANS_BASIC_CLUSTER_SRC_ZIP)
++])
++
+ AC_DEFUN([WITH_ALT_JAR_BINARY],
+ [
+   AC_MSG_CHECKING(alternate jar command)
+diff -r d6d04e2f4333 configure.ac
+--- a/configure.ac	Wed Oct 15 13:11:21 2008 -0400
++++ b/configure.ac	Thu Oct 16 00:49:26 2008 +0100
+@@ -247,6 +247,7 @@
+ WITH_OPENJDK_SRC_DIR
+ WITH_VISUALVM_SRC_ZIP
+ WITH_NETBEANS_PROFILER_SRC_ZIP
++WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP
+ WITH_ALT_JAR_BINARY
+ AC_CHECK_WITH_CACAO
+ AC_CHECK_WITH_CACAO_HOME
diff --git a/dev-util/visualvm/files/visualvm.clusters b/dev-util/visualvm/files/visualvm.clusters
new file mode 100644
index 00000000..1b5c06f5
--- /dev/null
+++ b/dev-util/visualvm/files/visualvm.clusters
@@ -0,0 +1,2 @@
+visualvm
+profiler3
diff --git a/dev-util/visualvm/metadata.xml b/dev-util/visualvm/metadata.xml
new file mode 100644
index 00000000..0fc0ae37
--- /dev/null
+++ b/dev-util/visualvm/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>java</herd>
+<maintainer>
+  <email>gnu_andrew@member.fsf.org</email>
+  <name>Andrew John Hughes</name>
+</maintainer>
+<longdescription>The IcedTea project provides a harness to build the source code from VisualVM. </longdescription>
+</pkgmetadata>
diff --git a/dev-util/visualvm/visualvm-1.0_p20080728.ebuild b/dev-util/visualvm/visualvm-1.0_p20080728.ebuild
new file mode 100644
index 00000000..8abbe026
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.0_p20080728.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="1"
+
+inherit autotools
+
+DESCRIPTION="A harness to build VisualVM using Free Software build tools"
+NETBEANS_BASIC_CLUSTER_ZIP="netbeans-6.1-200805300101-basic_cluster-src.zip"
+NETBEANS_PROFILER_TARBALL="netbeans-profiler-visualvm_preview2.tar.gz"
+VISUALVM_TARBALL="visualvm-20080728-src.tar.gz"
+SRC_URI="http://icedtea.classpath.org/download/source/icedtea6-1.3.tar.gz
+		 http://nbi.netbeans.org/files/documents/210/2056/${NETBEANS_BASIC_CLUSTER_ZIP}
+		 http://icedtea.classpath.org/visualvm/${NETBEANS_PROFILER_TARBALL}
+		 http://icedtea.classpath.org/visualvm/${VISUALVM_TARBALL}"
+HOMEPAGE="http://icedtea.classpath.org"
+
+IUSE=""
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-java/icedtea6-1.3
+		 ~dev-util/netbeans-6.1"
+
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+
+	# Fix missing --with-netbeans-basic-cluster-src-zip (http://icedtea.classpath.org/hg/icedtea6/rev/1c580400c8d9)
+	epatch "${FILESDIR}/missing_zip-${PV}.patch"
+
+	eautoreconf || die "failed to regenerate autoconf infrastructure"
+}
+
+src_compile() {
+	local vmhome="/usr/lib/jvm/icedtea6"
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	econf \
+		--with-netbeans-basic-cluster-src-zip="${DISTDIR}/${NETBEANS_BASIC_CLUSTER_ZIP}" \
+		--with-netbeans-src-zip="${DISTDIR}/${NETBEANS_PROFILER_TARBALL}" \
+		--with-visualvm-src-zip="${DISTDIR}/${VISUALVM_TARBALL}" \
+		--with-icedtea \
+		--with-icedtea-home="${vmhome}" \
+		--with-java="${vmhome}/bin/java" \
+		--with-javac="${vmhome}/bin/javac" \
+		--with-javah="${vmhome}/bin/javah" \
+		--with-visualvm \
+		--with-netbeans-home=/usr/share/netbeans-6.1 \
+		|| die "configure failed"
+
+	emake visualvm  || die "make failed"
+}
+
+src_install() {
+	local icedtea_home=/usr/lib/icedtea6;
+
+	dodir "${icedtea_home}/lib/visualvm/etc"
+	dodir "${icedtea_home}/lib/visualvm/visualvm"
+
+	sed "s/APPNAME=\`basename.*\`/APPNAME=visualvm/" \
+	  visualvm/visualvm/launcher/visualvm >> \
+	  "${D}"${icedtea_home}/bin/jvisualvm ; \
+	fperms 755 ${icedtea_home}/bin/jvisualvm
+
+	insinto "${icedtea_home}/lib/visualvm/etc"
+	doins visualvm/visualvm/launcher/visualvm.conf
+	doins "${FILESDIR}"/visualvm.clusters
+
+	insinto "${icedtea_home}/lib/visualvm/visualvm"
+	doins visualvm/visualvm/build/cluster/*
+
+	insinto "${icedtea_home}/lib/visualvm"
+	doins netbeans/nbbuild/netbeans/platform8
+	doins netbeans/nbbuild/netbeans/profiler3
+}
+