[gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, profiles/arch/arm64/, profiles/arch/sparc/, ...

[Joonas Niilola]

commit:     661cae5ff107fb5d58f21bb0e0dcd5dcec83c190
Author:     Eugene Bright <eugene <AT> bright <DOT> gdn>
AuthorDate: Tue Sep 17 17:51:36 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 16:00:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=661cae5f

sys-apps/flashrom: Get rid of underscore in IUSE

Closes: https://bugs.gentoo.org/694664
Signed-off-by: Eugene Bright <eugene <AT> bright.gdn>
Closes: https://github.com/gentoo/gentoo/pull/13204
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 profiles/arch/amd64/package.use.mask         |  2 +-
 profiles/arch/arm64/package.use.mask         |  2 +-
 profiles/arch/base/package.use.mask          |  2 +-
 profiles/arch/powerpc/package.use.mask       |  2 +-
 profiles/arch/powerpc/ppc64/package.use.mask |  2 +-
 profiles/arch/sparc/package.use.mask         |  2 +-
 profiles/arch/x86/package.use.mask           |  2 +-
 sys-apps/flashrom/flashrom-0.9.8.ebuild      | 74 +++++++++++++++++++---------
 sys-apps/flashrom/flashrom-1.0.ebuild        | 69 ++++++++++++++++++--------
 sys-apps/flashrom/flashrom-1.1.ebuild        | 64 ++++++++++++------------
 sys-apps/flashrom/flashrom-9999.ebuild       | 64 ++++++++++++------------
 sys-apps/flashrom/metadata.xml               | 36 +++++++-------
 12 files changed, 187 insertions(+), 134 deletions(-)

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index e12fa999409..0e8f34e6b6b 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -199,7 +199,7 @@ net-im/telepathy-connection-managers -steam
 
 # Mike Frysinger <vapier@g.o> (2014-08-04)
 # Unmask flashrom drivers that only work on x86 due to in/out asm insns #454024
-sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv
+sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer-spi -satamv
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> (2014-04-24)
 # It's only supported on amd64

diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 2fb0da2d39e..901d17e9c13 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -11,7 +11,7 @@ sys-firmware/seabios -debug
 
 # Eugene Bright <eugene@××××××.gdn> (2019-09-09)
 # Missing keyword on dev-embedded/libjaylink
-sys-apps/flashrom jlink_spi
+sys-apps/flashrom jlink-spi
 
 # Aaron Bauman <bman@g.o> (2019-08-05)
 # dep not keyworded here

diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 9c39320b7e5..6056662f400 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -179,7 +179,7 @@ games-board/stockfish armv7
 
 # Mike Frysinger <vapier@g.o> (2014-08-04)
 # Mask flashrom drivers that only work on x86 due to in/out asm insns #454024
-sys-apps/flashrom atahpt nic3com nicnatsemi nicrealtek rayer_spi satamv
+sys-apps/flashrom atahpt nic3com nicnatsemi nicrealtek rayer-spi satamv
 
 # Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> (2014-04-24)
 # It's only supported on amd64

diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index cd4ab4b9227..d2273928c6f 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -7,7 +7,7 @@ sys-firmware/seabios -debug
 
 # Eugene Bright <eugene@××××××.gdn> (2019-09-09)
 # Missing keyword on dev-embedded/libjaylink
-sys-apps/flashrom jlink_spi
+sys-apps/flashrom jlink-spi
 
 # Conrad Kostecki <ck+gentoo@××××××××.de> (2019-08-17)
 # app-misc/graphlcd-base won't work on PowerPC/PowerPC64

diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 42c973dbd42..cbfe8822ba6 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -3,7 +3,7 @@
 
 # Eugene Bright <eugene@××××××.gdn> (2019-09-09)
 # Missing keyword on dev-embedded/libjaylink
-sys-apps/flashrom jlink_spi
+sys-apps/flashrom jlink-spi
 
 # Matthew Thode <prometheanfire@g.o> (2019-08-22)
 # context works with newer versions of boost

diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 0e5a5806590..f639f53b04c 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -3,7 +3,7 @@
 
 # Eugene Bright <eugene@××××××.gdn> (2019-09-09)
 # Missing keyword on dev-embedded/libjaylink
-sys-apps/flashrom jlink_spi
+sys-apps/flashrom jlink-spi
 
 # Mart Raudsepp <leio@g.o> (2019-08-18)
 # media-video/pipewire is not keyworded yet

diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index c3f6d1739af..f307f763053 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -197,7 +197,7 @@ net-im/telepathy-connection-managers -steam
 
 # Mike Frysinger <vapier@g.o> (2014-08-04)
 # Unmask flashrom drivers that only work on x86 due to in/out asm insns #454024
-sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv
+sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer-spi -satamv
 
 # Yixun Lan <dlan@g.o> (2014-05-21)
 # sys-fs/zfs not keyworded on x86

diff --git a/sys-apps/flashrom/flashrom-0.9.8.ebuild b/sys-apps/flashrom/flashrom-0.9.8.ebuild
index 82ae6d8592c..91f74505262 100644
--- a/sys-apps/flashrom/flashrom-0.9.8.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.8.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
-	ESVN_REPO_URI="https://code.coreboot.org/svn/flashrom/trunk"
-	inherit subversion
+	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
+	inherit git-r3
 else
 	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
 	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
@@ -20,40 +20,66 @@ 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 +atavia +buspirate_spi dediprog +drkaiser +dummy
-+ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com
-+nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi
-+pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi"
-IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
+IUSE_PROGRAMMERS="
+	atahpt
+	+atavia
+	+buspirate-spi
+	dediprog
+	+drkaiser
+	+dummy
+	+ft2232-spi
+	+gfxnvidia
+	+internal
+	+it8212
+	+linux-spi
+	mstarddc-spi
+	+nic3com
+	+nicintel
+	+nicintel-eeprom
+	+nicintel-spi
+	nicnatsemi
+	+nicrealtek
+	+ogp-spi
+	+pickit2-spi
+	+pony-spi
+	+rayer-spi
+	+satamv
+	+satasii
+	+serprog
+	+usbblaster-spi
+"
+IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
 
-LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
+LIB_DEPEND="
+	atahpt? ( sys-apps/pciutils[static-libs(+)] )
 	atavia? ( sys-apps/pciutils[static-libs(+)] )
 	dediprog? ( virtual/libusb:0[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232_spi? ( dev-embedded/libftdi:0[static-libs(+)] )
+	ft2232-spi? ( dev-embedded/libftdi:0[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
-	it8212? ( sys-apps/pciutils[static-libs(+)] )
 	internal? ( sys-apps/pciutils[static-libs(+)] )
+	it8212? ( sys-apps/pciutils[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(+)] )
-	nicintel_eeprom? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel_spi? ( 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(+)] )
+	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(+)] )
-	usbblaster_spi? ( dev-embedded/libftdi:0[static-libs(+)] )"
+	usbblaster-spi? ( dev-embedded/libftdi:0[static-libs(+)] )
+"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 	sys-apps/diffutils"
-RDEPEND+=" !internal_dmi? ( sys-apps/dmidecode )"
+RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
 
 _flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr [:lower:] [:upper:])}"
+	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
 	args+=( "${c}=$(usex $1 yes no)" )
 }
 flashrom_enable() {
@@ -65,6 +91,8 @@ src_prepare() {
 	sed -i \
 		-e 's:pkg-config:$(PKG_CONFIG):' \
 		Makefile || die
+
+	default
 }
 
 src_compile() {
@@ -73,8 +101,8 @@ src_compile() {
 		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
 			sort -u | \
 			sed 's:^CONFIG_::' | \
-			tr '[:upper:]' '[:lower:]'))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS//[+-]})
+			tr '[:upper:]_' '[:lower:]-'))
+	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}"

diff --git a/sys-apps/flashrom/flashrom-1.0.ebuild b/sys-apps/flashrom/flashrom-1.0.ebuild
index 0c908ab1777..cd57ee3d0f6 100644
--- a/sys-apps/flashrom/flashrom-1.0.ebuild
+++ b/sys-apps/flashrom/flashrom-1.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit toolchain-funcs
 if [[ ${PV} == "9999" ]] ; then
@@ -21,42 +21,69 @@ SLOT="0"
 # 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 +drkaiser +dummy
-+ft2232_spi +gfxnvidia +internal +it8212 +linux_spi mstarddc_spi +nic3com
-+nicintel +nicintel_eeprom +nicintel_spi nicnatsemi +nicrealtek +ogp_spi
-+pickit2_spi +pony_spi +rayer_spi +satamv +satasii +serprog +usbblaster_spi"
-IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
+	atahpt
+	+atapromise
+	+atavia
+	+buspirate-spi
+	+ch341a-spi
+	+dediprog
+	+drkaiser
+	+dummy
+	+ft2232-spi
+	+gfxnvidia
+	+internal
+	+it8212
+	+linux-spi
+	mstarddc-spi
+	+nic3com
+	+nicintel
+	+nicintel-eeprom
+	+nicintel-spi
+	nicnatsemi
+	+nicrealtek
+	+ogp-spi
+	+pickit2-spi
+	+pony-spi
+	+rayer-spi
+	+satamv
+	+satasii
+	+serprog
+	+usbblaster-spi
+"
+IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
 
-LIB_DEPEND="atahpt? ( sys-apps/pciutils[static-libs(+)] )
+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(+)] )
+	ch341a-spi? ( virtual/libusb:1[static-libs(+)] )
 	dediprog? ( virtual/libusb:1[static-libs(+)] )
 	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232_spi? ( dev-embedded/libftdi:=[static-libs(+)] )
+	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
 	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
-	it8212? ( sys-apps/pciutils[static-libs(+)] )
 	internal? ( sys-apps/pciutils[static-libs(+)] )
+	it8212? ( sys-apps/pciutils[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(+)] )
-	nicintel_eeprom? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel_spi? ( 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(+)] )
+	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(+)] )
-	usbblaster_spi? ( dev-embedded/libftdi:=[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 )"
+RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
 
 _flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr [:lower:] [:upper:])}"
+	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
 	args+=( "${c}=$(usex $1 yes no)" )
 }
 flashrom_enable() {
@@ -70,8 +97,8 @@ src_compile() {
 		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
 			sort -u | \
 			sed 's:^CONFIG_::' | \
-			tr '[:upper:]' '[:lower:]'))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS//[+-]})
+			tr '[:upper:]_' '[:lower:]-'))
+	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}"

diff --git a/sys-apps/flashrom/flashrom-1.1.ebuild b/sys-apps/flashrom/flashrom-1.1.ebuild
index 30b34fa616a..873ed5612b8 100644
--- a/sys-apps/flashrom/flashrom-1.1.ebuild
+++ b/sys-apps/flashrom/flashrom-1.1.ebuild
@@ -26,74 +26,74 @@ IUSE_PROGRAMMERS="
 	atahpt
 	+atapromise
 	+atavia
-	+buspirate_spi
-	+ch341a_spi
+	+buspirate-spi
+	+ch341a-spi
 	+dediprog
-	+developerbox_spi
-	+digilent_spi
+	+developerbox-spi
+	+digilent-spi
 	+drkaiser
 	+dummy
-	+ft2232_spi
+	+ft2232-spi
 	+gfxnvidia
 	+internal
 	+it8212
-	jlink_spi
-	+linux_mtd
-	+linux_spi
-	mstarddc_spi
+	jlink-spi
+	+linux-mtd
+	+linux-spi
+	mstarddc-spi
 	+nic3com
 	+nicintel
-	+nicintel_eeprom
-	+nicintel_spi
+	+nicintel-eeprom
+	+nicintel-spi
 	nicnatsemi
 	+nicrealtek
-	+ogp_spi
-	+pickit2_spi
-	+pony_spi
-	+rayer_spi
+	+ogp-spi
+	+pickit2-spi
+	+pony-spi
+	+rayer-spi
 	+satamv
 	+satasii
 	+serprog
-	+usbblaster_spi
+	+usbblaster-spi
 "
 
-IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
+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(+)] )
+	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(+)] )
+	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:=[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(+)] )
+	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-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(+)] )
+	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(+)] )
-	usbblaster_spi? ( dev-embedded/libftdi:=[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 )"
+RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
 
 _flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr [:lower:] [:upper:])}"
+	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
 	args+=( "${c}=$(usex $1 yes no)" )
 }
 flashrom_enable() {
@@ -107,8 +107,8 @@ src_compile() {
 		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
 			sort -u | \
 			sed 's:^CONFIG_::' | \
-			tr '[:upper:]' '[:lower:]'))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS//[+-]})
+			tr '[:upper:]_' '[:lower:]-'))
+	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}"

diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 30b34fa616a..873ed5612b8 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -26,74 +26,74 @@ IUSE_PROGRAMMERS="
 	atahpt
 	+atapromise
 	+atavia
-	+buspirate_spi
-	+ch341a_spi
+	+buspirate-spi
+	+ch341a-spi
 	+dediprog
-	+developerbox_spi
-	+digilent_spi
+	+developerbox-spi
+	+digilent-spi
 	+drkaiser
 	+dummy
-	+ft2232_spi
+	+ft2232-spi
 	+gfxnvidia
 	+internal
 	+it8212
-	jlink_spi
-	+linux_mtd
-	+linux_spi
-	mstarddc_spi
+	jlink-spi
+	+linux-mtd
+	+linux-spi
+	mstarddc-spi
 	+nic3com
 	+nicintel
-	+nicintel_eeprom
-	+nicintel_spi
+	+nicintel-eeprom
+	+nicintel-spi
 	nicnatsemi
 	+nicrealtek
-	+ogp_spi
-	+pickit2_spi
-	+pony_spi
-	+rayer_spi
+	+ogp-spi
+	+pickit2-spi
+	+pony-spi
+	+rayer-spi
 	+satamv
 	+satasii
 	+serprog
-	+usbblaster_spi
+	+usbblaster-spi
 "
 
-IUSE="${IUSE_PROGRAMMERS} +internal_dmi static tools +wiki"
+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(+)] )
+	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(+)] )
+	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:=[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(+)] )
+	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-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(+)] )
+	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(+)] )
-	usbblaster_spi? ( dev-embedded/libftdi:=[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 )"
+RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
 
 _flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr [:lower:] [:upper:])}"
+	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
 	args+=( "${c}=$(usex $1 yes no)" )
 }
 flashrom_enable() {
@@ -107,8 +107,8 @@ src_compile() {
 		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
 			sort -u | \
 			sed 's:^CONFIG_::' | \
-			tr '[:upper:]' '[:lower:]'))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS//[+-]})
+			tr '[:upper:]_' '[:lower:]-'))
+	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}"

diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index 7f752c64c57..11a2a4bdc99 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -13,39 +13,37 @@
 		<flag name="atahpt">Highpoint (HPT) ATA/RAID controller support</flag>
 		<flag name="atapromise">Support for Promise PDC2026x (FastTrak/Ultra)</flag>
 		<flag name="atavia">Support for VIA VT6421A SATA controllers</flag>
-		<flag name="bitbang_spi">Bitbanging SPI infrastructure</flag>
-		<flag name="buspirate_spi">Enable Bus Pirate SPI programmer</flag>
-		<flag name="ch341a_spi">Enable WCH CH341A SPI programmer</flag>
+		<flag name="buspirate-spi">Enable Bus Pirate SPI programmer</flag>
+		<flag name="ch341a-spi">Enable WCH CH341A SPI programmer</flag>
 		<flag name="dediprog">Dediprog SF100 support</flag>
-		<flag name="developerbox_spi">Enable Devloperbox SPI recovery support</flag>
-		<flag name="digilent_spi">Enable support for Digilent iCEblink40 development board</flag>
+		<flag name="developerbox-spi">Enable Devloperbox SPI recovery support</flag>
+		<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="ft2232_spi">Enable ftdi programmer, flashing through FTDI/SPI USB interface</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>
-		<flag name="internal_dmi">Enable internal DMI decoding rather than use <pkg>sys-apps/dmidecode</pkg></flag>
+		<flag name="internal-dmi">Enable internal DMI decoding rather than use <pkg>sys-apps/dmidecode</pkg></flag>
 		<flag name="it8212">Support for ITE IT8212F ATA/RAID controllers</flag>
-		<flag name="jlink_spi">Support for SEGGER J-Link and compatible devices</flag>
-		<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="mstarddc_spi">Support for SPI flash ROMs accessible through DDC in MSTAR-equipped displays</flag>
+		<flag name="jlink-spi">Support for SEGGER J-Link and compatible devices</flag>
+		<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="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>
-		<flag name="nicintel_eeprom">Support for EEPROMs on Intel Gigabit network cards</flag>
-		<flag name="nicintel_spi">Support for SPI on Intel NICs</flag>
+		<flag name="nicintel-eeprom">Support for EEPROMs on Intel Gigabit network cards</flag>
+		<flag name="nicintel-spi">Support for SPI on Intel NICs</flag>
 		<flag name="nicnatsemi">Support for National Semiconductor NICs</flag>
 		<flag name="nicrealtek">Support for Realtek NICs</flag>
-		<flag name="ogp_spi">Enable support for OGP (Open Graphics Project) SPI flashing</flag>
-		<flag name="pickit2_spi">SUpport for SPI flash ROMs accessible via Microchip PICkit2</flag>
-		<flag name="pony_spi">Enable support for SI-Prog like hardware by Lancos</flag>
-		<flag name="rayer_spi">RayeR SPIPGM hardware support</flag>
+		<flag name="ogp-spi">Enable support for OGP (Open Graphics Project) SPI flashing</flag>
+		<flag name="pickit2-spi">SUpport for SPI flash ROMs accessible via Microchip PICkit2</flag>
+		<flag name="pony-spi">Enable support for SI-Prog like hardware by Lancos</flag>
+		<flag name="rayer-spi">RayeR SPIPGM hardware support</flag>
 		<flag name="satasii">Enable programmer for SiI SATA controllers</flag>
 		<flag name="satamv">Enable programmer for Marvell SATA controllers</flag>
 		<flag name="serprog">Enable Serial Flasher programmer</flag>
 		<flag name="tools">Install additional tools</flag>
-		<flag name="usbblaster">Enable support for Altera USB-Blaster dongles</flag>
-		<flag name="usbblaster_spi">Enable support for Altera USB-Blaster dongles</flag>
+		<flag name="usbblaster-spi">Enable support for Altera USB-Blaster dongles</flag>
 		<flag name="wiki">Enable wiki informations, like supported devices etc.</flag>
 	</use>
 	<longdescription lang="en">