From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2896D15808B for ; Sat, 19 Mar 2022 17:26:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7205AE097C; Sat, 19 Mar 2022 17:26:12 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 40D17E097C for ; Sat, 19 Mar 2022 17:26:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 751B93430CE for ; Sat, 19 Mar 2022 17:26:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BFA7D30C for ; Sat, 19 Mar 2022 17:26:09 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1647710761.3a29d2b18af55fa697afbfbacbc70cd8f1c8098e.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-block/tw_cli/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild sys-block/tw_cli/tw_cli-10.2.2.1-r2.ebuild X-VCS-Directories: sys-block/tw_cli/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 3a29d2b18af55fa697afbfbacbc70cd8f1c8098e X-VCS-Branch: master Date: Sat, 19 Mar 2022 17:26:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2a9753ff-236d-443f-9ac9-092f42bb9bb1 X-Archives-Hash: 1a46dfa8d3310158a3fdaa3856c4f92e commit: 3a29d2b18af55fa697afbfbacbc70cd8f1c8098e Author: David Seifert gentoo org> AuthorDate: Sat Mar 19 17:26:01 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Mar 19 17:26:01 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a29d2b1 sys-block/tw_cli: update EAPI 5 -> 8 Closes: https://bugs.gentoo.org/835358 Signed-off-by: David Seifert gentoo.org> ...0.2.2.1-r1.ebuild => tw_cli-10.2.2.1-r2.ebuild} | 29 ++++++++++------------ 1 file changed, 13 insertions(+), 16 deletions(-) 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 similarity index 89% rename from sys-block/tw_cli/tw_cli-10.2.2.1-r1.ebuild rename to 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() {