Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/xmlstarlet/
Date: Sun, 31 Jan 2021 19:45:47
Message-Id: 1612122259.40c7d31fee74fa7698c288a649f869e6c6b2a3b9.sping@gentoo
1 commit: 40c7d31fee74fa7698c288a649f869e6c6b2a3b9
2 Author: Sebastian Pipping <sping <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 31 19:44:19 2021 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 31 19:44:19 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40c7d31f
7
8 app-text/xmlstarlet: Minor QA fixes
9
10 Signed-off-by: Sebastian Pipping <sping <AT> gentoo.org>
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12
13 app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
16 diff --git a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
17 index 81ac6ed97cc..0ff17e1a810 100644
18 --- a/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
19 +++ b/app-text/xmlstarlet/xmlstarlet-1.6.1.ebuild
20 @@ -22,14 +22,14 @@ DEPEND="${RDEPEND}"
21 BDEPEND="virtual/pkgconfig"
22
23 src_prepare() {
24 - eapply_user
25 + default
26
27 # We need to patch use of /usr/lib because it is a problem with
28 - # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600)
29 + # linker lld with profile 17.1 on amd64 (see https://bugs.gentoo.org/729600).
30 # The grep sandwich acts as a regression test so that a future
31 - # version bump cannot break patching without noticing
32 + # version bump cannot break patching without noticing.
33 grep -wq _PREFIX/lib m4/xstar-check-libs.m4 || die
34 - sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
35 + sed "s,_PREFIX/lib,_PREFIX/$(get_libdir)," -i m4/xstar-check-libs.m4 || die
36 grep -w _PREFIX/lib m4/xstar-check-libs.m4 && die
37
38 eautoreconf