gentoo resync : 10.02.2019

3 files changed, 65 insertions, 15 deletions

diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 53386fcda600..375ca8c7a7b0 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.1.tar.gz 25887 BLAKE2B 36c3aa36b8371b993ac845faaebd738f8295d3bed34a1a97075d8449cb3a2febec746b21858071579e27021502c7e184fcb0750997eacce471b968bac0e555bf SHA512 875644bbc246088f2c87e50debbadd4bc179444b396b1b327149087e8bc5303325ebc9103a7e3c864266ee1ac683ea3cd8f0a08285c8e46fc4389d5b83a555f1
+DIST dwm-6.2.tar.gz 25273 BLAKE2B 2bb9e5b900a1d73f3eb94cb8454580ec98930dbacbabec1f2bbd394eb96696873434b6ddea4ac95eb9d171de2c09c5d4ca0b30649836f7e25f4769f44d25a6eb SHA512 01abcab954e5b7c20d011e6fd9c28025271fea2e85610c928812f7c6a09f99d7f9e93d11ffc2d6a7aca894b3fa7e507c6c2fe5f26ff5ddcfc650a9bbaaa41e06
 EBUILD dwm-6.1-r1.ebuild 1498 BLAKE2B 54aaf754eb62d86e365512707ffc47fc69da3198e82050b0167fc49fd046115989c89c89a5a5704e490e101f0b9d802f2530d19437da34f537f12e3275ecc54d SHA512 c37b1663c8381ddaf5d6c9215da1691f7ac4e2a02579e6b6ac2a88399261b7891dd1d2492e3864367654815a368abd32fd4b6912b4b53e40cbf20ce4ed6a41f0
-EBUILD dwm-9999.ebuild 1403 BLAKE2B abc9035e7132ac3daef3452c0b3e0a33e401091c799c242f118871507a771d1519ed531ff62408f9757bd075d1544d78d342f181498f83c2f08a43135ffd70a2 SHA512 7cc1fbdcbaf9d78cf099d3da588c8523c551bbd8cede13bc7d54e29fe0978ceee9bc5f286c27495851dbc8df9b690bdac2ca8d2b24f202e2fa582f19d665c06a
+EBUILD dwm-6.2.ebuild 1089 BLAKE2B 947e7aea798fdd1462b42445f59cd44940da7ec44f1545f7b28c629a3f9f8bb4bb0c5ddbd9b3ef32fbe6f24286ba766ca42767075a90d87e8adddc216b46ceca SHA512 0beb68183cf8a327d6e7fc7aaf561ecbf6e7d8995f6e3115b3c7f91f70fdbf5b7564f23bb3f93db713110ae671bfcb00ad668f3107af403c75fa3517ce120c09
+EBUILD dwm-9999.ebuild 990 BLAKE2B 8deec468299dd197361b29dc829c44c1b0d181112f18e829b40a9642e217775c54255f9d63c3718ceb8aadf30112cc225379316a9f76de12d63df160662c738c SHA512 7937a6d7d8961ef0508bd1ba74c7bb9ecbad5ff984ce3bc1560a15644d0fea8596d2637a001c3e838d1bfb07ecf77dfa4944c7faee9f987ea36638e527de485f
 MISC metadata.xml 464 BLAKE2B daf6e362c09f3fc174b6ea81e49096899f5de5cf070553391ead7ab1cfe2b9a40bcbe6043b49db219ffa305c32e854864c9c94ef3c340c8b59c4bc2de675ff33 SHA512 e089b8fee6ede56ac362879d23548bef3aaf5abfcd6fe12c0ad1446b59068fd63ac840154d3d007d5fb0e2a5230bbe9bb84a397c44704e5dc3087cd9b5e3025d
diff --git a/x11-wm/dwm/dwm-6.2.ebuild b/x11-wm/dwm/dwm-6.2.ebuild
new file mode 100644
index 000000000000..0344b44e7166
--- /dev/null
+++ b/x11-wm/dwm/dwm-6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 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/"
+SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+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}" \
+		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 27c5d18fe7ae..900dc238896c 100644
--- a/x11-wm/dwm/dwm-9999.ebuild
+++ b/x11-wm/dwm/dwm-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit git-r3 toolchain-funcs
 
 DESCRIPTION="a dynamic window manager for X11"
@@ -28,19 +28,9 @@ src_prepare() {
 	default
 
 	sed -i \
-		-e "s/CFLAGS = -std=c99 -pedantic -Wall -Os/CFLAGS += -std=c99 -pedantic -Wall/" \
-		-e "/^LDFLAGS/{s|=|+=|g;s|-s ||g}" \
-		-e "s/#XINERAMALIBS =/XINERAMALIBS ?=/" \
-		-e "s/#XINERAMAFLAGS =/XINERAMAFLAGS ?=/" \
-		-e "s@/usr/X11R6/include@${EPREFIX}/usr/include/X11@" \
-		-e "s@/usr/X11R6/lib@${EPREFIX}/usr/lib@" \
-		-e "s@-I/usr/include@@" -e "s@-L/usr/lib@@" \
-		-e "s/\/freetype2/\ -I\/usr\/include\/freetype2/" \
+		-e "s/ -Os / /" \
+		-e "/^\(LDFLAGS\|CFLAGS\|CPPFLAGS\)/{s| = | += |g;s|-s ||g}" \
 		config.mk || die
-	sed -i \
-		-e '/@echo CC/d' \
-		-e 's|@${CC}|$(CC)|g' \
-		Makefile || die
 }
 
 src_compile() {