gentoo resync : 20.03.2022

4 files changed, 68 insertions, 4 deletions

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index a5171a273db0..5d04d9ddd520 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,5 +1,7 @@
 AUX dmenu-4.9-gentoo.patch 759 BLAKE2B 965ebf79e580466fd98c3621d4d3b0cb9ea961a9f0f27cf1b91a82362aa49939469509929a66a0ef1e7a1be2a9919b2ab821882fa0d6b28e0821194e48e3c739 SHA512 15f379af1133ffa2724a1b5191108a85231f10db16850e14e1a8935f47cb3326061bed3c4854c8aba7bc1076211f1154c5927ff42e46e905b09a695666bbb576
 DIST dmenu-5.0.tar.gz 16028 BLAKE2B 9f161e3d44d5cb80e3996db81e28cdf7f143d310ec2660c837df167d8426645dde09d4f5a0c71d4be73f80f76615a32c20dd3d7f30a23506993215c89fe40844 SHA512 2b6a7cdf5aefc5e7ca7a4944883c3c16ee6f5005d2a96b61482d4899ad395f9cb8926907681d88b9df3e1188cf421dad4cc17e343b752f6cb8b161d33384b3f3
-EBUILD dmenu-5.0.ebuild 1426 BLAKE2B 1033bdc2ff07ff8745ce690a7d00239168312be1af80655b2a1dbea757e16bba9e144eeb3c2586857740a0e72ac8b25be78403f08d77b59f44bbf55b595c3240 SHA512 bd23c5d002c576050ab80231a4852e21e92f4a242f3a859d93762ba05836bd93c03a24a6170561993c3faf532a60611f0f96d14f5796fea254bcc333821a81ca
-EBUILD dmenu-9999.ebuild 1385 BLAKE2B 64feb1859b68cdd031cc12ad0bf2833e55091cc8002f9f533d0fea8bbdcc98a357a3e266592f8cd560e3634ebc2d568c0417ff378663dae2c2bd0b08a091526f SHA512 ae2cd23469b817da3c2a73ce3caeba1b0bf0e8f93dda3a2c72ae94b1e848f6bb533d7170f080a105a07c2dddf5b5596ad15a8502996ed2cc6a99afcfa8262ae1
+DIST dmenu-5.1.tar.gz 16096 BLAKE2B 22132d851c37c6fd7b08ce1087cb33278f3194412cc590b196831568f7fc0b25e1b7a98b83720fcd5df1f8bae095ea7405b96003a698038599b1f25b58aa8a3c SHA512 2f950c30e15880e6081e04d73dd0cf8f402f52d793a77d22c3f10739bfed6222a9c4e7ec8eb3fc676422fea09e30b8cf9789f67b276b22c398c96f5ed3b56453
+EBUILD dmenu-5.0.ebuild 1428 BLAKE2B 57053391b0a30b63aa82b904558414903b7d3028d39340b159c42415eb48e4e5adeb737d81becba2e4c8b4b6412a2b1dbf960454c61b96c7d1d776ba57fe1a6c SHA512 db4f3bdfeb1fe94594ea1251866e0f78d7fd9f39c18ed5a14ba3347f97e5b92f45fd3fb61053babff033609ddd598b0adfa8354092c60fcaa3b6d38969df0a03
+EBUILD dmenu-5.1.ebuild 1433 BLAKE2B cb37bc32148f39f037adc68e71ce00060a9821f395b3fe974b83590f9095db7e3b50833577608852d3a6163780a30c53200a088436650a33800b4386838d70c4 SHA512 4610b621b645a5ad63bcbba9d105606f8ca026e4cf29c31b26193ab92e5aec582fa295778d88911f5d917b578052f1cf6730b9d7aa267cf79fe852b3d02f016a
+EBUILD dmenu-9999.ebuild 1387 BLAKE2B 5b0e35bff1b1bc2fa2d1d05f9e0acd0993b2070a2f9a989e79afc8f2f2ee9323d9636f23728877209a4f3cedd2fca363219175982a2971eb6fdc2cec54ab9ecf SHA512 4d1abfe39c176103d2aa364884f7c91e4701279dd4e57816b48a72b3adfee5154610c8e82297bfdf4fe6dea2669a5f3db72609e17dde90547ee469b31c5bb79d
 MISC metadata.xml 252 BLAKE2B ed5f11ce8c4de4fde4020b83dc772d6b47192ea5617cacf05adf13ab5a29923858b2969ed9dc26e75194cb972d41ffceee40856e6f955f42039693af96ebb2e4 SHA512 7f9b5cf205b6500eb65742c67963c3c6c375fa05c7eb094037fb9950d9d2840930e8b4d3ef76c948ddf7f37005012be51c8217c758a615dd7e128c80b6b1db28
diff --git a/x11-misc/dmenu/dmenu-5.0.ebuild b/x11-misc/dmenu/dmenu-5.0.ebuild
index a6e9cace9bc6..a8602b9f9bb2 100644
--- a/x11-misc/dmenu/dmenu-5.0.ebuild
+++ b/x11-misc/dmenu/dmenu-5.0.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) \
+	emake CC="$(tc-getCC)" \
 		"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 )" \
diff --git a/x11-misc/dmenu/dmenu-5.1.ebuild b/x11-misc/dmenu/dmenu-5.1.ebuild
new file mode 100644
index 000000000000..98db03cf8f38
--- /dev/null
+++ b/x11-misc/dmenu/dmenu-5.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a generic, highly customizable, and efficient menu for the X Window System"
+HOMEPAGE="https://tools.suckless.org/dmenu/"
+SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.9-gentoo.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's|^	@|	|g' \
+		-e '/^	echo/d' \
+		Makefile || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		"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() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	save_config config.h
+}
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index bcc3080b34a2..49e950d0bb94 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) \
+	emake CC="$(tc-getCC)" \
 		"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 )" \