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.

Package-Manager: portage-2.1.10.57/cvs/Linux x86_64

4 files changed, 194 insertions, 2 deletions

diff --git a/dev-util/visualvm/ChangeLog b/dev-util/visualvm/ChangeLog
index 950e12af0389..c904d74fbbad 100644
--- a/dev-util/visualvm/ChangeLog
+++ b/dev-util/visualvm/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-util/visualvm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/ChangeLog,v 1.2 2012/01/08 21:02:46 fordfrog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/visualvm/ChangeLog,v 1.3 2012/05/01 09:01:07 sera Exp $
+
+*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.
 
   08 Jan 2012; Miroslav Šulc <fordfrog@gentoo.org>
   +files/netbeans-platform-version.patch:
diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 0548f2514e61..aa4ab28fb27f 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,8 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX netbeans-platform-version.patch 435 RMD160 88fc0ba7def717577e6e89d923e15c53a73403ee SHA1 35265290c793d5124782cf27ec1f929bdb7afd79 SHA256 2ab6b242b105952962ad5893cb9249c019912aad8d41b909e8afeadfefa24515
 DIST netbeans-profiler-visualvm_release701.tar.gz 1767450 RMD160 66e9a35d8092b9fec1f7e400c635d531355bf92e SHA1 10e145b19e5d544cd85f160d207369404fcd878d SHA256 0056c6b7da3fa9499b87319caa6b431b935b48f9579f7c94ec169777ecd2c238
 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 2195 RMD160 d0a5bdafd9cb6ca8c0a4b341ea09c7e1a3fd442d SHA1 6891b9197d76cbead99084cc57497d008b51a69c SHA256 7a6d3eefc12135b3487c6238db5d78139028fcffdb1a61d77681b1d59a3f012d
+EBUILD visualvm-1.3.3-r2.ebuild 2252 RMD160 c0a9a66a5d01f0623d987730a964ccda86d3409d SHA1 1401242aef69bf7b4dc073eec85df1293ec041a5 SHA256 9229a505cd84fe486e649bfa568c66c096e1efb12b01d785e6f80c47ecb5cd8a
 EBUILD visualvm-1.3.3-r8.ebuild 2195 RMD160 5e2415176b975282e953ba8d07c1b540106d3377 SHA1 b492c0340b167b2ed0817b31b99d17bdbffdc975 SHA256 e977342479f6fbd1b662047f4a75dc04d57dbb0defc62ee711ac72f861337c9c
-MISC ChangeLog 571 RMD160 e1ce5fa57bb80582ed12020f560034cdc67fd439 SHA1 8946363d8c5364c77857a73aa717d34b8dd722db SHA256 04c532e21d32fddab54533c173a64c47c1eda17557f5357b76eef8d2f2a3fd51
+EBUILD visualvm-1.3.3-r9.ebuild 2252 RMD160 706ce7d30c15baaf1742dd5a1db963d3bc53ab97 SHA1 d1216019bac97460d7ac3c51ac24fa487ac1d09e SHA256 4866bd495c4a8c292651a121c4d9086f8bc8dadd22b245778aa92970f0683e30
+MISC ChangeLog 911 RMD160 e72aa49a75be62af5c39bbb22bab9c27c99ce7b2 SHA1 bd5f83dba566b901e2da2901d09862e8f7d33910 SHA256 f78f8b6c8bbc7e96461e4c09117fa60c2c1c69351b0865d2d6c1eb415220818d
 MISC metadata.xml 376 RMD160 400defff92d0aa29672a5f9a25dd184904fff905 SHA1 3a1bedcce2b7789921cf3851d97d75e156ee4f8f SHA256 ca303aff216f2c2148d9c66a707e15f75fbaf91735311bb8c970fe37d0a5b7a0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJPn6ZgAAoJEIUJ+svaV163wlAH/jIhvnbZQq7aV3GKktjR3aoD
+A5Sx6FIJ1A0KGho/P3G4FBwcr6uG9OC/c5W/JPEA5mCTGO5gx7/QqQWhgxy/NOVZ
++886ejPnFntJM+QUIWWKYBr+OhF5NE0H7LRgnT1zE5KSg155WD4OJuCSD5okgirQ
+QfJcygyQVzrylCsGDx5g4WTdACnxSRsjdCvl9dhlKTgNkE8iryob+vZCDk9MLIb4
+CvFnOmQ8z9kkEL6bu1wRJJgQOsPZQ+zkhkE6SOI4cAu++ObtUP1YTyW3rs9MPNZt
+OoPJob73EQo2KuLHZAkMHFmBUuPsZs7pB7YFkU4ZpdBrK/wsCqwP+v6LwIdJsNQ=
+=8XwV
+-----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 000000000000..5b3542c3c696
--- /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: /var/cvsroot/gentoo-x86/dev-util/visualvm/visualvm-1.3.3-r2.ebuild,v 1.1 2012/05/01 09:01:07 sera Exp $
+
+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 000000000000..0e71dbd5444f
--- /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: /var/cvsroot/gentoo-x86/dev-util/visualvm/visualvm-1.3.3-r9.ebuild,v 1.1 2012/05/01 09:01:07 sera Exp $
+
+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}"
+}