gentoo resync : 20.03.2022

3 files changed, 14 insertions, 120 deletions

diff --git a/sys-block/tw_cli/Manifest b/sys-block/tw_cli/Manifest
index eff095ca7fb6..81fb84c84bcf 100644
--- a/sys-block/tw_cli/Manifest
+++ b/sys-block/tw_cli/Manifest
@@ -1,6 +1,5 @@
 DIST 368_tw_cli_debian8_beta.tgz 1958337 BLAKE2B 5e10c253a36132c8ee74e555b7e9151e70dd126ab4e58a76465c6d198387d612f19bd121c1d4dee49ca6c6fc35aeef5ed19466f05d3ce59ac4c4ab2d6f488f65 SHA512 1a0e22bd59eed4d26957bf17dd191f842251e61c035973cfc0e4611b0f93d798e718bed2dcb54e3fbf9ac8bbc9f7aaf9b332c419210331c318fb507a9d34492c
 DIST CLI_linux-from_the_10.2.2.1_9.5.5.1_codesets.zip 1878621 BLAKE2B 628070e5f6dc4dbc75f029067298be278b696b84afb245d19761043183bc6232fcf48dfe46954ef61e027082d974905244f6b3e73b596fbbe8d7955375859be2 SHA512 e8a7f27401e7811d5f8533d839066bdf6d93eeb2cb1242b00af7fc559b0a34316f8e6dc80f68e869d97f44290ea32c9e65d1d857c1010009ad1a540252400e31
 DIST LSI-tw_cli 35638 BLAKE2B 8267d311b7b09dd3f0e619fd7d5aadcaf5b24afa1958c99e838b9280b175b8f070dc58164622bf3ab54dc5ddfc24a4a4ea06971a919b17a3c2594541e43ea41f SHA512 1a1d35395ffccf70004b0c111d8c4a7e408cf0c57503bb4d1fdd608f9b71d6ea4d7488307dd6806eaf6557d65badd9c43aeea3e7c1ddae1c56962c85c2b868c9
-EBUILD tw_cli-10.2.2.1-r1.ebuild 4321 BLAKE2B 9375865f4adb0e9f695ad44fbba32caa74e2198b7444ad4ae7f9cdae125de42f828c7f1983361fafa7e46204e76b3aa8d98f5052260642c293a424d964c5bd53 SHA512 f4832cb03a8f32b3d9cbe3aa0ba0027f9d0e8fc3b0a5968e31d9c23954821ee09556d31c113f8c4b7f23d31f0750da464193d5c8cd6d48e90004d23e4bdcf87c
-EBUILD tw_cli-10.2.2.1.ebuild 3758 BLAKE2B ca5813bbe16718e4c226252fd29ee540fc4e6c413b0856dbd72c18d3a6c501262078db6ead7e6c6dfae82c6823d0d1d2ca0e3566e022246443b6075c11800a3e SHA512 8bfefd45ac7e0a5243e2098b45b36e69f97aab82149082d27c628aedc567c2d655b5a8398f7bead1fb08ae5104801b7f91e21e2c79eb551f40ca01b724ecdbb3
+EBUILD tw_cli-10.2.2.1-r2.ebuild 4273 BLAKE2B b10c884adc46ba939433cade1117463041fd485bc8671d9ff8e329ee863b6f5d089bbe4c189d546ffedf91ccc5b70ac7c5866d36298ad5f565d2b12cf9e40cb0 SHA512 c3309b4c7badc20ddb4e9d800d8c8e09e2fa2a3fe6c096370ff8b8cc7fada17b6f148283c6f34d3e7deafa7b168cf6080936a74275d3ce21063bc90658687ca6
 MISC metadata.xml 312 BLAKE2B 1a7c7a4a804f7a8d329dacbfc40d811590d872fee32eb706c47aa40baa197e47cd0aade9fb6265a67de7af4e0bee68d775b35212ead03d058cab0e24f7592ae4 SHA512 d2803eddccaddf96f42bcdce826115038d71996e92abfb4d3bcc37eec4220f98b09c9c5f84da7d43619c1b40b85ca5ca189f3440d6142691c720c53e2df73862
diff --git a/sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild b/sys-block/tw_cli/tw_cli-10.2.2.1-r2.ebuild
index dc6a4c2517b7..eb595dd6a5d0 100644
--- a/sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild
+++ b/sys-block/tw_cli/tw_cli-10.2.2.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=8
 
 DESCRIPTION="3ware SATA/PATA/SAS RAID controller Command Line Interface tool"
 HOMEPAGE="http://www.lsi.com/products/raid-controllers/pages/3ware-sas-9750-8i.aspx"
@@ -16,11 +16,12 @@ SRC_URI_A_linux="CLI_linux-from_the_${PV}_${ThreeDM2_PV}_codesets.zip"
 # https://www.broadcom.com/support/knowledgebase/1211161501805/debian-8-twcli-causes-fault-segment-failure
 EXTRA_linux="https://docs.broadcom.com/docs-and-downloads/kb-documents/lsi/368_tw_cli_debian8_beta.tgz"
 EXTRA_fbsd=""
-[ -n "${SRC_URI_A_linux}${EXTRA_linux}" ] && SRC_URI+=" kernel_linux? ( ${SRC_URI_A_linux:+${SRC_URI_BASE}/}${SRC_URI_A_linux} ${EXTRA_linux} )"
+[[ -n "${SRC_URI_A_linux}${EXTRA_linux}" ]] && SRC_URI+=" kernel_linux? ( ${SRC_URI_A_linux:+${SRC_URI_BASE}/}${SRC_URI_A_linux} ${EXTRA_linux} )"
 # The license is not available easily from upstream (embedded in a textbox),
 # nor in the upstream tarball, but needs to be installed, and can't be
 # referenced via PORTDIR per bug #373349.
 SRC_URI+=" https://gitweb.gentoo.org/repo/gentoo.git/plain/licenses/LSI-tw_cli"
+S="${WORKDIR}"
 
 # the minor ver on the end changes...
 RELNOTES="${SRC_URI_BASE}/${PV}_Release_Notes.pdf"
@@ -55,16 +56,12 @@ SLOT="0"
 # This package can never enter stable, it can't be mirrored and upstream
 # can remove the distfiles from their mirror anytime.
 KEYWORDS="-* amd64 x86"
-IUSE=""
-
 RESTRICT="strip"
-QA_PREBUILT="/opt/tw_cli/tw_cli"
 
 # binary packages
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}
+QA_PREBUILT="/opt/tw_cli/tw_cli"
 
 # If you want to fetch it yourself (not from the mirrors), there is an IP-based
 # clickthrough to accept the EULA.
@@ -75,26 +72,26 @@ pkg_nofetch() {
 }
 
 src_install() {
+	local cli_bin
 	case ${ARCH} in
 		# Special case per 10.2.2.1 segfault
-		amd64) CLI_BIN=debian8/x86_64/tw_cli ;;
-		x86) CLI_BIN=debian8/x86/tw_cli ;;
-		#amd64) CLI_BIN=x86_64/tw_cli;;
-		#x86) CLI_BIN=x86/tw_cli;;
-		*) die "unsupported ARCH";;
+		amd64) cli_bin=debian8/x86_64/tw_cli ;;
+		x86)   cli_bin=debian8/x86/tw_cli ;;
+		*)     die "unsupported ARCH";;
 	esac
 	exeinto /opt/tw_cli
 	# The names have varied in the past, sometimes there is a suffix
-	newexe ${CLI_BIN} tw_cli
+	newexe ${cli_bin} tw_cli
 	dosym ../../opt/tw_cli/tw_cli /usr/sbin/tw_cli
 
 	newman ${PN}.8.nroff ${PN}.8
-	dohtml *.html
 	dodoc *.txt
+	docinto html
+	dodoc *.html
 
 	# to comply with license requirement 3.1.b, per upstream request.
 	insinto /opt/tw_cli
-	newins "${DISTDIR}"/"${LICENSE}" LICENSE
+	newins "${DISTDIR}/${LICENSE}" LICENSE
 }
 
 pkg_postinst() {
diff --git a/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild b/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
deleted file mode 100644
index 1cb92bf7a2f9..000000000000
--- a/sys-block/tw_cli/tw_cli-10.2.2.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="3ware SATA/PATA/SAS RAID controller Command Line Interface tool"
-HOMEPAGE="http://www.lsi.com/products/raid-controllers/pages/3ware-sas-9750-8i.aspx"
-
-# This is apparently what the upstream stuff was based on when LSI took over?
-ThreeDM2_PV="9.5.5.1"
-
-SRC_URI_BASE="http://www.lsi.com/downloads/Public/SATA/SATA%20Common%20Files/"
-SRC_URI_A_linux="CLI_linux-from_the_${PV}_${ThreeDM2_PV}_codesets.zip"
-SRC_URI="kernel_linux? ( ${SRC_URI_BASE}/${SRC_URI_A_linux} )
-		 https://gitweb.gentoo.org/repo/gentoo.git/plain/licenses/LSI-tw_cli"
-# The license is not available easily from upstream (embedded in a textbox),
-# nor in the upstream tarball, but needs to be installed, and can't be
-# referenced via PORTDIR per bug #373349.
-# the minor ver on the end changes...
-RELNOTES="${SRC_URI_BASE}/${PV}_Release_Notes.pdf"
-
-# Note: 3ware gave permission to redistribute the binaries before:
-# Ref: https://bugs.gentoo.org/show_bug.cgi?id=60690#c106
-#
-# Please note that the LSI-tw_cli license does allow redistribution, despite
-# being a EULA:
-# 2. Grant of Rights
-# 2.1 LSI Binary Code. Subject to the terms of this Agreement, LSI grants
-# to Licensee a non-exclusive, world-wide, revocable (for breach in
-# accordance with Section 7), non-transferable limited license, without
-# the right to sublicense except as expressly provided herein, solely to:
-# (c) Distribute the LSI Binary Code as incorporated in Licensee's
-# Products or for use with LSI Devices to its Subsequent Users;
-# (d) Distribute the Explanatory Materials related to LSI Binary Code only
-# for use with LSI Devices;
-#
-# 3. License Restrictions
-# 3.1. LSI Binary Code. The Licenses granted in Section 2.1 for LSI Binary
-# Code and related Explanatory Materials are subject to the following
-# restrictions:
-# (a) Licensee shall not use the LSI Binary Code and related Explanatory
-# Materials for any purpose other than as expressly provided in Article 2;
-# (b) Licensee shall reproduce all copyright notices and other proprietary
-# markings or legends contained within or on the LSI Binary Code and
-# related Explanatory Materials on any copies it makes; and
-LICENSE="LSI-tw_cli"
-SLOT="0"
-
-# This package can never enter stable, it can't be mirrored and upstream
-# can remove the distfiles from their mirror anytime.
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RESTRICT="strip"
-QA_PREBUILT="/opt/tw_cli/tw_cli"
-
-# binary packages
-DEPEND="app-arch/unzip"
-RDEPEND=""
-
-S=${WORKDIR}
-
-# If you want to fetch it yourself (not from the mirrors), there is an IP-based
-# clickthrough to accept the EULA.
-pkg_nofetch() {
-	einfo "Upstream has implemented a mandatory clickthrough EULA for distfile download"
-	einfo "Please visit ${SRC_URI}"
-	einfo "And place ${A} into your DISTDIR directory"
-}
-
-src_install() {
-	case ${ARCH} in
-		amd64) CLI_BIN=x86_64/tw_cli;;
-		x86) CLI_BIN=x86/tw_cli;;
-		*) die "unsupported ARCH";;
-	esac
-	exeinto /opt/tw_cli
-	# The names have varied in the past, sometimes there is a suffix
-	newexe ${CLI_BIN} tw_cli
-	dosym /opt/tw_cli/tw_cli /usr/sbin/tw_cli
-
-	newman ${PN}.8.nroff ${PN}.8
-	dohtml *.html
-	dodoc *.txt
-
-	# to comply with license requirement 3.1.b, per upstream request.
-	insinto /opt/tw_cli
-	newins ${DISTDIR}/${LICENSE} LICENSE
-}
-
-pkg_postinst() {
-	elog "This binary supports should support ALL cards, including, but not"
-	elog "limited to the following series:"
-	elog ""
-	elog "PATA: 6xxx, 72xx, 74xx, 78xx, 7000, 7500, 7506"
-	elog "SATA: 8006, 8500, 8506, 9500S, 9550SX, 9590SE,"
-	elog "      9550SXU, 9650SE, 9650SE-{24M8,4LPME},"
-	elog "      9690SA, 9750"
-	elog ""
-	elog "Release notes for this version are available at:"
-	elog "${RELNOTES}"
-}