gentoo resync : 08.08.2018

5 files changed, 109 insertions, 94 deletions

diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index a0e7f5ff50e4..da84058bef0f 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -1,4 +1,6 @@
-DIST SMCIPMITool_2.19.0_build.171201_bundleJRE_Linux.tar.gz 77155490 BLAKE2B 5e69eb07f80aeb385ba7444a7eb8d14c24006fb8dd58c00976e5dfb1fca86a33b2079c33c6186baefcef2566ceefcaa45e738e9f1cbc0265551eaa89d145d8eb SHA512 c249a9ddfb1ee91eb74fa001e842b09f00ff10048f2b74650b3441794923261f077f3892bf719cb19f769acbf307d404006614f139a844e17135ff2220e5a1d4
-DIST SMCIPMITool_2.19.0_build.171201_bundleJRE_Linux_x64.tar.gz 75724816 BLAKE2B e473a3a2a419fab0c5a450ec23614b65379e5dca1e60ff46d38aa985ff461dc1dcb72565d210ce4cb9e35f8f3c3904f1e8e9fcabbb118e20e341dc0602260270 SHA512 d66688560653f122f086a1e8354065e76849435a3f704cc9e07f3ed8bf892b039547c3f24127d4813fe34ff29db8cfb4ee14a34846ce31c1774bd8b7cdc9bda3
-EBUILD smcipmitool-2.19.0.171201.ebuild 2476 BLAKE2B 7d8d11af4957d4750fef7a9ffba850b313c6264b2b5f2013375f0bd21b2042df3ac67b81bf9779f9c1d02c168956af6599de4f8f5b45124ad2204bb0770b0875 SHA512 65c95f5eca4474431a7b87ba593c15f61177acaf1cab3e003a24d795f19a287f78cf2bc79d2140e548312d83b44868c04203d870c1674ffa8a91017ab0675ee4
+AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d
+AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7
+DIST SMCIPMITool_2.20.0_build.180525_bundleJRE_Linux.tar.gz 78319288 BLAKE2B 9084894dd52aebce26853c611ca445d20d8d5363771013830ca2a27c4dfdbdfd00a660019755d579eb9bb6a845e196e59ef03c824cd7da5af9c9081406049c2f SHA512 b2c9fdc22c5963e8ab45ded776e823466fc5bd9fb3b1c04d44603f719409c38cc7f3f78fdd82c1230bf015f271607131ba0e00b73ef182ce18426490b9c58e9e
+DIST SMCIPMITool_2.20.0_build.180525_bundleJRE_Linux_x64.tar.gz 76888805 BLAKE2B 73ec6205ce5ed261706ecc2cd0947cdb6f27c930bdd3809581eb06062d2608d76c6696b906a44cd48b065eed1b2f5a83108b7a616cd956c77238c9af0ff1fa46 SHA512 4adab5f7d45eb8a2c88c37c519743af5244509f75800b3dcd6b002d6385309709e8efa15c0dca18f827d054ad7861168d17fcc93d4e1f5427769a0071f5772bc
+EBUILD smcipmitool-2.20.0.180525.ebuild 2188 BLAKE2B 4694471854e6bed78f303b6416f1d433fb4a527687290d7a12285a74a2a8145fd31d5f17a8566da86f2a7649d4d183b3759710ac9a8f4a81bf4401aa2f5189b3 SHA512 2c1722f3b040d2d5bb9ba0c4922d66875eb07a2c442ca3cb5a772943a27b28bfad3d530a924d2a39169f31232d5c0850e540182d6a692c2c3616191c38a697f9
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/sys-apps/smcipmitool/files/fake-java.bash b/sys-apps/smcipmitool/files/fake-java.bash
new file mode 100644
index 000000000000..ed89f4fc6532
--- /dev/null
+++ b/sys-apps/smcipmitool/files/fake-java.bash
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+for ARG in "${@}"; do
+	case ${ARG} in
+		-jar)
+			EXE=${2}
+			shift 2
+			break
+			;;
+		*)
+			shift
+			;;
+	esac
+done
+
+if [[ ${EXE} != *.jar ]]; then
+	echo "error: could not find jar argument in java invocation" >&2
+	exit 1
+fi
+
+EXE=smcipmitool-${EXE%.jar}
+EXE=${EXE,,}
+
+exec "${EXE}" "${@}"
diff --git a/sys-apps/smcipmitool/files/launcher-pre.bash b/sys-apps/smcipmitool/files/launcher-pre.bash
new file mode 100644
index 000000000000..e24bf72544f1
--- /dev/null
+++ b/sys-apps/smcipmitool/files/launcher-pre.bash
@@ -0,0 +1,3 @@
+gjl_pwd=${XDG_CONFIG_HOME:-${HOME}/.config}/smcipmitool
+mkdir -p "${gjl_pwd}" || exit $?
+ln -snf /usr/share/smcipmitool/jre "${gjl_pwd}"/ || exit $?
diff --git a/sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild b/sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild
deleted file mode 100644
index 5f5cb4965929..000000000000
--- a/sys-apps/smcipmitool/smcipmitool-2.19.0.171201.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eapi7-ver java-vm-2
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="SMCIPMITool"
-MY_PN_SRC_URI="SMCIPMItool"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI"
-HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
-	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="net-misc/stunnel
-	sys-libs/ncurses:5
-	virtual/jre"
-
-RESTRICT="bindist fetch mirror strip"
-
-S="${WORKDIR}"
-
-QA_PREBUILT="opt/smcipmitool/libiKVM*.so
-	opt/smcipmitool/libjcurses*.so
-	opt/smcipmitool/libSharedLibrary*.so"
-
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
-	elog "and place it in your DISTDIR directory."
-}
-
-src_install() {
-	# Choose ARCH
-	if use amd64; then
-		local my_arch="${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64"
-	else
-		local my_arch="${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux"
-	fi
-
-	# Install binary
-	exeinto /opt/smcipmitool
-	doexe ${my_arch}/SMCIPMITool
-
-	# Install libs
-	exeinto /opt/smcipmitool
-	if use amd64; then
-		doexe ${my_arch}/*64.so
-	else
-		doexe ${my_arch}/libjcurses.so ${my_arch}/*32.so
-	fi
-
-	# Install java libs
-	exeinto /opt/smcipmitool
-	if use amd64; then
-		doexe ${my_arch}/*64.jnilib
-	fi
-
-	# Install files
-	insinto /opt/smcipmitool
-	doins ${my_arch}/*.jar ${my_arch}/*.lax ${my_arch}/*.properties
-
-	# Use system java
-	dosym ../..${JAVA_VM_SYSTEM}/jre /opt/smcipmitool/jre
-
-	# Install certificates
-	insinto /opt/smcipmitool/BMCSecurity
-	doins ${my_arch}/BMCSecurity/*.crt ${my_arch}/BMCSecurity/*.key ${my_arch}/BMCSecurity/*.pem ${my_arch}/BMCSecurity/*.txt
-
-	# Install Stunnel config
-	insinto /opt/smcipmitool/BMCSecurity/linux
-	doins ${my_arch}/BMCSecurity/linux/stunnel.conf
-
-	# Use system stunnel
-	dosym ../../../../usr/bin/stunnel /opt/smcipmitool/BMCSecurity/linux/stunnel$(usex amd64 64 32)
-
-	# Install symlink
-	dodir /opt/bin
-	dosym ../smcipmitool/SMCIPMITool /opt/bin/smcipmitool
-
-	# Install docs
-	local DOCS=( "${my_arch}/jcurses.README" "${my_arch}/ReleaseNotes.txt" "${my_arch}/SMCIPMITool_User_Guide.pdf" )
-	einstalldocs
-}
diff --git a/sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild b/sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild
new file mode 100644
index 000000000000..67d6d6f7c2bd
--- /dev/null
+++ b/sys-apps/smcipmitool/smcipmitool-2.20.0.180525.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eapi7-ver java-pkg-2 prefix
+
+MY_DATE="$(ver_cut 4)"
+MY_PN="SMCIPMITool"
+MY_PN_SRC_URI="SMCIPMItool"
+MY_PV="$(ver_cut 1-3)"
+
+DESCRIPTION="An out-of-band utility for interfacing with SuperBlade and IPMI devices via CLI"
+HOMEPAGE="https://www.supermicro.com/"
+SRC_URI="amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
+	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )"
+
+LICENSE="supermicro"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="net-misc/stunnel
+	sys-libs/ncurses:5
+	virtual/jre:1.8"
+
+RESTRICT="bindist fetch mirror strip"
+
+DIR="/usr/share/${PN}"
+QA_PREBUILT="usr/lib*"
+
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=IPMI"
+	elog "and place it in your DISTDIR directory."
+}
+
+src_unpack() {
+	unpack ${A}
+	mv -v ${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux$(usex amd64 _x64 "") ${P} || die
+}
+
+src_prepare() {
+	default
+
+	# Don't use their scary launchers
+	rm -v lax.jar || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	java-pkg_dojar *.jar
+	java-pkg_doso libjcurses.so $(usex amd64 '*64.so' '*32.so')
+
+	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
+	java-pkg_dolauncher smcipmitool-ikvm --jar iKVM.jar -pre "${pre}"
+	java-pkg_dolauncher smcipmitool-jviewersmc --jar JViewerSMC.jar -pre "${pre}"
+	java-pkg_dolauncher smcipmitool-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
+	java-pkg_dolauncher smcipmitool --jar SMCIPMITool.jar -pre "${pre}"
+
+	exeinto ${DIR}/jre/bin
+	newexe $(prefixify_ro "${FILESDIR}"/fake-java.bash) java
+
+	insinto ${DIR}/lib/BMCSecurity
+	doins BMCSecurity/*.{crt,key,pem,txt}
+
+	insinto ${DIR}/lib/BMCSecurity/linux
+	doins BMCSecurity/linux/stunnel.conf
+
+	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel32
+	dosym ../../../../../bin/stunnel ${DIR}/lib/BMCSecurity/linux/stunnel64
+
+	local DOCS=( "jcurses.README" "ReleaseNotes.txt" "SMCIPMITool_User_Guide.pdf" )
+	einstalldocs
+}