Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-cluster/wulfware/files/, profiles/, sys-cluster/wulfware/
Date: Sat, 18 Mar 2023 16:45:34
Message-Id: 1679157780.e5ccd891730dde6303513a1a528637554b77271f.soap@gentoo
1 commit: e5ccd891730dde6303513a1a528637554b77271f
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sat Mar 18 16:43:00 2023 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sat Mar 18 16:43:00 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5ccd891
7
8 sys-cluster/wulfware: treeclean
9
10 Closes: https://bugs.gentoo.org/725818
11 Closes: https://bugs.gentoo.org/831111
12 Closes: https://bugs.gentoo.org/837611
13 Closes: https://bugs.gentoo.org/863740
14 Closes: https://bugs.gentoo.org/870772
15 Closes: https://bugs.gentoo.org/880947
16 Closes: https://bugs.gentoo.org/888958
17 Signed-off-by: David Seifert <soap <AT> gentoo.org>
18
19 profiles/package.mask | 6 -
20 sys-cluster/wulfware/Manifest | 1 -
21 .../files/wulfware-2.6.0-opts_and_strip.patch | 137 ---------------------
22 .../wulfware/files/wulfware-2.6.0-tinfo.patch | 22 ----
23 sys-cluster/wulfware/metadata.xml | 5 -
24 sys-cluster/wulfware/wulfware-2.6.0.ebuild | 65 ----------
25 6 files changed, 236 deletions(-)
26
27 diff --git a/profiles/package.mask b/profiles/package.mask
28 index d49117cf9362..f187326122c6 100644
29 --- a/profiles/package.mask
30 +++ b/profiles/package.mask
31 @@ -288,12 +288,6 @@ acct-group/jabber
32 # Commands trigger an assertion and crashes, bug #892487
33 =sys-fs/lvm2-2.03.18
34
35 -# Michał Górny <mgorny@g.o> (2023-01-25)
36 -# Unmaintained. Multiple build failure bugs reported. This version
37 -# predates 2008.
38 -# Removal on 2023-02-24. Bug #837611.
39 -sys-cluster/wulfware
40 -
41 # Sam James <sam@g.o> (2023-01-23)
42 # Please upgrade to >=app-eselect/eselect-wxwidgets-20230114-r1 as -r0 may
43 # lead to build failures.
44
45 diff --git a/sys-cluster/wulfware/Manifest b/sys-cluster/wulfware/Manifest
46 deleted file mode 100644
47 index 40ca2870cc61..000000000000
48 --- a/sys-cluster/wulfware/Manifest
49 +++ /dev/null
50 @@ -1 +0,0 @@
51 -DIST wulfware-2.6.0.tgz 469000 BLAKE2B 23730adeeafcef0761455fd62e744fec0fad1d8f1b13eabe256b27fa16a7bb468ff33b08ebff29e9c2c69c044e15fbf3b4d0ea2c39081ed7015089989bffa7b9 SHA512 626314124c836ee937f860a4093272d5b6e12b5d3aca631647bde6ef03880e2dd7916ab2805f34c4863e915ea3295e5c5d69ced9c5ec05b224cdf849738c78cd
52
53 diff --git a/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch b/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch
54 deleted file mode 100644
55 index 2db707d6a304..000000000000
56 --- a/sys-cluster/wulfware/files/wulfware-2.6.0-opts_and_strip.patch
57 +++ /dev/null
58 @@ -1,137 +0,0 @@
59 ---- a/libwulf/Makefile.am
60 -+++ b/libwulf/Makefile.am
61 -@@ -48,14 +48,14 @@
62 - # Define parameters and directives needed in compile/link steps.
63 - #========================================================================
64 - # C Compiler
65 --CC = gcc
66 -+CC ?= gcc
67 -
68 - # Compile flags. -fpic creates "position independent code" for
69 - # shared libraries!
70 --CFLAGS = -O3 -I/usr/include/libxml2 -I ../include $(DEFINES)
71 -+CFLAGS += -I/usr/include/libxml2 -I ../include $(DEFINES)
72 -
73 - # Linker flags
74 --LDFLAGS = -g -fpic --shared -Wl,-soname,$(PROGLIB_SONAME)
75 -+LDFLAGS += -fpic --shared -Wl,-soname,$(PROGLIB_SONAME)
76 -
77 - # Libraries
78 - LIBS = -lpthread -lxml2 -lm
79 -@@ -110,7 +110,7 @@
80 - install: $(PROGLIB_SO_VERSION) $(PROGMAN)
81 - (install -d $(libdir); \
82 - install -m 755 $(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO_VERSION); \
83 -- ln -sf $(libdir)/$(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO); \
84 -+ ln -sf $(PROGLIB_SO_VERSION) $(libdir)/$(PROGLIB_SO); \
85 - install -d $(includedir)/wulfware; \
86 - install -m 644 ../include/wulfware/*.h $(includedir)/wulfware; \
87 - install -d $(prefix)/share/man/man3; \
88 ---- a/wulf2html/Makefile.am
89 -+++ b/wulf2html/Makefile.am
90 -@@ -62,8 +62,7 @@
91 - echo "Clean does nothing"
92 -
93 - install : $(PROGRAM)
94 -- (strip $(PROGRAM);\
95 -- install -d $(prefix)/bin; \
96 -+ (install -d $(prefix)/bin; \
97 - install -m 755 $(PROGRAM) $(prefix)/bin; \
98 - install -d $(sysconfdir); \
99 - install -d $(sysconfdir)/init.d; \
100 ---- a/wulflogger/Makefile.am
101 -+++ b/wulflogger/Makefile.am
102 -@@ -54,13 +54,13 @@
103 - # Define parameters and directives needed in compile/link steps.
104 - #========================================================================
105 - # C Compiler
106 --CC = gcc
107 -+CC ?= gcc
108 -
109 - # Compile flags
110 --CFLAGS = -O3 -I/usr/include/libxml2 -I ../include $(DEFINES)
111 -+CFLAGS += -I/usr/include/libxml2 -I ../include $(DEFINES)
112 -
113 - # Linker flags
114 --LDFLAGS =
115 -+LDFLAGS +=
116 -
117 - # Libraries
118 - LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm
119 -@@ -108,8 +108,7 @@
120 - - rm -f core $(PROGRAM) *.o $(PROGRAM).1.gz
121 -
122 - install : $(PROGRAM)
123 -- (strip $(PROGRAM);\
124 -- install -d $(prefix)/bin; \
125 -+ (install -d $(prefix)/bin; \
126 - install -m 755 $(PROGRAM) $(prefix)/bin; \
127 - install -d $(prefix)/share/man/man1; \
128 - gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \
129 ---- a/wulfstat/Makefile.am
130 -+++ b/wulfstat/Makefile.am
131 -@@ -54,13 +54,13 @@
132 - # Define parameters and directives needed in compile/link steps.
133 - #========================================================================
134 - # C Compiler
135 --CC = gcc
136 -+CC ?= gcc
137 -
138 - # Compile flags
139 --CFLAGS = -O3 -I/usr/include/libxml2 -I ../include $(DEFINES)
140 -+CFLAGS += -I/usr/include/libxml2 -I ../include $(DEFINES)
141 -
142 - # Linker flags
143 --LDFLAGS =
144 -+LDFLAGS +=
145 -
146 - # Libraries
147 - LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm
148 -@@ -108,8 +108,7 @@
149 - - rm -f core $(PROGRAM) *.o $(PROGRAM).1.gz
150 -
151 - install : $(PROGRAM)
152 -- (strip $(PROGRAM);\
153 -- install -d $(prefix)/bin; \
154 -+ (install -d $(prefix)/bin; \
155 - install -m 755 $(PROGRAM) $(prefix)/bin; \
156 - install -d $(prefix)/share/man/man1; \
157 - gzip -c -9 $(PROGRAM).1 > $(PROGRAM).1.gz; \
158 ---- a/xmlsysd/Makefile.am
159 -+++ b/xmlsysd/Makefile.am
160 -@@ -60,13 +60,13 @@
161 - # Define parameters and directives needed in compile/link steps.
162 - #========================================================================
163 - # C Compiler
164 --CC = gcc
165 -+CC ?= gcc
166 -
167 - # Compile flags
168 --CFLAGS = -O3 -I/usr/include/libxml2 $(DEFINES)
169 -+CFLAGS += -I/usr/include/libxml2 $(DEFINES)
170 -
171 - # Linker flags
172 --LDFLAGS =
173 -+LDFLAGS +=
174 -
175 - # Libraries
176 - LIBS = -lxml2 -lz -lm
177 -@@ -79,7 +79,7 @@
178 - all: $(PROGRAM)
179 -
180 - $(PROGRAM): $(OBJECTS) $(INCLUDES)
181 -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(LIBS) $(OBJECTS)
182 -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
183 -
184 - #========================================================================
185 - # The only safe place to do commits is in the toplevel directory
186 -@@ -109,8 +109,7 @@
187 - # Application installation.
188 - #========================================================================
189 - install : $(PROGRAM)
190 -- (strip $(PROGRAM); \
191 -- install -d $(sbindir); \
192 -+ (install -d $(sbindir); \
193 - install -m 755 $(PROGRAM) $(sbindir); \
194 - install -d $(sysconfdir); \
195 - install -d $(sysconfdir)/xinetd.d; \
196
197 diff --git a/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch b/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch
198 deleted file mode 100644
199 index 7e88e621d91e..000000000000
200 --- a/sys-cluster/wulfware/files/wulfware-2.6.0-tinfo.patch
201 +++ /dev/null
202 @@ -1,22 +0,0 @@
203 ---- wulfware-2.6.0/configure.ac
204 -+++ wulfware-2.6.0/configure.ac
205 -@@ -61,6 +61,8 @@
206 -
207 - # Checks for libraries.
208 - # FIXME: Replace `main' with a function in `-lcurses':
209 -+AC_CHECK_LIB([tinfo], [main], TINFO_LIBS=-ltinfo, TINFO_LIBS=)
210 -+AC_SUBST(TINFO_LIBS)
211 - AC_CHECK_LIB([curses], [main])
212 - # FIXME: Replace `main' with a function in `-lm':
213 - AC_CHECK_LIB([m], [main])
214 ---- wulfware-2.6.0/wulfstat/Makefile.am
215 -+++ wulfware-2.6.0/wulfstat/Makefile.am
216 -@@ -63,7 +63,7 @@
217 - LDFLAGS =
218 -
219 - # Libraries
220 --LIBS = -L ../libwulf -lwulf -lpthread -lcurses -lxml2 -lm
221 -+LIBS = -L ../libwulf -lwulf -lpthread -lcurses $(TINFO_LIBS) -lxml2 -lm
222 -
223 - #========================================================================
224 - # List of variants one can make. all is the default. We always
225
226 diff --git a/sys-cluster/wulfware/metadata.xml b/sys-cluster/wulfware/metadata.xml
227 deleted file mode 100644
228 index 115e9d64a669..000000000000
229 --- a/sys-cluster/wulfware/metadata.xml
230 +++ /dev/null
231 @@ -1,5 +0,0 @@
232 -<?xml version="1.0" encoding="UTF-8"?>
233 -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
234 -<pkgmetadata>
235 - <!-- maintainer-needed -->
236 -</pkgmetadata>
237
238 diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild
239 deleted file mode 100644
240 index 995fea33c954..000000000000
241 --- a/sys-cluster/wulfware/wulfware-2.6.0.ebuild
242 +++ /dev/null
243 @@ -1,65 +0,0 @@
244 -# Copyright 1999-2021 Gentoo Authors
245 -# Distributed under the terms of the GNU General Public License v2
246 -
247 -EAPI=7
248 -
249 -inherit autotools flag-o-matic toolchain-funcs
250 -
251 -DESCRIPTION="Applications to monitor on a beowulf- or GRID-style clusters"
252 -HOMEPAGE="http://www.phy.duke.edu/~rgb/Beowulf/wulfware.php"
253 -SRC_URI="http://www.phy.duke.edu/~rgb/Beowulf/${PN}/${P}.tgz"
254 -
255 -LICENSE="GPL-2"
256 -SLOT="0"
257 -KEYWORDS="~amd64 ~x86"
258 -
259 -RDEPEND="
260 - dev-libs/libxml2:=
261 - sys-libs/ncurses:0=
262 - sys-libs/zlib:="
263 -DEPEND="
264 - ${RDEPEND}
265 - !sys-cluster/wulfstat
266 - !sys-cluster/xmlsysd"
267 -
268 -PATCHES=(
269 - "${FILESDIR}"/${P}-opts_and_strip.patch
270 - "${FILESDIR}"/${P}-tinfo.patch #528588
271 -)
272 -
273 -src_prepare() {
274 - default
275 - eautoreconf
276 -}
277 -
278 -src_configure() {
279 - tc-export CC
280 - append-cflags -fcommon
281 - econf
282 -}
283 -
284 -src_compile() {
285 - emake -j1
286 -}
287 -
288 -src_install() {
289 - emake prefix="${ED}"/usr libdir="${ED}"/usr/$(get_libdir) \
290 - includedir="${ED}"/usr/include sysconfdir="${ED}"/etc \
291 - install
292 -
293 - dodoc AUTHORS ChangeLog NEWS NOTES README xmlsysd/DESIGN
294 -
295 - # FIXME: Update to Gentoo style init script.
296 - rm -r "${ED}"/etc/init.d/wulf2html || die
297 -
298 - dosym libwulf.so.2.6.0 /usr/lib64/libwulf.so.2
299 - gunzip "${ED}"/usr/share/man/man?/*.gz || die
300 -}
301 -
302 -pkg_postinst() {
303 - elog "Add following line to /etc/services if you haven't done so already:"
304 - elog
305 - elog "xmlsysd 7887/tcp # xmlsysd remote system stats"
306 - elog
307 - elog "Be sure to edit /etc/xinetd.d/xmylsysd to suit your own options."
308 -}