Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xbatt/
Date: Thu, 15 Apr 2021 06:40:08
Message-Id: 1618468736.28291a79c8c9d1892b55e11c001ffb929c3f22d0.juippis@gentoo
1 commit: 28291a79c8c9d1892b55e11c001ffb929c3f22d0
2 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
3 AuthorDate: Wed Apr 14 12:30:48 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 06:38:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28291a79
7
8 x11-misc/xbatt: fix build with -native-symlinks
9
10 Closes: https://bugs.gentoo.org/726220
11 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
12 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
13
14 x11-misc/xbatt/xbatt-1.3_rc1.ebuild | 10 +++++++---
15 1 file changed, 7 insertions(+), 3 deletions(-)
16
17 diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
18 index 75a3899848d..df26d01cbd2 100644
19 --- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
20 +++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2018 Gentoo Foundation
23 +# Copyright 1999-2021 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -24,15 +24,19 @@ RDEPEND="
28 DEPEND="
29 ${RDEPEND}
30 x11-base/xorg-proto
31 - x11-misc/imake
32 + >=x11-misc/imake-1.0.8-r1
33 "
34 PATCHES=(
35 "${FILESDIR}"/${PN}-1.2.1-implicits.patch
36 )
37 S="${WORKDIR}"/${PN}-$(ver_cut 1-2)
38
39 +src_configure() {
40 + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
41 + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
42 +}
43 +
44 src_compile() {
45 - xmkmf || die
46 emake \
47 CC="$(tc-getCC)" \
48 CDEBUGFLAGS="${CFLAGS}" \