From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B125315800F for ; Wed, 4 Jan 2023 04:20:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B729AE07E6; Wed, 4 Jan 2023 04:20:13 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 781F1E07E6 for ; Wed, 4 Jan 2023 04:20:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46D8B335DB2 for ; Wed, 4 Jan 2023 04:20:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7C1EE7DE for ; Wed, 4 Jan 2023 04:20:10 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1672805992.9b9fea398103ffc4d09ef56d0a63e33a68a1c6b1.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/trace-cmd/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/trace-cmd/trace-cmd-3.1.4.ebuild dev-util/trace-cmd/trace-cmd-3.1.5.ebuild X-VCS-Directories: dev-util/trace-cmd/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: 9b9fea398103ffc4d09ef56d0a63e33a68a1c6b1 X-VCS-Branch: master Date: Wed, 4 Jan 2023 04:20:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 40fe1158-67d6-49ba-b117-63fa54ca20fd X-Archives-Hash: 75825da7aa4824637e8872f285af4f4e commit: 9b9fea398103ffc4d09ef56d0a63e33a68a1c6b1 Author: Yixun Lan gentoo org> AuthorDate: Wed Jan 4 04:14:48 2023 +0000 Commit: Yixun Lan gentoo org> CommitDate: Wed Jan 4 04:19:52 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b9fea39 dev-util/trace-cmd: fix doc issue 1) fix the man pages's wrong installation path 2) pull source-highlight as dependency Closes: https://bugs.gentoo.org/868168 Closes: https://bugs.gentoo.org/873007 Signed-off-by: Yixun Lan gentoo.org> dev-util/trace-cmd/trace-cmd-3.1.4.ebuild | 13 +++++++++++-- dev-util/trace-cmd/trace-cmd-3.1.5.ebuild | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild index f13210697f74..308eb115628e 100644 --- a/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild +++ b/dev-util/trace-cmd/trace-cmd-3.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,7 +43,10 @@ DEPEND="${RDEPEND} BDEPEND=" virtual/pkgconfig python? ( dev-lang/swig ) - doc? ( app-text/asciidoc ) + doc? ( + app-text/asciidoc + dev-util/source-highlight + ) " # having trouble getting tests to compile @@ -65,7 +68,13 @@ pkg_setup() { src_prepare() { default sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \ + -e '/^prefix/s:/usr/local:/usr:g' \ -i Makefile || die "sed failed" + + sed -i -e "s|^htmldir.*|&-${PVR}|g" \ + -e "s|^pdfdir.*|&-${PVR}|g" \ + Documentation/libtracecmd/Makefile \ + Documentation/trace-cmd/Makefile || die } src_configure() { diff --git a/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild b/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild index b608032b58bf..63c0354925ab 100644 --- a/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild +++ b/dev-util/trace-cmd/trace-cmd-3.1.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -43,7 +43,10 @@ DEPEND="${RDEPEND} BDEPEND=" virtual/pkgconfig python? ( dev-lang/swig ) - doc? ( app-text/asciidoc ) + doc? ( + app-text/asciidoc + dev-util/source-highlight + ) " # having trouble getting tests to compile @@ -65,7 +68,13 @@ pkg_setup() { src_prepare() { default sed -r -e 's:([[:space:]]+)install_bash_completion($|[[:space:]]+):\1:' \ + -e '/^prefix/s:/usr/local:/usr:g' \ -i Makefile || die "sed failed" + + sed -i -e "s|^htmldir.*|&-${PVR}|g" \ + -e "s|^pdfdir.*|&-${PVR}|g" \ + Documentation/libtracecmd/Makefile \ + Documentation/trace-cmd/Makefile || die } src_configure() {