gentoo resync : 07.01.2022

3 files changed, 83 insertions, 5 deletions

diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 75447e5cfd37..047e03dee257 100644
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -1,6 +1,8 @@
 AUX dwm-session2 170 BLAKE2B 10158b31ae25da00d7034ce88c321f0703f3374bcf0140ce4ad3ff00483ca634075b2b5b4fc3a97b105e66128c1c882154cd815bb420d473ad1e6af0ff1dce75 SHA512 e882c447824ec430862f9af968aad0f2276b7ab28cf60b8f8e49551e3b9cc2a249429987f4a7d6577eb18182b7709fb4d7c5c4651192a04dc2394ba9afa89f08
 AUX dwm.desktop 118 BLAKE2B e88e7e7376dc18c82c39cf2e07867febc49e0f4749a5e50fd3bca7a3e03af26222fd569aa3c38fa486e4998b64808fee5a3f17d4891eea0b410c54f726850004 SHA512 6a4ba9a9c80c9a39c181427eb48f28edc7c139c73e8452b4012774d1ea787054cad4996da9c839fa437e6dba3ddba521fea72050e3929d59fcf00988bee28db8
 DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06
+DIST dwm-6.3.tar.gz 25351 BLAKE2B 06edd0454802d79a5c796951b0a95d5376f0363f0b93ce82569d38af4a96d528c58abf7b9e0f78bb50b48ce8cee0c7993e08fafc8593bc63be6df87c17974f40 SHA512 285bf5e7f419b7bd6d7cd23548a5cb3dce84879b7e841ed3eb08c226f28c8782e37bce2bc481b2e90c4f2160f79d239476d56f01985af0d38a39fb9dce43dede
 EBUILD dwm-6.2.ebuild 1088 BLAKE2B 05e3cdb4c60c87432511e0862babb0f3af9b8fc64990035ab2420c10415dbdb50eb7673a11e0df12d61e43a055b843a4930cd3f97d15fc81f094f8586d811c69 SHA512 253915758913ff05684bbafabd7d6b78ef45b62e8b894b81b332483ef4e1277dd21bbf6d454449e5fcee7da41cfd25879ee4950b6622bac5a408bab36c0e55f9
-EBUILD dwm-9999.ebuild 1051 BLAKE2B b6cb69a1d68690bc904fd8276f60e3a4384cbcb54e7e334fe4562495485a7e382e613cd0481c63634c645c89012ad5a77375b8b9a8e297627ab917493a5a5e20 SHA512 377b6dbc10ef70c55e66af4c89b304ce6f146ccc81041ab814bb30e7bacba809e24383317bf9a932cf49bae025b4951c81f8c42dbb554d8cbe7113fd79f39482
+EBUILD dwm-6.3.ebuild 1316 BLAKE2B acf585eb136ad3d7719da996dcf0f5deee906c6443290d25de1c775c04026d28cd8311135b0d66269587da51a7c698dc4bc0d3a6f1d423e29992b71b4248986c SHA512 a74d114bff5fac09ff834856de152695662a9ac40a96539a41d5109d86d2da380e062c72ff12adbac2a1dca3e90f898b9487c6e95ca36197f40c9ce059a7f01c
+EBUILD dwm-9999.ebuild 1316 BLAKE2B acf585eb136ad3d7719da996dcf0f5deee906c6443290d25de1c775c04026d28cd8311135b0d66269587da51a7c698dc4bc0d3a6f1d423e29992b71b4248986c SHA512 a74d114bff5fac09ff834856de152695662a9ac40a96539a41d5109d86d2da380e062c72ff12adbac2a1dca3e90f898b9487c6e95ca36197f40c9ce059a7f01c
 MISC metadata.xml 503 BLAKE2B 741cc38200fa0911bf9fa1a2afcd0bad76da0469a85a6f72dfce5ed04e57083405cdc0e9ee8ca66b3f9bc88b1845a7132f66552e999f66568e3e044caaa3aaad SHA512 93d86f980268b8c9f2fba670220de0a138ebd7bd22481681ce0af029743a3142e52e215fc8dffcbce6ba882d50e9e1bfbe33eee858fe28978e733c0bfb864582
diff --git a/x11-wm/dwm/dwm-6.3.ebuild b/x11-wm/dwm/dwm-6.3.ebuild
new file mode 100644
index 000000000000..4ff4f401873f
--- /dev/null
+++ b/x11-wm/dwm/dwm-6.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit savedconfig toolchain-funcs
+
+DESCRIPTION="a dynamic window manager for X11"
+HOMEPAGE="https://dwm.suckless.org/"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/dwm"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="xinerama"
+
+RDEPEND="
+	media-libs/fontconfig
+	x11-libs/libX11
+	x11-libs/libXft
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="
+	${RDEPEND}
+	xinerama? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/ -Os / /" \
+		-e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
+		config.mk || die
+
+	restore_config config.h
+}
+
+src_compile() {
+	if use xinerama; then
+		emake CC=$(tc-getCC) dwm
+	else
+		emake CC=$(tc-getCC) XINERAMAFLAGS="" XINERAMALIBS="" dwm
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+
+	exeinto /etc/X11/Sessions
+	newexe "${FILESDIR}"/dwm-session2 dwm
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/dwm.desktop
+
+	dodoc README
+
+	save_config config.h
+}
diff --git a/x11-wm/dwm/dwm-9999.ebuild b/x11-wm/dwm/dwm-9999.ebuild
index 4b464a12ac2f..4ff4f401873f 100644
--- a/x11-wm/dwm/dwm-9999.ebuild
+++ b/x11-wm/dwm/dwm-9999.ebuild
@@ -1,16 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit git-r3 savedconfig toolchain-funcs
+
+inherit savedconfig toolchain-funcs
 
 DESCRIPTION="a dynamic window manager for X11"
 HOMEPAGE="https://dwm.suckless.org/"
-EGIT_REPO_URI="https://git.suckless.org/dwm"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.suckless.org/dwm"
+else
+	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+fi
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
 IUSE="xinerama"
 
 RDEPEND="
@@ -30,6 +37,8 @@ src_prepare() {
 	sed -i \
 		-e "s/ -Os / /" \
 		-e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \
+		-e "/^X11LIB/{s:/usr/X11R6/lib:/usr/$(get_libdir)/X11:}" \
+		-e '/^X11INC/{s:/usr/X11R6/include:/usr/include/X11:}' \
 		config.mk || die
 
 	restore_config config.h