Add CACAO, Shark and VisualVM support for IcedTea6 1.3.

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

13 files changed, 269 insertions, 18 deletions

diff --git a/dev-java/icedtea6/ChangeLog b/dev-java/icedtea6/ChangeLog
index dc1ff2d7..b12782b8 100644
--- a/dev-java/icedtea6/ChangeLog
+++ b/dev-java/icedtea6/ChangeLog
@@ -2,8 +2,13 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*icedtea6-1.3-r1 (16 10 2008)
+
+  15 Oct 2008; Andrew John Hughes <gnu_andrew@member.fsf.org> icedtea6-1.3-r1.ebuild:
+	Fixed naming of icedtea6 install directory and added cacao and shark options.
+
   15 Oct 2008; Vlastimil Babka <caster@gentoo.org> icedtea6-1.3.ebuild:
-  Prefer ecj 3.3 over 3.2
+	Prefer ecj 3.3 over 3.2
 
 *icedtea6-1.3 (15 10 2008)
 
diff --git a/dev-java/icedtea6/Manifest b/dev-java/icedtea6/Manifest
index 97de2ffb..917c5e2a 100644
--- a/dev-java/icedtea6/Manifest
+++ b/dev-java/icedtea6/Manifest
@@ -1,3 +1,4 @@
+AUX cacao-1.3.patch 985 RMD160 01533fcd9c1ad277ebb71e2f22c4212e69964828 SHA1 ab82caf2536d5043e573c8cc6c89390cd1bbb1d9 SHA256 3a3777112b96ca21aad89e86e2af1ed9c834f490f12b609a1b9ec174a7058af7
 AUX docs.patch 5842 RMD160 eac33d3d884c939e140f0bd9ea4073ad938d6b00 SHA1 bff6d5a710e390be55974d284f6dea2a781442b8 SHA256 78c9f263e2b334129a26b36e4c89b41a50cbe0aae6b756cea3d4871bb4636ccf
 AUX enable_fix-1.2.patch 733 RMD160 83672cb64e34716752d43a90e55fec2c137d5e74 SHA1 aa4c670a9e6be785ee822e0cd9428f4474e9cd69 SHA256 658fb2a9efee74670e29dfeb330be8ff088d2062ef354814f5b8159262fe3e15
 AUX gjar-1.2.patch 1606 RMD160 552ad05f04493da6f9f80f9b3d53c127f1232d67 SHA1 9d8034f01d0da760dade0478c6a409d6806cdaa7 SHA256 8c6b85099582f0c50b2e99cad352f6c1306e394c9e011d13f32444f1855e895a
@@ -8,11 +9,12 @@ AUX motif.patch 1576653 RMD160 d7617c764e996ac2733622eb5359326700618ffe SHA1 728
 AUX parallel_jobs.patch 4872 RMD160 fb333b460bd3715135b0a3b223e6b648e4e7c02e SHA1 0afad8989a249df0bbaf964ccfb3e32f8495ed1b SHA256 9e3be225ae770437f3da40b75e9a7cd0de63e0e2d31c56b4d827123e60e1c568
 AUX security_and_versioning.patch 49918 RMD160 bb8c51bf3f1bba6514be427ff3321c657c59be95 SHA1 844ae7b80fc217c74546b00f048ba41eebb8e114 SHA256 6b6eafebe18fbf25988323b9b1642034901d01924909c5292745454158750a60
 AUX zero.patch 1678 RMD160 ac5f3e842212669ef95c3261d17aed992e443706 SHA1 dd28b39d84875f2568d5c3d4429c449fa46d9939 SHA256 1bee0c0461386727dc27877fbb63d1f03f9ba9310d64694d5d4095f68c3c1032
+DIST cacao-0.99.3.tar.gz 4244669 RMD160 c5e0222e65e111ae70ac73f082aa0016f9a718dc SHA1 9c963dc63c9ff6e6a891d1f47666af66753fe65b SHA256 81316b9f84c654e139def3572c1aa099a05f7fd9a60a973236ae0d0dc6376a03
 DIST icedtea6-1.2.tar.gz 4909928 RMD160 5aff3b2114e38bd998581badc4df18f40506d2e2 SHA1 359434a16f170439b630c33f6070617d3f9f381f SHA256 855d94abd58212b35344e40e1b382d1043ef03416ae2c10cb4dbff71a6b58de2
 DIST icedtea6-1.3.tar.gz 5602066 RMD160 0249b620f816280df6e27e05534dcb15d8d89b15 SHA1 afbcc4e4e892d733ab03a71618e25f21fbc706c5 SHA256 2486672d9789fa2f7cbae5d02451c897939135f140d2115ce4e344e0a66ae976
 DIST openjdk-6-src-b09-11_apr_2008.tar.gz 49685308 RMD160 287b8d78747819160fa16d13821a240daab525c4 SHA1 6e0c72a736e82b41373649d953c8ae8875733862 SHA256 72ecd8a70a593057cf85c506e028d633125de4e8e492f1e5b434ad4e11090849
 DIST openjdk-6-src-b12-28_aug_2008.tar.gz 49175364 RMD160 05e0221a4c1ffffd1fd959b90c02c51dd9f9fca3 SHA1 fa864012b9f07042a1ea1e6c620abe5675f58827 SHA256 f099b3b1f3c22b8cea950403b992267ec69f43ad8a80bbcb84448b26340807ab
 EBUILD icedtea6-1.2.ebuild 5206 RMD160 953ddc1bfaec11267c5d7bc9da2950b19a3dd553 SHA1 7930bf58c7897da38ab6b099c3c152276dffdcc1 SHA256 3dc60cad13fecb66dfeb7f172afbc16426ac200c7f23515aee9590f731e77890
-EBUILD icedtea6-1.3.ebuild 4858 RMD160 4ccbfb322408ca997238477371b5d31c8c8b0860 SHA1 d33f1327e03530c0b51ddd05a5c2c2c0d92be136 SHA256 0bfa1412acdc9d1da7d0c8e421987b41d4a62c9719e5709abe29b196db208144
+EBUILD icedtea6-1.3-r1.ebuild 5824 RMD160 4252b027e4ae534dcd53be27fb87a21bb6b292b4 SHA1 dd2a420474555a6a40295cc772282919b3f001c9 SHA256 c6a75ef670ae40fe7ab3e438f2b81de7e39d3c9a642d815ec3b20ad7b4f048b1
 MISC ChangeLog 6059 RMD160 6d255d6124548cfbf62534a1d10cb415a722d89d SHA1 23e34aba813bbb19f5804bdd03dc6a863efd908f SHA256 432ca275ddfa0e5e2509de6786e772e6a7f718f6160f157cf6f911ade05f68ce
-MISC metadata.xml 621 RMD160 718de987c197138a20fc094c13b087dee77bb039 SHA1 51cb2ffc598fb96d2103fc1fe0ea2dde8deafb67 SHA256 de52b7692e144ede28cd9366b9e389e7c0c16f1e557bb7229f189a5c6ce96ee1
+MISC metadata.xml 769 RMD160 25f1df31ca2868be08175bf5b5e1f5eee4213f12 SHA1 b25996abf9b3aa613c4af15481c1997f2f18aa28 SHA256 cd693de80f89910d833b8f03cbb537f08a82eaa116a4c9288cb6f400b2ee759a
diff --git a/dev-java/icedtea6/files/cacao-1.3.patch b/dev-java/icedtea6/files/cacao-1.3.patch
new file mode 100644
index 00000000..1326a47b
--- /dev/null
+++ b/dev-java/icedtea6/files/cacao-1.3.patch
@@ -0,0 +1,33 @@
+diff -r ce3ea0b5a8c9 acinclude.m4
+--- a/acinclude.m4	Thu Oct 16 01:28:18 2008 +0100
++++ b/acinclude.m4	Thu Oct 16 01:32:45 2008 +0100
+@@ -847,13 +847,13 @@
+   AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
+ ])
+ 
+-AC_DEFUN([AC_CHECK_WITH_CACAO],
++AC_DEFUN([AC_CHECK_ENABLE_CACAO],
+ [
+   AC_MSG_CHECKING(whether to use CACAO as VM)
+-  AC_ARG_WITH([cacao],
+-	      [AS_HELP_STRING(--with-cacao,use CACAO as VM [[default=no]])],
++  AC_ARG_ENABLE([cacao],
++	      [AS_HELP_STRING(--enable-cacao,use CACAO as VM [[default=no]])],
+   [
+-    WITH_CACAO=yes
++    WITH_CACAO="${enableval}"
+   ],
+   [
+     WITH_CACAO=no
+diff -r ce3ea0b5a8c9 configure.ac
+--- a/configure.ac	Thu Oct 16 01:28:18 2008 +0100
++++ b/configure.ac	Thu Oct 16 01:32:45 2008 +0100
+@@ -249,7 +249,7 @@
+ WITH_NETBEANS_PROFILER_SRC_ZIP
+ WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP
+ WITH_ALT_JAR_BINARY
+-AC_CHECK_WITH_CACAO
++AC_CHECK_ENABLE_CACAO
+ AC_CHECK_WITH_CACAO_HOME
+ AC_CHECK_WITH_CACAO_SRC_ZIP
+ ENABLE_OPTIMIZATIONS
diff --git a/dev-java/icedtea6/icedtea6-1.3.ebuild b/dev-java/icedtea6/icedtea6-1.3-r1.ebuild
index be2feac4..cfed96a9 100644
--- a/dev-java/icedtea6/icedtea6-1.3.ebuild
+++ b/dev-java/icedtea6/icedtea6-1.3-r1.ebuild
@@ -10,15 +10,17 @@ DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and
 OPENJDK_BUILD="12"
 OPENJDK_DATE="28_aug_2008"
 OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
+CACAO_TARBALL="cacao-0.99.3.tar.gz"
 SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz
-		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}"
+		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
+		 cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.3/${CACAO_TARBALL} )"
 HOMEPAGE="http://icedtea.classpath.org"
 
-IUSE="debug doc examples javascript nsplugin zero"
+IUSE="cacao debug doc examples javascript nsplugin shark zero"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND=">=net-print/cups-1.2.12
 	 >=x11-libs/libX11-1.1.3
@@ -48,25 +50,43 @@ DEPEND="${RDEPEND}
 	>=dev-java/xalan-2.7.0
 	>=dev-java/xerces-2.9.1
 	>=dev-java/ant-core-1.7.0-r3
-	|| (	
+	|| (
 		dev-java/eclipse-ecj:3.3
 		>=dev-java/eclipse-ecj-3.2.1:3.2
 	)
 	javascript? ( dev-java/rhino:1.6 )"
 
 pkg_setup() {
-	if use_zero && ! built_with_use sys-devel/gcc libffi; then
+	if use zero && ! built_with_use sys-devel/gcc libffi; then
 		eerror "Using the zero assembler port requires libffi. Please rebuild sys-devel/gcc"
 		eerror "with USE=\"libffi\" or turn off the zero USE flag on ${PN}."
 		die "Rebuild sys-devel/gcc with libffi support"
 	fi
 
+	if use shark ; then
+	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
+		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
+		errror "without the shark USE flag turned on."
+		die "Rebuild without the shark USE flag on."
+	  fi
+	  if ( ! use zero ) ; then
+		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
+		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
+	  fi
+	fi
+
 	java-vm-2_pkg_setup
 	java-pkg-2_pkg_setup
 }
 
 src_unpack() {
 	unpack ${P}.tar.gz
+	cd "${S}" || die
+
+	# Fix --with-cacao (should be --enable-cacao) (http://icedtea.classpath.org/hg/icedtea6/rev/1c580400c8d9)
+	epatch "${FILESDIR}/cacao-${PV}.patch"
+
+	eautoreconf || die "failed to regenerate autoconf infrastructure"
 }
 
 src_compile() {
@@ -95,10 +115,10 @@ src_compile() {
 		einfo "Configuring using --with-parallel-jobs=${procs}"
 	fi
 
-	if use_zero ; then
-		config="${config} --enable-zero"
+	if use_cacao ; then
+		config="${config} --enable-cacao"
 	else
-		config="${config} --disable-zero"
+		config="${config} --disable-cacao"
 	fi
 
 	if use javascript ; then
@@ -109,6 +129,7 @@ src_compile() {
 
 	econf ${config} \
 		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
+		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
 		--with-java="${vmhome}/bin/java" \
 		--with-javac="${vmhome}/bin/javac" \
 		--with-javah="${vmhome}/bin/javah" \
@@ -116,13 +137,15 @@ src_compile() {
 		$(use_enable doc docs) \
 		$(use_enable nsplugin gcjwebplugin) \
 		$(use_with javascript rhino ${rhino_jar}) \
+		$(use_enable zero) \
+		$(use_enable shark) \
 		|| die "configure failed"
 
 	emake -j 1  || die "make failed"
 }
 
 src_install() {
-	local dest="/usr/$(get_libdir)/${P}"
+	local dest="/usr/$(get_libdir)/${PN}"
 	local ddest="${D}/${dest}"
 	dodir "${dest}" || die
 
@@ -163,8 +186,8 @@ src_install() {
 	set_java_env
 }
 
-use_zero() {
-	use zero || ( ! use amd64 && ! use x86 && ! use sparc )
+use_cacao() {
+	use cacao || ( ! use amd64 && ! use x86 && ! use sparc )
 }
 
 pkg_postinst() {
diff --git a/dev-java/icedtea6/metadata.xml b/dev-java/icedtea6/metadata.xml
index 82490aa2..06d2128b 100644
--- a/dev-java/icedtea6/metadata.xml
+++ b/dev-java/icedtea6/metadata.xml
@@ -8,6 +8,8 @@
 </maintainer>
 <longdescription>The IcedTea project provides a harness to build the source code from OpenJDK6 (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription>
 <use>
-  <flag name="zero">Enable the zero assembler port on x86 and amd64 architectures.</flag>
+  <flag name="cacao">Use the CACAO virtual machine instead of HotSpot on x86, amd64 or SPARC architectures.</flag>
+  <flag name="shark">Enable Shark JIT support</flag>
+  <flag name="zero">Enable the zero assembler port of HotSpot.</flag>
 </use>
 </pkgmetadata>
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
+}
+