gentoo resync : 13.10.2019

2 files changed, 19 insertions, 29 deletions

diff --git a/sys-apps/superdiag/Manifest b/sys-apps/superdiag/Manifest
index 98252f7892f6..484f625d63d6 100644
--- a/sys-apps/superdiag/Manifest
+++ b/sys-apps/superdiag/Manifest
@@ -1,3 +1,3 @@
-DIST SuperDiag_1.1.0_20180731_package.zip 2564515 BLAKE2B 9ae34682daf5aa8996989c434906dd59f64e569a1cd1ae107d1e7861430ae028829efd1a1aa1ba2b5269d13e0ac2bef33b106a945fbd800fba6766b10f7486a5 SHA512 b79eae3063fc1425ee2a7a71304ae8993da52e9a2a8b2565e5f4fe0f3f3cdf8a7016cf765dab9e440c71cb8ff6b311fa2e4067459d76268bcf2697e8344c4e9a
-EBUILD superdiag-1.1.0.20180731.ebuild 2053 BLAKE2B 71e957a37cc5360703ced5eb60a1aa91d790ff5ab6853eede1018d223c878c4d20dd3e78b0f38d1f13d800aa60be3b3ae3801526b11f4da81c85a66dbfb9dc8d SHA512 e1ac41f6d2dc61c7517c5a491f389274f97551d5821ce58c70b692536464ba3269ab0d2c4e3dc4b02e48ab97e5db837c65d3c5e303c7f08edb290cb85de72598
+DIST SuperDiag_1.2.0_20190711.zip 4826479 BLAKE2B c0ffaf59ab1cbbe406a907938bf028844781533516dc6b0f2c2ee8144395da48a43e5931ef65e6990c97cfb887dd086d7535260319721b534e3b66135c37c680 SHA512 24ac9224a302e4f61a56015476b5c5fb279a057acae97e12c1e8e9271a8f410337f6182d5204d531927b0004ccb76b65c784c91be2c3644d0f30db0c8eca4c6f
+EBUILD superdiag-1.2.0.20190711.ebuild 1684 BLAKE2B d570b13d31a3be75381fa3dc3facb3932a768862f0c74403d72c1ed055c9395979eea8fb66fc60b4de639848cf1dc25a497613aaffbf5ba32bceabce4b629ca7 SHA512 767e626430a3df45362efd793f35e35f473f618a077940b63e9ac448ef863864d83b758bf5e2b063e6964ff2e3b006c04da885adbf531fd1f7c64cbb3678380f
 MISC metadata.xml 1029 BLAKE2B 13723c78dd32c1f8c2109f857e6c4920416847a759dd2676060468cfba802cadd87d5ebf90deae548f04b71e1bab00e8f4f6668ef8bb5487c504ce3823bfc708 SHA512 48410f21f790cc13623ac9f0812b205b017b57a47d82b8af11a9b9fd6a3d83b8d761205d6fe919c3d1fe637ff8554c17fee5af9754c4d978e0d3f52e749eff0e
diff --git a/sys-apps/superdiag/superdiag-1.1.0.20180731.ebuild b/sys-apps/superdiag/superdiag-1.2.0.20190711.ebuild
index 99c892c14414..52739fd9846f 100644
--- a/sys-apps/superdiag/superdiag-1.1.0.20180731.ebuild
+++ b/sys-apps/superdiag/superdiag-1.2.0.20190711.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-MY_BUILD="0724"
+MY_BUILD="7119"
 MY_DATE="$(ver_cut 4)"
-MY_DATE_ISO="20180724"
+MY_DATE_ISO="0711"
 MY_PN="SuperDiag"
 MY_PV="$(ver_cut 1-3)"
-MY_P="${MY_PN}_${MY_PV}_${MY_DATE}"
+MY_PV_PDF="$(ver_cut 1) $(ver_cut 2) $(ver_cut 3)"
 
 DESCRIPTION="Provides the capability to determine the health of Supermicro servers components"
 HOMEPAGE="https://www.supermicro.com"
-SRC_URI="${MY_PN}_${MY_PV}_${MY_DATE}_package.zip"
+SRC_URI="${MY_PN}_${MY_PV}_${MY_DATE}.zip"
 
 KEYWORDS="-* ~amd64 ~x86"
 LICENSE="supermicro"
@@ -25,39 +25,31 @@ RESTRICT="bindist fetch mirror"
 
 S="${WORKDIR}"
 
+pkg_nofetch() {
+	elog "Please download ${A} from"
+	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SDO"
+	elog "and place it in your DISTDIR directory."
+}
+
 src_unpack() {
 	unpack ${A}
-	unpack "${S}"/${MY_P}.zip
 
 	if use iso; then
-		unzip ${MY_P}/Diagnose_Remotely/ISOFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d iso || die
+		unzip Diagnose_Remotely/ISOFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d iso || die
 	fi
 
 	if use usb; then
-		unzip ${MY_P}/Diagnose_Remotely/USBFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d usb || die
+		unzip Diagnose_Remotely/USBFor${MY_PN}_v${MY_PV}_${MY_BUILD}.zip -d usb || die
 	fi
 }
 
-pkg_nofetch() {
-	elog "Please download ${A} from"
-	elog "https://www.supermicro.com/SwDownload/UserInfo.aspx?sw=0&cat=SDO"
-	elog "and place it in your DISTDIR directory."
-}
-
 src_install() {
 	insinto /usr/share/superdiag
-	doins ${MY_P}/startup.nsh ${MY_P}/${MY_PN}_v${MY_PV}.efi ${MY_P}/EFI/Boot/BootX64.efi
-
-	insinto /usr/share/superdiag/Picture
-	doins ${MY_P}/Picture/*.bmp
-
-	insinto /usr/share/superdiag/SelData
-	doins ${MY_P}/SelData/*.dat
+	doins startup.nsh ${MY_PN}_v${MY_PV}.efi EFI/Boot/BootX64.efi
 
 	local DOCS=(
-		"Superdiag_${MY_PV}_addendum_release_notes.docx"
-		"${MY_P}/Supermicro Super Diagnostics Offline readme.txt"
-		"${MY_P}/Supermicro Super Diagnostics Offline User Guide V${MY_PV}.pdf"
+		"Supermicro Super Diagnostics Offline readme.txt"
+		"Supermicro Super Diagnostics Offline User Guide V${MY_PV_PDF}.pdf"
 	)
 	dodoc "${DOCS[@]}"
 
@@ -74,8 +66,6 @@ src_install() {
 
 		dosym ../BootX64.efi /usr/share/superdiag/USB/BootX64.efi
 		dosym ../${MY_PN}_v${MY_PV}.efi /usr/share/superdiag/USB/${MY_PN}_v${MY_PV}.efi
-		dosym ../Picture /usr/share/superdiag/USB/Picture
-		dosym ../SelData /usr/share/superdiag/USB/SelData
 
 		newdoc usb/Readme.txt Readme.USB.txt
 	fi