gentoo resync : 03.11.2019

4 files changed, 84 insertions, 3 deletions

diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 9ec7bd6361b1..bee8c0805387 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,4 +1,7 @@
-AUX spectrwm-3.1.0-Makefile.patch 1049 BLAKE2B eaa14f871a82c2c413c65a65d0a007210dc1f3e934145e8c932768311f644948c80d240e8817de87c80f36f105bd1017d8b7bf28a129d489bcd2ffd93c41464e SHA512 7b0bdb63d01713a946c68d1154df8cfdb213a155ddb5cd9ec5876dffe48dfa3f3d272c420391acab1ac86c314ace6d4a999ed18865ed148d97c64b5497e751ee
+AUX spectrwm-3.1.0-Makefile.patch 977 BLAKE2B 1f76bc331ee1d048387ab82900b44339e092986a793f5d03fa317f4247987ebb8ede090c0b157ae508d2a3ed05a374a9d06910e99fa9c5dd6df2169c54cfc3b3 SHA512 5d2be769544e4446e4e6780793bd61fe88a63c26b865d79e19892aca4734e600f16d55184b2e35d3f8e0d8456ac0c5c229854fcd607bd32c036a4397150ce118
+AUX spectrwm-3.2.0-gentoo.patch 1571 BLAKE2B b100631f6c47f45789c4931fcfd38c380404f38610cf91a3dbe5d857c2bf3ff31f7b14fd8f9f787f0fb3068aff50eaf1e51dcef5cfa88d062bf923d64b0c23ac SHA512 996c9f6dc9ac3cedf1178d0d2c9b678d3019d420e59e538233a0739e39dc33d08d7bdaab15d2e43aeddbedaf7df5d762829b1fe8c8f1c64f023bd2337d479b82
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
+DIST spectrwm-3.2.0.tar.gz 150691 BLAKE2B a90fb556f0572709df51272a259724c3a497ac3b9852722646058ffb92914ca49581f3f95884c8a6bab2cb6475c4c3b475ff7ed3ea0ff125e76f202696dfd2bd SHA512 038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039
 EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
+EBUILD spectrwm-3.2.0.ebuild 997 BLAKE2B 719d2c94665daf695fdb5241b97b63bb6b32414de0ac8092bd0b3b299d38e0c3dd69a50febea767d6a64d7dd16801d909609a6bb5b9c3e4fe76abc4b0c17f396 SHA512 9ba4c9e98bd68f6336ab021ec0541f2aea0b68594a29c533681a776535802e8c8a7c0cc8c3ff887860fc9c5631fe3ce4a9e49b49b67aa1470e1cd6be409fd4c3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
index 71f5578bfc58..c1162fb73610 100644
--- a/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
+++ b/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
@@ -1,5 +1,5 @@
---- a/Makefile	2017-10-03 20:36:39.000000000 +0200
-+++ b/Makefile	2017-11-13 20:53:33.341995465 +0100
+--- a/Makefile
++++ b/Makefile
 @@ -9,16 +9,16 @@
  LIBVERSION      = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major.$$minor)
  LIBMAJORVERSION = $(shell .  $(CURDIR)/../lib/shlib_version; echo $$major)
diff --git a/x11-wm/spectrwm/files/spectrwm-3.2.0-gentoo.patch b/x11-wm/spectrwm/files/spectrwm-3.2.0-gentoo.patch
new file mode 100644
index 000000000000..a193b133abc1
--- /dev/null
+++ b/x11-wm/spectrwm/files/spectrwm-3.2.0-gentoo.patch
@@ -0,0 +1,33 @@
+--- a/linux/Makefile
++++ b/linux/Makefile
+@@ -9,22 +9,22 @@
+ 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_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)
++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
+ LIB_LDFLAGS  = -fPIC -shared
+-LIB_CPPFLAGS = $(shell pkg-config --cflags x11)
+-LIB_LDLIBS   = $(shell pkg-config --libs   x11) -ldl
++LIB_CPPFLAGS = $(shell $(PKG_CONFIG) --cflags x11)
++LIB_LDLIBS   = $(shell $(PKG_CONFIG) --libs   x11) -ldl
+ 
+ all: spectrwm libswmhack.so.$(LIBVERSION)
+ 
diff --git a/x11-wm/spectrwm/spectrwm-3.2.0.ebuild b/x11-wm/spectrwm/spectrwm-3.2.0.ebuild
new file mode 100644
index 000000000000..6607081b734d
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 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="${HOMEPAGE}/archive/${PN^^}_${PV//./_}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	!x11-wm/scrotwm
+	x11-misc/dmenu
+"
+DEPEND="
+	x11-libs/libX11
+	x11-libs/libXcursor
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/xcb-util
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.0-gentoo.patch
+)
+S=${WORKDIR}/${PN}-${PN^^}_${PV//./_}
+
+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)" \
+		DESTDIR="${D}" install
+
+	insinto /etc
+	doins ${PN}.conf
+	dodoc CHANGELOG.md README.md ${PN}_*.conf {initscreen,screenshot}.sh
+
+	make_session_desktop ${PN} ${PN}
+}