gentoo resync : 29.01.2021

6 files changed, 7 insertions, 422 deletions

diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 1e717c752c31..85bb5e150256 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,9 +1,6 @@
-AUX flashrom-1.2_make-libflashrom-usable.patch 3230 BLAKE2B ddf5677e8a6b931d372059bf270b74a1dcd6ebfdfb1cf3e7c976e647fdc8180d005f19416ee15bb0b25f1f2b891348a42a83f8e6d44c528864947cd4be78e0da SHA512 dd60f4e25ab519f6b5f03c4e80be2fe24ab2c5c206c78aff2802f91026d5ef3889d2376f88bc4baa32de5c48951afe0cb1d62dbfc65c4965058caccfadff65d1
 AUX flashrom-1.2_meson-fixes.patch 7977 BLAKE2B 5ac9e09c6fbcf08f36da1fc874511f7023338b0bffe775c61be9f7c253d6d8343833ec64ff86dc3b4733e90e67435e3cc0d52e6ae11c8d368fe2f21b6a85bc59 SHA512 a0e30c2a87775342302fabfd594c91015b6ea9fba71a7d1b294c399a8336167f85b07fdcc2ff80174cc43362ef5ca28965571ca52e1a76922ef59dcb15991664
 AUX flashrom-1.2_meson-install-manpage.patch 1208 BLAKE2B a4290c046d82a7c8b8dbfba0d58abed2384506d761272929ca7972c68a92a314de2ad17af5bd49cb86af5fea119d36fb126c45febdd5ac99210949158d33fc75 SHA512 1345bc880317e37d028bc3d40c98e5b5b4b17c7cde18d3b17762c9792cf0e4ac19613702ae1d367937f86dd3dbb02732851774d91ef1372e5bbb8f998346526d
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
-EBUILD flashrom-1.2-r1.ebuild 4520 BLAKE2B d00007833d23c42b7b59cc1503565e75037d7f4dc835f79c280299a2818bb5ff2f48868958940a237ef52721f971a1c055f0ef35c0167ef263b5ef36232266d9 SHA512 9c7a87c29bf7f57ff9878127c8b38d21d97f3019e0a350e64d7271a208253d85091addff5799e6e947182490a8494f6743e2e2029d3b4ae6d5ab9c9b14900d3f
-EBUILD flashrom-1.2-r2.ebuild 5071 BLAKE2B 44b157d811e994054620a78ea0871e034de2396e8b8affa705b24b4d22b2932c60301f4c40337c473a946e6108f0edeb6a00ffd81136bfdbffefbd646b98e27b SHA512 9429863450f128888ff84815a0ea05cbb5b7d7e26c890f08bc6275e1fdc0a27bf484523f43a47a90942220ba88c80d9aef84d0eb807aa9d5a89e9961703fbb5e
-EBUILD flashrom-1.2-r3.ebuild 4343 BLAKE2B 3c075bddb34069081508434ad0310547a5271ff7af40626ace19d84d85dad4bb110bb1d0840008ddd6ab698af6ed67416550520af7c6bd00dafe8e1d11ff8858 SHA512 1ec2c508cd46cdfb9db995cc516e64e3562b568a1ea3d04a98753b042ce8aca44fa807f8c41a828953874211794aac415fe4e66c87a8d2d2c74dd0edc4e20f15
-EBUILD flashrom-9999.ebuild 4499 BLAKE2B 1253b00811d15e4ab8fe4411b133efaafe0bb3c126de9c36d47d608ce17e68dcf28927037178d27ef8e7629dfd63c72cdfcb2ad5b43df17b85b4c9caa4f3126a SHA512 80cedf318b434f2c9fca4348af7f64d7127069867b7268560a12c9f01be37b923db435b8b3e34770c443f81bdf6799576b4633d6cc5fdd5b1540601d13b2e41f
+EBUILD flashrom-1.2-r3.ebuild 4339 BLAKE2B c68cb290611caac7c67d3c30570c8e9d54c3e5d24c63a269c8e3ff87de932950722bc86bc8b4c8b884d5dd65006f1576eac0c88328a50fd958b6f9b748473251 SHA512 41afda3a5123d9d124fc032f51dfa8b553b9044443c1783b32aa076a0c5d2b0af42e60dfbc4735166ba23f606e7d01bc6b8e70c4e924ca1150a8a6cffbd710b6
+EBUILD flashrom-9999.ebuild 4501 BLAKE2B c9424d845e9e9e9617b7f7f34a5c4035af50567eecca422e1f06c388ba2400d97824c9e854d1088480637fa36c32e9812470e7532f111e503ff772ae2f9ccb14 SHA512 110cc4d1ae0465c8f29bb0c8a66729d6d23ceaf155aafa60774e6a1a074f8ba2e381f3ea686462b1eea378bbe1501bc7abf8ed5e6cf67012a71cd258dee748c5
 MISC metadata.xml 5037 BLAKE2B 3027f42fb0ab5965684cb79857991888772126fbf48e2f9c314a0e01c831cf38474a20ce846964631ea95dc459629396c3796fc89d858b35f239f2a3fb343c1b SHA512 8602f9ad7419bae5f10620400f9451d16c43d12223173873ab53191c93064bf0bdb72c78ee5cde8dc9fa091ce1c6c80575cf586141080c13c971370fa0ac85f8
diff --git a/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch b/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch
deleted file mode 100644
index ea15a4230592..000000000000
--- a/sys-apps/flashrom/files/flashrom-1.2_make-libflashrom-usable.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-1. Add an (extremely primitive) rule for generating a pkgconfig file
-   for libflashrom, as fwupd cannot find it without one. Note that this
-   rule depends on several variables to be passed to make, see ebuilds
-   using this patch for details;
-2. Tweak the way library dependencies are passed around a bit to make it
-   easier to inject them into said pkgconfig file;
-3. Move print.o from CLI_OBJS to LIB_OBJS - it contains the array
-   'boards_known' which is used in library code. Upstream have already
-   fixed this in Meson files but not in the Makefile.
-
-diff -urN a/flashrom.pc.in b/flashrom.pc.in
---- a/flashrom.pc.in	1970-01-01 01:00:00.000000000 +0100
-+++ b/flashrom.pc.in	2020-07-28 22:47:01.928679346 +0200
-@@ -0,0 +1,9 @@
-+prefix=@PREFIX@
-+libdir=${prefix}/@LIBDIR@
-+includedir=${prefix}/@INCLUDEDIR@
-+
-+Name: libflashrom
-+Description: library to interact with flashrom
-+Version: @VERSION@
-+Libs: -L${libdir} -lflashrom @LIBS@
-+Cflags: -I${includedir}
-diff -urN a/Makefile b/Makefile
---- a/Makefile	2019-12-31 18:25:41.000000000 +0100
-+++ b/Makefile	2020-07-28 23:18:41.019492448 +0200
-@@ -570,12 +570,12 @@
- ###############################################################################
- # Library code.
- 
--LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o
-+LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o ich_descriptors.o fmap.o print.o
- 
- ###############################################################################
- # Frontend related stuff.
- 
--CLI_OBJS = cli_classic.o cli_output.o cli_common.o print.o
-+CLI_OBJS = cli_classic.o cli_output.o cli_common.o
- 
- # versioninfo.inc stores metadata required to build a packaged flashrom. It is generated by the export rule and
- # imported below. If versioninfo.inc is not found and the variables are not defined by the user, the info will
-@@ -1130,11 +1130,16 @@
- 	@+$(MAKE) -C util/ich_descriptors_tool/ TARGET_OS=$(TARGET_OS) EXEC_SUFFIX=$(EXEC_SUFFIX)
- endif
- 
-+ALL_LIBS = $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS)
-+
-+flashrom.pc:
-+	sed -e "s#@PREFIX@#$(PREFIX)#" -e "s#@LIBDIR@#$(LIBDIR)#" -e "s#@INCLUDEDIR@#$(INCLUDEDIR)#" -e "s#@VERSION@#$(VERSION)#" -e "s#@LIBS@#$(ALL_LIBS)#" < $@.in > $@.tmp && mv $@.tmp $@
-+
- $(PROGRAM)$(EXEC_SUFFIX): $(OBJS)
--	$(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(LIBS) $(PCILIBS) $(FEATURE_LIBS) $(USBLIBS) $(USB1LIBS) $(JAYLINKLIBS) $(NI845X_LIBS)
-+	$(CC) $(LDFLAGS) -o $(PROGRAM)$(EXEC_SUFFIX) $(OBJS) $(ALL_LIBS)
- 
--libflashrom.a: $(LIBFLASHROM_OBJS)
--	$(AR) rcs $@ $^
-+libflashrom.a: $(LIBFLASHROM_OBJS) flashrom.pc
-+	$(AR) rcs $@ $(LIBFLASHROM_OBJS)
- 	$(RANLIB) $@
- 
- # TAROPTIONS reduces information leakage from the packager's system.
-@@ -1149,7 +1154,7 @@
- # This includes all frontends and libflashrom.
- # We don't use EXEC_SUFFIX here because we want to clean everything.
- clean:
--	rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a *.o *.d $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE)
-+	rm -f $(PROGRAM) $(PROGRAM).exe libflashrom.a flashrom.pc *.o *.d $(PROGRAM).8 $(PROGRAM).8.html $(BUILD_DETAILS_FILE)
- 	@+$(MAKE) -C util/ich_descriptors_tool/ clean
- 
- distclean: clean
diff --git a/sys-apps/flashrom/flashrom-1.2-r1.ebuild b/sys-apps/flashrom/flashrom-1.2-r1.ebuild
deleted file mode 100644
index e984e762420a..000000000000
--- a/sys-apps/flashrom/flashrom-1.2-r1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
-	inherit git-r3
-else
-	MY_P="${PN}-v${PV}"
-	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# The defaults match the upstream Makefile.
-# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
-# by some other spi programmers.
-IUSE_PROGRAMMERS="
-	atahpt
-	+atapromise
-	+atavia
-	+buspirate-spi
-	+ch341a-spi
-	+dediprog
-	+developerbox-spi
-	+digilent-spi
-	+drkaiser
-	+dummy
-	+ft2232-spi
-	+gfxnvidia
-	+internal
-	+it8212
-	jlink-spi
-	+linux-mtd
-	+linux-spi
-	mstarddc-spi
-	+nic3com
-	+nicintel
-	+nicintel-eeprom
-	+nicintel-spi
-	nicnatsemi
-	+nicrealtek
-	+ogp-spi
-	+pickit2-spi
-	+pony-spi
-	+rayer-spi
-	+satamv
-	+satasii
-	+serprog
-	stlinkv3-spi
-	+usbblaster-spi
-"
-
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
-
-LIB_DEPEND="
-	atahpt? ( sys-apps/pciutils[static-libs(+)] )
-	atapromise? ( sys-apps/pciutils[static-libs(+)] )
-	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a-spi? ( virtual/libusb:1[static-libs(+)] )
-	dediprog? ( virtual/libusb:1[static-libs(+)] )
-	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
-	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
-	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
-	internal? ( sys-apps/pciutils[static-libs(+)] )
-	it8212? ( sys-apps/pciutils[static-libs(+)] )
-	jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] )
-	nic3com? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-spi? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel? ( sys-apps/pciutils[static-libs(+)] )
-	nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
-	nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
-	ogp-spi? ( sys-apps/pciutils[static-libs(+)] )
-	pickit2-spi? ( virtual/libusb:0[static-libs(+)] )
-	rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
-	satamv? ( sys-apps/pciutils[static-libs(+)] )
-	satasii? ( sys-apps/pciutils[static-libs(+)] )
-	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	sys-apps/diffutils"
-RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
-
-_flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
-	args+=( "${c}=$(usex $1 yes no)" )
-}
-flashrom_enable() {
-	local u
-	for u ; do _flashrom_enable "${u}" ; done
-}
-
-src_prepare() {
-	# To make libflashrom.a actually useful
-	append-flags -fPIC
-
-	default
-}
-
-src_compile() {
-	# Help keep things in sync.
-	local sprogs=$(echo $(
-		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
-			LC_ALL=C sort -u | \
-			sed 's:^CONFIG_::' | \
-			tr '[:upper:]_' '[:lower:]-' | \
-			grep -v ni845x-spi))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g')
-	if [[ ${sprogs} != "${eprogs}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "IUSE set to: ${eprogs}"
-		eerror "flashrom.c : ${sprogs}"
-		die "sync IUSE to the list of source programmers"
-	fi
-
-	# Turn USE flags into CONFIG_xxx settings.
-	local args=()
-	flashrom_enable ${eprogs}
-	_flashrom_enable wiki PRINT_WIKI
-	_flashrom_enable static STATIC
-
-	# You have to specify at least one programmer, and if you specify more than
-	# one programmer you have to include either dummy or internal in the list.
-	# We pick dummy as the default because internal requires libpci.
-	if ! use internal && ! use dummy ; then
-		if [[ ${#args[@]} -ne 1 ]] ; then
-			ewarn "You have to specify at least one programmer, and if you specify"
-			ewarn "more than one programmer, you have to enable either dummy or"
-			ewarn "internal as well.  'dummy' will be the default now."
-			args+=( CONFIG_DUMMY=yes )
-		fi
-	fi
-
-	tc-export AR CC PKG_CONFIG RANLIB
-	emake WARNERROR=no "${args[@]}" all libflashrom.a
-}
-
-src_install() {
-	dosbin flashrom
-	doman flashrom.8
-	dodoc README Documentation/*.txt
-	dolib.a libflashrom.a
-	doheader libflashrom.h
-
-	if use tools; then
-		dosbin util/ich_descriptors_tool/ich_descriptors_tool
-	fi
-}
diff --git a/sys-apps/flashrom/flashrom-1.2-r2.ebuild b/sys-apps/flashrom/flashrom-1.2-r2.ebuild
deleted file mode 100644
index d8bff2a09caf..000000000000
--- a/sys-apps/flashrom/flashrom-1.2-r2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
-	inherit git-r3
-else
-	MY_P="${PN}-v${PV}"
-	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ppc ppc64 sparc x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# The defaults match the upstream Makefile.
-# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
-# by some other spi programmers.
-IUSE_PROGRAMMERS="
-	atahpt
-	+atapromise
-	+atavia
-	+buspirate-spi
-	+ch341a-spi
-	+dediprog
-	+developerbox-spi
-	+digilent-spi
-	+drkaiser
-	+dummy
-	+ft2232-spi
-	+gfxnvidia
-	+internal
-	+it8212
-	jlink-spi
-	+linux-mtd
-	+linux-spi
-	mstarddc-spi
-	+nic3com
-	+nicintel
-	+nicintel-eeprom
-	+nicintel-spi
-	nicnatsemi
-	+nicrealtek
-	+ogp-spi
-	+pickit2-spi
-	+pony-spi
-	+rayer-spi
-	+satamv
-	+satasii
-	+serprog
-	stlinkv3-spi
-	+usbblaster-spi
-"
-
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
-
-LIB_DEPEND="
-	atahpt? ( sys-apps/pciutils[static-libs(+)] )
-	atapromise? ( sys-apps/pciutils[static-libs(+)] )
-	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a-spi? ( virtual/libusb:1[static-libs(+)] )
-	dediprog? ( virtual/libusb:1[static-libs(+)] )
-	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
-	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
-	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
-	internal? ( sys-apps/pciutils[static-libs(+)] )
-	it8212? ( sys-apps/pciutils[static-libs(+)] )
-	jlink-spi? ( dev-embedded/libjaylink[static-libs(+)] )
-	nic3com? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-spi? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel? ( sys-apps/pciutils[static-libs(+)] )
-	nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
-	nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
-	ogp-spi? ( sys-apps/pciutils[static-libs(+)] )
-	pickit2-spi? ( virtual/libusb:0[static-libs(+)] )
-	rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
-	satamv? ( sys-apps/pciutils[static-libs(+)] )
-	satasii? ( sys-apps/pciutils[static-libs(+)] )
-	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	sys-apps/diffutils"
-RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2_make-libflashrom-usable.patch
-)
-
-_flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
-	args+=( "${c}=$(usex $1 yes no)" )
-}
-flashrom_enable() {
-	local u
-	for u ; do _flashrom_enable "${u}" ; done
-}
-
-src_prepare() {
-	# To make libflashrom.a actually useful
-	append-flags -fPIC
-
-	default
-}
-
-src_compile() {
-	# Help keep things in sync.
-	local sprogs=$(echo $(
-		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
-			LC_ALL=C sort -u | \
-			sed 's:^CONFIG_::' | \
-			tr '[:upper:]_' '[:lower:]-' | \
-			grep -v ni845x-spi))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g')
-	if [[ ${sprogs} != "${eprogs}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "IUSE set to: ${eprogs}"
-		eerror "flashrom.c : ${sprogs}"
-		die "sync IUSE to the list of source programmers"
-	fi
-
-	# Turn USE flags into CONFIG_xxx settings.
-	local args=()
-	flashrom_enable ${eprogs}
-	_flashrom_enable wiki PRINT_WIKI
-	_flashrom_enable static STATIC
-
-	# You have to specify at least one programmer, and if you specify more than
-	# one programmer you have to include either dummy or internal in the list.
-	# We pick dummy as the default because internal requires libpci.
-	if ! use internal && ! use dummy ; then
-		if [[ ${#args[@]} -ne 1 ]] ; then
-			ewarn "You have to specify at least one programmer, and if you specify"
-			ewarn "more than one programmer, you have to enable either dummy or"
-			ewarn "internal as well.  'dummy' will be the default now."
-			args+=( CONFIG_DUMMY=yes )
-		fi
-	fi
-
-	tc-export AR CC PKG_CONFIG RANLIB
-	# PREFIX, INCLUDEDIR and LIBDIR are injected into the libflashrom pkgconfig
-	# file, which is why we pass them here even though src_install() puts all
-	# files in correct locations without employing make.
-	# VERSION too goes into the pkgconfig file, and we override the upstream
-	# value to get rid of the prefix 'v'.
-	emake \
-		INCLUDEDIR="include" \
-		LIBDIR="$(get_libdir)" \
-		PREFIX="${EPREFIX}/usr" \
-		VERSION="${PV}" \
-		WARNERROR=no "${args[@]}" \
-		all libflashrom.a
-}
-
-src_install() {
-	dosbin flashrom
-	doman flashrom.8
-	dodoc README Documentation/*.txt
-	dolib.a libflashrom.a
-	doheader libflashrom.h
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-
-	if use tools; then
-		dosbin util/ich_descriptors_tool/ich_descriptors_tool
-	fi
-}
diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
index ba78c0a5a373..773755292456 100644
--- a/sys-apps/flashrom/flashrom-1.2-r3.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
@@ -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 ~sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
@@ -68,7 +68,7 @@ LIB_DEPEND="
 	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
 	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	ft2232-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
 	internal? ( sys-apps/pciutils[static-libs(+)] )
 	it8212? ( sys-apps/pciutils[static-libs(+)] )
@@ -85,7 +85,7 @@ LIB_DEPEND="
 	satamv? ( sys-apps/pciutils[static-libs(+)] )
 	satasii? ( sys-apps/pciutils[static-libs(+)] )
 	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	usbblaster-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
 "
 RDEPEND="${LIB_DEPEND//\[static-libs(+)]}"
 DEPEND="${RDEPEND}
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 0a8400359fa9..a307041b2749 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -74,7 +74,7 @@ LIB_DEPEND="
 	developerbox-spi? ( virtual/libusb:1[static-libs(+)] )
 	digilent-spi? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	ft2232-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
 	internal? ( sys-apps/pciutils[static-libs(+)] )
 	it8212? ( sys-apps/pciutils[static-libs(+)] )
@@ -91,7 +91,7 @@ LIB_DEPEND="
 	satamv? ( sys-apps/pciutils[static-libs(+)] )
 	satasii? ( sys-apps/pciutils[static-libs(+)] )
 	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	usbblaster-spi? ( dev-embedded/libftdi:1=[static-libs(+)] )
 "
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}