commit: 181eca9e2034af7d539281d5ad5ca2962acfe745 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Thu May 9 18:32:31 2024 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Thu May 9 18:34:29 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181eca9e
app-containers/conmon: do not call 'go' Apply https://github.com/containers/conmon/pull/507 to avoid the 'doc' target from depending on 'install.tools' target if GOMD2MAN is set. Closes: https://bugs.gentoo.org/931645 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> app-containers/conmon/Manifest | 1 + app-containers/conmon/conmon-2.1.11.ebuild | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app-containers/conmon/Manifest b/app-containers/conmon/Manifest index 0283970a03a4..defd6003ff19 100644 --- a/app-containers/conmon/Manifest +++ b/app-containers/conmon/Manifest @@ -1,3 +1,4 @@ DIST conmon-2.1.10.tar.gz 121047 BLAKE2B 14b4c2d541607eac0af6b335f35bd506c9a6c3d2b4e4e3ad79f32550385e90b6f7533f505565f90fb4bb1f42d528c41e9ddc7ec275c16ee982a6d0afe1c65bff SHA512 ecf1a961f431b005b54faa68b5c1bcf31d448f994ca66a56f13002216074dba79b53b52a377d4f8dab08141d6c6cf44467352fbff37175135d3da84081b27a18 +DIST conmon-2.1.11-make-docs-target-not-depend-on-install.tools.patch 985 BLAKE2B f2f34ca9a6f067f88f39726b52c5d476946413e84a93bfff2b9d4e9a0b9b117bf25a903455c3a762895746c5bca6eb93bf2ac7c2c6123d7b9bca9c345aba6230 SHA512 a9716057b0127d2b5aaca303e6d26484a5dbe91b9114259b2fded2a0c803568749b725e816004c80cb8b47ddff7a2fbcc231edd2df1d78a56ecaf6d3020c7fd7 DIST conmon-2.1.11.tar.gz 121573 BLAKE2B 600a3e13eee5f71ef5f7aa21d9cf0184dd01c8e5e68d31aa35efcb08c3cf4305313fcfcf0aba3eedb243fe36f0e1e27f68a71627e2050c8ed4a73de273b98131 SHA512 47952f6cbbb810591d78c67856100be0edbf96d30328a10f22c3ec927bc6d1187540824c388d1fc7f3bb16fb7414339f3f20311d1baffb1fae1e38c4d5e7249c DIST conmon-2.1.8.tar.gz 120541 BLAKE2B 8ae12e674edf49f233f7423f2566a1ddea793bd4fc888618a8903a84309cb4aacea9d200bb0f8e0895c96796dca9bc2e6e73c9c8a7dcc5f2c540b05f7a73a21e SHA512 a277de8f8adf001c3e3ef6ef19d4bade36d48c5395a624ee99cb22708ea26a9954df76362006a1331efc06265cb790883b43e84f0006f80c1725a7470ff244c3 diff --git a/app-containers/conmon/conmon-2.1.11.ebuild b/app-containers/conmon/conmon-2.1.11.ebuild index 2818e91ebc37..13d3d6c215c3 100644 --- a/app-containers/conmon/conmon-2.1.11.ebuild +++ b/app-containers/conmon/conmon-2.1.11.ebuild @@ -12,7 +12,12 @@ if [[ ${PV} == 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/containers/conmon.git"; else - SRC_URI="https://github.com/containers/conmon/archive/v${PV}.tar.gz -> ${P}.tar.gz" + SRC_URI=" + https://github.com/containers/conmon/archive/v${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/Flowdalic/conmon/commit/ff8794c5bc0805cc430229728befde16da47b68c.patch + -> ${PN}-2.1.11-make-docs-target-not-depend-on-install.tools.patch + " KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" fi @@ -27,6 +32,11 @@ RDEPEND="dev-libs/glib:= DEPEND="${RDEPEND}" BDEPEND="dev-go/go-md2man" +PATCHES=( + # https://github.com/containers/conmon/pull/507 + "${DISTDIR}"/${PN}-2.1.11-make-docs-target-not-depend-on-install.tools.patch +) + src_prepare() { # https://github.com/containers/conmon/pull/505 echo "${PV}" > VERSION || die
