commit: 6004504f6cb96bac7f284e166c513999f1db67ee Author: Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me> AuthorDate: Thu Oct 12 03:23:02 2023 +0000 Commit: Leonardo Hernandez <leohdz172 <AT> proton <DOT> me> CommitDate: Thu Oct 12 03:43:17 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6004504f
sys-apps/bat-extras: tidy up ebuilds - fix typo - remove a useless RESTRICT - do not set S, the default is fine - remove IUSE=man, it does not require any other dep and we should ship them per policy: https://projects.gentoo.org/qa/policy-guide/installed-files.html#pg0305 - fix dependency for clang, it requires clang-format (installed with USE=extra) Signed-off-by: Leonardo Hernández Hernández <leohdz172 <AT> proton.me> sys-apps/bat-extras/bat-extras-2023.09.19.ebuild | 27 ++++++++---------------- sys-apps/bat-extras/bat-extras-9999.ebuild | 27 ++++++++---------------- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild index f0c500214b..3071ef6212 100644 --- a/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild +++ b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild @@ -1,23 +1,22 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Bash scripts that integrate bat with various command line tools." HOMEPAGE="https://github.com/eth-p/bat-extras"; -if [[ ${PV} == *9999 ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/eth-p/bat-extras.git"; - RESTRICT="mirror fetch" else - SRC_URI="https://github.com/eth-p/bat-extras/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" - RESTRICT="mirror test" + SRC_URI="https://github.com/eth-p/bat-extras/archive/v${PV}.tar.gz -> ${P}.tar.gz" + # Requires test dir to be a git repo + RESTRICT="test" fi LICENSE="MIT" SLOT="0" -IUSE="+man" DEPEND=" app-shells/bash @@ -33,13 +32,11 @@ RDEPEND=" dev-vcs/git sys-apps/eza sys-apps/ripgrep - sys-devel/clang + sys-devel/clang[extra(+)] sys-libs/ncurses virtual/rust[rustfmt(+)] " -S="${WORKDIR}/${P}" - src_unpack() { default if [[ ${PV} == *9999 ]]; then @@ -56,11 +53,7 @@ src_prepare() { } src_compile() { - if use man; then - ./build.sh --compress --minify=all --manuals --no-verify || die "build failed" - else - ./build.sh --compress --minify=all --no-verify || die "build failed" - fi + ./build.sh --compress --minify=all --manuals --no-verify || die "build failed" } src_test() { @@ -69,14 +62,12 @@ src_test() { src_install() { dobin bin/* - if use man; then - doman man/* - fi + doman man/* } pkg_postinst() { einfo "To enable additional code formatting for 'prettybat' script, ensure" einfo "'net-libs/nodejs' is installed in your system, and use 'npm' to install" einfo "'prettier' (npm i -g prettier). Once 'prettier' is properly installed in" - einfo "your system, remerge this pacakge." + einfo "your system, remerge this package." } diff --git a/sys-apps/bat-extras/bat-extras-9999.ebuild b/sys-apps/bat-extras/bat-extras-9999.ebuild index f0c500214b..3071ef6212 100644 --- a/sys-apps/bat-extras/bat-extras-9999.ebuild +++ b/sys-apps/bat-extras/bat-extras-9999.ebuild @@ -1,23 +1,22 @@ -# Copyright 2023 Gentoo Authors +# Copyright 2022-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DESCRIPTION="Bash scripts that integrate bat with various command line tools." HOMEPAGE="https://github.com/eth-p/bat-extras"; -if [[ ${PV} == *9999 ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/eth-p/bat-extras.git"; - RESTRICT="mirror fetch" else - SRC_URI="https://github.com/eth-p/bat-extras/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64" - RESTRICT="mirror test" + SRC_URI="https://github.com/eth-p/bat-extras/archive/v${PV}.tar.gz -> ${P}.tar.gz" + # Requires test dir to be a git repo + RESTRICT="test" fi LICENSE="MIT" SLOT="0" -IUSE="+man" DEPEND=" app-shells/bash @@ -33,13 +32,11 @@ RDEPEND=" dev-vcs/git sys-apps/eza sys-apps/ripgrep - sys-devel/clang + sys-devel/clang[extra(+)] sys-libs/ncurses virtual/rust[rustfmt(+)] " -S="${WORKDIR}/${P}" - src_unpack() { default if [[ ${PV} == *9999 ]]; then @@ -56,11 +53,7 @@ src_prepare() { } src_compile() { - if use man; then - ./build.sh --compress --minify=all --manuals --no-verify || die "build failed" - else - ./build.sh --compress --minify=all --no-verify || die "build failed" - fi + ./build.sh --compress --minify=all --manuals --no-verify || die "build failed" } src_test() { @@ -69,14 +62,12 @@ src_test() { src_install() { dobin bin/* - if use man; then - doman man/* - fi + doman man/* } pkg_postinst() { einfo "To enable additional code formatting for 'prettybat' script, ensure" einfo "'net-libs/nodejs' is installed in your system, and use 'npm' to install" einfo "'prettier' (npm i -g prettier). Once 'prettier' is properly installed in" - einfo "your system, remerge this pacakge." + einfo "your system, remerge this package." }
