From b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 19 Mar 2019 11:37:34 +0000
Subject: gentoo resync : 19.03.2019

---
 x11-misc/dmenu/Manifest          |  4 ++--
 x11-misc/dmenu/dmenu-4.9.ebuild  |  1 -
 x11-misc/dmenu/dmenu-9999.ebuild | 24 +++++++++++++-----------
 3 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'x11-misc/dmenu')

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 15636840904e..4a6dd84294a8 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -7,6 +7,6 @@ DIST dmenu-4.8.tar.gz 15658 BLAKE2B 8e027905a3c32d0db20f22ac911bcd69c39d00b2c426
 DIST dmenu-4.9.tar.gz 15972 BLAKE2B 56ba03a3dfd24e2fb0f45feaaaac53e441b63a0d72adbc36499a97e2eab7c524da2088e3a15c6599c513bb35a6a049663b97220e671e03bd577baaaf711f228a SHA512 c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65
 EBUILD dmenu-4.6.ebuild 1268 BLAKE2B 525a04d499b2b5f6cf2f3b4abede52af3c7cf637185cff3174841b2c833468887b16a54614c7ce97f5a74a924031bc971706a0b79b427197878087fabc6105cf SHA512 6950b25d07543312738ee66bd8031d6a12fa3b19aa9323f1a1847bcbdf79c18e5f23f813b40784b649f4543b64816d5c019b8e5c87c275ea1cf91e468cafd98d
 EBUILD dmenu-4.8.ebuild 1331 BLAKE2B cd9a7d863e5f1ebcf407a9b8679770e5710ef473329b3fd21c2502cd238a8e35325f2cd1b6feb1746230d17364a0f1fa1ce1d346f71ec97e977221e3100f3d6b SHA512 d7616941e416beb543b0abd4b7ed16e7b157c36fe5e454ef7a1c9a5a78ec4de5c10ee34b7f4b749b6e77c012b82437acf87a374d883c56047cdee09fd30ced6b
-EBUILD dmenu-4.9.ebuild 1458 BLAKE2B 963a29137ef3f22eb47ffc52d52cb5d42424a66a433bd7ab9601315e0ef0f1fec9663b4990d9247fe7d315859bab9d4838548b684ee6ee329ae409d8f15d92f8 SHA512 d02880335ee2662345803ef16ecc9e6e720cdc092510e300be29a562b8cb85ba8c78dddc0702040b8b2a322cb252fc0553781748e5011b6c6c2aefd8c017c495
-EBUILD dmenu-9999.ebuild 1158 BLAKE2B 1f70618cd79408543653a9d4288a25e0b40ca7f141596ce66154c70dfbc85405cfca8a748eb14e54662e057ff41d5308f3c7cbb90922b90d7da88b678c860bdd SHA512 c45538edf8b4a9d3c000984634833c8e226d0a75ad647c56935b3c6fa3a435db9d210f47aaca076d086bbf0ef0ae584d8fddd37c9796082552e5c70461b16ee2
+EBUILD dmenu-4.9.ebuild 1417 BLAKE2B d2f8afa1e4ca55a0e6856e3b689e898fbd0bb3909d2a4a6db7cbea56717987159672ad6204c7f3b8e78c43de89768febbeb0d81a5a4108536e4889fd9200899c SHA512 9b7f90974a4ded07a37fa6f7c241b7954cd621176dc7ad3e552662f5f21e44d67b8473bc7b6ade8c8ecf1f1571a5dbbfcc2c8af321014d8bbe74b42dfb9e438b
+EBUILD dmenu-9999.ebuild 1370 BLAKE2B 158e394bd5b609af85717452f913921291556333224d07bd82b5b75d7e70a01d4be7ce17014d41a4647904715e97c004c700bc516f34b3ba0385489d7b3cb293 SHA512 71a19ebfb39776e2de6cdee238c59461ae2f95e24278ef6d3c84ad54c681e7deb39edddc7007d31b2135062912f40b9681716bc8a71eac4d242e2cd20a127dde
 MISC metadata.xml 361 BLAKE2B 40b663e4c351f9f6696f958b5a3006a3c18782dc2a4931584e566e2cdc2ea118f1fcef6a1ea7ad60724687e6f35bc1b25bc63351c6ffac03844ba0fb977576c8 SHA512 0be9c5e4fa1f72b02220088179c79f53e07928ee2890f78a24659e47961470d12ed7b8fe56b78ac4b493a2f42ebd491a8ebff405b013e7b7943de74892eed476
diff --git a/x11-misc/dmenu/dmenu-4.9.ebuild b/x11-misc/dmenu/dmenu-4.9.ebuild
index 9fe6efe17530..dafe23ddeda1 100644
--- a/x11-misc/dmenu/dmenu-4.9.ebuild
+++ b/x11-misc/dmenu/dmenu-4.9.ebuild
@@ -32,7 +32,6 @@ src_prepare() {
 
 	sed -i \
 		-e 's|^	@|	|g' \
-		-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
 		-e '/^	echo/d' \
 		Makefile || die
 
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index 8001b06f1d66..ac2f60df320b 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 savedconfig toolchain-funcs
 
 DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
@@ -32,7 +32,6 @@ src_prepare() {
 
 	sed -i \
 		-e 's|^	@|	|g' \
-		-e 's|${CC} -o|$(CC) $(CFLAGS) -o|g' \
 		-e '/^	echo/d' \
 		Makefile || die
 
@@ -41,15 +40,18 @@ src_prepare() {
 
 src_compile() {
 	emake CC=$(tc-getCC) \
-		INCS=" \
-			$(usex xinerama "-DXINERAMA" '') \
-			$(
-				$(tc-getPKG_CONFIG) --cflags fontconfig freetype2 x11 xft $(usex xinerama xinerama '')
-			)" \
-		LIBS=" \
-			$(
-				$(tc-getPKG_CONFIG) --libs fontconfig x11 xft $(usex xinerama xinerama '')
-			)"
+		"FREETYPEINC=$( $(tc-getPKG_CONFIG) --cflags x11 fontconfig xft 2>/dev/null )" \
+		"FREETYPELIBS=$( $(tc-getPKG_CONFIG) --libs x11 fontconfig xft 2>/dev/null )" \
+		"X11INC=$( $(tc-getPKG_CONFIG) --cflags x11 2>/dev/null )" \
+		"X11LIB=$( $(tc-getPKG_CONFIG) --libs x11 2>/dev/null )" \
+		"XINERAMAFLAGS=$(
+			usex xinerama "-DXINERAMA $(
+				$(tc-getPKG_CONFIG) --cflags xinerama 2>/dev/null
+			)" ''
+		)" \
+		"XINERAMALIBS=$(
+			usex xinerama "$( $(tc-getPKG_CONFIG) --libs xinerama 2>/dev/null)" ''
+		)"
 }
 
 src_install() {
-- 
cgit v1.2.3