commit: b2dcd5538d517c82394e5aba4574304534fce911
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 16 09:17:24 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Tue Nov 16 09:24:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2dcd553
sys-apps/flashrom: update live ebuild
* bump to EAPI 8
* sync arch keywords with the latest release
* support for ene-lpc and mec1308 has been removed upstream
* bdepend on dev-util/cmocka if tests are to be run
Still to be done: do not build/enable tests if cmocka is present but
FEATURES=test is not set.
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
sys-apps/flashrom/flashrom-9999.ebuild | 14 +++++++-------
sys-apps/flashrom/metadata.xml | 2 --
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild
b/sys-apps/flashrom/flashrom-9999.ebuild
index dedf1bc3ada7..333373eb5f83 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit meson
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
else
MY_P="${PN}-v${PV}"
SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2";
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
S="${WORKDIR}/${MY_P}"
fi
@@ -33,7 +33,6 @@ IUSE_PROGRAMMERS="
+digilent-spi
+drkaiser
+dummy
- +ene-lpc
+ft2232-spi
+gfxnvidia
+internal
@@ -42,7 +41,6 @@ IUSE_PROGRAMMERS="
+linux-mtd
+linux-spi
lspcon-i2c-spi
- +mec1308
mstarddc-spi
+nic3com
+nicintel
@@ -62,7 +60,9 @@ IUSE_PROGRAMMERS="
+stlinkv3-spi
+usbblaster-spi
"
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi tools +wiki"
+IUSE="${IUSE_PROGRAMMERS} +internal-dmi test tools +wiki"
+
+RESTRICT="!test? ( test )"
LIB_DEPEND="
atahpt? ( sys-apps/pciutils[static-libs(+)] )
@@ -97,9 +97,11 @@ RDEPEND="${LIB_DEPEND//\[static-libs(+)]}"
DEPEND="${RDEPEND}
sys-apps/diffutils"
RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
+BDEPEND="test? ( dev-util/cmocka )"
DOCS=( README Documentation/ )
+# TODO: cmocka automagic
PATCHES=(
"${FILESDIR}"/${PN}-9999_meson-fixes.patch
)
@@ -116,7 +118,6 @@ src_configure() {
$(meson_use digilent-spi config_digilent_spi)
$(meson_use drkaiser config_drkaiser)
$(meson_use dummy config_dummy)
- $(meson_use ene-lpc config_ene_lpc)
$(meson_use ft2232-spi config_ft2232_spi)
$(meson_use gfxnvidia config_gfxnvidia)
$(meson_use internal config_internal)
@@ -126,7 +127,6 @@ src_configure() {
$(meson_use linux-mtd config_linux_mtd)
$(meson_use linux-spi config_linux_spi)
$(meson_use lspcon-i2c-spi config_lspcon_i2c_spi)
- $(meson_use mec1308 config_mec1308)
$(meson_use mstarddc-spi config_mstarddc_spi)
$(meson_use nic3com config_nic3com)
$(meson_use nicintel-eeprom config_nicintel_eeprom)
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index fe748a74d4c1..a60db379da54 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -16,7 +16,6 @@
<flag name="digilent-spi">Enable support for Digilent
iCEblink40 development board</flag>
<flag name="drkaiser">Enable Dr. Kaiser programmer</flag>
<flag name="dummy">Enable dummy tracing</flag>
- <flag name="ene-lpc">Enable ENE LPC interface keyboard
controller</flag>
<flag name="ft2232-spi">Enable ftdi programmer, flashing
through FTDI/SPI USB interface</flag>
<flag name="gfxnvidia">Enable NVIDIA programmer</flag>
<flag name="internal">Enable internal/onboard support</flag>
@@ -26,7 +25,6 @@
<flag name="linux-mtd">Enable support for Linux mtd SPI flash
devices</flag>
<flag name="linux-spi">Enable support for Linux userspace
spidev interface</flag>
<flag name="lspcon-i2c-spi">Enable support for Parade lspcon
USB-C to HDMI protocol translator</flag>
- <flag name="mec1308">Enable support for Microchip MEC1308
embedded controller</flag>
<flag name="mstarddc-spi">Support for SPI flash ROMs accessible
through DDC in MSTAR-equipped displays</flag>
<flag name="nic3com">Enable 3Com NIC programmer</flag>
<flag name="nicintel">Support for Intel NICs</flag>
