gentoo resync : 05.12.2021

5 files changed, 52 insertions, 28 deletions

diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 23f319ecfb55..3f9d3e2bace8 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,7 +1,7 @@
 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
-AUX flashrom-9999_meson-fixes.patch 6672 BLAKE2B 299d89375783134cd1465db0b49c2b024c12e18c5c8551902989dbbedd4e17abf51074e387c569505531346b36605d3877106b2f23906b3c4b76b5f874d5104b SHA512 d235f343d28dc2ef7541c6f3f996eb21f51260bfd9f87376f22631035524fb92dfe63c711692092dc9749248db5756048976ba168d7f9814f5381f9234d8c7ec
+AUX flashrom-9999_meson-fixes.patch 7589 BLAKE2B a4c5475cb4574a3571514205ce62765faaf667ef8e08e8f7bfd8cb0c6b3fa61b914bb0f19f65f74c614bff5cad8b35eea3d69a1cb80ffa1af3c3fbe621f2ee2c SHA512 64711cb2483e9fe47d6d1cf7c8229dd97fe41bc41bde06e4fe876d7d1e128dc01e61eeece9d31ac36f200a8f510be6a4f855269a0d9c3302cf4e081a39d0ca9b
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
-EBUILD flashrom-1.2-r3.ebuild 4341 BLAKE2B 8036e77820ba03662c09fb74fbf7471379fc5a9afba2d45e3ce2858169820cd555448bee08dcd474f0a12206758c451b72a602ad879af4ac64f81c7415a5803b SHA512 f2e7472a4aaf9dead08d7cb71b6811c3d58486b55e6ef6a453f7224c6226cf9848593b5291b1b62b1700885c4fe0563cfcc1eb115dc0dcc8d0d7f944d8931504
-EBUILD flashrom-9999.ebuild 4710 BLAKE2B da42297fbf9d8f61f8180208faf0f713cd45a56331284d2497997de184f3ebb94aa7ded0354a978e30a45863126dd482c6ca685ceb9f4c7f81dfbae0b833ffb0 SHA512 6a530c9791ef111feb44dfaef6dd75719ec7a1eef7d668540e69313e01503fabcb77c324249639c0c71b25d7865e68f834f72d16912fb91ad7d1c143c908663b
-MISC metadata.xml 5038 BLAKE2B da17bde1ee18a9b870a60574b61f5b12cc359ce5ea8376ce3b7dd8c40f90a5cd84f92e07bdae83b5e2ba6a065fcad077143e6ac4c0293354fa07d5f6750dc4f6 SHA512 7672bc7988c9ad6cfaf2fd0918a7fdd1f90ed9af0baaa8378a0cbe653a9e51f53bc1dc955e266e6d9a3a0b6eaf2968210d68a40c0b5416d7522c1b646a914f63
+EBUILD flashrom-1.2-r3.ebuild 4348 BLAKE2B f1df27a4ad207fbb91a7a599b6d2a08357d5a3060774bc11916b4f5d1380765f0c5301c987cf68440ffbc50533a79c17b0087139f0eff106c487a1b085ce8ef7 SHA512 a9460ba8104096b4abe257211a321ae824c71c2e7aef5f064ef16088f6f4592472da8ce969688ec695c2e9420a85187a8111fb055af3b7f307e5b42afb7e75d3
+EBUILD flashrom-9999.ebuild 4722 BLAKE2B 8e275122e1d8d9c963c6d90bbf4364a63a49a0e5140079893b15e687fbd95a1a2364c5637a71d4f9a43d3874316b1ddf8cd480745532f6e069d461f6dd897153 SHA512 86d2fa477378033fce754ddb15cbbbb03a301136a8ae852bc041f8bf51f1253d8be02dfe1e7705b352ca73f46ff6f174c82cb2fc59f2cb6e28b8349a9059c5e2
+MISC metadata.xml 4876 BLAKE2B ad38e149e01f382b38aef8a5be73df52654e835665621f4e02696d9b837ce62206da16a6a1ee2b1c08b7e7f1c23329395fee81c9f319404aaf339a2a149b0362 SHA512 166e5d58869cc571872559ffb01a3c645ee4524aa81478c74a680b35bc53f472b55dfda78e49eb25f5438c1841bc58e796cdf8918f63c25d2aa7ea8c2ab807d1
diff --git a/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch b/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
index 63c2e2ef7553..7651585f4f6a 100644
--- a/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
+++ b/sys-apps/flashrom/files/flashrom-9999_meson-fixes.patch
@@ -9,7 +9,7 @@
  )
  
  # libtool versioning
-@@ -74,6 +74,10 @@ cargs = []
+@@ -105,6 +105,10 @@ cargs = []
  deps = []
  srcs = []
  
@@ -20,7 +20,7 @@
  need_raw_access = false
  need_serial = false
  
-@@ -88,27 +92,25 @@ if cc.check_header('sys/utsname.h')
+@@ -119,27 +123,25 @@ if cc.check_header('sys/utsname.h')
    add_project_arguments('-DHAVE_UTSNAME=1', language : 'c')
  endif
  
@@ -59,7 +59,7 @@
    config_atahpt = false
    config_atapromise = false
    config_atavia = false
-@@ -130,14 +132,17 @@ endif
+@@ -161,14 +163,17 @@ endif
  # set defines for configured programmers
  if config_atahpt
    srcs += 'atahpt.c'
@@ -77,7 +77,7 @@
    cargs += '-DCONFIG_ATAVIA=1'
  endif
  if config_buspirate_spi
-@@ -147,18 +152,22 @@ if config_buspirate_spi
+@@ -178,18 +183,22 @@ if config_buspirate_spi
  endif
  if config_ch341a_spi
    srcs += 'ch341a_spi.c'
@@ -100,7 +100,7 @@
    cargs += '-DCONFIG_DIGILENT_SPI=1'
  endif
  if config_jlink_spi
-@@ -168,6 +177,7 @@ if config_jlink_spi
+@@ -199,6 +208,7 @@ if config_jlink_spi
  endif
  if config_drkaiser
    srcs += 'drkaiser.c'
@@ -108,7 +108,7 @@
    cargs += '-DCONFIG_DRKAISER=1'
  endif
  if config_dummy
-@@ -176,16 +186,18 @@ if config_dummy
+@@ -207,16 +217,18 @@ if config_dummy
  endif
  if config_ft2232_spi
    srcs += 'ft2232_spi.c'
@@ -128,7 +128,7 @@
    cargs += '-DCONFIG_RAIDEN_DEBUG_SPI=1'
  endif
  if config_internal
-@@ -204,6 +216,7 @@ if config_internal
+@@ -235,6 +247,7 @@ if config_internal
      srcs += 'sb600spi.c'
      srcs += 'wbsio_spi.c'
    endif
@@ -136,7 +136,7 @@
    config_bitbang_spi = true
    cargs += '-DCONFIG_INTERNAL=1'
    if get_option('config_internal_dmi')
-@@ -217,6 +230,7 @@ if config_ene_lpc
+@@ -244,6 +257,7 @@ if config_internal
  endif
  if config_it8212
    srcs += 'it8212.c'
@@ -144,7 +144,7 @@
    cargs += '-DCONFIG_IT8212=1'
  endif
  if config_linux_mtd
-@@ -237,36 +251,44 @@ if config_mstarddc_spi
+@@ -260,36 +274,44 @@ if config_mstarddc_spi
  endif
  if config_nic3com
    srcs += 'nic3com.c'
@@ -189,7 +189,7 @@
    cargs += '-DCONFIG_PICKIT2_SPI=1'
  endif
  if config_pony_spi
-@@ -283,10 +305,12 @@ if config_rayer_spi
+@@ -306,10 +328,12 @@ if config_rayer_spi
  endif
  if config_satamv
    srcs += 'satamv.c'
@@ -202,7 +202,7 @@
    cargs += '-DCONFIG_SATASII=1'
  endif
  if config_serprog
-@@ -296,10 +320,12 @@ if config_serprog
+@@ -319,10 +343,12 @@ if config_serprog
  endif
  if config_usbblaster_spi
    srcs += 'usbblaster_spi.c'
@@ -215,8 +215,8 @@
    cargs += '-DCONFIG_STLINKV3_SPI=1'
  endif
  if config_lspcon_i2c_spi
-@@ -322,6 +348,26 @@ if host_machine.system() == 'linux'
-   cargs += '-DCONFIG_I2C_SUPPORT=1'
+@@ -344,6 +370,26 @@ if host_machine.system() == 'linux'
+   srcs += 'i2c_helper_linux.c'
  endif
  
 +# some programmers require libftdi
@@ -242,14 +242,40 @@
  # raw memory, MSR or PCI port I/O access
  if need_raw_access
    srcs += 'hwaccess.c'
+@@ -493,10 +539,12 @@ executable(
+ subdir('util')
+ 
+ # unit-test framework
++if get_option('build_tests')
++
+ cmocka_dep = dependency(
+   'cmocka',
+   fallback: ['cmocka', 'cmocka_dep'],
+-  required: false
++  required: true
+ )
+ flashrom_test_dep = declare_dependency(
+   include_directories : include_directories('.'),
+@@ -519,3 +567,5 @@ flashrom_test_dep = declare_dependency(
+ if cmocka_dep.found()
+   subdir('tests')
+ endif
++
++endif
 --- a/meson_options.txt
 +++ b/meson_options.txt
-@@ -1,5 +1,6 @@
+@@ -1,9 +1,12 @@
 -option('pciutils', type : 'boolean', value : true, description : 'use pciutils')
 -option('usb', type : 'boolean', value : true, description : 'use libusb1')
 +option('no_libftdi_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libftdi')
 +option('no_libpci_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libpci')
 +option('no_libusb_programmers', type : 'boolean', value : false, description : 'disable all programmers depending on libusb')
  option('print_wiki', type : 'boolean', value : true,  description : 'Print Wiki')
+ option('default_programmer_name', type : 'string', description : 'default programmer')
+ option('default_programmer_args', type : 'string', description : 'default programmer arguments')
  
++option('build_tests', type : 'boolean', value : false, description : 'build the test suite')
++
  option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers')
+ option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller')
+ option('config_atavia', type : 'boolean', value : true, description : 'VIA VT6421A LPC memory')
diff --git a/sys-apps/flashrom/flashrom-1.2-r3.ebuild b/sys-apps/flashrom/flashrom-1.2-r3.ebuild
index 286893be3db7..6465f20a4497 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 x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index dedf1bc3ada7..58c8150f039c 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,6 +97,7 @@ RDEPEND="${LIB_DEPEND//\[static-libs(+)]}"
 DEPEND="${RDEPEND}
 	sys-apps/diffutils"
 RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
+BDEPEND="test? ( dev-util/cmocka )"
 
 DOCS=( README Documentation/ )
 
@@ -106,6 +107,7 @@ PATCHES=(
 
 src_configure() {
 	local emesonargs=(
+		$(meson_use test build_tests)
 		$(meson_use atahpt config_atahpt)
 		$(meson_use atapromise config_atapromise)
 		$(meson_use atavia config_atavia)
@@ -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>