Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/
Date: Wed, 29 Nov 2017 23:20:09
Message-Id: 1511997561.79f50b4817bc17f890e61b3a1c50899cfdaf4fa9.asturm@gentoo
1 commit: 79f50b4817bc17f890e61b3a1c50899cfdaf4fa9
2 Author: Wade Cline <wadecline <AT> hotmail <DOT> com>
3 AuthorDate: Sat Nov 18 03:13:41 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 29 23:19:21 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79f50b48
7
8 net-irc/inspircd: Remove old 2.0.24
9
10 net-irc/inspircd/Manifest | 1 -
11 .../files/inspircd-2.0.24-fix-path-builds.patch | 253 ---------------------
12 net-irc/inspircd/inspircd-2.0.24-r1.ebuild | 123 ----------
13 3 files changed, 377 deletions(-)
14
15 diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
16 index e9a9481ebba..a7b18c92451 100644
17 --- a/net-irc/inspircd/Manifest
18 +++ b/net-irc/inspircd/Manifest
19 @@ -1,3 +1,2 @@
20 DIST inspircd-2.0.23.tar.gz 731695 SHA256 522b31fc80e8fd90b66837bf50f8a941233709d5b1fc9c0b3c47a413fb69f162 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb WHIRLPOOL 9ac288624835e8cf97cf3634df47c4310c6929691b4bfb39139cb0a6c45a7503e1c73addf7f6eaef03d77e52d53a78f8efd648ddb3b5ee9023c4bdee045ac4a1
21 -DIST inspircd-2.0.24.tar.gz 732354 SHA256 41f702cb84caa2db089a02f511a3da3e7fa3cdce7d2c5040b3c54c5da83c8b40 SHA512 766ed9b2786a36c6f3765405b5e02d831ea5ae1089c1b646ed0340b08147f9bb8d477ff94e16b0d9ed02dc109c6273f3772e1bed10bc45d1e9e9b409a37d2b6a WHIRLPOOL 3da7b2b694fd60755d3238d33090e9bc30abca3090e2552b6a9cb572c644cdc883236d39b91d1680e2500a26ef4829c98315e9975e27d5271046461569193d24
22 DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
23
24 diff --git a/net-irc/inspircd/files/inspircd-2.0.24-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.24-fix-path-builds.patch
25 deleted file mode 100644
26 index debf62a15f5..00000000000
27 --- a/net-irc/inspircd/files/inspircd-2.0.24-fix-path-builds.patch
28 +++ /dev/null
29 @@ -1,253 +0,0 @@
30 -diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
31 ---- a/docs/conf/inspircd.conf.example 2015-05-10 00:24:10.000000000 -0500
32 -+++ b/docs/conf/inspircd.conf.example 2015-07-27 05:22:26.107849785 -0500
33 -@@ -412,11 +412,11 @@
34 -
35 - # This file has all the information about oper classes, types and o:lines.
36 - # You *MUST* edit it.
37 --<include file="conf/examples/opers.conf.example">
38 -+<include file="/etc/inspircd/opers.conf.example">
39 -
40 - # This file has all the information about server links and ulined servers.
41 - # You *MUST* edit it if you intend to link servers.
42 --<include file="conf/examples/links.conf.example">
43 -+<include file="/etc/inspircd/links.conf.example">
44 -
45 - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-#
46 - # #
47 -@@ -426,7 +426,8 @@
48 - # motd - displayed on connect and when a user executes /MOTD
49 - # rules - displayed when the user executes /RULES
50 - # Modules can also define their own files
51 --<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
52 -+<files motd="/etc/inspircd/motd.txt.example"
53 -+ rules="/etc/inspircd/rules.txt.example">
54 -
55 - # Example of an executable file include. Note this will be read on rehash,
56 - # not when the command is run.
57 -@@ -472,7 +473,7 @@
58 - # the default of 'inspircd.pid' is used. #
59 - # #
60 -
61 --#<pid file="/path/to/inspircd.pid">
62 -+<pid file="/var/run/inspircd/inspircd.pid">
63 -
64 - #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
65 - # #
66 -@@ -953,7 +954,7 @@
67 - # provide almost all the features of InspIRCd. :) #
68 - # #
69 - # The default does nothing -- we include it for simplicity for you. #
70 --<include file="conf/examples/modules.conf.example">
71 -+<include file="/etc/inspircd/modules.conf.example">
72 -
73 - # Here are some pre-built modules.conf files that closely match the
74 - # default configurations of some popular IRCd's. You still may want to
75 -@@ -965,10 +966,10 @@
76 - # recommended that you make your own modules file based on modules.conf.example.
77 -
78 - # Settings similar to UnrealIRCd defaults.
79 --#<include file="conf/examples/modules/unrealircd.conf.example">
80 -+#<include file="/etc/inspircd/modules/unrealircd.conf.example">
81 -
82 - # Settings similar to Charybdis IRCd defaults.
83 --#<include file="conf/examples/modules/charybdis.conf.example">
84 -+#<include file="/etc/inspircd/modules/charybdis.conf.example">
85 -
86 -
87 - #########################################################################
88 -diff -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
89 ---- a/docs/conf/modules.conf.example 2016-02-28 17:38:30.492335461 -0600
90 -+++ b/docs/conf/modules.conf.example 2016-02-28 17:39:20.068559846 -0600
91 -@@ -315,7 +315,7 @@
92 - # specify some censor tags. See also: #
93 - # http://wiki.inspircd.org/Modules/censor #
94 - #
95 --#<include file="conf/examples/censor.conf.example">
96 -+#<include file="/etc/inspircd/censor.conf.example">
97 -
98 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
99 - # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
100 -@@ -778,7 +778,7 @@
101 - # specify below the path to the filter.conf file, or define some #
102 - # <filter> tags. #
103 - # #
104 --#<include file="conf/examples/filter.conf.example">
105 -+#<include file="/etc/inspircd/filter.conf.example">
106 -
107 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
108 - # Gecos ban: Implements extended ban 'r', which stops anyone matching
109 -@@ -834,7 +834,7 @@
110 - # #
111 - # If you specify to use the m_helpop.so module, then specify below #
112 - # the path to the helpop.conf file. #
113 --#<include file="conf/examples/inspircd.helpop-full.example">
114 -+#<include file="/etc/inspircd/inspircd.helpop-full.example">
115 -
116 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
117 - # Hide chans module: Allows users to hide their channels list from non-
118 -@@ -1284,7 +1284,7 @@
119 - # Read the comment above <connect:allowmotdcolors> in #
120 - # inspircd.conf.example for details. #
121 - # #
122 --#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
123 -+#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
124 -
125 - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
126 - # Override module: Adds support for oper override.
127 -diff -Nuar a/make/template/main.mk b/make/template/main.mk
128 ---- a/make/template/main.mk 2015-05-10 00:24:10.000000000 -0500
129 -+++ b/make/template/main.mk 2015-07-27 05:22:26.107849785 -0500
130 -@@ -34,7 +34,7 @@
131 - SYSTEM = @SYSTEM@
132 - BUILDPATH = @BUILD_DIR@
133 - SOCKETENGINE = @SOCKETENGINE@
134 --CXXFLAGS = -pipe -fPIC -DPIC
135 -+MYCXXFLAGS = -pipe -fPIC -DPIC
136 - LDLIBS = -pthread -lstdc++
137 - LDFLAGS =
138 - CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
139 -@@ -51,9 +51,9 @@
140 - INSTMODE_LIB = 0644
141 -
142 - @IFEQ $(CC) icpc
143 -- CXXFLAGS += -Wshadow
144 -+ MYCXXFLAGS += -Wshadow
145 - @ELSE
146 -- CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
147 -+ MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
148 - @ENDIF
149 -
150 -
151 -@@ -75,46 +75,46 @@
152 - INSTALL = ginstall
153 - @ENDIF
154 - @IFEQ $(SYSTEM) darwin
155 -- CXXFLAGS += -DDARWIN -frtti
156 -+ MYCXXFLAGS += -DDARWIN -frtti
157 - LDLIBS += -ldl
158 - CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
159 - PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
160 - @ENDIF
161 - @IFEQ $(SYSTEM) interix
162 -- CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
163 -+ MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
164 - @ENDIF
165 -
166 --@IFNDEF D
167 -- D=0
168 -+@IFNDEF DEBUGLEVEL
169 -+ DEBUGLEVEL=0
170 - @ENDIF
171 -
172 - GCC6=@GCC6@
173 - @IFEQ $(GCC6) true
174 -- CXXFLAGS += -fno-delete-null-pointer-checks
175 -+ MYCXXFLAGS += -fno-delete-null-pointer-checks
176 - @ENDIF
177 -
178 - DBGOK=0
179 --@IFEQ $(D) 0
180 -- CXXFLAGS += -O2
181 -+@IFEQ $(DEBUGLEVEL) 0
182 -+ MYCXXFLAGS += -O2
183 - @IFEQ $(CC) g++
184 -- CXXFLAGS += -g1
185 -+ MYCXXFLAGS += -g1
186 - @ENDIF
187 - HEADER = std-header
188 - DBGOK=1
189 - @ENDIF
190 --@IFEQ $(D) 1
191 -- CXXFLAGS += -O0 -g3 -Werror
192 -+@IFEQ $(DEBUGLEVEL) 1
193 -+ MYCXXFLAGS += -O0 -g3 -Werror
194 - HEADER = debug-header
195 - DBGOK=1
196 - @ENDIF
197 --@IFEQ $(D) 2
198 -- CXXFLAGS += -O2 -g3
199 -+@IFEQ $(DEBUGLEVEL) 2
200 -+ MYCXXFLAGS += -O2 -g3
201 - HEADER = debug-header
202 - DBGOK=1
203 - @ENDIF
204 - FOOTER = finishmessage
205 -
206 --CXXFLAGS += -Iinclude
207 -+MYCXXFLAGS += -Iinclude
208 -
209 - @GNU_ONLY MAKEFLAGS += --no-print-directory
210 -
211 -@@ -134,10 +134,11 @@
212 - @ENDIF
213 -
214 - @IFDEF PURE_STATIC
215 -- CXXFLAGS += -DPURE_STATIC
216 -+ MYCXXFLAGS += -DPURE_STATIC
217 - @ENDIF
218 -
219 --@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
220 -+MYCXXFLAGS += $(CXXFLAGS)
221 -+@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
222 - @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
223 -
224 - # Default target
225 -@@ -150,10 +151,10 @@
226 - @GNU_ONLY TARGET = modules/$(M:.so=).so
227 - @ENDIF
228 -
229 --@IFDEF T
230 -+@IFDEF TGT
231 - HEADER =
232 - FOOTER = target
233 -- TARGET = $(T)
234 -+ TARGET = $(TGT)
235 - @ENDIF
236 -
237 - @IFEQ $(DBGOK) 0
238 -@@ -228,8 +229,8 @@
239 - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
240 - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
241 - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
242 -- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
243 -- @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
244 -+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
245 -+ @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
246 - @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
247 - [ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
248 - @IFNDEF PURE_STATIC
249 -@@ -237,9 +238,9 @@
250 - @ENDIF
251 - -$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
252 - -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
253 -- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
254 -- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
255 -- -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
256 -+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
257 -+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
258 -+ -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
259 - @echo ""
260 - @echo "*************************************"
261 - @echo "* INSTALL COMPLETE! *"
262 -@@ -252,7 +253,7 @@
263 - @echo ' Data:' $(DATPATH)
264 - @echo 'To start the ircd, run:' $(BASE)/inspircd start
265 - @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
266 -- @echo 'Examples are available at:' $(CONPATH)/examples/
267 -+ @echo 'Examples are available at:' $(CONPATH)
268 -
269 - @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
270 - @BSD_ONLY RCS_FILES = src/version.sh
271 -diff -Nuar a/make/unit-cc.pl b/make/unit-cc.pl
272 ---- a/make/unit-cc.pl 2015-05-10 00:24:10.000000000 -0500
273 -+++ b/make/unit-cc.pl 2015-07-27 05:22:26.107849785 -0500
274 -@@ -113,7 +113,7 @@
275 - my $libs = '';
276 - my $binary = $ENV{RUNCC};
277 - if ($do_compile) {
278 -- $flags = $ENV{CXXFLAGS};
279 -+ $flags = $ENV{MYCXXFLAGS};
280 - $flags =~ s/ -pedantic// if nopedantic($file);
281 - $flags .= ' ' . getcompilerflags($file);
282 -
283
284 diff --git a/net-irc/inspircd/inspircd-2.0.24-r1.ebuild b/net-irc/inspircd/inspircd-2.0.24-r1.ebuild
285 deleted file mode 100644
286 index d3c92bdafc3..00000000000
287 --- a/net-irc/inspircd/inspircd-2.0.24-r1.ebuild
288 +++ /dev/null
289 @@ -1,123 +0,0 @@
290 -# Copyright 1999-2017 Gentoo Foundation
291 -# Distributed under the terms of the GNU General Public License v2
292 -
293 -EAPI="6"
294 -
295 -inherit toolchain-funcs user versionator
296 -
297 -DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
298 -HOMEPAGE="https://inspircd.github.com/"
299 -SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
300 -
301 -LICENSE="GPL-2"
302 -SLOT="0"
303 -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
304 -IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
305 -
306 -RDEPEND="
307 - dev-lang/perl
308 - ssl? ( dev-libs/openssl:= )
309 - geoip? ( dev-libs/geoip )
310 - gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
311 - ldap? ( net-nds/openldap )
312 - mysql? ( virtual/mysql )
313 - postgres? ( dev-db/postgresql:= )
314 - pcre? ( dev-libs/libpcre )
315 - sqlite? ( >=dev-db/sqlite-3.0 )
316 - tre? ( dev-libs/tre )"
317 -DEPEND="${RDEPEND}"
318 -
319 -DOCS=( docs/. )
320 -PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
321 -
322 -pkg_setup() {
323 - enewgroup ${PN}
324 - enewuser ${PN} -1 -1 -1 ${PN}
325 -}
326 -
327 -src_prepare() {
328 - # Patch the inspircd launcher with the inspircd user
329 - sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
330 -
331 - default_src_prepare
332 -}
333 -
334 -src_configure() {
335 - local extras=""
336 -
337 - use geoip && extras="${extras}m_geoip.cpp,"
338 - use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
339 - use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
340 - use mysql && extras="${extras}m_mysql.cpp,"
341 - use pcre && extras="${extras}m_regex_pcre.cpp,"
342 - use posix && extras="${extras}m_regex_posix.cpp,"
343 - use postgres && extras="${extras}m_pgsql.cpp,"
344 - use sqlite && extras="${extras}m_sqlite3.cpp,"
345 - use ssl && extras="${extras}m_ssl_openssl.cpp,"
346 - use tre && extras="${extras}m_regex_tre.cpp,"
347 -
348 - if [[ -n "${extras}" ]]; then
349 - econf --disable-interactive --enable-extras=${extras%,}
350 - fi
351 -
352 - econf \
353 - --with-cc="$(tc-getCXX)" \
354 - --disable-interactive \
355 - --prefix="/usr/$(get_libdir)/${PN}" \
356 - --config-dir="/etc/${PN}" \
357 - --data-dir="/var/lib/${PN}/data" \
358 - --log-dir="/var/log/${PN}" \
359 - --binary-dir="/usr/bin" \
360 - --module-dir="/usr/$(get_libdir)/${PN}/modules" \
361 - $(usex ipv6 '' '--disable-ipv6') \
362 - $(usex gnutls '--enable-gnutls' '') \
363 - $(usex ssl '--enable-openssl' '')
364 -}
365 -
366 -src_compile() {
367 - emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
368 -}
369 -
370 -src_install() {
371 - emake INSTUID=${PN} DESTDIR="${D%/}" install
372 -
373 - insinto "/usr/include/${PN}"
374 - doins -r include/.
375 -
376 - einstalldocs
377 -
378 - diropts -o"${PN}" -g"${PN}" -m0700
379 - dodir "/var/lib/${PN}"
380 - dodir "/var/lib/${PN}/data"
381 -
382 - newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}"
383 - newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}"
384 -
385 - keepdir "/var/log/${PN}"
386 -
387 - rm -r "${D%/}/etc/${PN}" || die
388 - dodir "/etc/${PN}"
389 - dodir "/etc/${PN}/aliases"
390 - dodir "/etc/${PN}/modules"
391 -}
392 -
393 -pkg_postinst() {
394 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
395 - # This is a new installation
396 - elog "Before starting ${PN} the first time, you *must* create"
397 - elog "the /etc/${PN}/${PN}.conf file."
398 - elog "You will find example configuration files under "
399 - elog "/usr/share/doc/${PN}"
400 - elog "Read the ${PN}.conf.example file carefully before "
401 - elog "starting the service."
402 - fi
403 - local pv=""
404 - for pv in ${REPLACING_VERSIONS}; do
405 - if ! version_is_at_least "2.0.24-r1" "${pv}"; then
406 - elog "Starting with 2.0.24-r1 the daemon is no longer started"
407 - elog "with the --logfile option and you are thus expected to define"
408 - elog "logging in the InspIRCd configuration file if you want it."
409 - break
410 - fi
411 - done
412 -}