* [gentoo-commits] repo/gentoo:master commit in: x11-wm/selectwm/files/, x11-wm/selectwm/
@ 2018-04-14 18:47 Aaron Bauman
0 siblings, 0 replies; 2+ messages in thread
From: Aaron Bauman @ 2018-04-14 18:47 UTC (permalink / raw
To: gentoo-commits
commit: ef227b56a0e6f8ca917628a5274114fb0d2c4709
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Apr 14 15:09:53 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 14 18:47:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef227b56
x11-wm/selectwm: EAPI6, use HTTPS, update patch, update LICENSE
Closes: https://github.com/gentoo/gentoo/pull/7717
x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch | 4 +--
x11-wm/selectwm/selectwm-0.4.1-r1.ebuild | 38 ++++++++++++++++++++++
x11-wm/selectwm/selectwm-0.4.1.ebuild | 6 ++--
3 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch b/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch
index d5300c9f94a..4287ca2d2cb 100644
--- a/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch
+++ b/x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch
@@ -2,8 +2,8 @@ Respect CFLAGS, don't strip binaries
http://bugs.gentoo.org/show_bug.cgi?id=252124
---- src/Makefile.am
-+++ src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
@@ -10,5 +10,6 @@
modify.c modify.h \
misc.h define.h
diff --git a/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild b/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
new file mode 100644
index 00000000000..c5ee2b776ca
--- /dev/null
+++ b/x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="window manager selector tool"
+HOMEPAGE="https://ordiluc.net/selectwm"
+SRC_URI="https://ordiluc.net/selectwm/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="2"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="nls"
+
+DOCS=( AUTHORS README sample.xinitrc )
+
+RDEPEND="x11-libs/gtk+:2
+ dev-libs/glib:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${P}-enable-deprecated-gtk.patch"
+ "${FILESDIR}/${P}-glibc-2.10.patch"
+ "${FILESDIR}/${P}-nostrip.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --program-suffix=2 \
+ $(use_enable nls)
+}
diff --git a/x11-wm/selectwm/selectwm-0.4.1.ebuild b/x11-wm/selectwm/selectwm-0.4.1.ebuild
index ac8889b0e7f..2d148c69907 100644
--- a/x11-wm/selectwm/selectwm-0.4.1.ebuild
+++ b/x11-wm/selectwm/selectwm-0.4.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit autotools eutils
DESCRIPTION="window manager selector tool"
-HOMEPAGE="http://ordiluc.net/selectwm"
-SRC_URI="http://ordiluc.net/selectwm/${P}.tar.bz2"
+HOMEPAGE="https://ordiluc.net/selectwm"
+SRC_URI="https://ordiluc.net/selectwm/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="2"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-wm/selectwm/files/, x11-wm/selectwm/
@ 2022-06-29 9:07 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2022-06-29 9:07 UTC (permalink / raw
To: gentoo-commits
commit: 08431ad2f1a967014f4c0e8bfb94103416c782a0
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 29 09:07:12 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 09:07:12 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08431ad2
x11-wm/selectwm: update EAPI 6 -> 8
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../selectwm/files/selectwm-0.4.1-autotools.patch | 26 ++++++++++++++++++++++
x11-wm/selectwm/files/selectwm-0.4.1-nostrip.patch | 15 -------------
...wm-0.4.1-r1.ebuild => selectwm-0.4.1-r2.ebuild} | 25 ++++++++++++---------
3 files changed, 41 insertions(+), 25 deletions(-)
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
similarity index 60%
rename from x11-wm/selectwm/selectwm-0.4.1-r1.ebuild
rename to 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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-06-29 9:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-14 18:47 [gentoo-commits] repo/gentoo:master commit in: x11-wm/selectwm/files/, x11-wm/selectwm/ Aaron Bauman
-- strict thread matches above, loose matches on Subject: below --
2022-06-29 9:07 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox