gentoo resync : 29.12.2022

4 files changed, 43 insertions, 27 deletions

diff --git a/x11-wm/selectwm/Manifest b/x11-wm/selectwm/Manifest
index 4158098a568a..c113d6a8d13c 100644
--- a/x11-wm/selectwm/Manifest
+++ b/x11-wm/selectwm/Manifest
@@ -1,6 +1,6 @@
+AUX selectwm-0.4.1-autotools.patch 662 BLAKE2B 98c515fd9e7eae9f3882c051a20a43bf84308309ab2890279532b608fc2a4b08e37d3ce72b264911d80627a3deb778c0335775a14ac3b5f0dc93fbdd531006bf SHA512 4b6b9100728c13c538f2acc23b28d33357c68085c3f6abc03a9aa01a2fe470a063acf3a3c97ef39d9afac81c318dac9383ed500d6bf3ef26bf72ecdee31b8fb8
 AUX selectwm-0.4.1-enable-deprecated-gtk.patch 299 BLAKE2B 8cd466ad4d7effdfc68831c6891c79ac2e2e97ab274e758cc5f56c7d1f16972514c3284034985497c62e0b39cafceec1717784b1198fa4e98855c7edd994f565 SHA512 154be35f4310e46708824312c53a4d6b942d80dd570ae2bafcdb6ffdc27eebfbdf518e2afb775d1c0014c6c521e4ae7b2177f2540a41e10a88412993746f04c1
 AUX selectwm-0.4.1-glibc-2.10.patch 677 BLAKE2B 4048952ab652e87b1d2520c5e725cfead0a8e6904b75f5bbabcacc49c94eb5e51c10ce74e3a2ca568b902cffff7e9ef3239ebbd96d9f8f436143451948b6c3f4 SHA512 dd477395578142bfa89a36d3f9f8c669f2a40d4867ef8ba366333bb1c107da4d2286d7ed1e357c3b78653213de5938955f52aa6e275ebb9cf5db0acd3bdcfcf9
-AUX selectwm-0.4.1-nostrip.patch 397 BLAKE2B 457e901557d8229a7f36a7334d3b3fa94f58ff3dd73cb30102d3bae54d08939372052022635f1a262e0c0682d258d365d118c8b9e3b0bba3b30b573b75b9e720 SHA512 741872c826c8ba44da29eeb9701792beb13a0c0a45dd59162c718408a5286876686b02abe301d21d4839aaad28dd993a3c5cf66fdb0d722062fbc0df4f5374bc
 DIST selectwm-0.4.1.tar.bz2 151454 BLAKE2B 849775ff0b5f860256fde9fd69b4a309c856089a8fabe0c8e97bbcd2a010db2ed7adfdce26c88922adf668828d5ab8ef41c7e4732b184cc9ac247fde4e2bff24 SHA512 3ddc4c1560d317ecb6e8e041d63415d16d31b67b4651d9e33fbe3e76a63754b78a86d332077ec091317e985dbedd903c9fdca46eb7cb650ad693039b8f4ab1ea
-EBUILD selectwm-0.4.1-r1.ebuild 704 BLAKE2B 4c3ba1949cb189b909f19abcb72f86ae3e44afa666186ea145d534361c87cb2009ec1bc49314f16724ecf230a8bd52d3c61bba02cdd1d9beab5905c967294415 SHA512 7d39ed81e69c0593003872b7a47ace9cf263bb615446d5c642ffd3f5c20124df897b9ff3be7f52fb42364f570dde4e9748d458452bdd365187406984da3c9f48
+EBUILD selectwm-0.4.1-r2.ebuild 728 BLAKE2B 8ccaae315a2aab221a32933459d06243b488d8c473634f1e31bfbfe5c00d3097ec02a7cdf5707a0fc516aa3c26c2bef33b3e958f535007c0c629e2443dcfbc36 SHA512 46e3894e2e952e7c87371a61fca82af787ec97d452f62bbee70af1378ae35e288bd2e2d1d09328f590355ba21ece18ce420e85f22dcafea3cd3c715c1b19802f
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-autotools.patch b/x11-wm/selectwm/files/selectwm-0.4.1-autotools.patch
new file mode 100644
index 000000000000..11dbcd3b94f0
--- /dev/null
+++ b/x11-wm/selectwm/files/selectwm-0.4.1-autotools.patch
@@ -0,0 +1,26 @@
+* Respect CFLAGS, don't strip binaries
+* Don't check for configure.in (EAPI 8)
+
+http://bugs.gentoo.org/252124
+
+--- a/configure.in
++++ b/configure.in
+@@ -1,6 +1,6 @@
+ dnl Process this file with autoconf to produce a configure script.
+ 
+-AC_INIT(configure.in)
++AC_INIT
+ AM_INIT_AUTOMAKE(selectwm, 0.4.1)
+ AM_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,5 +10,6 @@
+ 	modify.c modify.h \
+ 	misc.h define.h
+ 
+-LIBS = @GTK_LIBS@
+-AM_CFLAGS = -s -O2 -Wall @GTK_CFLAGS@ -DLOCALEDIR=\"$(datadir)/locale\"
++selectwm_LDADD = @GTK_LIBS@
++selectwm_CFLAGS = @GTK_CFLAGS@
++selectwm_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch b/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch
deleted file mode 100644
index 4287ca2d2cbb..000000000000
--- a/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Respect CFLAGS, don't strip binaries
-
-http://bugs.gentoo.org/show_bug.cgi?id=252124
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -10,5 +10,6 @@
- 	modify.c modify.h \
- 	misc.h define.h
- 
--LIBS = @GTK_LIBS@
--AM_CFLAGS = -s -O2 -Wall @GTK_CFLAGS@ -DLOCALEDIR=\"$(datadir)/locale\"
-+selectwm_LDADD = @GTK_LIBS@
-+selectwm_CFLAGS = @GTK_CFLAGS@
-+selectwm_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\"
diff --git a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild b/x11-wm/selectwm/selectwm-0.4.1-r2.ebuild
index e06d7d38dc00..43301bdf930c 100644
--- a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
+++ b/x11-wm/selectwm/selectwm-0.4.1-r2.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools
 
 DESCRIPTION="window manager selector tool"
@@ -13,17 +14,16 @@ SLOT="2"
 KEYWORDS="amd64 ppc sparc x86"
 IUSE="nls"
 
-DOCS=( AUTHORS README sample.xinitrc )
-
-RDEPEND="x11-libs/gtk+:2
+RDEPEND="
+	x11-libs/gtk+:2
 	dev-libs/glib:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-enable-deprecated-gtk.patch"
-	"${FILESDIR}/${P}-glibc-2.10.patch"
-	"${FILESDIR}/${P}-nostrip.patch"
+	"${FILESDIR}"/${P}-enable-deprecated-gtk.patch
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${P}-autotools.patch
 )
 
 src_prepare() {
@@ -36,3 +36,8 @@ src_configure() {
 		--program-suffix=2 \
 		$(use_enable nls)
 }
+
+src_install() {
+	default
+	dodoc sample.xinitrc
+}