Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/cwm/files/, x11-wm/cwm/
Date: Tue, 28 Dec 2021 17:10:39
Message-Id: 1640711153.eb077c974defa58803858d39455340824a26c5dc.ionen@gentoo
1 commit: eb077c974defa58803858d39455340824a26c5dc
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Tue Dec 28 14:36:56 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Tue Dec 28 17:05:53 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb077c97
7
8 x11-wm/cwm: drop 6.6
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 x11-wm/cwm/Manifest | 1 -
13 x11-wm/cwm/cwm-6.6.ebuild | 44 -------------------------------------
14 x11-wm/cwm/files/cwm-Makefile.patch | 19 ----------------
15 3 files changed, 64 deletions(-)
16
17 diff --git a/x11-wm/cwm/Manifest b/x11-wm/cwm/Manifest
18 index b51173f2d84f..400e19579f1e 100644
19 --- a/x11-wm/cwm/Manifest
20 +++ b/x11-wm/cwm/Manifest
21 @@ -1,2 +1 @@
22 -DIST cwm-6.6.tar.gz 53062 BLAKE2B 3da762f0c1a48c83c773a1f355cc970c5e4f6100e7294a00f44c6b5b7e1ffe954fde0e3d106991b05cd1f8c898fe055b5305b0bd7bf533df5868d32adbae2c5f SHA512 ff94fd1b7d263f9de538e5b338db58a08e1bec3e4233b84ab0a3ac94c47a45e10b2c772f93b897e70baf9a3c04e1a6fa04604ac71655acb7ebd1d10edb381042
23 DIST cwm-6.7.tar.gz 53172 BLAKE2B 9e8c6503235ee71f3974a4e64cf45b80675b6ff33a68505b07f003c8d711a68a158f31147f463d5467bb4242c6321ebe0acaee63727689a136ca83c47e7592ea SHA512 5ad0fa56d9c96c36cc32e68128e58d4e3a7483f349bb26be1083c5b5c6d853ff05eec1a783b07ed928bd99a35a2e0b2d7053fc89b828aa9bdfe3589a318c4171
24
25 diff --git a/x11-wm/cwm/cwm-6.6.ebuild b/x11-wm/cwm/cwm-6.6.ebuild
26 deleted file mode 100644
27 index 287fd7fcdde3..000000000000
28 --- a/x11-wm/cwm/cwm-6.6.ebuild
29 +++ /dev/null
30 @@ -1,44 +0,0 @@
31 -# Copyright 1999-2021 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -inherit desktop toolchain-funcs
37 -
38 -DESCRIPTION="OpenBSD fork of calmwm, a clean and lightweight window manager"
39 -HOMEPAGE="https://www.openbsd.org/cgi-bin/cvsweb/xenocara/app/cwm/
40 - https://github.com/chneukirchen/cwm"
41 -
42 -if [[ ${PV} == 9999 ]]; then
43 - inherit git-r3
44 - EGIT_REPO_URI="https://github.com/leahneukirchen/${PN}.git"
45 -else
46 - SRC_URI="https://github.com/leahneukirchen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
47 - KEYWORDS="amd64 arm ~arm64 x86"
48 -fi
49 -
50 -LICENSE="ISC"
51 -SLOT="0"
52 -
53 -RDEPEND="x11-libs/libXft
54 - x11-libs/libXinerama
55 - x11-libs/libXrandr
56 -"
57 -DEPEND="${RDEPEND}"
58 -BDEPEND="sys-devel/bison
59 - virtual/pkgconfig
60 -"
61 -
62 -PATCHES=(
63 - "${FILESDIR}/${PN}-Makefile.patch"
64 -)
65 -
66 -src_compile() {
67 - emake CFLAGS="${CFLAGS} -D_GNU_SOURCE" CC="$(tc-getCC)" PKG_CONFIG="$(tc-getPKG_CONFIG)"
68 -}
69 -
70 -src_install() {
71 - emake DESTDIR="${D}" PREFIX=/usr install
72 - dodoc README
73 - make_session_desktop ${PN} ${PN}
74 -}
75
76 diff --git a/x11-wm/cwm/files/cwm-Makefile.patch b/x11-wm/cwm/files/cwm-Makefile.patch
77 deleted file mode 100644
78 index fc26a3808876..000000000000
79 --- a/x11-wm/cwm/files/cwm-Makefile.patch
80 +++ /dev/null
81 @@ -1,19 +0,0 @@
82 ---- a/Makefile
83 -+++ b/Makefile
84 -@@ -13,12 +13,14 @@ OBJS= calmwm.o screen.o xmalloc.o client.o menu.o \
85 - search.o util.o xutil.o conf.o xevents.o group.o \
86 - kbfunc.o strlcpy.o strlcat.o y.tab.o \
87 - strtonum.o reallocarray.o
88 -+
89 -+PKG_CONFIG?= pkg-config
90 -
91 --CPPFLAGS+= `pkg-config --cflags x11 xft xrandr`
92 -+CPPFLAGS+= `${PKG_CONFIG} --cflags x11 xft xrandr`
93 -
94 - CFLAGS?= -Wall -O2 -g -D_GNU_SOURCE
95 -
96 --LDFLAGS+= `pkg-config --libs x11 xft xrandr`
97 -+LDFLAGS+= `${PKG_CONFIG} --libs x11 xft xrandr`
98 -
99 - MANPREFIX?= ${PREFIX}/share/man
100 -