gentoo resync : 29.12.2022

5 files changed, 18 insertions, 75 deletions

diff --git a/sys-block/hpssacli/Manifest b/sys-block/hpssacli/Manifest
index 10c50dd2c922..325da97b48ad 100644
--- a/sys-block/hpssacli/Manifest
+++ b/sys-block/hpssacli/Manifest
@@ -1,13 +1,11 @@
 AUX hpssacli-wrapper 534 BLAKE2B 151a434fb5bc2f2168d6d19d117edbf852c0ee8e3e664a7d5d34601b2bb41f7c8489baf391ffd331ec2ab4445e884b80f7572e522c09e4eaab22eb15ad3d71a5 SHA512 e80780df1e683ac58a50c12ae8854deb5c4bb8b08c5fde40df7f1f045fc94d76fa64221f78cff9b100588f520d03761a7994e33897722c3746675a6522e4fecc
 DIST hpssacli-2.40-13.0.i386.rpm 11413754 BLAKE2B e6aa28581e08a34bbd77be507d6224090e42458b300e176164794c749c119923da80b9832d589d535bc0a8dc81d4819fe3111393a4e0dfaf7926b396bf75f6ea SHA512 f284c0979141fa2ef8728b2a6c7d7aa8b0e5e61ebb3878439321dd3742223f240f5be9782068da49a58c07ce91615072d9575f22feefb9ff6bb6fac00ae31d75
 DIST hpssacli-2.40-13.0.x86_64.rpm 11772990 BLAKE2B e8d5def139939342183d8edb69902778f53c470af58833a137924e9ba31b277abf40afd96137015dff6d2507bee0e0a6ebb7f39aa7db4f0d6d7aa7f8d7292382 SHA512 4a650c2700f77bdc79693905e56598cbe8f198d4f54c7c97e05a7b8af830f11c5e5eea2d16538a3c6068eadb75159850b391d7f772f59447bbbd870f64eb7efa
-DIST ssacli-3.10-3.0.x86_64.rpm 14202277 BLAKE2B 4697326cbb0d4b89cc68dc8ff44668a7941007398e46e793c1ac785e5d994172d9570af1a2e13328658c2264d0fd9fcc09322dcc9fa92291de8159a9237863c6 SHA512 32df57143f0cdae086569400d3b9f2263aedb536cc81ac794f67c559518f7b9033105f967f15025036b280956149e0ae84f9928c2b6a22b01f5757de7190657b
 DIST ssacli-3.40-3.0.x86_64.rpm 15201025 BLAKE2B a4307ffad4b01f11fea5bf51a27dc8971b46d08afedba5b522b67c43c811ef8f48245e1831f0b9f34cda267d6dd039de33719e53da861bbd60f1a796231aadcf SHA512 372a08098cb4769455e0ced7ebe3e25589353f2feb689fba6234272b79c21fac7e419d559279dedca1e18b7fe0250efb624b0e1b7a8a8ea4720a67701b507d3d
 DIST ssacli-4.21-7.0.x86_64.rpm 15888806 BLAKE2B 65577085cb3b32bd0bb30ef6eec8e1f8c903e1619eb386142864e52fb1ed2d43520ae79b1831fd6c17673a992980d06092c67ed7808ddf3cf6df5f18d3e150ef SHA512 55fb5d533d2b072ea0491f58aef054d53e744350bbf1a812c1a639f5c5964a23bb895fdf363c6dcb4531de8dab5a09d51f483389714172f3aa70a23fcf8fd3aa
-DIST ssacli-5.20-8.0.x86_64.rpm 16605930 BLAKE2B 992ea95e69f75b423c02125db55d8dab92f3e63520c9592374bda3a7fcb98d0603318d5fe0d224fbe837779e6049ffab804f5016be57d296630ce0563e9c9e78 SHA512 73ac593dbae1a9a7e5e004c2882f0dcbd39f3edfc851140e19ca6914150bf134a25367c726d8cf6bb4abcd049127be4d24e02e52e7cedaf7be5698d2314053c3
+DIST ssacli-5.30-6.0.x86_64.rpm 16639836 BLAKE2B 6df471b0db7ad948adf7d135b724800e768bd530b4e8e681472723e13b1f717b2ac48fee0b8a1652bed729a8b090f1ed135f0a531f16c7c0741923d04c69ced2 SHA512 ec79e865ffaa9477e5aa0cdc7c93c70ffb82dc8968f146aae18f1314a727d74636ab6e4c3906e770b422cf04aef92a4830757c4b351fd545b9359ab5d8fe5f9a
 EBUILD hpssacli-2.40.13.0-r1.ebuild 1813 BLAKE2B 38a6dfaaaf13ad267ee68dbf98e0070f0083dbbd3b7a69b86f68ca7c72409dee5088d913129dae0ada17b3018fa989384553055f491b8684d4a64bbfe965a131 SHA512 ec7c7e0c0118332eff213066a74699d91803317b3a06a1f4d28eebd50d0103dc2baa786747cf9feb901c94ee3e387afcb1680c088be53ef12040467ecadeac5f
-EBUILD hpssacli-3.10.3.0.ebuild 1848 BLAKE2B 0640f0ec506895598ef48c0056cfd867f63026f57d37a39d5d4fe60345ef47f6cebf8eb69f6bc179d116f4b45b029550f8ab9701e8c4443392d9da2888d77702 SHA512 50e3fd826edba186459a7abe747ee6e029a3dc9bd9d115a4db1b849d5b70f288c648aad2b002f7b2203ace11a38b67ac767f18d924207ca6cad231bb0e65c24a
 EBUILD hpssacli-3.40.3.0.ebuild 1824 BLAKE2B 97784741cdcee9cd8228a6f87fce6c25058f727feea5067413482fabf520e116b22cfbe953d7b63185c9247e4fdf6a5bbce7336994f94bc00617e6d22242e7c3 SHA512 0748ef6142865d403851e82852ddbe041386d9900fb7ec73924b66b7a520705bec7a48a0abc510ddaf08b4b34d4f0113e9e0848e93c7bd974a53bf60c7062b0c
-EBUILD hpssacli-4.21.7.0.ebuild 846 BLAKE2B 51f1af3c69cb2c8a79fddeeb2b1bc2edbe126c276799fc68c4e17c41bef6887236bbaca6904554e5aa2eb4ec0526d888b31b8992fb8adddc1c631d607805ba74 SHA512 44f24e95374d92b45ce455e18c4254320dc4fa27b780d4306d71dccf4b5a9de63d733611a2b66d6fd4a07310f3b68d826ba12be8dc796ccadc15e7e7f7d825ad
-EBUILD hpssacli-5.20.8.0.ebuild 846 BLAKE2B df1f674185443434e0448eb165f11baa7cabcefe43fbca069454b66f48e678d5982e436e201b43b9df6d53b21d4df6b7afe25b2490d07e29fd83d6602c4d369c SHA512 85669f6b9b646e38c7f46dd698763b9888a94c37755f9fbcde7d3a98a105c7614524810d8aea9554fea8bf67e507d73fe98212f746d25244fa3cbb1e56f92382
-MISC metadata.xml 252 BLAKE2B 84ce9630af2d663427fcf6fbc9832ea43e936720673088eb4a50db0e894647868f68ff3521824675235ee1ef504e4dc823efbd8d8f0b0905d58d8da94269eb2f SHA512 e44e7852efb83e01ec3ae07e390307b5de89fdd86705bfbc79432807c7b286fd56939ba92f8896c55cd70dae507b5e8ebc9d8e70c7d2756bab84cdc011c42126
+EBUILD hpssacli-4.21.7.0.ebuild 845 BLAKE2B 5b6daabba59f0bcd28bf752d1fb43c6a2a94c7077debb4c57debf4d28635945052949f59039bbc92b34e145d0f8bd53c2a24c5cff7c104259118240c2de454db SHA512 48722a44c23204b6b4a6a05fa63a2cbc3d35fccd4de263d2d2e89fafd85efbe36e693659dcf0990bf5c05fcc1e11a663f2ef1fcb4bd867bb83ea2281aba329d7
+EBUILD hpssacli-5.30.6.0.ebuild 954 BLAKE2B d471d7a44743fca0ee1d9acde14889b58e6d75fefb6f65e8ff5877fec489d72de18f401c097234635b5137ceeaed1a3a77df799d8bac1a668d89607c043255f5 SHA512 82e8e9bf19e0e29c1e40a94d6e15cd6679bfc14f70d4d6847f3de194456669b4031bab6fe5eeb43bb17ea716d8bb1e52cdd8f80adc2f61f110db22a26054fa03
+MISC metadata.xml 247 BLAKE2B f18c471812d5b8c75f2e05c4fb556108fb93554b59ee61a8215803f2654854a7401fcd62964192c228bfebfb52ae4573cfd24b29a944630c8c733d154d2b0d9a SHA512 cea16f7db3110bd4629b9265d5acdec6d70877330664f8e83f726002eb69aec7f822e9cde9c7da900451cdef60f1ceba373dfe73c73f82173bbf1d2f9f7338b7
diff --git a/sys-block/hpssacli/hpssacli-3.10.3.0.ebuild b/sys-block/hpssacli/hpssacli-3.10.3.0.ebuild
deleted file mode 100644
index fa95dc7cfd07..000000000000
--- a/sys-block/hpssacli/hpssacli-3.10.3.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit pax-utils rpm versionator
-
-MY_PV=$(replace_version_separator 2 '-')
-
-DESCRIPTION="HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)"
-HOMEPAGE="https://support.hpe.com/hpsc/swd/public/detail?swItemId=MTX_5530b3f5b38b4e0781e6bf9c74"
-SRC_URI="https://downloads.linux.hpe.com/SDR/repo/spp/2017.10.1/packages/ssacli-${MY_PV}.x86_64.rpm"
-
-LICENSE="hpe"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="elibc_glibc? ( >sys-libs/glibc-2.14 )
-	>=sys-libs/libunwind-0.99
-	>=sys-process/procps-3.3.6"
-
-DOCS=( license.txt readme.txt )
-
-MY_HPSSACLI_BASEDIR="/opt/hp/hpssacli"
-
-QA_PREBUILT="${MY_HPSSACLI_BASEDIR:1}/hpssa*.bin"
-QA_EXECSTACK="${MY_HPSSACLI_BASEDIR:1}/hpssa*.bin"
-
-src_unpack() {
-	rpm_src_unpack
-
-	mkdir "${S}" || die "Failed to create '${S}'"
-}
-
-src_prepare() {
-	default
-
-	# Create a clean $S
-	mv "${WORKDIR}"/opt/smartstorageadmin/ssacli/bin/ssa* "${S}" || die "Failed to to copy 'ssa*' related files"
-	mv "${S}"/ssacli "${S}"/hpssacli || die "Renaming ssacli failed!"
-	mv "${S}"/ssascripting "${S}"/hpssascripting || die "Renaming ssascripting failed!"
-	mv "${S}"/ssacli.license "${S}"/license.txt || die "Renaming ssacli.license failed!"
-	mv "${S}"/ssacli*.txt "${S}"/readme.txt || die "Renaming ssacli*.txt failed!"
-	rm -rf "${WORKDIR}"/opt || die "Failed to cleanup '${WORKDIR}/opt'"
-	rm -rf "${WORKDIR}"/usr || die "Failed to cleanup '${WORKDIR}/usr'"
-}
-
-src_install() {
-	newsbin "${FILESDIR}"/"${PN}-wrapper" ${PN}
-	dosym ${PN} /usr/sbin/hpssascripting
-
-	exeinto "${MY_HPSSACLI_BASEDIR}"
-	for bin in "${S}"/hpssa{cli,scripting}; do
-		local basename=$(basename "${bin}")
-		newexe "${bin}" ${basename}.bin
-	done
-
-	dodoc "${DOCS[@]}"
-
-	pax-mark m "${D%/}${HPSSACLI_BASEDIR}"/*.bin
-}
diff --git a/sys-block/hpssacli/hpssacli-4.21.7.0.ebuild b/sys-block/hpssacli/hpssacli-4.21.7.0.ebuild
index 4e46a04028ac..52b203ce7f2d 100644
--- a/sys-block/hpssacli/hpssacli-4.21.7.0.ebuild
+++ b/sys-block/hpssacli/hpssacli-4.21.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p185704664
 
 LICENSE="hp-proliant-essentials"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 S="${WORKDIR}"
 
diff --git a/sys-block/hpssacli/hpssacli-5.20.8.0.ebuild b/sys-block/hpssacli/hpssacli-5.30.6.0.ebuild
index d308b0033cd9..0bedb3614f76 100644
--- a/sys-block/hpssacli/hpssacli-5.20.8.0.ebuild
+++ b/sys-block/hpssacli/hpssacli-5.30.6.0.ebuild
@@ -1,15 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit rpm
 
 MY_PV=$(ver_rs 2 '-')
 
 DESCRIPTION="HPE Smart Storage Administrator (HPE SSA) CLI (HPSSACLI, formerly HPACUCLI)"
-HOMEPAGE="https://support.hpe.com/hpesc/public/swd/detail?swItemId=MTX_8484363847dd4e5ca2970188b7"
-SRC_URI="https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p1736097809/v193233/ssacli-${MY_PV}.x86_64.rpm"
+HOMEPAGE="https://support.hpe.com/connect/s/softwaredetails?softwareId=MTX_1b5853f050a24da4be479f680e"
+SRC_URI="https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p1736097809/v205349/ssacli-${MY_PV}.x86_64.rpm"
 
 LICENSE="hp-proliant-essentials"
 SLOT="0"
@@ -17,6 +17,14 @@ KEYWORDS="-* ~amd64"
 
 S="${WORKDIR}"
 
+RDEPEND="sys-libs/glibc"
+
+QA_FLAGS_IGNORED="
+	usr/sbin/ssacli
+	usr/sbin/ssascripting
+	usr/sbin/rmstr
+"
+
 src_install() {
 	local -r ssacli_bindir="opt/smartstorageadmin/ssacli/bin"
 
diff --git a/sys-block/hpssacli/metadata.xml b/sys-block/hpssacli/metadata.xml
index 542a8a19f0f6..a7fa285c7476 100644
--- a/sys-block/hpssacli/metadata.xml
+++ b/sys-block/hpssacli/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>