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/x2x/
Date: Thu, 15 Apr 2021 06:40:07
Message-Id: 1618468735.a50d9135ce439a19167f417374a6c8c86545cceb.juippis@gentoo
1 commit: a50d9135ce439a19167f417374a6c8c86545cceb
2 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
3 AuthorDate: Wed Apr 14 12:17:04 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 06:38:55 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50d9135
7
8 x11-misc/x2x: fix build with -native-symlinks
9
10 Also swapped DEPEND with BDEPEND to put imake in the right block.
11
12 Closes: https://bugs.gentoo.org/726236
13 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
14 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
15
16 x11-misc/x2x/x2x-1.27-r3.ebuild | 10 ++++++----
17 1 file changed, 6 insertions(+), 4 deletions(-)
18
19 diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
20 index 4c02869b428..3fa95a9e0e9 100644
21 --- a/x11-misc/x2x/x2x-1.27-r3.ebuild
22 +++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2019 Gentoo Authors
25 +# Copyright 1999-2021 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=7
29 @@ -20,10 +20,11 @@ IUSE=""
30 RDEPEND="x11-libs/libX11
31 x11-libs/libXtst
32 x11-libs/libXext"
33 -DEPEND="${RDEPEND}
34 +DEPEND="${RDEPEND}"
35 +BDEPEND="
36 app-text/rman
37 x11-base/xorg-proto
38 - x11-misc/imake"
39 + >=x11-misc/imake-1.0.8-r1"
40
41 PATCHES=(
42 # Patch from Debian to add -north and -south, among other fixes
43 @@ -45,7 +46,8 @@ src_prepare() {
44 }
45
46 src_configure() {
47 - xmkmf || die
48 + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
49 + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die
50 }
51
52 src_compile() {