1 |
commit: 08431ad2f1a967014f4c0e8bfb94103416c782a0 |
2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 29 09:07:12 2022 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 29 09:07:12 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08431ad2 |
7 |
|
8 |
x11-wm/selectwm: update EAPI 6 -> 8 |
9 |
|
10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
11 |
|
12 |
.../selectwm/files/selectwm-0.4.1-autotools.patch | 26 ++++++++++++++++++++++ |
13 |
x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch | 15 ------------- |
14 |
...wm-0.4.1-r1.ebuild => selectwm-0.4.1-r2.ebuild} | 25 ++++++++++++--------- |
15 |
3 files changed, 41 insertions(+), 25 deletions(-) |
16 |
|
17 |
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-autotools.patch b/x11-wm/selectwm/files/selectwm-0.4.1-autotools.patch |
18 |
new file mode 100644 |
19 |
index 000000000000..11dbcd3b94f0 |
20 |
--- /dev/null |
21 |
+++ b/x11-wm/selectwm/files/selectwm-0.4.1-autotools.patch |
22 |
@@ -0,0 +1,26 @@ |
23 |
+* Respect CFLAGS, don't strip binaries |
24 |
+* Don't check for configure.in (EAPI 8) |
25 |
+ |
26 |
+http://bugs.gentoo.org/252124 |
27 |
+ |
28 |
+--- a/configure.in |
29 |
++++ b/configure.in |
30 |
+@@ -1,6 +1,6 @@ |
31 |
+ dnl Process this file with autoconf to produce a configure script. |
32 |
+ |
33 |
+-AC_INIT(configure.in) |
34 |
++AC_INIT |
35 |
+ AM_INIT_AUTOMAKE(selectwm, 0.4.1) |
36 |
+ AM_CONFIG_HEADER(config.h) |
37 |
+ AM_MAINTAINER_MODE |
38 |
+--- a/src/Makefile.am |
39 |
++++ b/src/Makefile.am |
40 |
+@@ -10,5 +10,6 @@ |
41 |
+ modify.c modify.h \ |
42 |
+ misc.h define.h |
43 |
+ |
44 |
+-LIBS = @GTK_LIBS@ |
45 |
+-AM_CFLAGS = -s -O2 -Wall @GTK_CFLAGS@ -DLOCALEDIR=\"$(datadir)/locale\" |
46 |
++selectwm_LDADD = @GTK_LIBS@ |
47 |
++selectwm_CFLAGS = @GTK_CFLAGS@ |
48 |
++selectwm_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" |
49 |
|
50 |
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch b/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch |
51 |
deleted file mode 100644 |
52 |
index 4287ca2d2cbb..000000000000 |
53 |
--- a/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch |
54 |
+++ /dev/null |
55 |
@@ -1,15 +0,0 @@ |
56 |
-Respect CFLAGS, don't strip binaries |
57 |
- |
58 |
-http://bugs.gentoo.org/show_bug.cgi?id=252124 |
59 |
- |
60 |
---- a/src/Makefile.am |
61 |
-+++ b/src/Makefile.am |
62 |
-@@ -10,5 +10,6 @@ |
63 |
- modify.c modify.h \ |
64 |
- misc.h define.h |
65 |
- |
66 |
--LIBS = @GTK_LIBS@ |
67 |
--AM_CFLAGS = -s -O2 -Wall @GTK_CFLAGS@ -DLOCALEDIR=\"$(datadir)/locale\" |
68 |
-+selectwm_LDADD = @GTK_LIBS@ |
69 |
-+selectwm_CFLAGS = @GTK_CFLAGS@ |
70 |
-+selectwm_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" |
71 |
|
72 |
diff --git a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild b/x11-wm/selectwm/selectwm-0.4.1-r2.ebuild |
73 |
similarity index 60% |
74 |
rename from x11-wm/selectwm/selectwm-0.4.1-r1.ebuild |
75 |
rename to x11-wm/selectwm/selectwm-0.4.1-r2.ebuild |
76 |
index e06d7d38dc00..43301bdf930c 100644 |
77 |
--- a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild |
78 |
+++ b/x11-wm/selectwm/selectwm-0.4.1-r2.ebuild |
79 |
@@ -1,7 +1,8 @@ |
80 |
-# Copyright 1999-2019 Gentoo Authors |
81 |
+# Copyright 1999-2022 Gentoo Authors |
82 |
# Distributed under the terms of the GNU General Public License v2 |
83 |
|
84 |
-EAPI=6 |
85 |
+EAPI=8 |
86 |
+ |
87 |
inherit autotools |
88 |
|
89 |
DESCRIPTION="window manager selector tool" |
90 |
@@ -13,17 +14,16 @@ SLOT="2" |
91 |
KEYWORDS="amd64 ppc sparc x86" |
92 |
IUSE="nls" |
93 |
|
94 |
-DOCS=( AUTHORS README sample.xinitrc ) |
95 |
- |
96 |
-RDEPEND="x11-libs/gtk+:2 |
97 |
+RDEPEND=" |
98 |
+ x11-libs/gtk+:2 |
99 |
dev-libs/glib:2" |
100 |
-DEPEND="${RDEPEND} |
101 |
- virtual/pkgconfig" |
102 |
+DEPEND="${RDEPEND}" |
103 |
+BDEPEND="virtual/pkgconfig" |
104 |
|
105 |
PATCHES=( |
106 |
- "${FILESDIR}/${P}-enable-deprecated-gtk.patch" |
107 |
- "${FILESDIR}/${P}-glibc-2.10.patch" |
108 |
- "${FILESDIR}/${P}-nostrip.patch" |
109 |
+ "${FILESDIR}"/${P}-enable-deprecated-gtk.patch |
110 |
+ "${FILESDIR}"/${P}-glibc-2.10.patch |
111 |
+ "${FILESDIR}"/${P}-autotools.patch |
112 |
) |
113 |
|
114 |
src_prepare() { |
115 |
@@ -36,3 +36,8 @@ src_configure() { |
116 |
--program-suffix=2 \ |
117 |
$(use_enable nls) |
118 |
} |
119 |
+ |
120 |
+src_install() { |
121 |
+ default |
122 |
+ dodoc sample.xinitrc |
123 |
+} |