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

["Ben Kohler" <bkohler@gentoo.org>]

commit:     b736ece2eb5da75a4db21e9b5c364aea3557fc6f
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 12:36:57 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 12:41:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b736ece2

x11-wm/spectrwm: bump to 3.4.0

Reworked Makefile patch since upstream has applied the $(PKGCONFIG)
fixes

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 x11-wm/spectrwm/Manifest                          |  1 +
 x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch | 24 ++++++++++++
 x11-wm/spectrwm/spectrwm-3.4.0.ebuild             | 48 +++++++++++++++++++++++
 3 files changed, 73 insertions(+)

diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index a9aec43846e..c8beb99909a 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,3 +1,4 @@
 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

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 00000000000..3b923b6a125
--- /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 00000000000..67195eaf70b
--- /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
+}