From: Robin H. Johnson <robbat2@gentoo.org>
Date: Sat, 13 Apr 2019 04:02:53 +0000 (-0700)
Subject: app-misc/jq: cpu savings & anti-bundling safety
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=7534f110f6c60e2d24d0257a508d18a0fa606c3a;p=gentoo.git

app-misc/jq: cpu savings & anti-bundling safety

eautoreconf runs on all subdirectories that have autotooled and
referenced by the toplevel Makefile.am SUBDIRS, even when we don't use a
given subdirectory anymore. Rip out the subdirectory and Makefile.am
reference.

As a bonus, by removing the bundled source that's now unused, we prevent
any accidental build usage of it.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
---

diff --git a/app-misc/jq/jq-1.6-r3.ebuild b/app-misc/jq/jq-1.6-r3.ebuild
index 2b187f05c7ab..036113cf5316 100644
--- a/app-misc/jq/jq-1.6-r3.ebuild
+++ b/app-misc/jq/jq-1.6-r3.ebuild
@@ -36,6 +36,12 @@ src_prepare() {
 	sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \
 		configure.ac || die
 
+	# jq-1.6-r3-never-bundle-oniguruma makes sure we build with the system oniguruma,
+	# but the bundled copy of oniguruma still gets eautoreconf'd since it
+	# exists; save the cycles by nuking it.
+	sed -i -e '/modules\/oniguruma/d' Makefile.am || die
+	rm -rf "${S}"/modules/oniguruma || die
+
 	default
 	eautoreconf
 }