gentoo resync : 25.11.2020

3 files changed, 4 insertions, 101 deletions

diff --git a/net-misc/ipmiview/Manifest b/net-misc/ipmiview/Manifest
index dabc5e48c36c..395837962ce2 100644
--- a/net-misc/ipmiview/Manifest
+++ b/net-misc/ipmiview/Manifest
@@ -1,8 +1,5 @@
 AUX fake-java-r1.bash 289 BLAKE2B 1bd0c9477af5d064f4479fadd040338d972195ad99f87e7244b4953764da3f4a2bc4ffb7118bbe8bcc9c6d8cf9c5e42a1990219ca7e8d89cb931f5ee6265d214 SHA512 9de74481bcff69098484b328157ad2208255e791dd4595e1ba926a2754c7bbae04b94ec4d717e7b9556b64bf4fdc749e012c99fdc771844fbf003021d9cda65a
 AUX launcher-pre.bash 143 BLAKE2B b33051ba8052380465c59b68733416298166949bcc794047a097816dac68fed0bc7ad39dc056e57e5114f622faf64b67598028b35b83d6ded95034d2a71126d0 SHA512 2a1b35175fe6364eb7790de93878d4834ca69f1dde438fdcf0cebd7c7bf16600f2eaacf334f91c740512ad068914c1adb7a09017a23694bcceb837be20989161
-DIST IPMIView_2.15.0_build.190109_bundleJRE_Linux.tar.gz 138691420 BLAKE2B 7f2d8e9519d6a9651d09c8b55e6a530266b809e437132ac4a814473ec25622663a0fb455a3b078fd5e79194e82d24d1b324369799f15bd1d4dbb6b607cdada76 SHA512 17078c8480579e63391a8cfb7af5033510ca3a9c5616b2af0af7679bbd6592f4f7fbe68dc01194aa11c1b481bc1c4089339adb42c22a687effa05dd728984579
-DIST IPMIView_2.15.0_build.190109_bundleJRE_Linux_x64.tar.gz 135584164 BLAKE2B d74ade013d00e7c7dd5d79b808d158519a520603931dfe9bd44f4dc64911b066f0e9f61bdff7386ee30d2d5b1f4fb86477ee339e76f00746f0b119c3a4b49e82 SHA512 2409f79850cafb2af5f34ec3fd755a6438ef7abef3c1a014df95d4ccc49d9b151ddfba7c1824de9c0f00234ea36b2fa6bb519f5035321dccae9ac06fa2f9458a
 DIST IPMIView_2.17.0_build.200505_bundleJRE_Linux_x64.tar.gz 105509705 BLAKE2B 915c1c27bb9e1f519634c0c2a78e3673aaa2c6e713be1132d2682dabf8f56a35b16c2403645fc0fda54643e35214ead65ef9d01854180219dfcc8489904b8766 SHA512 17ed72e802fb0a55c140f98262575385ede2d490484fe926bb7ff19f34e5a376f2d21025e99318d2001b042487729dc8b07b38cca4bf62df6e04d7df0d1d3091
-EBUILD ipmiview-2.15.0.190109.ebuild 2389 BLAKE2B 251caeefbe35ea4f88c6fb9f6c4dc3e3ac8beb992aab4fe91bd1037cd1ffdae21e4daee57af69a026e48715d7f9e3bb822482d408442eb72dfa81438233e2d4d SHA512 ec5dfc4088d33cfd70b704e263518424f26aba1c3c6ffe0ee4e43533cd60edf9f29e96a8480aab147e73439833a6180cdc817639b4a080278887acd0862c26fa
-EBUILD ipmiview-2.17.0.200505.ebuild 2197 BLAKE2B fe4c5b9f9358e32fe42696f2a6cfcabead5ff37c84ada6b36ca33ff1ad357d30f7fed6c5bf0b14e3228c68f5a0d905e592f2dbf6ec3e07a100610f6c094b4712 SHA512 06fcadc842fb8abfbdd876e677f31bf6a77de45f59b30a2403ac0b5bcc154c7e30890cbabaeec4ead1f35acc9d219e6dd2376c580e5b0bf10f0cf5f44ef12390
+EBUILD ipmiview-2.17.0.200505.ebuild 2050 BLAKE2B f7e27ae0b780324bdc6b07e065739eaad96807daecc3c296f42c21a22684233def5954dfad4d79062c48ceedc205f64ccd057f0c115e1108637fb4f04b49e00a SHA512 dad201c2af7ed264b5ef8a504720173d146dfffdb3b91db9520130a45b4fa901e84a895c0cd4939c3959cee8f9250cb32906cbf383d2c1acbbd22caaa09cf750
 MISC metadata.xml 702 BLAKE2B 094fd116b6c0d306d68106f78b867450fdb4a48b321a69f2169dac1737b6f8b93df2740e4f04b0671b61e01d872542411a22773f043ffefa8adbeb64cfc43ce3 SHA512 ee1eb3a7497345d7f7d8c55d25dd6d8f2b0353e1d785ee496cde69c2a1b386ebc96aaf70d5a70eee8d6294b5b072dfe97882254d3f42d4f69d238dde78aec6ce
diff --git a/net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild b/net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild
deleted file mode 100644
index 7d565a17b74c..000000000000
--- a/net-misc/ipmiview/ipmiview-2.15.0.190109.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop eapi7-ver java-pkg-2 prefix
-
-MY_DATE="$(ver_cut 4)"
-MY_PN="IPMIView"
-MY_PV="$(ver_cut 1-3)"
-
-DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC"
-HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="
-	amd64? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz )
-	x86? ( ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux.tar.gz )
-"
-
-LICENSE="supermicro"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-
-RDEPEND="
-	net-misc/stunnel
-	virtual/jre:1.8
-"
-
-DEPEND="app-arch/unzip"
-
-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
-
-	# Extract icons for menu entries
-	unzip -j -LL IPMIView20.jar images/ipmi{view,trap}.ico || die
-
-	# Don't use their scary launchers
-	rm -v lax.jar || die
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	java-pkg_dojar *.jar
-	java-pkg_doso $(usex amd64 '*64.so' '*32.so')
-
-	local pre=$(prefixify_ro "${FILESDIR}"/launcher-pre.bash)
-	java-pkg_dolauncher ipmiview --jar IPMIView20.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview-ikvm --jar iKVM.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview-ikvmmicroblade --jar iKVMMicroBlade.jar -pre "${pre}"
-	java-pkg_dolauncher ipmiview-jviewerx9 --jar JViewerX9.jar -pre "${pre}"
-	java-pkg_dolauncher trapreceiver --jar TrapView.jar -pre "${pre}"
-
-	exeinto ${DIR}/jre/bin
-	newexe $(prefixify_ro "${FILESDIR}"/fake-java-r1.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
-
-	doicon ipmi{view,trap}.ico
-	make_desktop_entry ipmiview IPMIView ipmiview.ico
-	make_desktop_entry trapreceiver "Trap Receiver" ipmitrap.ico
-
-	local DOCS=( *.pdf *.txt )
-	einstalldocs
-}
diff --git a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild b/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
index 664d3944d27e..e6d9549403ff 100644
--- a/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
+++ b/net-misc/ipmiview/ipmiview-2.17.0.200505.ebuild
@@ -11,7 +11,7 @@ MY_PV="$(ver_cut 1-3)"
 
 DESCRIPTION="A GUI application that allows to manage multiple target systems through BMC"
 HOMEPAGE="https://www.supermicro.com/"
-SRC_URI="ftp://ftp.supermicro.com/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
+SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
 
 LICENSE="supermicro"
 SLOT="0"
@@ -19,22 +19,17 @@ KEYWORDS="-* ~amd64"
 
 RDEPEND="
 	net-misc/stunnel
+	sys-libs/ncurses-compat:5
 	virtual/jre:1.8
 "
 
 BDEPEND="app-arch/unzip"
 
-RESTRICT="bindist fetch mirror"
+RESTRICT="bindist mirror"
 
 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_x64 ${P} || die