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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9F342158094 for ; Fri, 30 Sep 2022 11:02:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 853972BC098; Fri, 30 Sep 2022 11:02:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 704BA2BC099 for ; Fri, 30 Sep 2022 11:02:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46010341193 for ; Fri, 30 Sep 2022 11:02:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7527E5FE for ; Fri, 30 Sep 2022 11:02:15 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1664534892.c663d76d498d34d84edd2ecf23ebc6be911f327d.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/xkeycaps/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild X-VCS-Directories: x11-misc/xkeycaps/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: c663d76d498d34d84edd2ecf23ebc6be911f327d X-VCS-Branch: master Date: Fri, 30 Sep 2022 11:02:15 +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: 9c14c50f-f3af-45ce-98da-1abc37f64da7 X-Archives-Hash: f9940d0f447f24965e313601805e6e11 commit: c663d76d498d34d84edd2ecf23ebc6be911f327d Author: Ionen Wolkens gentoo org> AuthorDate: Fri Sep 30 09:17:17 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Sep 30 10:48:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c663d76d x11-misc/xkeycaps: force gcc -E for imake's generation Requires traditional cpp support and is broken in all sort of ways with clang-cpp / -E. Can still use clang & friends for everything else. Ideally these packages need to be built another way or last rited, imake will just accumulate more problems. Closes: https://bugs.gentoo.org/871129 Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild index cbac2508a679..be540734790a 100644 --- a/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild +++ b/x11-misc/xkeycaps/xkeycaps-2.47_p7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,10 +23,12 @@ RDEPEND=" x11-libs/libXt x11-misc/xbitmaps " -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-apps/sed-4 +DEPEND=" + ${RDEPEND} x11-base/xorg-proto +" +BDEPEND=" + sys-devel/gcc >=x11-misc/imake-1.0.8-r1 " @@ -47,7 +49,7 @@ src_prepare() { src_configure() { CC="$(tc-getBUILD_CC)" LD="$(tc-getLD)" \ - IMAKECPP="${IMAKECPP:-$(tc-getCPP)}" xmkmf || die + IMAKECPP="${IMAKECPP:-${CHOST}-gcc -E}" xmkmf || die sed -i \ -e "s,all:: xkeycaps.\$(MANSUFFIX).html,all:: ,g" \ Makefile || die