summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-19 09:23:08 +0100
committerSam James <sam@gentoo.org>2021-04-19 20:11:20 +0100
commit98a7f57873f95dae78f935d974d9219271608f41 (patch)
treeff4ae18fec4bcd1ab51dfd2398e2f3d6801f692a
parentx11-themes/gtk-chtheme: tidy patches (diff)
downloadgentoo-98a7f57873f95dae78f935d974d9219271608f41.tar.gz
gentoo-98a7f57873f95dae78f935d974d9219271608f41.tar.bz2
gentoo-98a7f57873f95dae78f935d974d9219271608f41.zip
x11-wm/musca: respect PKG_CONFIG and depend on it
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--x11-wm/musca/files/musca-0.9.24-make.patch8
-rw-r--r--x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild7
2 files changed, 9 insertions, 6 deletions
diff --git a/x11-wm/musca/files/musca-0.9.24-make.patch b/x11-wm/musca/files/musca-0.9.24-make.patch
index 0f28c5653c7b..d6677b9929b7 100644
--- a/x11-wm/musca/files/musca-0.9.24-make.patch
+++ b/x11-wm/musca/files/musca-0.9.24-make.patch
@@ -1,10 +1,10 @@
---- a/Makefile 2009-11-03 03:20:21.000000000 +0100
-+++ b/Makefile 2009-12-27 19:12:02.461539607 +0100
+--- a/Makefile
++++ b/Makefile
@@ -1,9 +1,12 @@
-CFLAGS?=-Wall -g
+CFLAGS ?= -Wall -g
-+INCLUDES = $(shell pkg-config --cflags x11)
-+LIBS = $(shell pkg-config --libs x11) -lm
++INCLUDES = $(shell ${PKG_CONFIG} --cflags x11)
++LIBS = $(shell ${PKG_CONFIG} --libs x11) -lm
+BIN_DIST = musca apis xlisten
-all:
diff --git a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
index 3b59bc329b78..59b442b1ea7f 100644
--- a/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
+++ b/x11-wm/musca/musca-0.9.24_p20100226-r4.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
+
inherit savedconfig toolchain-funcs
DESCRIPTION="A simple dynamic window manager, with features nicked from ratpoison and dwm"
@@ -21,6 +22,8 @@ RDEPEND="
>=x11-misc/dmenu-4.4
apis? ( x11-misc/xbindkeys )
"
+BDEPEND="virtual/pkgconfig"
+
PATCHES=(
"${FILESDIR}"/${PN}-0.9.24-make.patch
"${FILESDIR}"/${PN}-0.9.24_p20100226-dmenu-4.4.patch
@@ -46,7 +49,7 @@ src_prepare() {
fi
done
- tc-export CC
+ tc-export CC PKG_CONFIG
}
src_install() {