commit: 2936ff1e2c0d51ba067391f12cb9dc310f27985c Author: Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me> AuthorDate: Thu Oct 12 03:49:21 2023 +0000 Commit: Rui Huang <vowstar <AT> gmail <DOT> com> CommitDate: Thu Oct 12 03:56:44 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2936ff1e
Revert "sys-apps/bat-extras: tidy up ebuilds" this requires a revbump This reverts commit 6004504f6cb96bac7f284e166c513999f1db67ee. 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, 36 insertions(+), 18 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 3071ef6212..f0c500214b 100644 --- a/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild +++ b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild @@ -1,22 +1,23 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 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 - KEYWORDS="~amd64" 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" + KEYWORDS="~amd64" + RESTRICT="mirror test" fi LICENSE="MIT" SLOT="0" +IUSE="+man" DEPEND=" app-shells/bash @@ -32,11 +33,13 @@ RDEPEND=" dev-vcs/git sys-apps/eza sys-apps/ripgrep - sys-devel/clang[extra(+)] + sys-devel/clang sys-libs/ncurses virtual/rust[rustfmt(+)] " +S="${WORKDIR}/${P}" + src_unpack() { default if [[ ${PV} == *9999 ]]; then @@ -53,7 +56,11 @@ src_prepare() { } src_compile() { - ./build.sh --compress --minify=all --manuals --no-verify || die "build failed" + 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 } src_test() { @@ -62,12 +69,14 @@ src_test() { src_install() { dobin bin/* - doman man/* + if use man; then + doman man/* + fi } 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 package." + einfo "your system, remerge this pacakge." } diff --git a/sys-apps/bat-extras/bat-extras-9999.ebuild b/sys-apps/bat-extras/bat-extras-9999.ebuild index 3071ef6212..f0c500214b 100644 --- a/sys-apps/bat-extras/bat-extras-9999.ebuild +++ b/sys-apps/bat-extras/bat-extras-9999.ebuild @@ -1,22 +1,23 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 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 - KEYWORDS="~amd64" 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" + KEYWORDS="~amd64" + RESTRICT="mirror test" fi LICENSE="MIT" SLOT="0" +IUSE="+man" DEPEND=" app-shells/bash @@ -32,11 +33,13 @@ RDEPEND=" dev-vcs/git sys-apps/eza sys-apps/ripgrep - sys-devel/clang[extra(+)] + sys-devel/clang sys-libs/ncurses virtual/rust[rustfmt(+)] " +S="${WORKDIR}/${P}" + src_unpack() { default if [[ ${PV} == *9999 ]]; then @@ -53,7 +56,11 @@ src_prepare() { } src_compile() { - ./build.sh --compress --minify=all --manuals --no-verify || die "build failed" + 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 } src_test() { @@ -62,12 +69,14 @@ src_test() { src_install() { dobin bin/* - doman man/* + if use man; then + doman man/* + fi } 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 package." + einfo "your system, remerge this pacakge." }
