[gentoo-commits] repo/gentoo:master commit in: sys-block/megacli/, profiles/features/musl/

[gentoo-commits] repo/gentoo:master commit in: sys-block/megacli/, profiles/features/musl/

[David Seifert]

commit:     36d341bafe0587acc2a75914fc9fcb44f7363dca
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 29 08:24:18 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jul 29 08:24:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36d341ba

sys-block/megacli: update EAPI 7 -> 8

Closes: https://bugs.gentoo.org/832934
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 profiles/features/musl/package.mask                |  4 +++
 ...8.07.14-r3.ebuild => megacli-8.07.14-r4.ebuild} | 31 +++++++++++++---------
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 22eb277af38e..60195181698f 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# David Seifert <soap@gentoo.org> (2022-07-29)
+# Binary package linked against glibc
+sys-block/megacli
+
 # Marek Szuba <marecki@gentoo.org> (2022-07-28)
 # Relies on unimplemented functions outb_p and inb_p,
 # support for which has never made it into musl. Bug #712972.

diff --git a/sys-block/megacli/megacli-8.07.14-r3.ebuild b/sys-block/megacli/megacli-8.07.14-r4.ebuild
similarity index 88%
rename from sys-block/megacli/megacli-8.07.14-r3.ebuild
rename to sys-block/megacli/megacli-8.07.14-r4.ebuild
index 240d079dd480..c1a4970b565a 100644
--- a/sys-block/megacli/megacli-8.07.14-r3.ebuild
+++ b/sys-block/megacli/megacli-8.07.14-r4.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit rpm
+
 MY_PV="${PV//./-}"
 MY_P=${MY_PV}_MegaCLI
 
@@ -11,32 +12,36 @@ DESCRIPTION="LSI Logic MegaRAID Command Line Interface management tool"
 HOMEPAGE="https://www.broadcom.com/support/knowledgebase/1211161498596/megacli-cheat-sheet--live-examples https://www.broadcom.com/support/knowledgebase/1211161496959/megacli-commands"
 # This file is '[zip]	MegaCLI 5.5 P2', Date: 01/20/2014   Size: 7753 KB
 SRC_URI="https://docs.broadcom.com/docs-and-downloads/raid-controllers/raid-controllers-common-files/${MY_P}.zip"
+S="${WORKDIR}"
 
 LICENSE="LSI"
 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=""
-
-DEPEND="app-arch/unzip
-	app-admin/chrpath"
-RDEPEND="sys-libs/ncurses-compat:5"
-
-S=${WORKDIR}
-
 # Previous releases from LSI directly required a click-through EULA; but the
 # upstream website no longer requires this consistently: most old files have
 # two or more download pages, and while one of the pages has a generic
 # click-through download form, the file-specific download page only requires
 # click-through on some items. See also sys-block/lsiutil
 RESTRICT="mirror bindist"
-QA_PREBUILT="/opt/${PN}/${PN}
+
+BDEPEND="
+	app-admin/chrpath
+	app-arch/unzip"
+# links to glibc and libstdc++/libgcc_s
+RDEPEND="
+	sys-devel/gcc
+	sys-libs/glibc
+	sys-libs/ncurses-compat:5"
+
+QA_PREBUILT="
+	/opt/${PN}/${PN}
 	/opt/${PN}/lib/*"
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
+	cd "${S}" || die
 	rpm_unpack ./Linux/MegaCli-${PV}-1.noarch.rpm
 }
 
@@ -60,7 +65,7 @@ src_install() {
 	dosym ${PN} /opt/bin/MegaCli
 
 	# Remove DT_RPATH
-	chrpath -d "${D}"/opt/${PN}/${PN}
+	chrpath -d "${ED}"/opt/${PN}/${PN} || die
 }
 
 pkg_postinst() {