From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1370936-garchives=archives.gentoo.org@lists.gentoo.org> 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0332F15808B for <garchives@archives.gentoo.org>; Sat, 26 Feb 2022 02:48:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 249FDE081B; Sat, 26 Feb 2022 02:48:43 +0000 (UTC) Received: from smtp.gentoo.org (mail.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0F91EE081B for <gentoo-commits@lists.gentoo.org>; Sat, 26 Feb 2022 02:48:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2B9FA342BD2 for <gentoo-commits@lists.gentoo.org>; Sat, 26 Feb 2022 02:48:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D97A12EE for <gentoo-commits@lists.gentoo.org>; Sat, 26 Feb 2022 02:48:40 +0000 (UTC) From: "Sam James" <sam@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org> Message-ID: <1645843679.5a408912a2468dba3e79b685a201338adbfc9b16.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/bat/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/bat/bat-0.18.3-r1.ebuild sys-apps/bat/bat-0.18.3.ebuild X-VCS-Directories: sys-apps/bat/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5a408912a2468dba3e79b685a201338adbfc9b16 X-VCS-Branch: master Date: Sat, 26 Feb 2022 02:48:40 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2e2d4517-f85e-4033-98a2-1910678fb702 X-Archives-Hash: c56da479946c2fe10f2f8d3447dc5932 commit: 5a408912a2468dba3e79b685a201338adbfc9b16 Author: Alexey Zapparov <alexey <AT> zapparov <DOT> com> AuthorDate: Wed Feb 2 04:03:06 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Feb 26 02:47:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a408912 sys-apps/bat: add 0.18.3-r1 * Fix manpage installation with USE=debug * Install BASH complitions Closes: https://bugs.gentoo.org/829629 Closes: https://bugs.gentoo.org/828876 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alexey Zapparov <alexey <AT> zapparov.com> Closes: https://github.com/gentoo/gentoo/pull/24047 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{bat-0.18.3.ebuild => bat-0.18.3-r1.ebuild} | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys-apps/bat/bat-0.18.3.ebuild b/sys-apps/bat/bat-0.18.3-r1.ebuild similarity index 88% rename from sys-apps/bat/bat-0.18.3.ebuild rename to sys-apps/bat/bat-0.18.3-r1.ebuild index b791c28b50a8..97b8c7d47f4b 100644 --- a/sys-apps/bat/bat-0.18.3.ebuild +++ b/sys-apps/bat/bat-0.18.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2017-2021 Gentoo Authors +# Copyright 2017-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -153,7 +153,7 @@ CRATES=" yaml-rust-0.4.5 " -inherit cargo +inherit bash-completion-r1 cargo DESCRIPTION="cat(1) clone with syntax highlighting and Git integration" # Double check the homepage as the cargo_metadata crate @@ -191,14 +191,16 @@ src_install() { einstalldocs - doman target/release/build/bat-*/out/assets/manual/bat.1 + local build_dir=( target/$(usex debug{,} release)/build/${PN}-*/out ) + cd ${build_dir[0]} || die "Cannot change directory to ${PN} build" - insinto /usr/share/fish/vendor_completions.d/ - doins target/release/build/bat-*/out/assets/completions/bat.fish + doman assets/manual/bat.1 - # Hack to find/install generated zsh completions files as it can be present in - # multiple directories - local BUILD_DIR="$(dirname $(find target/release -name bat.zsh -print -quit || die) || die)" - insinto /usr/share/zsh/site-functions/ - newins "${BUILD_DIR}"/bat.zsh _${PN} + newbashcomp assets/completions/${PN}.bash ${PN} + + insinto /usr/share/zsh/site-functions + newins assets/completions/${PN}.zsh _${PN} + + insinto /usr/share/fish/vendor_completions.d + doins assets/completions/${PN}.fish }