[gentoo-commits] repo/gentoo:master commit in: games-board/xskat/

[Ionen Wolkens]

commit:     4046aacb83395ab4e0f227c85d72736cb9fedd77
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 02:31:05 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 03:08:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4046aacb

games-board/xskat: adjust CPPFLAGS, move xorg-proto to DEPEND

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-board/xskat/xskat-4.0-r2.ebuild | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/games-board/xskat/xskat-4.0-r2.ebuild 
b/games-board/xskat/xskat-4.0-r2.ebuild
index da925919f0cc..e32197c981c3 100644
--- a/games-board/xskat/xskat-4.0-r2.ebuild
+++ b/games-board/xskat/xskat-4.0-r2.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=8
@@ -15,13 +15,14 @@ LICENSE="freedist"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
-DEPEND="x11-libs/libX11"
+COMMON_DEPEND="x11-libs/libX11"
 RDEPEND="
-       ${DEPEND}
+       ${COMMON_DEPEND}
        media-fonts/font-misc-misc"
-BDEPEND="
-       virtual/pkgconfig
+DEPEND="
+       ${COMMON_DEPEND}
        x11-base/xorg-proto"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() { :; }
 
@@ -29,7 +30,8 @@ src_compile() {
        tc-export CC
 
        local emakeargs=(
-               CFLAGS="${CFLAGS} ${CPPFLAGS}"
+               CFLAGS="${CFLAGS} ${CPPFLAGS} $($(tc-getPKG_CONFIG) --cflags 
x11 || die)"
+               CPPFLAGS= # force everywhere above, but avoid implicit 
duplication
                LDFLAGS="${LDFLAGS} $($(tc-getPKG_CONFIG) --libs x11 || die)"
        )