public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/bat-extras/
@ 2022-07-30 22:54 Randall Vasquez
  0 siblings, 0 replies; 7+ messages in thread
From: Randall Vasquez @ 2022-07-30 22:54 UTC (permalink / raw
  To: gentoo-commits

commit:     996f3f5b52bb35bbff7b3be4f9cd2b9627646043
Author:     Randall T. Vasquez <ran.dall <AT> icloud <DOT> com>
AuthorDate: Sat Jul 30 22:42:30 2022 +0000
Commit:     Randall Vasquez <ran.dall <AT> icloud <DOT> com>
CommitDate: Sat Jul 30 22:53:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=996f3f5b

sys-apps/bat-extras: add ebuilds

Signed-off-by: Randall T. Vasquez <ran.dall <AT> icloud.com>

 sys-apps/bat-extras/Manifest                     |  1 +
 sys-apps/bat-extras/bat-extras-2022.07.27.ebuild | 82 ++++++++++++++++++++++++
 sys-apps/bat-extras/bat-extras-9999.ebuild       | 82 ++++++++++++++++++++++++
 sys-apps/bat-extras/metadata.xml                 | 14 ++++
 4 files changed, 179 insertions(+)

diff --git a/sys-apps/bat-extras/Manifest b/sys-apps/bat-extras/Manifest
new file mode 100644
index 000000000..27c2a072c
--- /dev/null
+++ b/sys-apps/bat-extras/Manifest
@@ -0,0 +1 @@
+DIST bat-extras-2022.07.27.tar.gz 41647 BLAKE2B aa481520c49675c249b47b9b6a1f06c24928ccf6eb96a0b1b17d87364f43063d718cea61a8edaebca097a27c239e528bf8c10f93b7d09d92b374cbf720fc6481 SHA512 352edf8f5879239894a8defbac466e908f6235bf4a9c7a64622418f2bdbae9b364343fca54769f792025d2a87aeca52a356ee36c5733eee7fd641d8d5c8d995b

diff --git a/sys-apps/bat-extras/bat-extras-2022.07.27.ebuild b/sys-apps/bat-extras/bat-extras-2022.07.27.ebuild
new file mode 100644
index 000000000..682f571b7
--- /dev/null
+++ b/sys-apps/bat-extras/bat-extras-2022.07.27.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2022 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
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+man"
+
+DEPEND="
+	app-shells/bash
+	sys-apps/bat
+	dev-util/sh
+"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+	sys-apps/ripgrep
+	app-admin/entr
+	dev-util/git-delta
+	sys-devel/clang
+	sys-apps/exa
+	app-shells/fzf
+	sys-libs/ncurses
+	dev-python/black
+	virtual/rust[rustfmt(+)]
+"
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	default
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_checkout
+	fi
+}
+
+src_prepare() {
+	# remove license
+	rm LICENSE.md || die
+	# remove contribution document
+	rm CONTRIBUTING.md || die
+	default
+}
+
+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
+}
+
+src_test() {
+	./test.sh || die "test failed"
+}
+
+src_install() {
+	dobin bin/*
+	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 pacakge."
+}

diff --git a/sys-apps/bat-extras/bat-extras-9999.ebuild b/sys-apps/bat-extras/bat-extras-9999.ebuild
new file mode 100644
index 000000000..682f571b7
--- /dev/null
+++ b/sys-apps/bat-extras/bat-extras-9999.ebuild
@@ -0,0 +1,82 @@
+# Copyright 2022 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
+	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"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="+man"
+
+DEPEND="
+	app-shells/bash
+	sys-apps/bat
+	dev-util/sh
+"
+RDEPEND="
+	${DEPEND}
+	dev-vcs/git
+	sys-apps/ripgrep
+	app-admin/entr
+	dev-util/git-delta
+	sys-devel/clang
+	sys-apps/exa
+	app-shells/fzf
+	sys-libs/ncurses
+	dev-python/black
+	virtual/rust[rustfmt(+)]
+"
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	default
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_checkout
+	fi
+}
+
+src_prepare() {
+	# remove license
+	rm LICENSE.md || die
+	# remove contribution document
+	rm CONTRIBUTING.md || die
+	default
+}
+
+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
+}
+
+src_test() {
+	./test.sh || die "test failed"
+}
+
+src_install() {
+	dobin bin/*
+	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 pacakge."
+}

diff --git a/sys-apps/bat-extras/metadata.xml b/sys-apps/bat-extras/metadata.xml
new file mode 100644
index 000000000..590860096
--- /dev/null
+++ b/sys-apps/bat-extras/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>ran.dall@icloud.com</email>
+    <name>Randall Vasquez</name>
+  </maintainer>
+  <longdescription lang="en">
+    Bash scripts that integrate bat with various command line tools. 
+  </longdescription>
+  <upstream>
+    <remote-id type="github">eth-p/bat-extras</remote-id>
+  </upstream>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/bat-extras/
@ 2022-09-08 10:29 Andrew Ammerlaan
  0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2022-09-08 10:29 UTC (permalink / raw
  To: gentoo-commits

commit:     1196d7231b07e2c7f0a50b2f442d0c9a3be991b2
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  8 10:26:56 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Sep  8 10:26:56 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1196d723

sys-apps/bat-extras: drop RedundantLongDescription

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 sys-apps/bat-extras/metadata.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sys-apps/bat-extras/metadata.xml b/sys-apps/bat-extras/metadata.xml
index 590860096..c097e8719 100644
--- a/sys-apps/bat-extras/metadata.xml
+++ b/sys-apps/bat-extras/metadata.xml
@@ -5,9 +5,6 @@
     <email>ran.dall@icloud.com</email>
     <name>Randall Vasquez</name>
   </maintainer>
-  <longdescription lang="en">
-    Bash scripts that integrate bat with various command line tools. 
-  </longdescription>
   <upstream>
     <remote-id type="github">eth-p/bat-extras</remote-id>
   </upstream>


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/bat-extras/
  2023-10-12  3:41 [gentoo-commits] repo/proj/guru:master commit in: sys-apps/bat-extras/ Rui Huang
@ 2023-10-12  3:27 ` Rui Huang
  0 siblings, 0 replies; 7+ messages in thread
From: Rui Huang @ 2023-10-12  3:27 UTC (permalink / raw
  To: gentoo-commits

commit:     87af1012ad0c3b9d24b5ec3d17530052a99ca880
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Oct 12 03:23:30 2023 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Oct 12 03:23:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87af1012

sys-apps/bat-extras: bump to 2023.09.19, remove sys-apps/exa

- sys-apps/exa removed in ::gentoo, and changed to sys-apps/eza [1]
- bat-extras-2023.09.19 changed to use sys-apps/eza [2]

[1] https://github.com/gentoo/gentoo/commit/64cad5f333e281d5044a35943cb2ca62452d1150
[2] https://github.com/eth-p/bat-extras/commit/d96fc92165069159a977e3d36c50beed88647417

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-apps/bat-extras/Manifest                                 |  2 +-
 ...extras-2022.07.27.ebuild => bat-extras-2023.09.19.ebuild} | 12 ++++++------
 sys-apps/bat-extras/bat-extras-9999.ebuild                   | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys-apps/bat-extras/Manifest b/sys-apps/bat-extras/Manifest
index 27c2a072cb..9b72f8f155 100644
--- a/sys-apps/bat-extras/Manifest
+++ b/sys-apps/bat-extras/Manifest
@@ -1 +1 @@
-DIST bat-extras-2022.07.27.tar.gz 41647 BLAKE2B aa481520c49675c249b47b9b6a1f06c24928ccf6eb96a0b1b17d87364f43063d718cea61a8edaebca097a27c239e528bf8c10f93b7d09d92b374cbf720fc6481 SHA512 352edf8f5879239894a8defbac466e908f6235bf4a9c7a64622418f2bdbae9b364343fca54769f792025d2a87aeca52a356ee36c5733eee7fd641d8d5c8d995b
+DIST bat-extras-2023.09.19.tar.gz 49416 BLAKE2B f67cee8793951921b92b802b57fb96e50ac8bf6db3ebdf852d56dbaf818a3fc3d3439481f5fa9cbe834334119b368bb90f1020cd708a5b1540de2c6007fae6d2 SHA512 021dd25c77476d2059ee80659a870db214da25cd2683ac7a15748f356dd416c257a98595188df9c76aea37233c5b67cef82d8d829f5ecc185ecad0dc47105ddd

diff --git a/sys-apps/bat-extras/bat-extras-2022.07.27.ebuild b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild
similarity index 97%
rename from sys-apps/bat-extras/bat-extras-2022.07.27.ebuild
rename to sys-apps/bat-extras/bat-extras-2023.09.19.ebuild
index 682f571b79..f0c500214b 100644
--- a/sys-apps/bat-extras/bat-extras-2022.07.27.ebuild
+++ b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,15 +26,15 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	dev-vcs/git
-	sys-apps/ripgrep
 	app-admin/entr
+	app-shells/fzf
+	dev-python/black
 	dev-util/git-delta
+	dev-vcs/git
+	sys-apps/eza
+	sys-apps/ripgrep
 	sys-devel/clang
-	sys-apps/exa
-	app-shells/fzf
 	sys-libs/ncurses
-	dev-python/black
 	virtual/rust[rustfmt(+)]
 "
 

diff --git a/sys-apps/bat-extras/bat-extras-9999.ebuild b/sys-apps/bat-extras/bat-extras-9999.ebuild
index 682f571b79..f0c500214b 100644
--- a/sys-apps/bat-extras/bat-extras-9999.ebuild
+++ b/sys-apps/bat-extras/bat-extras-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,15 +26,15 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	dev-vcs/git
-	sys-apps/ripgrep
 	app-admin/entr
+	app-shells/fzf
+	dev-python/black
 	dev-util/git-delta
+	dev-vcs/git
+	sys-apps/eza
+	sys-apps/ripgrep
 	sys-devel/clang
-	sys-apps/exa
-	app-shells/fzf
 	sys-libs/ncurses
-	dev-python/black
 	virtual/rust[rustfmt(+)]
 "
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: sys-apps/bat-extras/
@ 2023-10-12  3:41 Rui Huang
  2023-10-12  3:27 ` [gentoo-commits] repo/proj/guru:dev " Rui Huang
  0 siblings, 1 reply; 7+ messages in thread
From: Rui Huang @ 2023-10-12  3:41 UTC (permalink / raw
  To: gentoo-commits

commit:     87af1012ad0c3b9d24b5ec3d17530052a99ca880
Author:     Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Thu Oct 12 03:23:30 2023 +0000
Commit:     Rui Huang <vowstar <AT> gmail <DOT> com>
CommitDate: Thu Oct 12 03:23:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=87af1012

sys-apps/bat-extras: bump to 2023.09.19, remove sys-apps/exa

- sys-apps/exa removed in ::gentoo, and changed to sys-apps/eza [1]
- bat-extras-2023.09.19 changed to use sys-apps/eza [2]

[1] https://github.com/gentoo/gentoo/commit/64cad5f333e281d5044a35943cb2ca62452d1150
[2] https://github.com/eth-p/bat-extras/commit/d96fc92165069159a977e3d36c50beed88647417

Signed-off-by: Huang Rui <vowstar <AT> gmail.com>

 sys-apps/bat-extras/Manifest                                 |  2 +-
 ...extras-2022.07.27.ebuild => bat-extras-2023.09.19.ebuild} | 12 ++++++------
 sys-apps/bat-extras/bat-extras-9999.ebuild                   | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sys-apps/bat-extras/Manifest b/sys-apps/bat-extras/Manifest
index 27c2a072cb..9b72f8f155 100644
--- a/sys-apps/bat-extras/Manifest
+++ b/sys-apps/bat-extras/Manifest
@@ -1 +1 @@
-DIST bat-extras-2022.07.27.tar.gz 41647 BLAKE2B aa481520c49675c249b47b9b6a1f06c24928ccf6eb96a0b1b17d87364f43063d718cea61a8edaebca097a27c239e528bf8c10f93b7d09d92b374cbf720fc6481 SHA512 352edf8f5879239894a8defbac466e908f6235bf4a9c7a64622418f2bdbae9b364343fca54769f792025d2a87aeca52a356ee36c5733eee7fd641d8d5c8d995b
+DIST bat-extras-2023.09.19.tar.gz 49416 BLAKE2B f67cee8793951921b92b802b57fb96e50ac8bf6db3ebdf852d56dbaf818a3fc3d3439481f5fa9cbe834334119b368bb90f1020cd708a5b1540de2c6007fae6d2 SHA512 021dd25c77476d2059ee80659a870db214da25cd2683ac7a15748f356dd416c257a98595188df9c76aea37233c5b67cef82d8d829f5ecc185ecad0dc47105ddd

diff --git a/sys-apps/bat-extras/bat-extras-2022.07.27.ebuild b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild
similarity index 97%
rename from sys-apps/bat-extras/bat-extras-2022.07.27.ebuild
rename to sys-apps/bat-extras/bat-extras-2023.09.19.ebuild
index 682f571b79..f0c500214b 100644
--- a/sys-apps/bat-extras/bat-extras-2022.07.27.ebuild
+++ b/sys-apps/bat-extras/bat-extras-2023.09.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,15 +26,15 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	dev-vcs/git
-	sys-apps/ripgrep
 	app-admin/entr
+	app-shells/fzf
+	dev-python/black
 	dev-util/git-delta
+	dev-vcs/git
+	sys-apps/eza
+	sys-apps/ripgrep
 	sys-devel/clang
-	sys-apps/exa
-	app-shells/fzf
 	sys-libs/ncurses
-	dev-python/black
 	virtual/rust[rustfmt(+)]
 "
 

diff --git a/sys-apps/bat-extras/bat-extras-9999.ebuild b/sys-apps/bat-extras/bat-extras-9999.ebuild
index 682f571b79..f0c500214b 100644
--- a/sys-apps/bat-extras/bat-extras-9999.ebuild
+++ b/sys-apps/bat-extras/bat-extras-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -26,15 +26,15 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
-	dev-vcs/git
-	sys-apps/ripgrep
 	app-admin/entr
+	app-shells/fzf
+	dev-python/black
 	dev-util/git-delta
+	dev-vcs/git
+	sys-apps/eza
+	sys-apps/ripgrep
 	sys-devel/clang
-	sys-apps/exa
-	app-shells/fzf
 	sys-libs/ncurses
-	dev-python/black
 	virtual/rust[rustfmt(+)]
 "
 


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/bat-extras/
@ 2023-10-12  3:47 Leonardo Hernandez
  0 siblings, 0 replies; 7+ messages in thread
From: Leonardo Hernandez @ 2023-10-12  3:47 UTC (permalink / raw
  To: gentoo-commits

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."
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/bat-extras/
@ 2023-10-12  3:57 Leonardo Hernandez
  0 siblings, 0 replies; 7+ messages in thread
From: Leonardo Hernandez @ 2023-10-12  3:57 UTC (permalink / raw
  To: gentoo-commits

commit:     2936ff1e2c0d51ba067391f12cb9dc310f27985c
Author:     Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Thu Oct 12 03:49:21 2023 +0000
Commit:     Leonardo Hernandez <leohdz172 <AT> proton <DOT> me>
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."
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: sys-apps/bat-extras/
@ 2023-10-12  3:57 Leonardo Hernandez
  0 siblings, 0 replies; 7+ messages in thread
From: Leonardo Hernandez @ 2023-10-12  3:57 UTC (permalink / raw
  To: gentoo-commits

commit:     9d740b4882a520f27f35865773ec659e490d064e
Author:     Leonardo Hernández Hernández <leohdz172 <AT> proton <DOT> me>
AuthorDate: Thu Oct 12 03:53:19 2023 +0000
Commit:     Leonardo Hernandez <leohdz172 <AT> proton <DOT> me>
CommitDate: Thu Oct 12 03:56:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9d740b48

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>

 ...9999.ebuild => bat-extras-2023.09.19-r1.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-9999.ebuild b/sys-apps/bat-extras/bat-extras-2023.09.19-r1.ebuild
similarity index 74%
copy from sys-apps/bat-extras/bat-extras-9999.ebuild
copy to sys-apps/bat-extras/bat-extras-2023.09.19-r1.ebuild
index f0c500214b..3071ef6212 100644
--- a/sys-apps/bat-extras/bat-extras-9999.ebuild
+++ b/sys-apps/bat-extras/bat-extras-2023.09.19-r1.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."
 }


^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-10-12  3:57 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-12  3:41 [gentoo-commits] repo/proj/guru:master commit in: sys-apps/bat-extras/ Rui Huang
2023-10-12  3:27 ` [gentoo-commits] repo/proj/guru:dev " Rui Huang
  -- strict thread matches above, loose matches on Subject: below --
2023-10-12  3:57 Leonardo Hernandez
2023-10-12  3:57 Leonardo Hernandez
2023-10-12  3:47 Leonardo Hernandez
2022-09-08 10:29 Andrew Ammerlaan
2022-07-30 22:54 Randall Vasquez

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox