gentoo resync : 25.11.2020

3 files changed, 3 insertions, 97 deletions

diff --git a/sys-apps/smcipmitool/Manifest b/sys-apps/smcipmitool/Manifest
index fc60f16446c1..f030d7eb0296 100644
--- a/sys-apps/smcipmitool/Manifest
+++ b/sys-apps/smcipmitool/Manifest
@@ -1,8 +1,5 @@
 AUX fake-java.bash 301 BLAKE2B e164317201544295dfaa10724c0319a4dc980d25256706172cb8547706725c05244c827489929faf19c0375630db0597427b1e42c758521a4b4d352d1e742d33 SHA512 bb5b4a57a0492df04f9428bbeedb6917fe5cf7273f0c73a300adb13e4d8b6e5cd907729cabfad548bafaa71a98e4ee1d996914fa4dafe0cd6e5a5310b1625e6d
 AUX launcher-pre.bash 149 BLAKE2B 7af8c0fb3d29784008e0c94aefad7d4f586e42f49a3dc9542c82755e1bf9af91cca452f8050b1c8c96f7bac887cb7da1c782efeae9d9eba24350a3a09c958025 SHA512 1d3ae073b2268ef070b4480a7d117091c6bbdc029a33e9f97c8cb5f008aa4b2d951371c17023ee91199b7daee4cd1fcd42f72cd8c3abb50c9932d29e65bb01a7
-DIST SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux.tar.gz 122153416 BLAKE2B 2d4224a76588fa4da41a8080bde5833ce3a7da01a11e45fc48069084077fe2e1e48f5e92ec266b10a390b3a40cfbc66f2b674c9ef59f8b3b11d42cb20eb992bb SHA512 e655e14751906d392f0f528c6d5afe83298f398025c5808d2efed142a3cdf9b56d06964feeed63fef58f2fe793d7de06c3eeb909e4467ce774317bb7971792d1
-DIST SMCIPMITool_2.21.0_build.181029_bundleJRE_Linux_x64.tar.gz 119034481 BLAKE2B 032bbae5a3e608f6f51ae955df875d18a7b260fc0d49d6371af910cc1186c47b3db2b012dccd2837b598d5e405fde01390cfb44a5526297691c9bb99029c2dbd SHA512 9d721b8409510f75dbe36e8b5e3fdfb89f42f85365406f2c53890c1f5a6620f6abe00325017443b9af26bc60aeae7392065eb451d1a318de9898783562b43933
 DIST SMCIPMITool_2.23.0_build.191216_bundleJRE_Linux_x64.tar.gz 78810880 BLAKE2B fa4d0c7ed8cd7fb8b03847b30d22b4c70d74402be50ef217b237a0ba786e264a0832533476db5523cf3ce9a88c2191cbc9ff32d54911dfca54ff8835268f0efd SHA512 7770a1ec468934e1ac89612e77092f83ce91822326279afedcc5da9b5cdd84193e8077b87441c79253e366bde6f1ef3756ff35ff7fce8bc1759bb889ab8b082b
-EBUILD smcipmitool-2.21.0.181029.ebuild 2209 BLAKE2B 0cb30302e5cd7bbf9d0205dba7605d5a124ad5a54b538580b878c9111d24f61d9805011c8513a292525163ababc8f522507a484bafce3a2d26cc38a772bee1ea SHA512 a73f9d575679c44ad14092356ad53e4825690b4a3fbb32b5678cd7441e64d8bf80823d7e04939e1a9008c170f597f59483b758ebd3fcff3c3fc9a2628ff8ddc0
-EBUILD smcipmitool-2.23.0.191216.ebuild 2013 BLAKE2B a7b9c5ad65b954f16a8d5e40059bddf85796629a8090c63783ba69539cbd1e738d16b49348cc9d1906a627d299aee1ac9a4c1cd0028fb5eed33411493049d1ba SHA512 f8d284a8dd6e85a6acbfad95942bdbcf43091574fd5e3c76716192615b2f30956da4a747e7fa70f4814485045c4a3ff7e2b1aba1920fe88d3cc72c29226417e7
+EBUILD smcipmitool-2.23.0.191216.ebuild 1839 BLAKE2B 132b8c51469f0a37bc4ca4aa5170510f2741e2aa9121f056493964ed28941bed8e8fc5d0b8341c7b1b5ce7cf605e3b90260e3dd17d0394fae7b5b7414230dee7 SHA512 31347e3b5f314f2034f13f9f7f77496fb5baeb228cbf05a46872d9401ee64cbaf55d0b86040ca36a6132a6986f51b7fc68af6361f88a7907fefaab4c226fa44e
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild b/sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild
deleted file mode 100644
index bd287818fb34..000000000000
--- a/sys-apps/smcipmitool/smcipmitool-2.21.0.181029.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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-compat:5
-	virtual/jre:1.8
-"
-
-RESTRICT="bindist fetch 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$(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
-}
diff --git a/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild b/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
index c0b818a212c6..279c66adc7f2 100644
--- a/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
+++ b/sys-apps/smcipmitool/smcipmitool-2.23.0.191216.ebuild
@@ -12,7 +12,7 @@ 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="ftp://ftp.supermicro.com/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
+SRC_URI="https://www.supermicro.com/wftp/utility/${MY_PN_SRC_URI}/Linux/${MY_PN}_${MY_PV}_build.${MY_DATE}_bundleJRE_Linux_x64.tar.gz"
 
 LICENSE="supermicro"
 SLOT="0"
@@ -24,17 +24,11 @@ RDEPEND="
 	virtual/jre:1.8
 "
 
-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