Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/ircservices/files/, net-irc/ircservices/
Date: Tue, 24 Jul 2018 22:42:48
Message-Id: 1532472149.4b137236165cf1aaa17f20091207a4571ae08a2e.zlogene@gentoo
1 commit: 4b137236165cf1aaa17f20091207a4571ae08a2e
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 24 22:39:57 2018 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 24 22:42:29 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b137236
7
8 net-irc/ircservices: remove last rited package
9
10 Closes: https://bugs.gentoo.org/651340
11 Closes: https://bugs.gentoo.org/424383
12 Closes: https://bugs.gentoo.org/520564
13 Closes: https://bugs.gentoo.org/554944
14
15 net-irc/ircservices/Manifest | 1 -
16 .../files/ircservices-5.1.17-fPIC-configure.patch | 14 --
17 .../files/ircservices-5.1.17-fPIC.patch | 12 --
18 .../files/ircservices-5.1.24-as-needed.patch | 17 --
19 .../files/ircservices-5.1.24-fd_set-amd64.patch | 236 ---------------------
20 ...rcservices-5.1.24-ircservices-chk-pidfile.patch | 22 --
21 .../files/ircservices-5.1.24-ldflags.patch | 12 --
22 .../files/ircservices-5.1.24-parallel-make.patch | 28 ---
23 net-irc/ircservices/files/ircservices.confd | 11 -
24 net-irc/ircservices/files/ircservices.initd | 30 ---
25 net-irc/ircservices/ircservices-5.1.24.ebuild | 95 ---------
26 net-irc/ircservices/metadata.xml | 4 -
27 12 files changed, 482 deletions(-)
28
29 diff --git a/net-irc/ircservices/Manifest b/net-irc/ircservices/Manifest
30 deleted file mode 100644
31 index 066b60894d0..00000000000
32 --- a/net-irc/ircservices/Manifest
33 +++ /dev/null
34 @@ -1 +0,0 @@
35 -DIST ircservices-5.1.24.tar.gz 1516612 BLAKE2B df341d84ad958dfc3e1228d346d91ba50be765836d9a167b5c3c9efaba6d005921f07a92b1431b960a0e19e488cb84f96014fb9853376bf3cddfffac4977556b SHA512 1c1a0ec6d0e0a11071532e07792a15b1910fe108f09e991ca27e0196cfeec72e057a067fa69396b8647aca4ed8097c857eb8e714d8bee2ca6a0c5e27593fb06d
36
37 diff --git a/net-irc/ircservices/files/ircservices-5.1.17-fPIC-configure.patch b/net-irc/ircservices/files/ircservices-5.1.17-fPIC-configure.patch
38 deleted file mode 100644
39 index 8e279031b2e..00000000000
40 --- a/net-irc/ircservices/files/ircservices-5.1.17-fPIC-configure.patch
41 +++ /dev/null
42 @@ -1,14 +0,0 @@
43 ---- ircservices-5.1.12/configure 2008-09-22 17:35:52.000000000 +0000
44 -+++ ircservices-5.1.12.orig/configure 2008-09-22 17:33:51.000000000 +0000
45 -@@ -1296,9 +1296,9 @@
46 - fi
47 - if [ "$OK" ] ; then
48 - if [ "x`uname -s`" = "xOSF1" ] ; then
49 -- CC_SHARED="$CC -shared -Wl,-expect_unresolved"
50 -+ CC_SHARED="$CC -shared -Wl,-expect_unresolved -fPIC"
51 - else
52 -- CC_SHARED="$CC -shared"
53 -+ CC_SHARED="$CC -shared -fPIC"
54 - fi
55 - if run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib.c -o $CONFTMP/test-lib.so && run $CC_SHARED $CC_FLAGS $CC_LIBS $CONFTMP/test-lib2.c -o $CONFTMP/test-lib2.so ; then
56 - log "-shared works"
57
58 diff --git a/net-irc/ircservices/files/ircservices-5.1.17-fPIC.patch b/net-irc/ircservices/files/ircservices-5.1.17-fPIC.patch
59 deleted file mode 100644
60 index 788723c5be0..00000000000
61 --- a/net-irc/ircservices/files/ircservices-5.1.17-fPIC.patch
62 +++ /dev/null
63 @@ -1,12 +0,0 @@
64 -diff -Nur ircservices-5.1.12/modules/Makerules ircservices-5.1.12.orig/modules/Makerules
65 ---- ircservices-5.1.12/modules/Makerules 2008-09-22 17:37:48.000000000 +0000
66 -+++ ircservices-5.1.12.orig/modules/Makerules 2008-09-22 17:33:51.000000000 +0000
67 -@@ -172,7 +172,7 @@
68 - $(TARGET).o: .compiled-$(TARGET).o FRC
69 - @echo >/dev/null
70 - .compiled-$(TARGET).o: $(TARGET).c $(DEPS) $(INCLUDES2)
71 -- cd $(TOPDIR) && $(CC) $(CFLAGS) -I. -c modules/$(DIRNAME)/$< -o modules/$(DIRNAME)/$(TARGET).o
72 -+ cd $(TOPDIR) && $(CC) $(CFLAGS) -fPIC -I. -c modules/$(DIRNAME)/$< -o modules/$(DIRNAME)/$(TARGET).o
73 - @rm -f $@
74 - @ln -s $(TARGET).o $@
75 -
76
77 diff --git a/net-irc/ircservices/files/ircservices-5.1.24-as-needed.patch b/net-irc/ircservices/files/ircservices-5.1.24-as-needed.patch
78 deleted file mode 100644
79 index b8b3668e1e3..00000000000
80 --- a/net-irc/ircservices/files/ircservices-5.1.24-as-needed.patch
81 +++ /dev/null
82 @@ -1,17 +0,0 @@
83 -From: Nathan Phillip Brink <binki@g.o>
84 -Date: 2011-06-22
85 -Subject: Fix missing $(LIBS) in the Makefiles where linking of modules
86 - happens.
87 -
88 -diff -r 7c815ad6fa2e -r f195c349225a modules/Makerules
89 ---- a/modules/Makerules Wed Jun 22 00:14:22 2011 -0400
90 -+++ b/modules/Makerules Wed Jun 22 13:32:24 2011 -0400
91 -@@ -104,7 +104,7 @@
92 -
93 - # Compile one or more objects into a dynamic module.
94 - $(TARGET).so: $(TARGET).o $(OBJECTS)
95 -- $(CC_SHARED) $(CFLAGS) $(LFLAGS) $^ -o $@
96 -+ $(CC_SHARED) $(CFLAGS) $(LFLAGS) $^ -o $@ $(LIBS)
97 -
98 - # Compile one or more objects into a static module and generate a symbol
99 - # list. The .a file we create here is just a placeholder to show that
100
101 diff --git a/net-irc/ircservices/files/ircservices-5.1.24-fd_set-amd64.patch b/net-irc/ircservices/files/ircservices-5.1.24-fd_set-amd64.patch
102 deleted file mode 100644
103 index b15595d570a..00000000000
104 --- a/net-irc/ircservices/files/ircservices-5.1.24-fd_set-amd64.patch
105 +++ /dev/null
106 @@ -1,236 +0,0 @@
107 -From: Nathan Phillip Brink <binki@g.o>
108 -Subject: Fix compilation on amd64 platform by using a different method
109 - of fixing the printf() + size_t problem.
110 -
111 -The method used is to test if the `z' printf integer modifier works or
112 -not. If that works, use it. Otherwise, search for a normal integer
113 -type of similar length to size_t. Defines PRIdSIZE and PRIuSIZE in
114 -reminiscence of inttypes.h
115 -
116 -diff -r b323b647fe91 -r e10ae0e7b778 Makefile
117 ---- a/Makefile Tue Jun 21 00:42:59 2011 -0400
118 -+++ b/Makefile Tue Jun 21 00:44:38 2011 -0400
119 -@@ -116,17 +116,17 @@
120 -
121 - ifneq ($(STATIC_MODULES),)
122 - modules: langstrs.h
123 -- @$(MAKE) -C modules all-static CFLAGS="$(CFLAGS)"
124 -+ @$(MAKE) -C modules all-static CFLAGS='$(CFLAGS)'
125 - else
126 - modules: langstrs.h
127 -- @$(MAKE) -C modules all-dynamic CFLAGS="$(CFLAGS)"
128 -+ @$(MAKE) -C modules all-dynamic CFLAGS='$(CFLAGS)'
129 - endif
130 -
131 - languages:
132 -- @$(MAKE) -C lang CFLAGS="$(CFLAGS)"
133 -+ @$(MAKE) -C lang CFLAGS='$(CFLAGS)'
134 -
135 - tools: langstrs.h services.h
136 -- @$(MAKE) -C tools CFLAGS="$(CFLAGS)"
137 -+ @$(MAKE) -C tools CFLAGS='$(CFLAGS)'
138 -
139 -
140 - # Catch any changes in compilation options at the top of this file or the
141 -diff -r b323b647fe91 -r e10ae0e7b778 configure
142 ---- a/configure Tue Jun 21 00:42:59 2011 -0400
143 -+++ b/configure Tue Jun 21 00:44:38 2011 -0400
144 -@@ -271,6 +271,7 @@
145 - SIZEOF_INT=
146 - SIZEOF_LONG=
147 - SIZEOF_PTR=
148 -+SIZEOF_SIZE_T=
149 - SIZEOF_TIME_T=
150 - MAX_TIME_T=
151 - SIZEOF_GID_T=bonkle
152 -@@ -1997,6 +1998,39 @@
153 - fi
154 - fi
155 -
156 -+MODE="check_size_t "
157 -+echo2 "Checking the size of size_t... "
158 -+if [ "$SIZEOF_SIZE_T" ]; then
159 -+ echo "(cached) `expr $SIZEOF_SIZE_T \* 8` bits"
160 -+ log "cache supplied `expr $SIZEOF_SIZE_T \* 8` bits"
161 -+else
162 -+ cat >$CONFTMP/test.c <<EOT
163 -+ #include <stdlib.h>
164 -+ #include <stdio.h>
165 -+ int main()
166 -+ {
167 -+ size_t a = 0;
168 -+ printf("%d", sizeof(a));
169 -+ return 0;
170 -+ }
171 -+EOT
172 -+ if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test; then
173 -+ a="`$CONFTMP/test`"
174 -+ log "test program output (sizeof(size_t)): $a"
175 -+ if [ ! "$a" ]; then
176 -+ echo "test program failed! Assuming `expr $SIZEOF_PTR \* 8` bits."
177 -+ log "assuming `expr $SIZEOF_PTR \* 8` bits"
178 -+ SIZEOF_SIZE_T=$SIZEOF_PTR
179 -+ else
180 -+ SIZEOF_SIZE_T="$a"
181 -+ echo `expr $SIZEOF_SIZE_T \* 8` bits
182 -+ log "`expr $SIZEOF_SIZE_T \* 8` bits"
183 -+ fi
184 -+ else
185 -+ whoa_there
186 -+ fi
187 -+fi
188 -+
189 - MODE="check_time_t "
190 - echo2 "Checking the size of time_t... "
191 - if [ "$SIZEOF_TIME_T" -a "$MAX_TIME_T" ] ; then
192 -@@ -2135,6 +2169,53 @@
193 - fi
194 - fi
195 -
196 -+MODE="check_PRIdSIZE "
197 -+echo2 "Checking how to use size_t with printf... "
198 -+if [ "$SIZE_T_FORMAT" ]; then
199 -+ echo "(cached) $SIZE_T_FORMAT"
200 -+ log "cache $SIZE_T_FORMAT"
201 -+else
202 -+ cat >$CONFTMP/test.c <<EOT
203 -+ #include <stdlib.h>
204 -+ #include <stdio.h>
205 -+ int main()
206 -+ {
207 -+ size_t a = 26;
208 -+ printf("%zu", a);
209 -+ return 0;
210 -+ }
211 -+EOT
212 -+ if run $CC $CC_FLAGS $CONFTMP/test.c $CC_LIBS -o $CONFTMP/test; then
213 -+ a="`$CONFTMP/test`"
214 -+ log "test program output printf(\"%zu\", (size_t)26): $a"
215 -+ if [ "x$a" = "x26" ]; then
216 -+ echo "can use %zu to print size_t (I love standards-compliance :-))."
217 -+ log "can use %zu to print size_t (I love standards-compliance :-))."
218 -+ CDEFS="$CDEFS -DPRIdSIZE=\\\"zd\\\" -DPRIuSIZE=\\\"zu\\\""
219 -+ else
220 -+ echo "test program indicated that runtime does not accept %zu for size_t."
221 -+ log "test program indicated that runtime does not accept %zu for size_t."
222 -+ if [ "x$SIZEOF_SIZE_T" = "x$SIZEOF_INT" ]; then
223 -+ SIZE_MOD=
224 -+ MATCHED=int
225 -+ else
226 -+ if [ "x$SIZEOF_SIZE_T" = "x$SIZEOF_LONG" ]; then
227 -+ SIZE_MOD=l
228 -+ MATCHED=long
229 -+ else
230 -+ SIZE_MOD=l
231 -+ MATCHED="no known types"
232 -+ fi
233 -+ fi
234 -+ echo "size_t's size matched $MATCHED, using %$SIZE_MOD""d to print size_t."
235 -+ log "size_t's size matched $MATCHED, using %$SIZE_MOD""d to print size_t."
236 -+ CDEFS="$CDEFS -DPRIdSIZE=\\\"$SIZE_MOD""d\\\" -DPRIuSIZE=\\\"$SIZE_MOD""u\\\""
237 -+ fi
238 -+ else
239 -+ whoa_there
240 -+ fi
241 -+fi
242 -+
243 - ###########################################################################
244 -
245 - # AIX workaround.
246 -diff -r b323b647fe91 -r e10ae0e7b778 defs.h
247 ---- a/defs.h Tue Jun 21 00:42:59 2011 -0400
248 -+++ b/defs.h Tue Jun 21 00:44:38 2011 -0400
249 -@@ -224,11 +224,6 @@
250 -
251 - /* Various generally useful macros. */
252 -
253 --
254 --/* Make sizeof() return an int regardless of compiler (avoids printf
255 -- * argument type warnings). */
256 --#define sizeof(v) ((int)sizeof(v))
257 --
258 - /* Length of an array: */
259 - #define lenof(a) (sizeof(a) / sizeof(*(a)))
260 -
261 -diff -r b323b647fe91 -r e10ae0e7b778 modules/Makefile
262 ---- a/modules/Makefile Tue Jun 21 00:42:59 2011 -0400
263 -+++ b/modules/Makefile Tue Jun 21 00:44:38 2011 -0400
264 -@@ -18,7 +18,7 @@
265 -
266 - all-dynamic:
267 - @set -e ; for i in $(SUBDIRS) ; do \
268 -- $(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS="$(CFLAGS)" ; \
269 -+ $(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS='$(CFLAGS)' ; \
270 - if $(TEST_NT) ! -f .stamp -o "$$i/.stamp" -nt .stamp ; then \
271 - echo "touch .stamp" ; \
272 - touch .stamp ; \
273 -@@ -33,7 +33,7 @@
274 - @echo '#include "modsyms.c"' >>modlist.c
275 - @echo 'struct {const char *name; void *symlist;} modlist[] = {' >>modlist.c
276 - @set -e ; for i in $(SUBDIRS) ; do \
277 -- $(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS="$(CFLAGS)" ; \
278 -+ $(MAKE) -C $$i $@ DIRNAME="$$i" CFLAGS='$(CFLAGS)' ; \
279 - cat $$i/.modext-*.h >>modext.h ; \
280 - cat $$i/.modsyms-*.c >>modsyms.c ; \
281 - cat $$i/.modlist-*.c >>modlist.c ; \
282 -diff -r b323b647fe91 -r e10ae0e7b778 modules/Makerules
283 ---- a/modules/Makerules Tue Jun 21 00:42:59 2011 -0400
284 -+++ b/modules/Makerules Tue Jun 21 00:44:38 2011 -0400
285 -@@ -153,13 +153,13 @@
286 - $(TARGET).o $(TARGET)_static.o: MODULE_CFLAGS += -DMODULE_MAIN_FILE
287 - $(TARGET)_static.o: MODULE_CFLAGS += -D_this_module_ptr=_this_module_ptr_$(MODULE_ID) -Dmodule_version=module_version_$(MODULE_ID) -Dmodule_config=module_config_$(MODULE_ID) -Dinit_module=init_module_$(MODULE_ID) -Dexit_module=exit_module_$(MODULE_ID)
288 - $(TARGET)_static.o: FRC
289 -- @$(MAKE) --no-print-directory $@ TARGET=$(@:_static.o=) INCLUDES2="$(INCLUDES-$(@:_static.o=.o))" CFLAGS="$(CFLAGS) $(MODULE_CFLAGS)" REALLY_COMPILE=2
290 -+ @$(MAKE) --no-print-directory $@ TARGET=$(@:_static.o=) INCLUDES2="$(INCLUDES-$(@:_static.o=.o))" CFLAGS='$(CFLAGS) $(MODULE_CFLAGS)' REALLY_COMPILE=2
291 - @if $(TEST_NT) ! -f .stamp -o "$@" -nt .stamp ; then \
292 - echo "touch .stamp" ; \
293 - touch .stamp ; \
294 - fi
295 - $(TARGET).o $(OBJECTS): FRC
296 -- @$(MAKE) --no-print-directory $@ TARGET=$(@:.o=) INCLUDES2="$(INCLUDES-$@)" CFLAGS="$(CFLAGS) $(MODULE_CFLAGS)" REALLY_COMPILE=2
297 -+ @$(MAKE) --no-print-directory $@ TARGET=$(@:.o=) INCLUDES2="$(INCLUDES-$@)" CFLAGS='$(CFLAGS) $(MODULE_CFLAGS)' REALLY_COMPILE=2
298 - @if $(TEST_NT) ! -f .stamp -o "$@" -nt .stamp ; then \
299 - echo "touch .stamp" ; \
300 - touch .stamp ; \
301 -diff -r b323b647fe91 -r e10ae0e7b778 tools/convert-cygnus.c
302 ---- a/tools/convert-cygnus.c Tue Jun 21 00:42:59 2011 -0400
303 -+++ b/tools/convert-cygnus.c Tue Jun 21 00:44:38 2011 -0400
304 -@@ -245,7 +245,7 @@
305 - break;
306 - }
307 - if (strlen(pass) > sizeof(ngi->pass)-1) {
308 -- fprintf(stderr, "%s:%d: Password for `%s' truncated to %d"
309 -+ fprintf(stderr, "%s:%d: Password for `%s' truncated to %" PRIdSIZE
310 - " characters\n", fname, line, ni->nick,
311 - sizeof(ngi->pass)-1);
312 - pass[sizeof(ngi->pass)-1] = 0;
313 -@@ -741,7 +741,7 @@
314 - }
315 - ci->founder = ni->nickgroup;
316 - if (strlen(pass) > sizeof(ci->founderpass)-1) {
317 -- fprintf(stderr, "%s:%d: Password for `%s' truncated to %d"
318 -+ fprintf(stderr, "%s:%d: Password for `%s' truncated to %" PRIdSIZE
319 - " characters\n", fname, line, ci->name,
320 - sizeof(ci->founderpass)-1);
321 - pass[sizeof(ci->founderpass)-1] = 0;
322 -diff -r b323b647fe91 -r e10ae0e7b778 tools/convert-hybserv.c
323 ---- a/tools/convert-hybserv.c Tue Jun 21 00:42:59 2011 -0400
324 -+++ b/tools/convert-hybserv.c Tue Jun 21 00:44:38 2011 -0400
325 -@@ -198,7 +198,7 @@
326 - exit(1);
327 - } else {
328 - fprintf(stderr, "%s:%d: Password for `%s'"
329 -- " truncated to %d characters\n", fname,
330 -+ " truncated to %" PRIdSIZE " characters\n", fname,
331 - line, ni->nick,
332 - sizeof(ngi->pass.password)-1);
333 - }
334 -@@ -564,7 +564,7 @@
335 - exit(1);
336 - } else {
337 - fprintf(stderr, "%s:%d: Password for `%s'"
338 -- " truncated to %d characters\n", fname,
339 -+ " truncated to %" PRIdSIZE " characters\n", fname,
340 - line, ci->name,
341 - sizeof(ci->founderpass.password)-1);
342 - }
343
344 diff --git a/net-irc/ircservices/files/ircservices-5.1.24-ircservices-chk-pidfile.patch b/net-irc/ircservices/files/ircservices-5.1.24-ircservices-chk-pidfile.patch
345 deleted file mode 100644
346 index b232e8c5e07..00000000000
347 --- a/net-irc/ircservices/files/ircservices-5.1.24-ircservices-chk-pidfile.patch
348 +++ /dev/null
349 @@ -1,22 +0,0 @@
350 -From: Nathan Phillip Brink <binki@g.o>
351 -Date: 2011/06/15
352 -Subject: Use the same datadir/pidfile searching algorithm in
353 - ircservices-chk as in ircservices to ensure consistent
354 - results.
355 -
356 ---- a/tools/ircservices-chk.in
357 -+++ b/tools/ircservices-chk.in
358 -@@ -21,10 +21,10 @@
359 - fi
360 -
361 - ok=
362 --if [ -f "@DATDEST@/$PIDFILE" ] ; then
363 -- pid=`cat "@DATDEST@/$PIDFILE"`
364 -+if ! cd "@DATDEST@" || [ -f "$PIDFILE" ] ; then
365 -+ pid=`cat "$PIDFILE"`
366 - if echo "0$pid" | grep -q '[^0-9]' ; then
367 -- rm -f "@DATDEST@/$PIDFILE"
368 -+ rm -f "$PIDFILE"
369 - elif kill -0 $pid ; then
370 - ok=1
371 - fi
372
373 diff --git a/net-irc/ircservices/files/ircservices-5.1.24-ldflags.patch b/net-irc/ircservices/files/ircservices-5.1.24-ldflags.patch
374 deleted file mode 100644
375 index b4041cd74a2..00000000000
376 --- a/net-irc/ircservices/files/ircservices-5.1.24-ldflags.patch
377 +++ /dev/null
378 @@ -1,12 +0,0 @@
379 -diff -r e10ae0e7b778 modules/Makerules
380 ---- a/modules/Makerules Tue Jun 21 00:44:38 2011 -0400
381 -+++ b/modules/Makerules Tue Jun 21 13:00:07 2011 -0400
382 -@@ -104,7 +104,7 @@
383 -
384 - # Compile one or more objects into a dynamic module.
385 - $(TARGET).so: $(TARGET).o $(OBJECTS)
386 -- $(CC_SHARED) $^ -o $@
387 -+ $(CC_SHARED) $(CFLAGS) $(LFLAGS) $^ -o $@
388 -
389 - # Compile one or more objects into a static module and generate a symbol
390 - # list. The .a file we create here is just a placeholder to show that
391
392 diff --git a/net-irc/ircservices/files/ircservices-5.1.24-parallel-make.patch b/net-irc/ircservices/files/ircservices-5.1.24-parallel-make.patch
393 deleted file mode 100644
394 index 910771adcdc..00000000000
395 --- a/net-irc/ircservices/files/ircservices-5.1.24-parallel-make.patch
396 +++ /dev/null
397 @@ -1,28 +0,0 @@
398 -From: Nathan Phillip Brink <binki@g.o>
399 -Subject: Fix issues of langstrs.h not being built before modules and
400 - tools are, hopefully fixing parallel make.
401 -
402 -diff -r ad64cfd2cacc -r b323b647fe91 Makefile
403 ---- a/Makefile Mon Jun 20 22:29:07 2011 -0400
404 -+++ b/Makefile Tue Jun 21 00:42:59 2011 -0400
405 -@@ -115,17 +115,17 @@
406 - $(CC) $(LFLAGS) $(OBJS) version.o $(MODLIB) $(LIBS) -o $@
407 -
408 - ifneq ($(STATIC_MODULES),)
409 --modules:
410 -+modules: langstrs.h
411 - @$(MAKE) -C modules all-static CFLAGS="$(CFLAGS)"
412 - else
413 --modules:
414 -+modules: langstrs.h
415 - @$(MAKE) -C modules all-dynamic CFLAGS="$(CFLAGS)"
416 - endif
417 -
418 - languages:
419 - @$(MAKE) -C lang CFLAGS="$(CFLAGS)"
420 -
421 --tools: services.h
422 -+tools: langstrs.h services.h
423 - @$(MAKE) -C tools CFLAGS="$(CFLAGS)"
424 -
425 -
426
427 diff --git a/net-irc/ircservices/files/ircservices.confd b/net-irc/ircservices/files/ircservices.confd
428 deleted file mode 100644
429 index 6d2bc475ca1..00000000000
430 --- a/net-irc/ircservices/files/ircservices.confd
431 +++ /dev/null
432 @@ -1,11 +0,0 @@
433 -# -*- mode: sh; -*-
434 -
435 -# The user which ircservices should be run as. Set to an empty value
436 -# to have ircservices run as the user the initscript is run as (which
437 -# is generally bad practice).
438 -IRCSERVICES_USER=ircservices
439 -
440 -# The location of the pidfile (as written in ircservices.conf). If the
441 -# directory containing the pidfile does not exist, and attempt will be
442 -# made to create that folder and set its owner to IRCSERVICES_USER.
443 -IRCSERVICES_PIDFILE=/var/run/ircservices/ircservices.pid
444
445 diff --git a/net-irc/ircservices/files/ircservices.initd b/net-irc/ircservices/files/ircservices.initd
446 deleted file mode 100644
447 index c938eb0bde8..00000000000
448 --- a/net-irc/ircservices/files/ircservices.initd
449 +++ /dev/null
450 @@ -1,30 +0,0 @@
451 -#!/sbin/openrc-run
452 -# Copyright 1999-2011 Gentoo Foundation
453 -# Distributed under the terms of the GNU General Public License, v2 or later
454 -
455 -depend() {
456 - need net
457 - use ircd
458 - provide irc-services
459 -}
460 -
461 -start() {
462 - IRCSERVICES_RUNDIR="${IRCSERVICES_PIDFILE%/*}"
463 - if ! [ -d "${IRCSERVICES_RUNDIR}" ]; then
464 - ebegin "Creating ${IRCSERVICES_RUNDIR} for ${SVCNAME}"
465 - mkdir "${IRCSERVICES_RUNDIR}" && chown "${IRCSERVICES_USER}" "${IRCSERVICES_RUNDIR}"
466 - eend $?
467 - fi
468 -
469 - ebegin "Starting ${SVCNAME}"
470 - start-stop-daemon --start --user ircservices --exec /usr/bin/ircservices -- \
471 - -dir=/var/lib/ircservices \
472 - -log=/var/log/ircservices/ircservices.log
473 - eend $?
474 -}
475 -
476 -stop() {
477 - ebegin "Stopping ${SVCNAME}"
478 - start-stop-daemon --stop --pidfile "${IRCSERVICES_PIDFILE}"
479 - eend $?
480 -}
481
482 diff --git a/net-irc/ircservices/ircservices-5.1.24.ebuild b/net-irc/ircservices/ircservices-5.1.24.ebuild
483 deleted file mode 100644
484 index 3ebf8ce32dd..00000000000
485 --- a/net-irc/ircservices/ircservices-5.1.24.ebuild
486 +++ /dev/null
487 @@ -1,95 +0,0 @@
488 -# Copyright 1999-2014 Gentoo Foundation
489 -# Distributed under the terms of the GNU General Public License v2
490 -
491 -EAPI=4
492 -
493 -inherit eutils fixheadtails flag-o-matic prefix toolchain-funcs user
494 -
495 -DESCRIPTION="ChanServ, NickServ, and MemoServ with support for several IRC daemons"
496 -HOMEPAGE="http://achurch.org/services/"
497 -SRC_URI="http://achurch.org/services/tarballs/${P}.tar.gz"
498 -LICENSE="GPL-2 FDL-1.2"
499 -SLOT="0"
500 -KEYWORDS="amd64 ppc x86"
501 -IUSE=""
502 -
503 -pkg_setup() {
504 - enewgroup ircservices
505 - enewuser ircservices -1 -1 -1 ircservices
506 -
507 - # this is needed, because old ebuilds added the user with ircservices:users
508 - usermod -g ircservices ircservices
509 -}
510 -
511 -src_prepare() {
512 - epatch "${FILESDIR}"/${PN}-5.1.17-fPIC.patch \
513 - "${FILESDIR}"/${PN}-5.1.17-fPIC-configure.patch \
514 - "${FILESDIR}"/${P}-ircservices-chk-pidfile.patch \
515 - "${FILESDIR}"/${P}-parallel-make.patch \
516 - "${FILESDIR}"/${P}-ldflags.patch \
517 - "${FILESDIR}"/${P}-as-needed.patch \
518 - "${FILESDIR}"/${P}-fd_set-amd64.patch
519 -
520 - ht_fix_file configure
521 - sed -i \
522 - -e "s/-m 750/-m 755/" \
523 - -e "s/-m 640/-m 644/" \
524 - configure || die
525 -
526 - sed -i -e "s;ircservices.pid;${EPREFIX}/var/run/ircservices/&;g" data/example-ircservices.conf || die
527 -}
528 -
529 -src_configure() {
530 - append-flags -fno-stack-protector
531 - # configure fails with -O higher than 2
532 - replace-flags "-O[3-9s]" "-O2"
533 -
534 - RUNGROUP="ircservices" \
535 - ./configure \
536 - -cc "$(tc-getCC)" \
537 - -cflags "${CFLAGS}" \
538 - -lflags "${LDFLAGS}" \
539 - -bindest /usr/bin \
540 - -datdest /var/lib/ircservices \
541 - || die "./configure failed"
542 -}
543 -
544 -src_install() {
545 - dodir /usr/bin /{etc,usr/{$(get_libdir),share},var/lib}/ircservices
546 - keepdir /var/log/ircservices
547 -
548 - emake \
549 - BINDEST="${D}"/usr/bin \
550 - DATDEST="${D}"/var/lib/ircservices \
551 - install
552 -
553 - mv "${D}"/var/lib/ircservices/convert-db "${D}"/usr/bin/ircservices-convert-db || die "mv failed"
554 -
555 - # Now we move some files around to make it FHS conform
556 - mv "${D}"/var/lib/ircservices/example-ircservices.conf "${D}"/etc/ircservices/ircservices.conf || die "mv failed"
557 - dosym /etc/ircservices/ircservices.conf /var/lib/ircservices/ircservices.conf
558 -
559 - mv "${D}"/var/lib/ircservices/example-modules.conf "${D}"/etc/ircservices/modules.conf || die "mv failed"
560 - dosym /etc/ircservices/modules.conf /var/lib/ircservices/modules.conf
561 -
562 - mv "${D}"/var/lib/ircservices/modules "${D}"/usr/$(get_libdir)/ircservices || die "mv failed"
563 - dosym /usr/$(get_libdir)/ircservices/modules /var/lib/ircservices/modules
564 -
565 - mv "${D}"/var/lib/ircservices/{helpfiles,languages} "${D}"/usr/share/ircservices || die "mv failed"
566 - dosym /usr/share/ircservices/helpfiles /var/lib/ircservices/helpfiles
567 - dosym /usr/share/ircservices/languages /var/lib/ircservices/languages
568 -
569 - fperms 750 /var/{lib,log}/ircservices /etc/ircservices
570 - fperms 640 /etc/ircservices/{ircservices,modules}.conf
571 - fowners ircservices:ircservices /var/{lib,log}/ircservices
572 - fowners root:ircservices /etc/ircservices{,/{ircservices,modules}.conf}
573 -
574 - newinitd "${FILESDIR}"/ircservices.initd ircservices
575 - newconfd "${FILESDIR}"/ircservices.confd ircservices
576 -
577 - doman docs/ircservices*.8
578 - newman docs/convert-db.8 ircservices-convert-db.8
579 -
580 - dohtml -r docs/*
581 - dodoc docs/Changes* README docs/WhatsNew
582 -}
583
584 diff --git a/net-irc/ircservices/metadata.xml b/net-irc/ircservices/metadata.xml
585 deleted file mode 100644
586 index 097975e3adc..00000000000
587 --- a/net-irc/ircservices/metadata.xml
588 +++ /dev/null
589 @@ -1,4 +0,0 @@
590 -<?xml version="1.0" encoding="UTF-8"?>
591 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
592 -<pkgmetadata>
593 -</pkgmetadata>