gentoo auto-resync : 20:12:2024 - 06:30:59HEADmaster

3 files changed, 17 insertions, 17 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 4151d681b35b..5887de362fe6 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index d670b9abc331..10f2c0a42c22 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -2,8 +2,9 @@ AUX flashrom-1.3.0-c99.patch 2134 BLAKE2B d1f0216a5281719972208d22ae31ca19fd6e34
 AUX flashrom-1.3.0-libflashrom.patch 935 BLAKE2B e982b5872a9588cf7b792ff533911e86cc849180ff79b00c1a9469368f9c8ea2c843de90c7e59128c3c76c414c8376811ceccf5776fb520d3b39d23a3229995a SHA512 dce40f9ab1624942888d2db62169147281aadba448d12e54484b5b14e5df49f62f39b742ac6baf38f13328332336c5e40e8c7b2f964f0ebd22e9f3685a22240c
 AUX flashrom-1.3.0_spi-master.patch 9287 BLAKE2B 5e85ec4ce06edce61cfaa00a7dc5e954c76f4d404fb096009f14c11771719996679d185a0271ffcfc7518bc3e93b3264c1cc9c3cc61796a651df7a3a6027fef6 SHA512 b97e4546692273e787c8e1f8f01074978484ef8dab4d13887d58e60d3c643368bf853c7ee2a883c8aecdff432281f3539ace3d08253c84c8405cbfbecf9187bc
 DIST flashrom-1.4.0.tar.gz 1223536 BLAKE2B 6ff3a1a8a29187e841009319995028dd7dab0ac6d08587ae8d23b19736ca9fd34fe2378620515a4e21c587862f60131d1b9d593e09d4a06ca3632d215791c106 SHA512 356a0e6d42981f0eff18a9b19ee1df3aed182437737fe01ddbe5757b34a99ffd729b7bfbf0a419df76bf4109fa12975176a7ccaf58b598d60e574150dfc7b7ce
+DIST flashrom-1.5.0.tar.gz 4957428 BLAKE2B 50b9a71067e57ed676d10a277c4a925955f32ebaebeb7acd3324ec482be9128d0146c661f8d5b1ce4ae56d58efe96330e461a0aa91a14d2f879d977de1d14bbd SHA512 1c8929270f967d603b0d86587fd8a8776c56d6ff19caffad16ff9e7a3334d98b05376cfd8fa5f8978d0634a61f6be2f9f1714d8dfd7540df85f85f51e835b5b1
 DIST flashrom-v1.3.0.tar.bz2 489782 BLAKE2B e6d2284d83171b003b434251f060fa44edf32ecfd3d397bd4ba39b74c6a0b5c9d1659b703dd6b632b63aa4bf27d08c8aeece72920199712c6a4ae160b2eb3a8a SHA512 73b6e00bd3bc66c98d4ad53966a65b19d3d92f07d7b210d69e041d6f5788605b9791a9bf7aec0a52e13d19fcb62c4bdaf4bab9f805fc31468393ca313129a77b
-EBUILD flashrom-1.3.0-r1.ebuild 3316 BLAKE2B 8bf9cd5852d5802b40da3446b865608f3a33e8e843acdd548ef3d1a9b1b969bad78f81c2321766b631c5c2ce6d03a508b9082622a0d92863587db49a600673e0 SHA512 508611ca0f0d59062db946fb9d3722db241aa81a78922c1a2ac37490e7ff605e480d301577d455ff2cf682f3daa389106020178def57b7bdfcc9f5e71caaa9d3
 EBUILD flashrom-1.3.0-r3.ebuild 3693 BLAKE2B 34154c1e5160e037a77a00f25a6324c671344575cd8a056f7f11b10c7af541d88d233b6078798951bbbfc1087e2b4b3d055bf9e2ffb5726749b97a0e86f34da8 SHA512 0a84406f2b79e2f13ecd5019c7673687c81d5e747b6e758d7d72d3fb93a726ffee3c27755af7e80542cf89e5958313c2d5a2f0bbad34c01df260cf60c07d2316
 EBUILD flashrom-1.4.0.ebuild 3750 BLAKE2B 03a723b309a04cba0ce7fbdda0cb9269e6e448cb1764cdb6ae5f5d88e00ae66aefd9a0aeb1b6c7723cb904de79714441a706e6e50bcbed4db045cdbcaa69f684 SHA512 0c855f536fc9610bdf84257db902db000e2b8c7298a5d154942d7d61a8a06c4a8464c72b4379e4e488ac66e8ac346007f74ba39def3d63b8765410d6d9099925
+EBUILD flashrom-1.5.0.ebuild 3455 BLAKE2B ebe78016e0b8e865812d11554adf9129aa2896445d69d5ec2e02338c7c8752aee2c1eac64931094805a649720cf11f44cdab50accef024c02fc6789d475edb56 SHA512 b994d8a3eb0864133dc22657195f1e543278ad83ef8a5bfe8ce0aefc38738c599becfbf22a0ef04d262f62fc22bf662921c167c983a2c248db56bbde81224e72
 MISC metadata.xml 5075 BLAKE2B a698e5756c49254e9365a613dc418ac9ba27a0f54d5a0e4550d89c9938b32dbe01f0be03a296bc08973cf31cda4e7af33cd681c81869c8ab91aced6c760d9638 SHA512 6a8d44d70af1d630f791648c05023e059d97e799bf1112e1cdffe3ff1167e52edfe7fd0d9a5aa6834844d305827ef2fa92264277c4c63c6015641da36b028d81
diff --git a/sys-apps/flashrom/flashrom-1.3.0-r1.ebuild b/sys-apps/flashrom/flashrom-1.5.0.ebuild
index cbfc2f492f90..fa2992506626 100644
--- a/sys-apps/flashrom/flashrom-1.3.0-r1.ebuild
+++ b/sys-apps/flashrom/flashrom-1.5.0.ebuild
@@ -3,19 +3,15 @@
 
 EAPI=8
 
-inherit meson
-
-MY_P="${PN}-v${PV}"
+inherit meson bash-completion-r1
 
 DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/Flashrom"
-SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-
-S="${WORKDIR}"/${MY_P}
+HOMEPAGE="https://www.flashrom.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 
 # The defaults should match the upstream "default" flags in meson.build
 IUSE_PROGRAMMERS="
@@ -100,11 +96,7 @@ DEPEND="${COMMON}
 	realtek-mst-i2c-spi? ( sys-kernel/linux-headers )"
 BDEPEND="test? ( dev-util/cmocka )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.0_spi-master.patch
-)
-
-DOCS=( README Documentation/ )
+DOCS=( README.rst doc/ )
 
 src_configure() {
 	local programmers="$(printf '%s,' $(for flag in ${IUSE_PROGRAMMERS//+/}; do usev ${flag}; done))"
@@ -113,6 +105,8 @@ src_configure() {
 	local emesonargs=(
 		-Dclassic_cli="enabled"
 		-Dprogrammer="${programmers}"
+		-Dman-pages="disabled"
+		-Ddocumentation="disabled"
 		$(meson_feature test tests)
 		$(meson_feature tools ich_descriptors_tool)
 	)
@@ -122,11 +116,16 @@ 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.
+	# 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
 
+	# bash completion file is not up to standards, #941844
+	rm -Rf "${ED}"/usr/share/bash-completion
+	newbashcomp "${BUILD_DIR}/${PN}.bash" "${PN}"
+
 	if use tools; then
 		dosbin "${BUILD_DIR}"/util/ich_descriptors_tool/ich_descriptors_tool
 	fi