commit: 0235710f893fda07818ca611fe10ae34da1c2e78 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Dec 19 11:50:57 2024 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu Dec 19 11:54:23 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0235710f
sys-apps/flashrom-1.5.0: version bump Closes: https://bugs.gentoo.org/946663 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> sys-apps/flashrom/Manifest | 1 + ...shrom-1.3.0-r1.ebuild => flashrom-1.5.0.ebuild} | 31 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest index 78468136d947..ec3274606301 100644 --- a/sys-apps/flashrom/Manifest +++ b/sys-apps/flashrom/Manifest @@ -1,2 +1,3 @@ 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 diff --git a/sys-apps/flashrom/flashrom-1.3.0-r1.ebuild b/sys-apps/flashrom/flashrom-1.5.0.ebuild similarity index 80% rename from sys-apps/flashrom/flashrom-1.3.0-r1.ebuild rename to 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
