Gentoo Archives: gentoo-commits

From: Michael Weber <xmw@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-wm/spectrwm/files/, x11-wm/spectrwm/
Date: Thu, 05 May 2016 13:14:17
Message-Id: 1462454030.ad47b7951353615354f86bf326107f9a980a7f70.xmw@gentoo
1 commit: ad47b7951353615354f86bf326107f9a980a7f70
2 Author: Michael Weber <xmw <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 5 13:13:28 2016 +0000
4 Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
5 CommitDate: Thu May 5 13:13:50 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad47b795
7
8 x11-wm/spectrwm: drop old.
9
10 Package-Manager: portage-2.2.28
11
12 x11-wm/spectrwm/Manifest | 1 -
13 .../spectrwm/files/spectrwm-2.0.2-makefile.patch | 23 -----------
14 .../spectrwm/files/spectrwm-2.1.0-makefile.patch | 23 -----------
15 .../spectrwm/files/spectrwm-2.3.0-Makefile.patch | 36 -----------------
16 .../spectrwm/files/spectrwm-2.4.0-Makefile.patch | 17 --------
17 .../spectrwm/files/spectrwm-2.5.0-Makefile.patch | 20 ----------
18 x11-wm/spectrwm/spectrwm-2.6.2.ebuild | 45 ----------------------
19 7 files changed, 165 deletions(-)
20
21 diff --git a/x11-wm/spectrwm/Manifest b/x11-wm/spectrwm/Manifest
22 index b6cd730..25724df 100644
23 --- a/x11-wm/spectrwm/Manifest
24 +++ b/x11-wm/spectrwm/Manifest
25 @@ -1,2 +1 @@
26 -DIST spectrwm-2.6.2.tgz 124215 SHA256 eb9b33ee05b0625d59607f886d9ba7f0723bd863b503d66bdb592f5461c59459 SHA512 f1962df679ca07ca7d8c68a2d0b88331eda5c7cd35ecf1a5a63687984c1c67ef48fffb4e29d273fb1ccef9c9bb77a5ab12a09ef27b1d97abdc87dc20f38717f5 WHIRLPOOL 9bddfbb242c3ebcd79aea2730406783e86ec2669601d47c26918f467935df3c64ad1055376e4f63aaf376771d3f89ebc51eea6004d188da617c85f35baf9caee
27 DIST spectrwm-2.7.2.tgz 132554 SHA256 b56cffa01ee2c58515350c1be1940140286fd18778659c6f5ada4595319f97cb SHA512 cebb0e42566125933bf2c4c9200765d360bb572fd953c510ad39e7abcf9cc507e61420441234fb1bb44d06d28526ba6c594272c173a04181d2c6798e404b7421 WHIRLPOOL 5ab24d2866d6a252c03a72fae3e0dd914f6c2041185088da5beb4c7a4a0ee5ec0c3b55cff32bef5f10f159ae1a5e66a6a217a3d67cba2d17ed324145a05391c7
28
29 diff --git a/x11-wm/spectrwm/files/spectrwm-2.0.2-makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.0.2-makefile.patch
30 deleted file mode 100644
31 index 6fa2d35..0000000
32 --- a/x11-wm/spectrwm/files/spectrwm-2.0.2-makefile.patch
33 +++ /dev/null
34 @@ -1,23 +0,0 @@
35 ---- spectrwm-2.0.2/linux/Makefile
36 -+++ spectrwm-2.0.2/linux/Makefile
37 -@@ -1,5 +1,5 @@
38 --CFLAGS+= -Wall -Wextra -Wshadow -g -D_GNU_SOURCE -I. -I/usr/include/freetype2
39 --CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
40 -+CFLAGS+= -Wall -Wextra -Wshadow -D_GNU_SOURCE -I. -I/usr/include/freetype2
41 -+CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
42 - LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
43 -
44 - PREFIX?= /usr/local
45 -@@ -29,10 +29,10 @@
46 - $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
47 -
48 - %.so: %.c
49 -- $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
50 -+ $(CC) $(CFLAGS) $(LDFLAGS) -c -fpic -DPIC $+ -o $@
51 -
52 - libswmhack.so.$(LVERS): swm_hack.so
53 -- $(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
54 -+ $(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
55 -
56 - install: all
57 - install -m 755 -d $(DESTDIR)$(BINDIR)
58
59 diff --git a/x11-wm/spectrwm/files/spectrwm-2.1.0-makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.1.0-makefile.patch
60 deleted file mode 100644
61 index 97a9689..0000000
62 --- a/x11-wm/spectrwm/files/spectrwm-2.1.0-makefile.patch
63 +++ /dev/null
64 @@ -1,23 +0,0 @@
65 ---- spectrwm-2.1.0/linux/Makefile
66 -+++ spectrwm-2.1.0/linux/Makefile
67 -@@ -1,5 +1,5 @@
68 --CFLAGS+= -std=c99 -Wall -Wextra -Wmissing-prototypes -Wshadow -g -D_GNU_SOURCE -I. -I/usr/include/freetype2
69 --CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
70 -+CFLAGS+= -std=c99 -Wall -Wextra -Wmissing-prototypes -Wshadow -D_GNU_SOURCE -I. -I/usr/include/freetype2
71 -+CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
72 - LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
73 -
74 - PREFIX?= /usr/local
75 -@@ -29,10 +29,10 @@
76 - $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
77 -
78 - %.so: %.c
79 -- $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
80 -+ $(CC) $(CFLAGS) $(LDFLAGS) -c -fpic -DPIC $+ -o $@
81 -
82 - libswmhack.so.$(LVERS): swm_hack.so
83 -- $(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
84 -+ $(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
85 -
86 - install: all
87 - install -m 755 -d $(DESTDIR)$(BINDIR)
88
89 diff --git a/x11-wm/spectrwm/files/spectrwm-2.3.0-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.3.0-Makefile.patch
90 deleted file mode 100644
91 index 2b04953..0000000
92 --- a/x11-wm/spectrwm/files/spectrwm-2.3.0-Makefile.patch
93 +++ /dev/null
94 @@ -1,36 +0,0 @@
95 ---- spectrwm-2.3.0/linux/Makefile
96 -+++ spectrwm-2.3.0/linux/Makefile
97 -@@ -1,5 +1,5 @@
98 --CFLAGS+= -std=c99 -Wall -Wextra -Wmissing-prototypes -Wshadow -g -D_GNU_SOURCE -I. -I/usr/include/freetype2
99 --CFLAGS+= -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
100 -+CFLAGS+= -std=c99 -Wall -Wextra -Wmissing-prototypes -Wshadow -D_GNU_SOURCE -I. -I/usr/include/freetype2
101 -+CFLAGS+= -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
102 - LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
103 -
104 - PREFIX?= /usr/local
105 -@@ -29,10 +29,10 @@
106 - $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
107 -
108 - %.so: %.c
109 -- $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
110 -+ $(CC) $(CFLAGS) $(LDFLAGS) -c -fpic -DPIC $+ -o $@
111 -
112 - libswmhack.so.$(LVERS): swm_hack.so
113 -- $(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
114 -+ $(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
115 -
116 - install: all
117 - install -m 755 -d $(DESTDIR)$(BINDIR)
118 -@@ -45,9 +45,9 @@
119 - install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1
120 - install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1
121 - install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1
122 -- ln -sf $(BINDIR)/spectrwm $(DESTDIR)$(BINDIR)/scrotwm
123 -- ln -sf $(LIBDIR)/libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so.0
124 -- ln -sf $(LIBDIR)/libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so
125 -+ ln -sf spectrwm $(DESTDIR)$(BINDIR)/scrotwm
126 -+ ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so.0
127 -+ ln -sf libswmhack.so.0.0 $(DESTDIR)$(LIBDIR)/libswmhack.so
128 -
129 - clean:
130 - rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h
131
132 diff --git a/x11-wm/spectrwm/files/spectrwm-2.4.0-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.4.0-Makefile.patch
133 deleted file mode 100644
134 index 405a6a3..0000000
135 --- a/x11-wm/spectrwm/files/spectrwm-2.4.0-Makefile.patch
136 +++ /dev/null
137 @@ -1,17 +0,0 @@
138 ---- spectrwm-2.4.0/linux/Makefile
139 -+++ spectrwm-2.4.0/linux/Makefile
140 -@@ -1,4 +1,4 @@
141 --CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
142 -+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized
143 - CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"libswmhack.so.$(LVERS)\"
144 - LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
145 -
146 -@@ -29,7 +29,7 @@
147 - $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
148 -
149 - %.so: %.c
150 -- $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
151 -+ $(CC) $(CFLAGS) $(LDFLAGS) -c -fpic -DPIC $+ -o $@
152 -
153 - libswmhack.so.$(LVERS): swm_hack.so
154 - $(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
155
156 diff --git a/x11-wm/spectrwm/files/spectrwm-2.5.0-Makefile.patch b/x11-wm/spectrwm/files/spectrwm-2.5.0-Makefile.patch
157 deleted file mode 100644
158 index 2748651..0000000
159 --- a/x11-wm/spectrwm/files/spectrwm-2.5.0-Makefile.patch
160 +++ /dev/null
161 @@ -1,20 +0,0 @@
162 ---- spectrwm-2.5.0/linux/Makefile
163 -+++ spectrwm-2.5.0/linux/Makefile
164 -@@ -5,7 +5,7 @@
165 -
166 - LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor)
167 -
168 --CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized -g
169 -+CFLAGS+= -std=c99 -Wmissing-prototypes -Wall -Wextra -Wshadow -Wno-uninitialized
170 - CFLAGS+= -D_GNU_SOURCE -I. -I/usr/include/freetype2 -DSWM_LIB=\"$(LIBDIR)/libswmhack.so.$(LVERS)\"
171 - LDADD+= -lX11 -lX11-xcb -lxcb -lxcb-icccm -lxcb-randr -lxcb-keysyms -lxcb-util -lxcb-xtest -lXft -lXcursor
172 -
173 -@@ -29,7 +29,7 @@
174 - $(CC) $(LDFLAGS) -o $@ $+ $(LDADD)
175 -
176 - %.so: %.c
177 -- $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@
178 -+ $(CC) $(CFLAGS) $(LDFLAGS) -c -fpic -DPIC $+ -o $@
179 -
180 - libswmhack.so.$(LVERS): swm_hack.so
181 - $(CC) $(LDFLAGS) -Wl,-soname,$@ -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD)
182
183 diff --git a/x11-wm/spectrwm/spectrwm-2.6.2.ebuild b/x11-wm/spectrwm/spectrwm-2.6.2.ebuild
184 deleted file mode 100644
185 index 5750567..0000000
186 --- a/x11-wm/spectrwm/spectrwm-2.6.2.ebuild
187 +++ /dev/null
188 @@ -1,45 +0,0 @@
189 -# Copyright 1999-2015 Gentoo Foundation
190 -# Distributed under the terms of the GNU General Public License v2
191 -# $Id$
192 -
193 -EAPI=4
194 -
195 -inherit eutils multilib toolchain-funcs
196 -
197 -DESCRIPTION="Small dynamic tiling window manager for X11"
198 -HOMEPAGE="https://opensource.conformal.com/wiki/spectrwm"
199 -SRC_URI="http://opensource.conformal.com/snapshots/${PN}/${P}.tgz"
200 -
201 -LICENSE="ISC"
202 -SLOT="0"
203 -KEYWORDS="amd64 x86"
204 -IUSE=""
205 -
206 -RDEPEND="x11-misc/dmenu"
207 -DEPEND="${DEPEND}
208 - x11-libs/libX11
209 - x11-libs/libXcursor
210 - x11-libs/libXrandr
211 - x11-libs/libXtst
212 - x11-libs/xcb-util
213 - !x11-wm/scrotwm"
214 -
215 -S=${WORKDIR}/${P}/linux
216 -
217 -src_prepare() {
218 - epatch "${FILESDIR}"/${P}-Makefile.patch
219 - tc-export CC
220 -}
221 -
222 -src_install() {
223 - emake PREFIX="${D}"/usr LIBDIR="${D}usr/$(get_libdir)" install
224 -
225 - cd "${WORKDIR}"/${P} || die
226 -
227 - insinto /etc
228 - doins ${PN}.conf
229 - dodoc ${PN}_*.conf {initscreen,screenshot}.sh
230 -
231 - elog "Example keyboard config and helpful scripts can be found"
232 - elog "in ${ROOT}usr/share/doc/${PF}"
233 -}