Add missing eutils to inherit.

Bump netbeans deps to :7.1 and only depend on required subset. #397843
Fix bogous DESTDIR for prefix.
Don't call die in subshells.

(Portage version: 2.1.10.57/svn/Linux x86_64, signed Manifest commit with key 0xDA575EB7)

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

4 files changed, 194 insertions, 2 deletions

diff --git a/dev-util/visualvm/ChangeLog b/dev-util/visualvm/ChangeLog
index b17c2548..29d2093f 100644
--- a/dev-util/visualvm/ChangeLog
+++ b/dev-util/visualvm/ChangeLog
@@ -1,7 +1,17 @@
 # ChangeLog for dev-util/visualvm
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*visualvm-1.3.3-r9 (01 May 2012)
+*visualvm-1.3.3-r2 (01 May 2012)
+
+  01 May 2012; Ralph Sennhauser <sera@gentoo.org> +visualvm-1.3.3-r2.ebuild,
+  +visualvm-1.3.3-r9.ebuild:
+  Add missing eutils to inherit.
+  Bump netbeans deps to :7.1 and only depend on required subset. #397843
+  Fix bogous DESTDIR for prefix.
+  Don't call die in subshells.
+
 *visualvm-1.3.3-r8 (26 Dec 2011)
 *visualvm-1.3.3-r1 (26 Dec 2011)
 
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index e1706fc2..80a97553 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX missing_zip-1.3.patch 2387 RMD160 9eff545c2ac6616b1af6f5d22372d545cb1ad4f6 SHA1 f0d0e6d6eb1b8b6e8308291da3abb64dc4fba99d SHA256 680842157f749b631ffe259d0694aae0657d158b580c201c29eebc0180e5b2dc
 AUX netbeans-platform-version.patch 435 RMD160 88fc0ba7def717577e6e89d923e15c53a73403ee SHA1 35265290c793d5124782cf27ec1f929bdb7afd79 SHA256 2ab6b242b105952962ad5893cb9249c019912aad8d41b909e8afeadfefa24515
 AUX visualvm.clusters 19 RMD160 a8161acbae079a8d1857b9b09af9cd50c478e1f3 SHA1 00610db2193ac777b462d026e180c1ca10fb4b3c SHA256 8025e901b00ea8f092c63ba0a5aabcb85d8c271d2cdec85b26ba698ff0c669d7
@@ -5,6 +8,19 @@ DIST netbeans-profiler-visualvm_release701.tar.gz 1767450 RMD160 66e9a35d8092b9f
 DIST visualvm_133-src.tar.gz 978434 RMD160 4bad0d1b1ca806a40c511e5786459f8088c8b4e9 SHA1 d61bb9a2a9fec21908299f5ef414c088af6dad29 SHA256 43f4d5c892d3654ada9d07f2a8dc1c1b98db671f558a5c7fa7e9db7e86b7ca81
 DIST visualvm_harness-1.3.tar.gz 147059 RMD160 85edd84d5cb01568f21b133ed1da522442a3906c SHA1 a7aa102c96e1dcd863fb45956404dda5c41fe99f SHA256 e66eb2fe2b4703896d329ca0e0a8f5e89c5a0097dbad72f9211e14d71401f585
 EBUILD visualvm-1.3.3-r1.ebuild 2089 RMD160 945bbe0964c5062ff36dae83570a57d8615e89bf SHA1 2e2647e98e0a7ef6f83022b33c3ad1c17ca87e5c SHA256 f181186eacbc679421d6c8e034b861096a0de7765f6dc907905793dbaa556e25
+EBUILD visualvm-1.3.3-r2.ebuild 2150 RMD160 b2338e11a3223ce4d10cac49e29dba5f0ecf0497 SHA1 0fc331fa9602a8e38c83499d2373d39cf91e550b SHA256 e7e85c63232014f30d6424666d1a3be23603c68055882aadaf9653aee76142c7
 EBUILD visualvm-1.3.3-r8.ebuild 2089 RMD160 768f04a04d203e7f063b31a589e675121d68c6ad SHA1 cbf9feb0c4378bae1266c27843a97c748b6b8b90 SHA256 e34e9e52d1343b3abf0c3a8e39118b03702dd3c6ccdc8e6221163b4a73a92231
-MISC ChangeLog 1038 RMD160 88d0923c9f7aa7be408e80c268a6fc5769896119 SHA1 994285823af4e0bd19ea767237884295d60a7eb7 SHA256 ccb807c56ca4b6120aa433ef0e22be1ba8aa5305fceb08e28069f5ff857044ea
+EBUILD visualvm-1.3.3-r9.ebuild 2150 RMD160 ee5044c8334e1bea59996bb1183a33b3b3c449fb SHA1 440c49720e88125e3c5de90fe894d51067c1a64c SHA256 ee948fad001ed09b1cc6d91244242e56cf6c06bc9081e9d29d0e3bd5eb8f1d7b
+MISC ChangeLog 1382 RMD160 472b425a5524283958cae390aced999a04f03601 SHA1 00aa71e6a0ac024ddc20b991ba84377cc173b6a8 SHA256 30b6954bcc0a5f45dd10271fe69d019e5c696c6c35ef9723702db0b65fe3396d
 MISC metadata.xml 376 RMD160 400defff92d0aa29672a5f9a25dd184904fff905 SHA1 3a1bedcce2b7789921cf3851d97d75e156ee4f8f SHA256 ca303aff216f2c2148d9c66a707e15f75fbaf91735311bb8c970fe37d0a5b7a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPn6HrAAoJEIUJ+svaV163SlsH/06od3wk08sppv0ZzDZf6gbG
+hacSNPdIgoXYOdTavnN7fbxFB+b2B9Ssr8bvj/TaTUuzaujSJNs2aPihABTPA+mS
+19nGCBNfXsTf+D9Oj9eTKYzooapwfKhX+xsIl0/gt9vSy6rbv7vW3Lqwj3DCSir8
+ThYLpeCCsJSkdw8TkSH0Fp4Hvx344Y3LKi1as5br71EvlfVeaKcXcexqCntt6fIK
+1B/uhcZK82+VMy4WrRk+8Qg7zd8tcY4ump5F9gxjBDcZhFSKftbyOsGHSqZU7K4v
+V3iQLrswFbTUpN/H86GRIZYDmLmXlIs+lNuJ8KZuybzWvq849aL3jNqOtF47X0Q=
+=tOnB
+-----END PGP SIGNATURE-----
diff --git a/dev-util/visualvm/visualvm-1.3.3-r2.ebuild b/dev-util/visualvm/visualvm-1.3.3-r2.ebuild
new file mode 100644
index 00000000..62426555
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.3.3-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils autotools
+
+VISUALVM_PKG="visualvm_harness-1.3"
+VISUALVM_TARBALL="visualvm_133-src.tar.gz"
+NETBEANS_PROFILER_TARBALL="netbeans-profiler-visualvm_release701.tar.gz"
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilites."
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/visualvm/${VISUALVM_PKG}.tar.gz
+	http://icedtea.classpath.org/download/visualvm/${VISUALVM_TARBALL}
+	http://icedtea.classpath.org/download/visualvm/${NETBEANS_PROFILER_TARBALL}"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="6"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/icedtea:${SLOT}
+	dev-java/netbeans-harness:7.1
+	dev-java/netbeans-platform:7.1"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	dev-java/ant-core
+	dev-java/ant-nodeps"
+
+S="${WORKDIR}/${VISUALVM_PKG}"
+
+src_unpack() {
+	unpack ${VISUALVM_PKG}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/netbeans-platform-version.patch
+	eautoreconf
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	export ANT_RESPECT_JAVA_HOME=TRUE
+	export ANT_TASKS=ant-nodeps
+}
+
+src_configure() {
+	local vmhome
+	vmhome=$(get_vmhome) || die
+
+	econf NB_PLATFORM=platform \
+		--bindir="${vmhome}"/bin \
+		--libdir="${vmhome}"/lib \
+		--sysconfdir="${vmhome}"/lib/visualvm/etc \
+		--with-netbeans-profiler-zip="${DISTDIR}"/${NETBEANS_PROFILER_TARBALL} \
+		--with-visualvm-zip="${DISTDIR}"/${VISUALVM_TARBALL} \
+		--with-visualvm-version=${PV} \
+		--with-netbeans-home="${EPREFIX}"/usr/share/netbeans-nb-7.1 \
+		--with-jdk-home="${vmhome}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Don't install default .desktop, file collision.
+	local vmhome
+	vmhome=$(get_vmhome) || die
+	rm -r "${ED}"/usr/share || die
+	make_desktop_entry "${vmhome}/bin/jvisualvm" "OpenJDK ${SLOT} VisualVM" "java" "Development;Java;"
+}
+
+get_vmhome() {
+	local vmhandle=icedtea-${SLOT}
+	has_version "<=dev-java/icedtea-6.1.10.4:6" && vmhandle=icedtea6
+
+	local vmhome
+	vmhome="$(GENTOO_VM=${vmhandle} java-config -O)" || return 1
+
+	echo "${vmhome}"
+}
diff --git a/dev-util/visualvm/visualvm-1.3.3-r9.ebuild b/dev-util/visualvm/visualvm-1.3.3-r9.ebuild
new file mode 100644
index 00000000..8fd0aa98
--- /dev/null
+++ b/dev-util/visualvm/visualvm-1.3.3-r9.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils autotools
+
+VISUALVM_PKG="visualvm_harness-1.3"
+VISUALVM_TARBALL="visualvm_133-src.tar.gz"
+NETBEANS_PROFILER_TARBALL="netbeans-profiler-visualvm_release701.tar.gz"
+
+DESCRIPTION="Integrates commandline JDK tools and profiling capabilites."
+HOMEPAGE="http://icedtea.classpath.org"
+SRC_URI="
+	http://icedtea.classpath.org/download/visualvm/${VISUALVM_PKG}.tar.gz
+	http://icedtea.classpath.org/download/visualvm/${VISUALVM_TARBALL}
+	http://icedtea.classpath.org/download/visualvm/${NETBEANS_PROFILER_TARBALL}"
+
+LICENSE="GPL-2-with-linking-exception"
+SLOT="7"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEP="
+	dev-java/icedtea:${SLOT}
+	dev-java/netbeans-harness:7.1
+	dev-java/netbeans-platform:7.1"
+RDEPEND="${COMMON_DEP}"
+DEPEND="${COMMON_DEP}
+	dev-java/ant-core
+	dev-java/ant-nodeps"
+
+S="${WORKDIR}/${VISUALVM_PKG}"
+
+src_unpack() {
+	unpack ${VISUALVM_PKG}.tar.gz
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/netbeans-platform-version.patch
+	eautoreconf
+
+	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
+
+	export ANT_RESPECT_JAVA_HOME=TRUE
+	export ANT_TASKS=ant-nodeps
+}
+
+src_configure() {
+	local vmhome
+	vmhome=$(get_vmhome) || die
+
+	econf NB_PLATFORM=platform \
+		--bindir="${vmhome}"/bin \
+		--libdir="${vmhome}"/lib \
+		--sysconfdir="${vmhome}"/lib/visualvm/etc \
+		--with-netbeans-profiler-zip="${DISTDIR}"/${NETBEANS_PROFILER_TARBALL} \
+		--with-visualvm-zip="${DISTDIR}"/${VISUALVM_TARBALL} \
+		--with-visualvm-version=${PV} \
+		--with-netbeans-home="${EPREFIX}"/usr/share/netbeans-nb-7.1 \
+		--with-jdk-home="${vmhome}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Don't install default .desktop, file collision.
+	local vmhome
+	vmhome=$(get_vmhome) || die
+	rm -r "${ED}"/usr/share || die
+	make_desktop_entry "${vmhome}/bin/jvisualvm" "OpenJDK ${SLOT} VisualVM" "java" "Development;Java;"
+}
+
+get_vmhome() {
+	local vmhandle=icedtea-${SLOT}
+	has_version "<=dev-java/icedtea-6.1.10.4:6" && vmhandle=icedtea6
+
+	local vmhome
+	vmhome="$(GENTOO_VM=${vmhandle} java-config -O)" || return 1
+
+	echo "${vmhome}"
+}