gentoo resync : 28.04.2021

4 files changed, 6 insertions, 84 deletions

diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
index 39d0f5b10292..ed54dbbfc45f 100644
--- a/x11-wm/spectrwm/Manifest
+++ b/x11-wm/spectrwm/Manifest
@@ -1,8 +1,5 @@
-AUX spectrwm-3.1.0-Makefile.patch 977 BLAKE2B 1f76bc331ee1d048387ab82900b44339e092986a793f5d03fa317f4247987ebb8ede090c0b157ae508d2a3ed05a374a9d06910e99fa9c5dd6df2169c54cfc3b3 SHA512 5d2be769544e4446e4e6780793bd61fe88a63c26b865d79e19892aca4734e600f16d55184b2e35d3f8e0d8456ac0c5c229854fcd607bd32c036a4397150ce118
 AUX spectrwm-3.4.0-gentoo.patch 1134 BLAKE2B 01f472388c38b276fc91747cb1e06bf4709b1a53caacd1e16f3ef7d0817eb3d127aac76c665e92d05c41c9f01ce8b79525dd0bacbeecdd5d36c1d012bcdcb1c5 SHA512 9c8450fcdd198dd0ef88d13c38edb0cc48c7324cc8a3b3e2c331d9ca5608cfa9fa041b9cae466429e8b77fcb9eb28a29d484590106ea604f27163d07ee428508
 AUX spectrwm-3.4.1-musl.patch 259 BLAKE2B 61dde875af4c9fb8be72a098debe0ac00174ee4bf15c727778d37f80f844a60834959c8ab6f2f15200e4fb5968528f06c03a18fa4d89d074ffe1f32eb7fbfd8c SHA512 5780b9fa2504b3fe0d426bc373d9e43babc642af402035bcdf453b71766adac9d9e903226a63ccac1edc4f90d44c61723f80ceb2fb0c8743702cc1b14da0491b
-DIST spectrwm-3.1.0.tar.gz 147206 BLAKE2B abcce22bc7859dbcc109f02ea832d65091c842562579d47cd1dd83c5de82a015b02343972d4d85cf291b63bfbaf0e901616cca94d911014672ffc35436bdd3c1 SHA512 dd8e16361b979a55b210a88a1ae5d53e7086fd854e92320e09b6407d374580cc271c0e974e38606481ab57a504a86e16293edee967d251b043a1eb65e8c77687
 DIST spectrwm-3.4.1.tar.gz 164507 BLAKE2B 8047e639be3d4a07616f7ef3911765c5d6dd7dbd56c684453db90283faee08aac2cb9e3e20ae42f839582b67b778a4490a04fa21fc90fe489f798c40c517351e SHA512 94d468833124b51fa12b29b173126f10f27dd551d599459e4bea589721b3df6f1f0af0ea67326ed3ad462e1203d3bbcb82032ff83abfa0943ec45afd29dedaa6
-EBUILD spectrwm-3.1.0.ebuild 1132 BLAKE2B dacd1cfb94ef799132eef7ee5d7f0c4d521b417529403ca81c4657074df5e61f52af0bd3baee5d53a8652f8e5456fb835ae9c11320a902b99cbb4eb97e7bf06e SHA512 b31a2e6cd77ae1117929f063f8b6cc7cd3a0167189fd3fd86d95254ea91bc6173414b7354af029d2671e08b6f62c9f0cefccc509ea89108fdb562fdf906096bf
-EBUILD spectrwm-3.4.1.ebuild 1164 BLAKE2B fcbd535dd17560efb09016fc30ff0ef4a2b4375a24412ecfa118fa734c06a163dfa90c9c201ef778dc96482093e6534169bad2518ca1e1904eadbdfe03abd4d8 SHA512 2bf7269931f1cf435f6794333396c71a1c1c9a15f08c2c3d304fd0a138b0ed85b35671b7304179147c148bbc0fcd90eaee4eedc6c84b1a999d120aa136611740
+EBUILD spectrwm-3.4.1.ebuild 1178 BLAKE2B 320c66c5585f60206318568ff6b5b43878cf0b940ec5ad250bf43aeee4d222cdef06f24075b8461f1ae7e05b65de01f85f75928f3cd023ec41adfe17871d6fa8 SHA512 a4a74677a018f361a14cbef154b480f6135903efda8009754753412493a1df2d989ff4a4b98a678fd9d0dc36e3323403ad74345d7c301e92d891ef0f9255d593
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
deleted file mode 100644
index c1162fb73610..000000000000
--- a/x11-wm/spectrwm/files/spectrwm-3.1.0-Makefile.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- 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)
- 
--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-xtest xcursor xft)
- BIN_LDLIBS   = $(shell pkg-config --libs   x11 x11-xcb xcb-icccm xcb-keysyms xcb-randr xcb-util xcb-xtest xcursor xft)
- LIB_CFLAGS   = -fPIC
diff --git a/x11-wm/spectrwm/spectrwm-3.1.0.ebuild b/x11-wm/spectrwm/spectrwm-3.1.0.ebuild
deleted file mode 100644
index f6038f78ba8c..000000000000
--- a/x11-wm/spectrwm/spectrwm-3.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs vcs-snapshot
-
-DESCRIPTION="Small dynamic tiling window manager for X11"
-HOMEPAGE="https://github.com/conformal/spectrwm"
-SRC_URI="https://github.com/conformal/${PN}/archive/SPECTRWM_${PV//./_}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="x11-misc/dmenu"
-DEPEND="${DEPEND}
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXrandr
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	!x11-wm/scrotwm"
-
-S=${WORKDIR}/${P}/linux
-
-PATCHES=( "${FILESDIR}"/${P}-Makefile.patch )
-
-src_prepare() {
-	default
-	tc-export CC
-}
-
-src_compile() {
-	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)"
-}
-
-src_install() {
-	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" DESTDIR="${D}" install
-
-	cd "${WORKDIR}"/${P} || die
-
-	insinto /etc
-	doins ${PN}.conf
-	dodoc ${PN}_*.conf {initscreen,screenshot}.sh
-
-	make_session_desktop ${PN} ${PN}
-
-	elog "Example keyboard config and helpful scripts can be found"
-	elog "in ${ROOT}usr/share/doc/${PF}"
-}
diff --git a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
index 9f77e6443e36..3836663ba0ba 100644
--- a/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
+++ b/x11-wm/spectrwm/spectrwm-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,11 +13,11 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 
 RDEPEND="
-	!x11-wm/scrotwm
 	x11-misc/dmenu
 "
 DEPEND="
 	elibc_musl? ( sys-libs/queue-standalone )
+	virtual/pkgconfig
 	x11-libs/libX11
 	x11-libs/libXcursor
 	x11-libs/libXrandr
@@ -37,12 +37,12 @@ src_prepare() {
 
 src_compile() {
 	tc-export CC PKG_CONFIG
-	emake -C linux PREFIX="${EROOT}/usr" LIBDIR="${EROOT}/usr/$(get_libdir)"
+	emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/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}" \
+	emake -C linux PREFIX="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		SYSCONFDIR="${EPREFIX}/etc" DOCDIR="${EPREFIX}/usr/share/doc/${P}" \
 		DESTDIR="${D}" install
 
 	dodoc README.md ${PN}_*.conf {initscreen,screenshot}.sh