gentoo auto-resync : 08:03:2023 - 18:00:26

4 files changed, 137 insertions, 149 deletions

diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index fe40daea8286..f79d2ab03c7c 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
-DIST flashrom-v1.2.1.tar.bz2 365512 BLAKE2B d0eb2446ed0f0a952ae18296c5b4cbe72760cdf534d4bdc88255752c2ad1a4a503c7c5154493ba2c4dc042d31ca98359db3609a114536423d7a84af6a50fe1c7 SHA512 9cf4b9f69dd19364015fed49d411069ec6683455c90ebc3d102853825e0c46ccdaac30e78172f7cec5d2d15916efcd5ae12529d4e1ddc55efe705efecf3c0f40
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
+DIST flashrom-v1.3.0.tar.bz2 489782 BLAKE2B e6d2284d83171b003b434251f060fa44edf32ecfd3d397bd4ba39b74c6a0b5c9d1659b703dd6b632b63aa4bf27d08c8aeece72920199712c6a4ae160b2eb3a8a SHA512 73b6e00bd3bc66c98d4ad53966a65b19d3d92f07d7b210d69e041d6f5788605b9791a9bf7aec0a52e13d19fcb62c4bdaf4bab9f805fc31468393ca313129a77b
 EBUILD flashrom-1.2-r4.ebuild 3883 BLAKE2B d6db324e8c8aabb66dc112f537817e921a349a19c614abeaa554c6cd0c1cef307a866406a154df36905a97a4323b18cd10735bdabf884c8c25a1721391285a6a SHA512 2d46f9be773ce539b49ea729ba09257395a69f0d259d434032d88e24db1b0ac7ccd16c6e6ecb00c950f8e2e2cc4400eb9f40593c33534aeb06fd80da0c1fc625
-EBUILD flashrom-1.2.1.ebuild 3889 BLAKE2B fe31f9ae5d8705564a230f9420ae502ddda69ec74a5cb074b7cbaacea70aecd285009428749dd914175370b8aab5a1df065b11cccd6b6a39606c07f63084ed47 SHA512 433593e4e73337a791e2ed2f50a49723c67fe4977d894fb32da70acb9930805106ebf517a25c5ad30525f1f89f759743118b317e3429d8b5cb5aae41777bc060
-MISC metadata.xml 4597 BLAKE2B bfc45d706d56846d4c3dc8a4073d11f6c52aac1282c14b5c4578f3c5687560c47a98832afd303981e79e68b78de842eaf2ac2aee60f2ceb5bd6c663c93db0c7e SHA512 9b341cbe55799cc095496ef6bcd9632951105db1ffeb472ebed5cd48d2919ac02f8461ccd3fc62afbc66182cb1448faab98ba9ef5081f995986841245b8d5388
+EBUILD flashrom-1.3.0.ebuild 3256 BLAKE2B d08c0029d3279fdf639e075ac8640604d9496642bc409d82c7c1673060b369163bd686638d294bdf39fab2584f582043fdc99d99716d48711e8b67748f3180fc SHA512 304dce055a1f9965ead1a82a53d2b07379a1e8452b093f6bef09056eae8b5727ba519b8fb0df88a46be75d95898a29c25375e686384e30ad7a027bb5c018adf3
+MISC metadata.xml 5072 BLAKE2B 5e11d250b2d59b71281ef50bf9cc79c30b2b2000002fae9725f75c73f89d02e297714d23d63dcaa55fb980162e54395b5ec5a528d15ada6c0fe8b6d020e1e3e9 SHA512 bec32f9d6d997e487f2560c89e68c041ae4162a2cc7b80dc38f20e610c300e76e8fa35144c371055f6a4594653c5af4865ba23634be87bd3e36cc8d66069ebc3
diff --git a/sys-apps/flashrom/flashrom-1.2.1.ebuild b/sys-apps/flashrom/flashrom-1.2.1.ebuild
deleted file mode 100644
index f9c7fff0db2c..000000000000
--- a/sys-apps/flashrom/flashrom-1.2.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-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 ~riscv ~x86"
-	S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/Flashrom"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# The defaults match the upstream meson_options.txt.
-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 tools"
-
-RDEPEND="atahpt? ( sys-apps/pciutils )
-	atapromise? ( sys-apps/pciutils )
-	atavia? ( sys-apps/pciutils )
-	ch341a-spi? ( virtual/libusb:1 )
-	dediprog? ( virtual/libusb:1 )
-	developerbox-spi? ( virtual/libusb:1 )
-	digilent-spi? ( virtual/libusb:1 )
-	drkaiser? ( sys-apps/pciutils )
-	ft2232-spi? ( dev-embedded/libftdi:1= )
-	gfxnvidia? ( sys-apps/pciutils )
-	internal? ( sys-apps/pciutils )
-	it8212? ( sys-apps/pciutils )
-	jlink-spi? ( dev-embedded/libjaylink )
-	nic3com? ( sys-apps/pciutils )
-	nicintel-eeprom? ( sys-apps/pciutils )
-	nicintel-spi? ( sys-apps/pciutils )
-	nicintel? ( sys-apps/pciutils )
-	nicnatsemi? ( sys-apps/pciutils )
-	nicrealtek? ( sys-apps/pciutils )
-	ogp-spi? ( sys-apps/pciutils )
-	pickit2-spi? ( virtual/libusb:1 )
-	rayer-spi? ( sys-apps/pciutils )
-	satamv? ( sys-apps/pciutils )
-	satasii? ( sys-apps/pciutils )
-	stlinkv3-spi? ( virtual/libusb:1 )
-	usbblaster-spi? ( dev-embedded/libftdi:1= )"
-DEPEND="${RDEPEND}
-	sys-apps/diffutils"
-RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
-
-DOCS=( README Documentation/ )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2_meson-fixes.patch
-	"${FILESDIR}"/${PN}-1.2_meson-install-manpage.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use atahpt config_atahpt)
-		$(meson_use atapromise config_atapromise)
-		$(meson_use atavia config_atavia)
-		$(meson_use buspirate-spi config_buspirate_spi)
-		$(meson_use ch341a-spi config_ch341a_spi)
-		$(meson_use dediprog config_dediprog)
-		$(meson_use developerbox-spi config_developerbox_spi)
-		$(meson_use digilent-spi config_digilent_spi)
-		$(meson_use drkaiser config_drkaiser)
-		$(meson_use dummy config_dummy)
-		$(meson_use ft2232-spi config_ft2232_spi)
-		$(meson_use gfxnvidia config_gfxnvidia)
-		$(meson_use internal config_internal)
-		$(meson_use internal-dmi config_internal_dmi)
-		$(meson_use it8212 config_it8212)
-		$(meson_use jlink-spi config_jlink_spi)
-		$(meson_use linux-mtd config_linux_mtd)
-		$(meson_use linux-spi config_linux_spi)
-		$(meson_use mstarddc-spi config_mstarddc_spi)
-		$(meson_use nic3com config_nic3com)
-		$(meson_use nicintel-eeprom config_nicintel_eeprom)
-		$(meson_use nicintel-spi config_nicintel_spi)
-		$(meson_use nicintel config_nicintel)
-		$(meson_use nicnatsemi config_nicnatsemi)
-		$(meson_use nicrealtek config_nicrealtek)
-		$(meson_use ogp-spi config_ogp_spi)
-		$(meson_use pickit2-spi config_pickit2_spi)
-		$(meson_use pony-spi config_pony_spi)
-		$(meson_use rayer-spi config_rayer_spi)
-		$(meson_use satamv config_satamv)
-		$(meson_use satasii config_satasii)
-		$(meson_use stlinkv3-spi config_stlinkv3_spi)
-		$(meson_use serprog config_serprog)
-		$(meson_use usbblaster-spi config_usbblaster_spi)
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use tools; then
-		dosbin "${BUILD_DIR}"/util/ich_descriptors_tool/ich_descriptors_tool
-	fi
-}
diff --git a/sys-apps/flashrom/flashrom-1.3.0.ebuild b/sys-apps/flashrom/flashrom-1.3.0.ebuild
new file mode 100644
index 000000000000..96d7cbdffb27
--- /dev/null
+++ b/sys-apps/flashrom/flashrom-1.3.0.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson
+
+MY_P="${PN}-v${PV}"
+SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
+HOMEPAGE="https://flashrom.org/Flashrom"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+# The defaults should match the upstream "default" flags in meson.build
+IUSE_PROGRAMMERS="
+	atahpt
+	atapromise
+	+atavia
+	+buspirate-spi
+	+ch341a-spi
+	+dediprog
+	+developerbox-spi
+	+digilent-spi
+	+dirtyjtag-spi
+	+drkaiser
+	+dummy
+	+ft2232-spi
+	+gfxnvidia
+	+internal
+	+it8212
+	jlink-spi
+	+linux-mtd
+	+linux-spi
+	mediatek-i2c-spi
+	mstarddc-spi
+	+nic3com
+	+nicintel
+	+nicintel-eeprom
+	+nicintel-spi
+	nicnatsemi
+	+nicrealtek
+	+ogp-spi
+	parade-lspcon
+	+pickit2-spi
+	+pony-spi
+	+raiden-debug-spi
+	+rayer-spi
+	realtek-mst-i2c-spi
+	+satamv
+	+satasii
+	+serprog
+	+stlinkv3-spi
+	+usbblaster-spi"
+IUSE="${IUSE_PROGRAMMERS} +internal-dmi test tools"
+
+RESTRICT="!test? ( test )"
+
+COMMON="atahpt? ( sys-apps/pciutils )
+	atapromise? ( sys-apps/pciutils )
+	atavia? ( sys-apps/pciutils )
+	ch341a-spi? ( virtual/libusb:1 )
+	dediprog? ( virtual/libusb:1 )
+	developerbox-spi? ( virtual/libusb:1 )
+	digilent-spi? ( virtual/libusb:1 )
+	dirtyjtag-spi? ( virtual/libusb:1 )
+	drkaiser? ( sys-apps/pciutils )
+	ft2232-spi? ( dev-embedded/libftdi:1= )
+	gfxnvidia? ( sys-apps/pciutils )
+	internal? ( sys-apps/pciutils )
+	it8212? ( sys-apps/pciutils )
+	jlink-spi? ( dev-embedded/libjaylink )
+	nic3com? ( sys-apps/pciutils )
+	nicintel? ( sys-apps/pciutils )
+	nicintel-eeprom? ( sys-apps/pciutils )
+	nicintel-spi? ( sys-apps/pciutils )
+	nicnatsemi? ( sys-apps/pciutils )
+	nicrealtek? ( sys-apps/pciutils )
+	ogp-spi? ( sys-apps/pciutils )
+	pickit2-spi? ( virtual/libusb:1 )
+	raiden-debug-spi? ( virtual/libusb:1 )
+	satamv? ( sys-apps/pciutils )
+	satasii? ( sys-apps/pciutils )
+	stlinkv3-spi? ( virtual/libusb:1 )
+	usbblaster-spi? ( dev-embedded/libftdi:1= )"
+RDEPEND="${COMMON}
+	!internal-dmi? ( sys-apps/dmidecode )"
+DEPEND="${COMMON}
+	sys-apps/diffutils
+	linux-mtd? ( sys-kernel/linux-headers )
+	linux-spi? ( sys-kernel/linux-headers )
+	mediatek-i2c-spi? ( sys-kernel/linux-headers )
+	mstarddc-spi? ( sys-kernel/linux-headers )
+	parade-lspcon? ( sys-kernel/linux-headers )
+	realtek-mst-i2c-spi? ( sys-kernel/linux-headers )"
+BDEPEND="test? ( dev-util/cmocka )"
+
+DOCS=( README Documentation/ )
+
+src_configure() {
+	local programmers="$(printf '%s,' $(for flag in ${IUSE_PROGRAMMERS//+/}; do usev ${flag}; done))"
+	programmers="${programmers%,}"
+	programmers="${programmers//-/_}"
+	local emesonargs=(
+		-Dclassic_cli="enabled"
+		-Dprogrammer="${programmers}"
+		$(meson_feature test tests)
+		$(meson_feature tools ich_descriptors_tool)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	# Upstream requires libflashrom.a to be present at build time because the classic CLI
+	# executable uses internal symbols from that library. Therefore, we let it be built
+	# but keep it out of the installed tree.
+	find "${ED}" -name '*.a' -delete || die
+
+	if use tools; then
+		dosbin "${BUILD_DIR}"/util/ich_descriptors_tool/ich_descriptors_tool
+	fi
+}
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index 5d3f570f6a38..6f60f84bb3d6 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -14,6 +14,7 @@
 		<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="dirtyjtag-spi">Support for DirtyJTAG (a USB-JTAG firmware for STM32 MCUs)</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>
@@ -24,6 +25,7 @@
 		<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="mediatek-i2c-spi">Support for Mediatek LCD controllers</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>
@@ -32,9 +34,12 @@
 		<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="parade-lspcon">Enable support for Parade lspcon USB-C to HDMI protocol translator</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="raiden-debug-spi">Support for Chrome EC based debug tools - SuzyQable, Servo V4, C2D2 &amp; uServo</flag>
 		<flag name="rayer-spi">RayeR SPIPGM hardware support</flag>
+		<flag name="realtek-mst-i2c-spi">Enable support for Realtek RTD2142 MST</flag>
 		<flag name="satamv">Enable programmer for Marvell SATA controllers</flag>
 		<flag name="satasii">Enable programmer for SiI SATA controllers</flag>
 		<flag name="stlinkv3-spi">Enable SPI programmer using STLINK-V3</flag>