gentoo Easter resync : 12.04.2020

5 files changed, 21 insertions, 195 deletions

diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 26956f71a63a..bf55eb2277df 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,8 +1,6 @@
 DIST flashrom-0.9.8.tar.bz2 473902 BLAKE2B c127a41c2857ae2e1564777b49b1eff17e2e931c8a2417e738e8188871a6ce4e0fe6a0380c2139aaa906f299ca833563df895aa5fd1af333b24bf7467de0dc8f SHA512 1a1c4513bac7cdf91326ab68b822034101e688bfab0dc0b5698f664fc766027229128c55eed94f302cac05d949647cdec6a103a423c3861b047cf0ff7cc0b509
-DIST flashrom-1.0.tar.bz2 321693 BLAKE2B 7e3e021cdf639083717ca30d5268ac9e02eb8b68e54bbcd5caf9de4352f332ba0ab23cf22253f0627fa9c9a0472404fff44cda17e8c306fe4f93b2b1f0563718 SHA512 355ac1322421b2fd699deb0ceff8555c9e89062e639de674c62f1fdacad9ed9351fe89e4c14e22f07a6d4e2e2f070fd4d2ed1cd347a20069f2505966b5c29e0e
-DIST flashrom-v1.1.tar.bz2 348458 BLAKE2B cee1b8e4f680739e794239c3d777ef9cf0af1f734fe4d8f4b122d26316cdb8d45d53f92054937c7cde1737364ba8ed80410561bfbb7f304b0371942be144859b SHA512 8cb75a7223490fa9dbd65a85d24a87beab68ee03120891a3d8ebf4e8bc3d2a2ee640e254ccff657eaf5175e6c2477288337369fa1b1dac110a0903b0c95c1e56
+DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
 EBUILD flashrom-0.9.8.ebuild 4186 BLAKE2B 16f9f031ff5e2e6509ac875fecff28765b6887cc215a59af53297b75cbf724f988f22981c669ae7e196bd37644d123bca7924f3f271c33718279074c6c073a39 SHA512 060e93fc378994d2168b0deb196ef9f7c4fc8af52ffed9210742539eaff8a656e8eb97b28b8fc708256231b1077433ac381c097b0966c5b64573a054d088894a
-EBUILD flashrom-1.0.ebuild 4213 BLAKE2B 57c64441746478610f4bdc4ebc9708c6021fba8241aff21c226e06efc7c0d03f5d6c7165222b882003e9df153abb3222a3c7e2fdbb37bc9a7c4911828c7ed72d SHA512 c92ca23bb21bc1e5cd71359f1876f6577050766f4d03b443a9b9dc63c89e49d8add999410c3b9736ac266ae315ec2cd2165f4efb685326658fb9ee840914f51c
-EBUILD flashrom-1.1.ebuild 4483 BLAKE2B 6011c9743d8e1aee24a873a18a1a837882fd360d2e8066f277d23e77b59c0f8b2797bddbf0738503fa586dcc0cd596ce9e0cc68f0fc09c53ff15ba871d22dac8 SHA512 d033ad0b5013802eec89860959d388a012c835f9c8217f294c8ebb5673bcbb490330ce9ec90e53bc4a75fb7b843dfdfd7dc0b13f1bea0b4c90fd5bcef0a39e68
-EBUILD flashrom-9999.ebuild 4575 BLAKE2B 48819fdadf803ac9428b300ed4ebcfe6cbf9e181095116cf46f9bcadca220204eabfcc3d43e02a59c768930da793effba5e511cebad87d6670ebb1462ad478fe SHA512 37ee887746e789d47a67f042c2343f5e39a2ef0b7fdb3bfb545de147ae31985e58d77aad58b9ab977ef96687ee60ca6de745e6ec9a438c7686d07e159b74d7db
-MISC metadata.xml 4633 BLAKE2B 2a4703209896ba0e5e35992a8a0b5779bc077f9314a84d499ccf4445b54e925d25eac13844c6397ccea45391647b4afc31ab6406fa046017ee89a155935659b9 SHA512 f6172421b2a8fd98c5cad433de26e9d301f11f7f2264b47b90b07da304d72a29dc0239b17a951eca5593b53fb5265fd8b699cda62a2218f05e60588b217b838a
+EBUILD flashrom-1.2.ebuild 4423 BLAKE2B fc758295685fea683f2b7bdc07dc307525571b00745ced19910a95117a033964d037da53b86ddca9482c96b8dcb6f54e46eb6401e17e5268f2b565ed89bf6ee6 SHA512 b2ef614c5bee6c83a510306823ae34b2e32e8d03726479b6ceb89f29e51c2f9d6a91f7e6c1f24166fe572094299b3bbc49047ae4c865d3ca994be233cfa7d90e
+EBUILD flashrom-9999.ebuild 4423 BLAKE2B fc758295685fea683f2b7bdc07dc307525571b00745ced19910a95117a033964d037da53b86ddca9482c96b8dcb6f54e46eb6401e17e5268f2b565ed89bf6ee6 SHA512 b2ef614c5bee6c83a510306823ae34b2e32e8d03726479b6ceb89f29e51c2f9d6a91f7e6c1f24166fe572094299b3bbc49047ae4c865d3ca994be233cfa7d90e
+MISC metadata.xml 4595 BLAKE2B 0a7c4f212c57dccca72a7da1172b8eb36a7027703fea6137be5eefbadf5592abaa6e9841befa3e8f8ef65b1b5057af3c0f162584f0db65addd362a0a8880e648 SHA512 25b118e1150b405d34081add86fa02c04094ada970ea2a121bf21a3047d1df2566383549df7d0138883bcfed31c2574a420e9357dccce993c93179e3e769b8ef
diff --git a/sys-apps/flashrom/flashrom-1.0.ebuild b/sys-apps/flashrom/flashrom-1.0.ebuild
deleted file mode 100644
index 766fefcc7255..000000000000
--- a/sys-apps/flashrom/flashrom-1.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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:1[static-libs(+)] )
-	dediprog? ( 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(+)] )
-	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(+)] )
-	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 | \
-			LC_ALL=C sort -u | \
-			sed 's:^CONFIG_::' | \
-			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}"
-		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-1.1.ebuild b/sys-apps/flashrom/flashrom-1.2.ebuild
index 210c82d3c759..b51635e3ad80 100644
--- a/sys-apps/flashrom/flashrom-1.1.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2.ebuild
@@ -54,6 +54,7 @@ IUSE_PROGRAMMERS="
 	+satamv
 	+satasii
 	+serprog
+	stlinkv3-spi
 	+usbblaster-spi
 "
 
@@ -84,6 +85,7 @@ LIB_DEPEND="
 	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(+)]} )"
@@ -107,7 +109,8 @@ src_compile() {
 		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
 			LC_ALL=C sort -u | \
 			sed 's:^CONFIG_::' | \
-			tr '[:upper:]_' '[:lower:]-'))
+			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."
@@ -135,27 +138,17 @@ src_compile() {
 	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
+	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
-		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
+	if use tools; then
+		dosbin util/ich_descriptors_tool/ich_descriptors_tool
 	fi
 }
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 44446c7c4e17..b51635e3ad80 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -138,27 +138,17 @@ src_compile() {
 	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
+	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
-		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
+	if use tools; then
+		dosbin util/ich_descriptors_tool/ich_descriptors_tool
 	fi
 }
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index cb68ee1711d9..e013e68e7b82 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>peter@stuge.se</email>
-		<name>Peter Stuge</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<use>
 		<flag name="atahpt">Highpoint (HPT) ATA/RAID controller support</flag>
@@ -43,7 +39,7 @@
 		<flag name="satamv">Enable programmer for Marvell SATA controllers</flag>
 		<flag name="stlinkv3-spi">Enable SPI programmer using STLINK-V3</flag>
 		<flag name="serprog">Enable Serial Flasher programmer</flag>
-		<flag name="tools">Install additional tools</flag>
+		<flag name="tools">Install ich_descriptor_tool, a tool for reading descriptor-mode SPI-flash images for Intel chipsets</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>