gentoo resync : 21.06.2020

3 files changed, 75 insertions, 0 deletions

diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index a1a0da6f7fcf..4b7117cab1b1 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,9 +1,12 @@
 AUX spectrwm-3.1.0-Makefile.patch 977 BLAKE2B 1f76bc331ee1d048387ab82900b44339e092986a793f5d03fa317f4247987ebb8ede090c0b157ae508d2a3ed05a374a9d06910e99fa9c5dd6df2169c54cfc3b3 SHA512 5d2be769544e4446e4e6780793bd61fe88a63c26b865d79e19892aca4734e600f16d55184b2e35d3f8e0d8456ac0c5c229854fcd607bd32c036a4397150ce118
 AUX spectrwm-3.2.0-gentoo.patch 1571 BLAKE2B b100631f6c47f45789c4931fcfd38c380404f38610cf91a3dbe5d857c2bf3ff31f7b14fd8f9f787f0fb3068aff50eaf1e51dcef5cfa88d062bf923d64b0c23ac SHA512 996c9f6dc9ac3cedf1178d0d2c9b678d3019d420e59e538233a0739e39dc33d08d7bdaab15d2e43aeddbedaf7df5d762829b1fe8c8f1c64f023bd2337d479b82
+AUX spectrwm-3.4.0-gentoo.patch 1134 BLAKE2B 01f472388c38b276fc91747cb1e06bf4709b1a53caacd1e16f3ef7d0817eb3d127aac76c665e92d05c41c9f01ce8b79525dd0bacbeecdd5d36c1d012bcdcb1c5 SHA512 9c8450fcdd198dd0ef88d13c38edb0cc48c7324cc8a3b3e2c331d9ca5608cfa9fa041b9cae466429e8b77fcb9eb28a29d484590106ea604f27163d07ee428508
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
 DIST spectrwm-3.2.0.tar.gz 150691 BLAKE2B a90fb556f0572709df51272a259724c3a497ac3b9852722646058ffb92914ca49581f3f95884c8a6bab2cb6475c4c3b475ff7ed3ea0ff125e76f202696dfd2bd SHA512 038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039
 DIST spectrwm-3.3.0.tar.gz 161806 BLAKE2B 07470511486c7b5c61e65eb33e5a9ec7fbfec97390057311fab27bd5608d428b3a53c379fe6c5436000b4847769db9d175154e696b39d3175175bae173e8e68e SHA512 743affffd0437641a760ae29ccbd0084baee3354dadc48f3fc9ab70bffa2413ffe3af67f1223413aa1bbf8c679fbae1fbbdd71a840b3e44f5df83b527f63c1cc
+DIST spectrwm-3.4.0.tar.gz 164188 BLAKE2B a79feb7f1e667728d237ec97aa5753eb5d0a1ae96ea63a5f14348cbc63ddde7a49639664fa19bffb564d0342727e558498a7a72ec3442899462ad8800075e32e SHA512 f55785976ffefaa93601cdc509880cc7e1c13df6f676d3dc0ee8121240b221b0d3db5968d32486673e2ab172165dd55da3d28b1e088fbf4f77ccecb8c6e57519
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
 EBUILD spectrwm-3.2.0.ebuild 1023 BLAKE2B f966d0420844ca3dee536f60a12a81677f2a9a6eb64983bf727992956490256721a374b7f144da7b54111499f7d7b9fe4668ea130e50c3cb6c71855295ef9f19 SHA512 79410cf8fc5859f0e7e5f9bfbc135cca3f69c38721c317acc582228fd9755e2667febbe9015fccb205963ed65512c86d2fb3ae05fb5fe8ffed2b67e9194861e2
 EBUILD spectrwm-3.3.0.ebuild 1128 BLAKE2B 731f6a1988fd23082740086b6d1c4600a0f9ca1486a8aaf7895b10c50be91ef034e68a747a6c0258d5b6a14155b693c24c7efe1f183d43ebfb160d48776e7737 SHA512 e5fb1c60b25d64fa499c1e0d69b12a325a28904dd8f1bb7c296b8daa131b2ddbb2b217f131e6443ef46cdcf30c00d14e60ee22c28d98a9bfea83db61384bbd38
+EBUILD spectrwm-3.4.0.ebuild 1128 BLAKE2B 8747ca9aba5e6a65d5b622729a3c1ac35f2b7c2e078bf34a43a43f5069a9bf78aa2b03b31c79b36319ed71d63cc7b6a62f43100cfe6462844b9c76544ab544c7 SHA512 de30080599900e14beb0d982ff237f8a45e37df764328a748afab6898a7528a456229c199cf3c5195a81d8a07c5700ffefdd249cdc58e81b854be04260b65757
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch b/x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch
new file mode 100644
index 000000000000..3b923b6a1256
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch
@@ -0,0 +1,24 @@
+diff -ur a/linux/Makefile b/linux/Makefile
+--- a/linux/Makefile	2020-06-20 07:31:46.794877103 -0500
++++ b/linux/Makefile	2020-06-20 07:33:10.283526519 -0500
+@@ -12,16 +12,16 @@
+ LIBVERSION      = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
+ LIBMAJORVERSION = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major)
+ 
+-MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
+-MAINT_LDFLAGS  = -Wl,--as-needed
++MAINT_CFLAGS   = -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized
++MAINT_LDFLAGS  =
+ MAINT_CPPFLAGS = -I. -D_GNU_SOURCE -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LIBVERSION)\"
+ 
+ ifneq ("${BUILDVERSION}", "")
+ MAINT_CPPFLAGS += -DSPECTRWM_BUILDSTR=\"$(BUILDVERSION)\"
+ endif
+ 
+-BIN_CFLAGS   = -fPIE
+-BIN_LDFLAGS  = -fPIE -pie
++BIN_CFLAGS   =
++BIN_LDFLAGS  =
+ BIN_CPPFLAGS = $(shell $(PKG_CONFIG) --cflags x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
+ BIN_LDLIBS   = $(shell $(PKG_CONFIG) --libs   x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xinput xcb-xtest xcursor xft)
+ LIB_CFLAGS   = -fPIC
diff --git a/x11-wm/spectrwm/spectrwm-3.4.0.ebuild b/x11-wm/spectrwm/spectrwm-3.4.0.ebuild
new file mode 100644
index 000000000000..67195eaf70bb
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.4.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit desktop multilib toolchain-funcs
+
+DESCRIPTION="Small dynamic tiling window manager for X11"
+HOMEPAGE="https://github.com/conformal/spectrwm"
+SRC_URI="https://github.com/conformal/spectrwm/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!x11-wm/scrotwm
+	x11-misc/dmenu
+"
+DEPEND="
+	elibc_musl? ( sys-libs/queue-standalone )
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXt
+	x11-libs/xcb-util
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4.0-gentoo.patch
+)
+S=${WORKDIR}/${PN}-${PN^^}_${PV//./_}
+
+src_prepare() {
+	sed -i -e '/LICENSE.md/d' linux/Makefile || die
+	default
+}
+
+src_compile() {
+	tc-export CC PKG_CONFIG
+	emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)" \
+		SYSCONFDIR="${EROOT}/etc" DOCDIR="${EROOT}/usr/share/doc/${P}" \
+		DESTDIR="${D}" install
+
+	dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh
+}