[gentoo-commits] repo/gentoo:master commit in: x11-wm/spectrwm/files/, x11-wm/spectrwm/

["Jeroen Roovers" <jer@gentoo.org>]

commit:     a82ad74e34def7f745b4cd47f9a88b035a3f0cec
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 11:11:11 2019 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 11:11:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a82ad74e

x11-wm/spectrwm: Version 3.2.0

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Fixes: https://bugs.gentoo.org/665510
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>

 x11-wm/spectrwm/Manifest                          |  1 +
 x11-wm/spectrwm/files/spectrwm-3.2.0-gentoo.patch | 33 +++++++++++++++++
 x11-wm/spectrwm/spectrwm-3.2.0.ebuild             | 43 +++++++++++++++++++++++
 3 files changed, 77 insertions(+)

diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index ec9c4281977..7f38ff33381 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1 +1,2 @@
 DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
+DIST spectrwm-3.2.0.tar.gz 150691 BLAKE2B a90fb556f0572709df51272a259724c3a497ac3b9852722646058ffb92914ca49581f3f95884c8a6bab2cb6475c4c3b475ff7ed3ea0ff125e76f202696dfd2bd SHA512 038d7fc5716fbca324a078a311939ec23db6ff53e9ef33b2804c687838e729f0e7bb7f724c539e8ac8efed9607358962d4dd742db7f1a30bf3c6ab72eade1039

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 00000000000..a193b133abc
--- /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 00000000000..e2e7e564aa9
--- /dev/null
+++ b/x11-wm/spectrwm/spectrwm-3.2.0.ebuild
@@ -0,0 +1,43 @@
+# 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"
+IUSE=""
+
+RDEPEND="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}
+}