gentoo resync : 29.03.2018

6 files changed, 139 insertions, 19 deletions

diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 71a0b435f2b8..20cb807d6562 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -2,9 +2,11 @@ DIST flashrom-0.9.6.1.tar.bz2 368133 BLAKE2B 17ebea9814ad0513df7e8f80d7f9e2115d8
 DIST flashrom-0.9.7.tar.bz2 408883 BLAKE2B cf4168d6e9bbc2de32714963c6a6730412041df36d5d4bac5e7021821dd18ecb13d94673c7aeecb24870e30c1e3ffd840f47bcb664b169107af5a7ac7b5e9f89 SHA512 a226c1ac3f9c7822b74ca14b7f9b53013110b2cdb66b1f936593c693ee54f19d643cc3a97a9635c05f2c959aca817668006f609ddb503a84d0bf5d510065674e
 DIST flashrom-0.9.8.tar.bz2 473902 BLAKE2B c127a41c2857ae2e1564777b49b1eff17e2e931c8a2417e738e8188871a6ce4e0fe6a0380c2139aaa906f299ca833563df895aa5fd1af333b24bf7467de0dc8f SHA512 1a1c4513bac7cdf91326ab68b822034101e688bfab0dc0b5698f664fc766027229128c55eed94f302cac05d949647cdec6a103a423c3861b047cf0ff7cc0b509
 DIST flashrom-0.9.9.tar.bz2 495199 BLAKE2B 0bfb6fe1ea3dfbc21192da574473190b6674a4cdada5b2ad5200174a2c7249aae196eadc9fc48208174caf2f8b19588a73f717cf17781b0fd1fa5791cde7fc08 SHA512 155445ce7acab97f91596aad704aa2211da1c3f71fb463fc65c621dfea41e44b5de7db801c5b5cfc37450e8a8cfed5b202553715d999710422c830a0c38ae153
+DIST flashrom-1.0.tar.bz2 321693 BLAKE2B 7e3e021cdf639083717ca30d5268ac9e02eb8b68e54bbcd5caf9de4352f332ba0ab23cf22253f0627fa9c9a0472404fff44cda17e8c306fe4f93b2b1f0563718 SHA512 355ac1322421b2fd699deb0ceff8555c9e89062e639de674c62f1fdacad9ed9351fe89e4c14e22f07a6d4e2e2f070fd4d2ed1cd347a20069f2505966b5c29e0e
 EBUILD flashrom-0.9.6.1.ebuild 2702 BLAKE2B e09bdc5eefbb5ede081353387f4f28d5de54a1298e867053774a883fdbd5a4cdd3df7dcc461a1806911c0ff74f84ee086130d0c1c9e250e01ff39c725635f62e SHA512 5488a0f73d3545182fd1e240add89304044aa511db26cb1799a4f99112c55902a70a1fdf79f12d1bb5713b18d5f1a4bdf1136b5c18d381cffe7430cf5dc80020
-EBUILD flashrom-0.9.7.ebuild 3400 BLAKE2B 11c2fb2eda0d52ef3fae367d3cec29e62956242b2ba160d78a8eb34e06f13f8143fe1777906d1b16bbb14d40d376017c0aeb06bfed8e1b79d7eee0f63f7d60eb SHA512 822b0ed4c599fc237c78913aa59eedf48852c9ea6fbe87de6783594d2af2a168bed9ccb67b3fbdb81ceb1822ff37fce567504d945552c58ecf34603f1812c35e
-EBUILD flashrom-0.9.8.ebuild 4135 BLAKE2B 7800d2f231479c083af14f1e4ab625cb8b7be3371b2db4ade1099d9742a1e77fc2f22408e3b6babfc14c0c64f1d7a7d3ed1347a765fd132a9bc22b3e2f0c91b0 SHA512 a4b53721ac9c1568482120bd3702a998a6ecb9d38c352a7878903b8fc4622cf23b5e625bf4a2565b9aa4958a93d807f6920836d3c8e6741558521b0dc0976ba1
-EBUILD flashrom-0.9.9.ebuild 4253 BLAKE2B e88703f23f93dd2f5c5b6ab30b47624f49aa334bae3837cac80e63bb66be6538323879a1fd50164343cdda5c8dde3c5c95342a184a29e02ac7dcd14f28bd48a5 SHA512 a01fe51282a284faea2e8213866df650148d7abfb399c113ecf5a2b9a98d41795b72218a52a0db61197225033e2fabaf56254bc02e1af1a606957cd2d0b89bc3
-EBUILD flashrom-9999.ebuild 4253 BLAKE2B e88703f23f93dd2f5c5b6ab30b47624f49aa334bae3837cac80e63bb66be6538323879a1fd50164343cdda5c8dde3c5c95342a184a29e02ac7dcd14f28bd48a5 SHA512 a01fe51282a284faea2e8213866df650148d7abfb399c113ecf5a2b9a98d41795b72218a52a0db61197225033e2fabaf56254bc02e1af1a606957cd2d0b89bc3
+EBUILD flashrom-0.9.7.ebuild 3394 BLAKE2B f95bbed798bb7a86c962c32cf2b09b47474415fb141d72c13d6045b955153d8a50e0f29834f641bc674f7349796167d0a9be9fae7dad2c9758ec79df14f8f816 SHA512 6435c267b8664b7cdfe9a8fedea13ff4e5756e107ed40643b16c404f6c46bff4c6f679cc02154d29157ff45c2fa3930d9fe742c258bf29de502ed8c090f92ea9
+EBUILD flashrom-0.9.8.ebuild 4129 BLAKE2B 40113bd2aae43ad066b0e3f3da25e2164bb94250047d8cc360402af983f6dd4ad8de5a0c285fccce776c301fd659e5e3dd49d36fa9f550726ea631f7ea7c71a5 SHA512 2fa5038683700dbe446a386f93c37afcb6f089396b4f6e17526de58ca840cb3c908808335988a6d84ebe44868d92d47dfba6bcc7b62a0cfc1ba8568f4258770f
+EBUILD flashrom-0.9.9.ebuild 4247 BLAKE2B 14c4b35866d6f45924b20f625152bad859c853ae651d0704e1ec267f420ca6a29013fc67b6b8cfe6ae42cd86d23d68420e914f4a77c383724055470b387507db SHA512 4a8591b141a7c3964e814e4b47f0cc3f1f4810ef0526b640846668f3a54a7b69354f4ac02e937842042e3e6cefa112e711d6ad22d2742b1711125c451c6968b1
+EBUILD flashrom-1.0.ebuild 4146 BLAKE2B ceeaea4b99c4151866294c5ed4bf25203bc9cd394d79e60f553e02ef76e73863d3196691d47bb0f46fef3c55370358c91d9373751e5bec261f38093721ccc374 SHA512 0dfee6352b5bdf9f349ba257fedc73d5e3ba5071951eb5ff5be73b4e7be9aa4df338c296125dc52e5602dffce49c094f11d4c1a04f7abaee0846ee52e7032c5b
+EBUILD flashrom-9999.ebuild 4146 BLAKE2B ceeaea4b99c4151866294c5ed4bf25203bc9cd394d79e60f553e02ef76e73863d3196691d47bb0f46fef3c55370358c91d9373751e5bec261f38093721ccc374 SHA512 0dfee6352b5bdf9f349ba257fedc73d5e3ba5071951eb5ff5be73b4e7be9aa4df338c296125dc52e5602dffce49c094f11d4c1a04f7abaee0846ee52e7032c5b
 MISC metadata.xml 4482 BLAKE2B 69683fa8e9f2193f52a7b548cf6c811f2d01e18acdcc57edbc12fdfca8cf4110a65c3c204ee1d323d3e1529ec169381c92c923dc0d6a637ab745d0c49cc80942 SHA512 f9161a35b798faccd83029720b0780e4edae9c2127d5226f7e8933a55dcba3a38e9f7e215555325a9178f931478ea43d93353c40bafcfdaa813666cfb7589ba8
diff --git a/sys-apps/flashrom/flashrom-0.9.7.ebuild b/sys-apps/flashrom/flashrom-0.9.7.ebuild
index 380c620e355d..1ddd4a0e7b4a 100644
--- a/sys-apps/flashrom/flashrom-0.9.7.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.7.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
-	KEYWORDS="amd64 arm ~mips x86"
+	KEYWORDS="amd64 arm x86"
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
diff --git a/sys-apps/flashrom/flashrom-0.9.8.ebuild b/sys-apps/flashrom/flashrom-0.9.8.ebuild
index 5c1ffdbebc23..82ae6d8592c2 100644
--- a/sys-apps/flashrom/flashrom-0.9.8.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.8.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
-	KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
diff --git a/sys-apps/flashrom/flashrom-0.9.9.ebuild b/sys-apps/flashrom/flashrom-0.9.9.ebuild
index 5e764d19fc7d..b6fe28e75232 100644
--- a/sys-apps/flashrom/flashrom-0.9.9.ebuild
+++ b/sys-apps/flashrom/flashrom-0.9.9.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
diff --git a/sys-apps/flashrom/flashrom-1.0.ebuild b/sys-apps/flashrom/flashrom-1.0.ebuild
new file mode 100644
index 000000000000..45893e146faf
--- /dev/null
+++ b/sys-apps/flashrom/flashrom-1.0.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+if [[ ${PV} == "9999" ]] ; then
+	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"
+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 +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(+)] )
+	atapromise? ( sys-apps/pciutils[static-libs(+)] )
+	atavia? ( sys-apps/pciutils[static-libs(+)] )
+	ch341a_spi? ( virtual/libusb:0[static-libs(+)] )
+	dediprog? ( virtual/libusb:0[static-libs(+)] )
+	drkaiser? ( sys-apps/pciutils[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(+)] )
+	nic3com? ( 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(+)] )
+	satamv? ( sys-apps/pciutils[static-libs(+)] )
+	satasii? ( sys-apps/pciutils[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_compile() {
+	# Help keep things in sync.
+	local sprogs=$(echo $(
+		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
+			sort -u | \
+			sed 's:^CONFIG_::' | \
+			tr '[:upper:]' '[:lower:]'))
+	local eprogs=$(echo ${IUSE_PROGRAMMERS//[+-]})
+	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[@]}"
+}
+
+src_test() {
+	if [[ -d tests ]] ; then
+		pushd tests >/dev/null
+		./tests.py || die
+		popd >/dev/null
+	fi
+}
+
+src_install() {
+	dosbin flashrom
+	doman flashrom.8
+	dodoc README Documentation/*.txt
+
+	if use tools ; then
+		if use amd64 ; then
+			dosbin util/ich_descriptors_tool/ich_descriptors_tool
+		elif use x86 ; then
+			dosbin util/ich_descriptors_tool/ich_descriptors_tool
+		fi
+	fi
+}
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 5e764d19fc7d..45893e146faf 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-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 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
@@ -64,12 +64,6 @@ flashrom_enable() {
 	for u ; do _flashrom_enable "${u}" ; done
 }
 
-src_prepare() {
-	sed -i \
-		-e 's:pkg-config:$(PKG_CONFIG):' \
-		Makefile || die
-}
-
 src_compile() {
 	# Help keep things in sync.
 	local sprogs=$(echo $(