Gentoo Archives: gentoo-commits

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