[gentoo-commits] repo/gentoo:master commit in: x11-terms/root-tail/

[Joonas Niilola]

commit:     e182d60c6e8ab1e1e2608e887d702649807488b7
Author:     Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Wed Apr 14 14:35:55 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 06:38:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e182d60c

x11-terms/root-tail: fix build with -native-symlinks

Also swapped DEPEND with BDEPEND to put imake in the right block.

Closes: https://bugs.gentoo.org/726208
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-terms/root-tail/root-tail-1.2-r4.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/x11-terms/root-tail/root-tail-1.2-r4.ebuild b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
index 410af2e4297..ea4f261a0a9 100644
--- a/x11-terms/root-tail/root-tail-1.2-r4.ebuild
+++ b/x11-terms/root-tail/root-tail-1.2-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,10 +16,10 @@ IUSE="kde debug"
 
 RDEPEND="x11-libs/libXext
 	x11-libs/libX11"
-DEPEND="x11-misc/imake
+DEPEND="${RDEPEND}"
+BDEPEND=">=x11-misc/imake-1.0.8-r1
 	app-text/rman
 	x11-base/xorg-proto
-	x11-libs/libX11
 	x11-misc/gccmakedep"
 
 src_prepare() {
@@ -28,15 +28,16 @@ src_prepare() {
 }
 
 src_configure() {
-	xmkmf -a
+	CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \
+		IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf -a || die
 }
 
 src_compile() {
 	sed -i 's:/usr/X11R6/bin:/usr/bin:' Makefile || die "sed Makefile failed"
 	use debug && append-flags -DDEBUG
 	emake \
-		CC=$(tc-getCC) \
-		CCOPTIONS="${CFLAGS}" \
+		CC="$(tc-getCC)" \
+		CDEBUGFLAGS="${CFLAGS}" \
 		EXTRA_LDOPTIONS="${LDFLAGS}"
 }