gentoo resync : 09.06.2018

3 files changed, 22 insertions, 82 deletions

diff --git a/dev-util/visualvm/Manifest b/dev-util/visualvm/Manifest
index 4940726e140e..b43aed57a5fd 100644
--- a/dev-util/visualvm/Manifest
+++ b/dev-util/visualvm/Manifest
@@ -1,8 +1,5 @@
 AUX visualvm-r1.conf 786 BLAKE2B 863af1d373f3e8633a630c6a1cdbc8ada09b1a9b5f35704db044e12614c997e9648ae9c087caaed89c2632dde7a09a1eb3b158d4227a1e2cd94214ba25d61eef SHA512 243ab8ac4472492edf796582dea5164f53261f654168cde9ccf863e0f265ec5c50442c1c44de89ca759c8d0dee6c00c10a3f807ad45d039976ff4d91c89d8397
 AUX visualvm-r1.sh 424 BLAKE2B ad18e375535b92e5bc5720c7b4f9f9526ee136d29d51103038a68e8c260245222af1e912b8320ca98dbaeb1a8736f041fea89ae87b15d1db9cb916eb1552c8e6 SHA512 8e579f126142f52e14f235a23c3834933b59a9df95ba76b6b9a82175cfc5e12d759bc0d7234ae3cea7684bdfe12f2efb9785afbe6844394f458cff05ae8342f7
-DIST nb802_visualvm_02102016.zip 23257637 BLAKE2B b18570b69a646c975c4b93028438cb7827f82e4e8d7d02bd11a76faf2a40164b9171626a1bd3b0664a216a30e27ff8b14d68941c8eff92e426fb92a45fb95687 SHA512 e33dba0cdfb509e9351fac343a4fbec07d3a893b6f484d0aeab972aefe41b061422dba8695003c6ca33db52d5be2f4ce218ea4fc7129f67dbd48c991c35349b5
-DIST visualvm-1.3.9.tar.gz 3623394 BLAKE2B 8132447427b4abd206a825b4ce45ac54055cbb761a03624438baed7f58decb370d36bd13bb233638daad55086e04e01502b971fd0c95a31648a5b0795d8eb30f SHA512 580e2f3dd7cab1f71c8ae3004101c1067d04a7b4c164e6a59bbe95ca927dd275b8b4389e724cb7d8b38586986762126f261abc1779fb229a778c1c8db0f20387
 DIST visualvm-1.4.1.tar.gz 56752632 BLAKE2B cd171a48a0a9af440c27f2968ce27c5f89af3769046258629ba384ebbfc1c2ecb9847678af9d69bea5847fe1098e9039f35d350fb6f5d112e9236a6510c52bc7 SHA512 de8cf37e619e15c3a30c5116d49becddc09b54062aa22709e412892cf78e3048777116a8388dc6f63609d11bfb6fe37176fe48f5e3263a4dbce8439df676ef15
-EBUILD visualvm-1.3.9.ebuild 1448 BLAKE2B d86f03eeb55c832e33dbed3ee694e6d7737b0bf5b414e5d5c7c675b154be35320afaf47c20c71955d6791278b2a600101479e5887b0fbf68164f816ed14379c9 SHA512 53f14fe6f1ceb34d9a1b0c3da20baa510f115c99b479603a2af36510b20826d6e23f71b7102288ea0a4f817c8ad0e4511bc9c2d427b2324e9eeed9106395d6fe
-EBUILD visualvm-1.4.1.ebuild 1689 BLAKE2B e1fe2081e2792d4b12703ae7250df86464270f6417f164747b0ee9919d97cd479589695f1a515a127fc3acdb2e1be4e490e5c3bb5626788da9acaabe2b8975cd SHA512 71e6ade4c914312b3b03fd6450a51d28b1596f169704ed9a8add7f44009ca83304091f76191a981c425c223abbefcbb73c22cc6830267b09e2021616bf9012bb
+EBUILD visualvm-1.4.1.ebuild 1667 BLAKE2B 92813bb7a920d1f2a83af817d9fdd821be79661331c29b6c4a7f8f945c190a9dfd4a89a8cae04ae347be3fbb68bf6a8f9b02a80310780f7fea29f3522dec0fbf SHA512 b38ac4aae3d549e8f7c749436f885cc538c5844b81af6ba2adbed503ffc5ec297ffc1dec3a4f5e3c96ac7f53dd8f508e25c18e3a11f7a3b9108b05ce0d51d542
 MISC metadata.xml 452 BLAKE2B a1a04fcf6da524fc4bc9d68c415c429dbf43813e594797eaf24f6590e47dd6466d9ec5bae1909011976ab9a47cedb07bbbff29f254f60371aa50ed88a3d9a50a SHA512 cfb0070326f1fc73f96016a138bdba35b6799333a625c38c84fb486134e1446f71bcfe2f170cdbe9ff86befe66905ba79caebd68f811547ec638e69821a5a739
diff --git a/dev-util/visualvm/visualvm-1.3.9.ebuild b/dev-util/visualvm/visualvm-1.3.9.ebuild
deleted file mode 100644
index 7fe5e09f1733..000000000000
--- a/dev-util/visualvm/visualvm-1.3.9.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-NBV=802
-NBT=02102016
-NBZ=nb${NBV}_${PN}_${NBT}.zip
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Integrates commandline JDK tools and profiling capabilities"
-HOMEPAGE="https://visualvm.github.io/"
-SRC_URI="https://github.com/oracle/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/oracle/${PN}/releases/download/${PV}/${NBZ}"
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="~amd64"
-
-RDEPEND=">=virtual/jre-1.7"
-DEPEND=">=virtual/jdk-1.7
-	app-arch/unzip"
-
-S=${WORKDIR}/${P}/${PN}
-EANT_BUILD_TARGET=build
-INSTALL_DIR=/usr/share/${PN}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd "${S}" || die
-	unpack ${NBZ}
-}
-
-src_prepare() {
-	default
-
-	# Remove unneeded binaries
-	rm -rv netbeans/platform/lib/*.{dll,exe} \
-	   netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-	find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
-		 -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
-}
-
-src_install() {
-	# this is the visualvm cluster
-	insinto ${INSTALL_DIR}
-	doins -r build/cluster netbeans/{platform,profiler}
-
-	# configuration file that can be used to tweak visualvm startup parameters
-	insinto /etc/${PN}
-	newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
-
-	# visualvm runtime script
-	newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
-
-	# makes visualvm entry
-	make_desktop_entry ${PN} VisualVM java "Development;Java;"
-}
diff --git a/dev-util/visualvm/visualvm-1.4.1.ebuild b/dev-util/visualvm/visualvm-1.4.1.ebuild
index b29eb860b654..a33b5289f774 100644
--- a/dev-util/visualvm/visualvm-1.4.1.ebuild
+++ b/dev-util/visualvm/visualvm-1.4.1.ebuild
@@ -1,3 +1,4 @@
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -32,34 +33,34 @@ EANT_BUILD_TARGET=build
 INSTALL_DIR=/usr/share/${PN}
 
 src_unpack() {
-    unpack ${P}.tar.gz
-    cd "${S}" || die
-    # unpack ${NBZ}
-    unpack ${S}/${NBZ}  # archive is included in the main archive
+	unpack ${P}.tar.gz
+	cd "${S}" || die
+	# unpack ${NBZ}
+	unpack "${S}"/"${NBZ}"  # archive is included in the main archive
 }
 
 src_prepare() {
-    default
+	default
 
-    # Remove unneeded binaries
-    rm -rv netbeans/platform/lib/*.{dll,exe} \
-       netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
-    find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
-         -maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
+	# Remove unneeded binaries
+	rm -rv netbeans/platform/lib/*.{dll,exe} \
+		netbeans/platform/modules/lib/{amd64/*.dll,i386,x86} || die
+	find netbeans/profiler/lib/deployed/jdk1? -mindepth 1 \
+		-maxdepth 1 ! -name linux-amd64 -exec rm -rv {} + || die
 }
 
 src_install() {
-    # this is the visualvm cluster
-    insinto ${INSTALL_DIR}
-    doins -r build/cluster netbeans/{platform,profiler}
+	# this is the visualvm cluster
+	insinto ${INSTALL_DIR}
+	doins -r build/cluster netbeans/{platform,profiler}
 
-    # configuration file that can be used to tweak visualvm startup parameters
-    insinto /etc/${PN}
-    newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
+	# configuration file that can be used to tweak visualvm startup parameters
+	insinto /etc/${PN}
+	newins "${FILESDIR}"/${PN}-r1.conf ${PN}.conf
 
-    # visualvm runtime script
-    newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
+	# visualvm runtime script
+	newbin "${FILESDIR}"/${PN}-r1.sh ${PN}
 
-    # makes visualvm entry
-    make_desktop_entry ${PN} VisualVM java "Development;Java;"
+	# makes visualvm entry
+	make_desktop_entry ${PN} VisualVM java "Development;Java;"
 }