From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A020713835A for ; Thu, 15 Apr 2021 06:40:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0714FE08F3; Thu, 15 Apr 2021 06:40:07 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1E02E08F3 for ; Thu, 15 Apr 2021 06:40:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A135340D4D for ; Thu, 15 Apr 2021 06:40:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98CD36BD for ; Thu, 15 Apr 2021 06:39:58 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1618468735.a50d9135ce439a19167f417374a6c8c86545cceb.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/x2x/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/x2x/x2x-1.27-r3.ebuild X-VCS-Directories: x11-misc/x2x/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: a50d9135ce439a19167f417374a6c8c86545cceb X-VCS-Branch: master Date: Thu, 15 Apr 2021 06:39:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3771bb65-c355-423b-ab56-88afc26f221c X-Archives-Hash: 3dc0b8ed20d262f7c8612e67290d33f4 commit: a50d9135ce439a19167f417374a6c8c86545cceb Author: Ionen Wolkens gmail com> AuthorDate: Wed Apr 14 12:17:04 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Apr 15 06:38:55 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a50d9135 x11-misc/x2x: fix build with -native-symlinks Also swapped DEPEND with BDEPEND to put imake in the right block. Closes: https://bugs.gentoo.org/726236 Signed-off-by: Ionen Wolkens gmail.com> Signed-off-by: Joonas Niilola gentoo.org> x11-misc/x2x/x2x-1.27-r3.ebuild | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild index 4c02869b428..3fa95a9e0e9 100644 --- a/x11-misc/x2x/x2x-1.27-r3.ebuild +++ b/x11-misc/x2x/x2x-1.27-r3.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 @@ -20,10 +20,11 @@ IUSE="" RDEPEND="x11-libs/libX11 x11-libs/libXtst x11-libs/libXext" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" app-text/rman x11-base/xorg-proto - x11-misc/imake" + >=x11-misc/imake-1.0.8-r1" PATCHES=( # Patch from Debian to add -north and -south, among other fixes @@ -45,7 +46,8 @@ src_prepare() { } src_configure() { - xmkmf || die + CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ + IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die } src_compile() {