gentoo auto-resync : 24:04:2023 - 18:10:43

4 files changed, 16 insertions, 49 deletions

diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index c5031b48ad04..f09817d81ba6 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,8 +1,6 @@
-AUX spectrwm-3.4.0-gentoo.patch 1134 BLAKE2B 01f472388c38b276fc91747cb1e06bf4709b1a53caacd1e16f3ef7d0817eb3d127aac76c665e92d05c41c9f01ce8b79525dd0bacbeecdd5d36c1d012bcdcb1c5 SHA512 9c8450fcdd198dd0ef88d13c38edb0cc48c7324cc8a3b3e2c331d9ca5608cfa9fa041b9cae466429e8b77fcb9eb28a29d484590106ea604f27163d07ee428508
-AUX spectrwm-3.4.1-musl.patch 259 BLAKE2B 61dde875af4c9fb8be72a098debe0ac00174ee4bf15c727778d37f80f844a60834959c8ab6f2f15200e4fb5968528f06c03a18fa4d89d074ffe1f32eb7fbfd8c SHA512 5780b9fa2504b3fe0d426bc373d9e43babc642af402035bcdf453b71766adac9d9e903226a63ccac1edc4f90d44c61723f80ceb2fb0c8743702cc1b14da0491b
 AUX spectrwm-3.4.1_p20221224-fix-cflags-ldflags.patch 1126 BLAKE2B 5be199ba5324db6d2420453c3e8f492933d11e07746e665d91c48db6fc32eadd0930935acb71ce41985159977afdcacaf5546f99de57d472ab4c493aaabec659 SHA512 37e39380d8b322c733ab8665a1f92526461ac29f78ce130d605792a0d0a7caf1bdffd174812d0eae4c694e338b1fb095c844630a2844e78efc77dfa7b06f624b
-DIST spectrwm-3.4.1.tar.gz 164507 BLAKE2B 8047e639be3d4a07616f7ef3911765c5d6dd7dbd56c684453db90283faee08aac2cb9e3e20ae42f839582b67b778a4490a04fa21fc90fe489f798c40c517351e SHA512 94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6
 DIST spectrwm-3.4.1_p20221224.tar.gz 166161 BLAKE2B 62dddfea9b80727d47bdfe61e4bf5ae5996e7bcdcaf76a37c29a3a448fcf4d19f6eeed75d7c13ca2c1e5c093c79503f00dfdde239d5022e700e27f75b7157e39 SHA512 424acf589ab137bdb8b7c010c757fde40a53b7bf70dc1c0ccf0df7e4a5ffce360cab02933f6eb7191e57ba594f4c8a6e732ac4bb8da0684d3889e9448e704edb
-EBUILD spectrwm-3.4.1.ebuild 1210 BLAKE2B 723ed509fea0b900873ef62ebc7ff82b02fb7ba780dc989c5cc39ed41687ba5564f6a83f25899f2797683689158062d4c0d65698777191f06f9185cdc9c6364f SHA512 f5c6644ff6f537371329044d9a73ff54e21f817f70acf3c01139e63e79bfada27d2577e10e34788fea8db06e1c3284f3f7bf7a541350aababa49bc18ca03b9ed
+DIST spectrwm-efc458efa5730680a5ff3805f6cf9d88dc88748b.tar.gz 172141 BLAKE2B 0ae0f85dd40d170d3f68c8ab6763f251f3a901172a1bb39b0dbf45915c1f59044abd24c25f92b966efa0cee5824de6d4694012f98161438579891d70ee72faec SHA512 4e74585da0bfa65e83cc91786bf28ac5f61ddf1cbfb293064af802bd63c55e9bf9b78127e51ffc9348ea2ae77fc24503a6319e80438d9f72346c38636dcfb01a
 EBUILD spectrwm-3.4.1_p20221224.ebuild 1207 BLAKE2B 366ee716faf1ab3c6d9c9eaf472da1dbe91c683b0a9a4f2d30c78080dea7096d213da00a9b7295c51efb361624ef44efb32b22320531bdf5df7dc8a07e390bb1 SHA512 ea3ccff814a141cdd2b0dea45f423a0f4f4505f43e64f534019ed747c131f202b4f56f4c58c215199bf6b0c51cd051f326665b88f2da32fc95682282e94b7a7d
+EBUILD spectrwm-3.4.1_p20230310.ebuild 1259 BLAKE2B 0ece35693eb56c74768a47687f97c121216efd34a7c19b7ef415e79309746a62adc0b6087d979794046b7a6a04f900115c5cd62d5988643e5a458765c03ca602 SHA512 78c8ce8884a60b091ae92332355b1137b577b3cf783c5fe8a2913b7439a6084b3f3ee7edd44e2c87c640db832e12d34fe81ef791a63f5ceab1f1dd9746636fdd
 MISC metadata.xml 328 BLAKE2B 4f82bd35cf47d6791ea543bec20f7e510abba33f9de8bc8e0fe8176b0d3e908c30581a6083e90e6f0a2947ad3ffb6ff93d0e11030e68b8056451a017debfb377 SHA512 97e6057c3043db295d56ffd208c189cb5b575cf48f1cc9b78475f8055e59801fa8f7c8c1b8c9c090beb85e00365438c33831c87d9499e95495ee6287ecf7e4c4
diff --git a/x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch b/x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch
deleted file mode 100644
index 3b923b6a1256..000000000000
--- a/x11-wm/spectrwm/files/spectrwm-3.4.0-gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/files/spectrwm-3.4.1-musl.patch b/x11-wm/spectrwm/files/spectrwm-3.4.1-musl.patch
deleted file mode 100644
index 79c05c8e78a4..000000000000
--- a/x11-wm/spectrwm/files/spectrwm-3.4.1-musl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ur a/linux/linux.c b/linux/linux.c
---- a/linux/linux.c	2020-09-03 07:25:24.937163198 -0500
-+++ b/linux/linux.c	2020-09-03 07:25:35.470882700 -0500
-@@ -1,5 +1,4 @@
- #include <sys/types.h>
--#include <sys/cdefs.h>
- 
- #include <errno.h>
- #include <errno.h>
diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1_p20230310.ebuild
index 8628a4ce4ffe..b75adf5980fb 100644
--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.4.1_p20230310.ebuild
@@ -1,36 +1,38 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+COMMIT=efc458efa5730680a5ff3805f6cf9d88dc88748b
 inherit 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"
+SRC_URI="https://github.com/conformal/spectrwm/archive/${COMMIT}.tar.gz -> ${PN}-${COMMIT}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	x11-misc/dmenu
-"
 DEPEND="
 	elibc_musl? ( sys-libs/queue-standalone )
-	virtual/pkgconfig
+	x11-libs/libxcb
 	x11-libs/libX11
 	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXt
+	x11-libs/libXft
 	x11-libs/xcb-util
 	x11-libs/xcb-util-keysyms
 	x11-libs/xcb-util-wm
 "
+RDEPEND="
+	${DEPEND}
+	x11-misc/dmenu
+"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.4.0-gentoo.patch
-	"${FILESDIR}"/${PN}-3.4.1-musl.patch
+	"${FILESDIR}"/spectrwm-3.4.1_p20221224-fix-cflags-ldflags.patch
 )
-S=${WORKDIR}/${PN}-${PN^^}_${PV//./_}
+S=${WORKDIR}/${PN}-${COMMIT}
 
 src_prepare() {
 	sed -i -e '/LICENSE.md/d' linux/Makefile || die