commit: 71ad6cfc71c82de27c91c1dd5d10bb7d52293455
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 28 18:18:50 2025 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 28 18:18:50 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ad6cfc
app-misc/yq: move patch from inline to files/ [QA]
This was weird solution, with nothing to gain from inline patch in the
ebuild. No variable substitution, no conditional, nothing. It was even
the same file across versions.
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
app-misc/yq/files/yq-3.4.3-rename-cli.patch | 5 +++++
app-misc/yq/yq-3.4.3.ebuild | 13 ++-----------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/app-misc/yq/files/yq-3.4.3-rename-cli.patch
b/app-misc/yq/files/yq-3.4.3-rename-cli.patch
new file mode 100644
index 000000000000..19ab049a4705
--- /dev/null
+++ b/app-misc/yq/files/yq-3.4.3-rename-cli.patch
@@ -0,0 +1,5 @@
+--- a/setup.py
++++ b/setup.py
+@@ -37 +37 @@
+- "console_scripts": ["yq=yq:cli", "xq=yq:xq_cli", "tomlq=yq:tq_cli"],
++ "console_scripts": ["yq-python=yq:cli", "xq=yq:xq_cli",
"tomlq=yq:tq_cli"],
diff --git a/app-misc/yq/yq-3.4.3.ebuild b/app-misc/yq/yq-3.4.3.ebuild
index 98ccb3b1e776..7c61a57b74b3 100644
--- a/app-misc/yq/yq-3.4.3.ebuild
+++ b/app-misc/yq/yq-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -38,19 +38,10 @@ DEPEND="
PATCHES=(
"${FILESDIR}/yq-3.1.2-test.patch"
+ "${FILESDIR}/yq-3.4.3-rename-cli.patch"
)
python_prepare_all() {
- cat <<-\EOF > "${T}"/yq-python.patch
- --- setup.py
- +++ setup.py
- @@ -37 +37 @@
- - "console_scripts": ["yq=yq:cli", "xq=yq:xq_cli",
"tomlq=yq:tq_cli"],
- + "console_scripts": ["yq-python=yq:cli", "xq=yq:xq_cli",
"tomlq=yq:tq_cli"],
- EOF
-
- eapply -p0 "${T}"/yq-python.patch
-
sed -e 's:unittest.main():unittest.main(verbosity=2):' \
-i test/test.py || die
