1 |
commit: 2a07167f0bb8ee125b1281c8a96a74a760ef5c82 |
2 |
Author: Wade Cline <wadecline <AT> hotmail <DOT> com> |
3 |
AuthorDate: Sat May 29 18:38:45 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 31 08:15:38 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a07167f |
7 |
|
8 |
net-irc/inspircd: Drop 3.9.0 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/791589 |
11 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
12 |
Signed-off-by: Wade Cline <wadecline <AT> hotmail.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/21040 |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
net-irc/inspircd/Manifest | 1 - |
17 |
.../files/inspircd-3.9.0-fix-path-builds.patch | 384 --------------------- |
18 |
net-irc/inspircd/inspircd-3.9.0.ebuild | 121 ------- |
19 |
3 files changed, 506 deletions(-) |
20 |
|
21 |
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest |
22 |
index 53ada51b850..65e95bbd2e8 100644 |
23 |
--- a/net-irc/inspircd/Manifest |
24 |
+++ b/net-irc/inspircd/Manifest |
25 |
@@ -1,3 +1,2 @@ |
26 |
DIST inspircd-3.10.0-fix-path-builds.patch.bz2 5316 BLAKE2B 42831f5f1c442b0492dee1d49469361ca797e743399bf8cffd6069227fbaf0123ab43eda81ad0f732bed289111238e00f0e9b3351a555fc4b14f24fe18bb8251 SHA512 e1479970050dca02be092d5575077342ce3e517baf1c9b1d80e4b2a52559786dca387c685505d6c42b812c9206961eef057ad07a2f4966f9922a16a387559eb0 |
27 |
DIST inspircd-3.10.0.tar.gz 854024 BLAKE2B b6aed621c6c5c4ea082d07605c6a9fe8be5fce04896c820a9055b17103853b0091515f8a52448ecb1accbe39eef3f49b01acbecae73894b76f91bb4b75edf821 SHA512 6cb1c66ce2a4531628264fc4b4836b47b7cba2c8aa6ffef5d72489ae663815254783b09aeb149d8ae9e41cf51be3c703612d443da84995695449a94db86f8944 |
28 |
-DIST inspircd-3.9.0.tar.gz 853862 BLAKE2B 68134412f12ac06dc5ab5f9ffc94cb6053d88430210cb516e3569aad5e06dacd985038f51e057c9d7bd88179f472f685be5cd6fb31031e79948b0d3aee60eac3 SHA512 2adc4c39fc80d0095a9157a4c72f1df8288c364d909b2200eb04fb7e6bf5eb6172fe80153b79fdd437882d0b252999abad5912cef28f29cbceb9ab540df8db70 |
29 |
|
30 |
diff --git a/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch |
31 |
deleted file mode 100644 |
32 |
index 2c821586bbf..00000000000 |
33 |
--- a/net-irc/inspircd/files/inspircd-3.9.0-fix-path-builds.patch |
34 |
+++ /dev/null |
35 |
@@ -1,384 +0,0 @@ |
36 |
-From 675020067b59575c3bef2185aad42f046ea0c83d Mon Sep 17 00:00:00 2001 |
37 |
-From: Wade Cline <wadecline@×××××××.com> |
38 |
-Date: Mon, 3 Feb 2020 19:10:54 -0800 |
39 |
-Subject: [PATCH] Fix build paths |
40 |
- |
41 |
---- |
42 |
- .../{ascii.conf.example => ascii.conf} | 0 |
43 |
- .../{latin1.conf.example => latin1.conf} | 2 +- |
44 |
- .../{rfc1459.conf.example => rfc1459.conf} | 0 |
45 |
- ...c1459.conf.example => strict-rfc1459.conf} | 0 |
46 |
- .../conf/{filter.conf.example => filter.conf} | 0 |
47 |
- .../conf/{helpop.conf.example => helpop.conf} | 0 |
48 |
- .../{inspircd.conf.example => inspircd.conf} | 20 +++++++++---------- |
49 |
- docs/conf/{links.conf.example => links.conf} | 2 +- |
50 |
- .../{modules.conf.example => modules.conf} | 20 +++++++++---------- |
51 |
- docs/conf/{motd.txt.example => motd.txt} | 2 +- |
52 |
- .../{opermotd.txt.example => opermotd.txt} | 2 +- |
53 |
- docs/conf/{opers.conf.example => opers.conf} | 2 +- |
54 |
- .../{irccloud.conf.example => irccloud.conf} | 0 |
55 |
- docs/conf/{quotes.txt.example => quotes.txt} | 0 |
56 |
- .../{anope.conf.example => anope.conf} | 2 +- |
57 |
- .../{atheme.conf.example => atheme.conf} | 2 +- |
58 |
- .../{generic.conf.example => generic.conf} | 0 |
59 |
- make/template/main.mk | 19 +++++++++--------- |
60 |
- 18 files changed, 36 insertions(+), 37 deletions(-) |
61 |
- rename docs/conf/codepages/{ascii.conf.example => ascii.conf} (100%) |
62 |
- rename docs/conf/codepages/{latin1.conf.example => latin1.conf} (97%) |
63 |
- rename docs/conf/codepages/{rfc1459.conf.example => rfc1459.conf} (100%) |
64 |
- rename docs/conf/codepages/{strict-rfc1459.conf.example => strict-rfc1459.conf} (100%) |
65 |
- rename docs/conf/{filter.conf.example => filter.conf} (100%) |
66 |
- rename docs/conf/{helpop.conf.example => helpop.conf} (100%) |
67 |
- rename docs/conf/{inspircd.conf.example => inspircd.conf} (99%) |
68 |
- rename docs/conf/{links.conf.example => links.conf} (98%) |
69 |
- rename docs/conf/{modules.conf.example => modules.conf} (99%) |
70 |
- rename docs/conf/{motd.txt.example => motd.txt} (96%) |
71 |
- rename docs/conf/{opermotd.txt.example => opermotd.txt} (96%) |
72 |
- rename docs/conf/{opers.conf.example => opers.conf} (99%) |
73 |
- rename docs/conf/providers/{irccloud.conf.example => irccloud.conf} (100%) |
74 |
- rename docs/conf/{quotes.txt.example => quotes.txt} (100%) |
75 |
- rename docs/conf/services/{anope.conf.example => anope.conf} (86%) |
76 |
- rename docs/conf/services/{atheme.conf.example => atheme.conf} (98%) |
77 |
- rename docs/conf/services/{generic.conf.example => generic.conf} (100%) |
78 |
- |
79 |
-diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf |
80 |
-similarity index 100% |
81 |
-rename from docs/conf/codepages/ascii.conf.example |
82 |
-rename to docs/conf/codepages/ascii.conf |
83 |
-diff --git a/docs/conf/codepages/latin1.conf.example b/docs/conf/codepages/latin1.conf |
84 |
-similarity index 97% |
85 |
-rename from docs/conf/codepages/latin1.conf.example |
86 |
-rename to docs/conf/codepages/latin1.conf |
87 |
-index 3beb002fd..f5c6b98dc 100644 |
88 |
---- a/docs/conf/codepages/latin1.conf.example |
89 |
-+++ b/docs/conf/codepages/latin1.conf |
90 |
-@@ -39,4 +39,4 @@ |
91 |
- <cpcase lower="222" upper="254"> # þ => Þ |
92 |
- |
93 |
- # Include the ASCII rules to avoid duplication. |
94 |
--<include file="examples/codepages/ascii.conf.example"> |
95 |
-+<include file="/etc/inspircd/codepages/ascii.conf"> |
96 |
-diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf |
97 |
-similarity index 100% |
98 |
-rename from docs/conf/codepages/rfc1459.conf.example |
99 |
-rename to docs/conf/codepages/rfc1459.conf |
100 |
-diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf |
101 |
-similarity index 100% |
102 |
-rename from docs/conf/codepages/strict-rfc1459.conf.example |
103 |
-rename to docs/conf/codepages/strict-rfc1459.conf |
104 |
-diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf |
105 |
-similarity index 100% |
106 |
-rename from docs/conf/filter.conf.example |
107 |
-rename to docs/conf/filter.conf |
108 |
-diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf |
109 |
-similarity index 100% |
110 |
-rename from docs/conf/helpop.conf.example |
111 |
-rename to docs/conf/helpop.conf |
112 |
-diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf |
113 |
-similarity index 99% |
114 |
-rename from docs/conf/inspircd.conf.example |
115 |
-rename to docs/conf/inspircd.conf |
116 |
-index cdfb6f3c2..f0d17ceff 100644 |
117 |
---- a/docs/conf/inspircd.conf.example |
118 |
-+++ b/docs/conf/inspircd.conf |
119 |
-@@ -242,7 +242,7 @@ |
120 |
- # This can be done by using <connect registered="no"> # |
121 |
- |
122 |
- # To enable IRCCloud on your network uncomment this: |
123 |
--#<include file="examples/providers/irccloud.conf.example"> |
124 |
-+#<include file="/etc/inspircd/providers/irccloud.conf"> |
125 |
- |
126 |
- # A connect class with <connect:deny> set denies connections from the specified host/IP range. |
127 |
- <connect |
128 |
-@@ -494,11 +494,11 @@ |
129 |
- |
130 |
- # This file has all the information about oper classes, types and o:lines. |
131 |
- # You *MUST* edit it. |
132 |
--#<include file="examples/opers.conf.example"> |
133 |
-+#<include file="/etc/inspircd/opers.conf"> |
134 |
- |
135 |
- # This file has all the information about server links and ulined servers. |
136 |
- # You *MUST* edit it if you intend to link servers. |
137 |
--#<include file="examples/links.conf.example"> |
138 |
-+#<include file="/etc/inspircd/links.conf"> |
139 |
- |
140 |
- #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# |
141 |
- # # |
142 |
-@@ -507,7 +507,7 @@ |
143 |
- # |
144 |
- # motd - displayed on connect and when a user executes /MOTD |
145 |
- # Modules can also define their own files |
146 |
--<files motd="examples/motd.txt.example"> |
147 |
-+<files motd="/etc/inspircd/motd.txt"> |
148 |
- |
149 |
- # Example of an executable file include. Note this will be read on rehash, |
150 |
- # not when the command is run. |
151 |
-@@ -543,7 +543,7 @@ |
152 |
- # default of 'inspircd.pid' is used. # |
153 |
- # # |
154 |
- |
155 |
--#<pid file="/path/to/inspircd.pid"> |
156 |
-+#<pid file="/var/run/inspircd/inspircd.pid"> |
157 |
- |
158 |
- #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-# |
159 |
- # # |
160 |
-@@ -698,7 +698,7 @@ |
161 |
- # - topiclock Channel mode +t - limits changing the topic to (half)ops |
162 |
- # You can also configure this on a per-channel basis with a channel mode and |
163 |
- # even negate the configured exemptions below. |
164 |
-- # See exemptchanops in modules.conf.example for more details. |
165 |
-+ # See exemptchanops in modules.conf for more details. |
166 |
- exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o" |
167 |
- |
168 |
- # invitebypassmodes: This allows /INVITE to bypass other channel modes. |
169 |
-@@ -1041,7 +1041,7 @@ |
170 |
- # provide almost all the features of InspIRCd. :) # |
171 |
- # # |
172 |
- # The default does nothing -- we include it for simplicity for you. # |
173 |
--#<include file="examples/modules.conf.example"> |
174 |
-+#<include file="/etc/inspircd/modules.conf"> |
175 |
- |
176 |
- #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# |
177 |
- # # |
178 |
-@@ -1050,13 +1050,13 @@ |
179 |
- # exemptions for services pseudoclients: # |
180 |
- # |
181 |
- # Anope users should uncomment this: |
182 |
--#<include file="examples/services/anope.conf.example"> |
183 |
-+#<include file="/etc/inspircd/aliases/anope.conf"> |
184 |
- # |
185 |
- # Atheme users should uncomment this: |
186 |
--#<include file="examples/services/atheme.conf.example"> |
187 |
-+#<include file="/etc/inspircd/aliases/atheme.conf"> |
188 |
- # |
189 |
- # Users of other services should uncomment this: |
190 |
--#<include file="examples/services/generic.conf.example"> |
191 |
-+#<include file="/etc/inspircd/aliases/generic.conf"> |
192 |
- |
193 |
- ######################################################################### |
194 |
- # # |
195 |
-diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf |
196 |
-similarity index 98% |
197 |
-rename from docs/conf/links.conf.example |
198 |
-rename to docs/conf/links.conf |
199 |
-index 3b25e86f4..1208253a6 100644 |
200 |
---- a/docs/conf/links.conf.example |
201 |
-+++ b/docs/conf/links.conf |
202 |
-@@ -143,4 +143,4 @@ |
203 |
- |
204 |
- # Once you have edited this file you can remove this line. This is just to |
205 |
- # ensure that you don't hastily include the file without reading it. |
206 |
--<die reason="Using links.conf.example without editing it is a security risk"> |
207 |
-+<die reason="Using links.conf without editing it is a security risk"> |
208 |
-diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf |
209 |
-similarity index 99% |
210 |
-rename from docs/conf/modules.conf.example |
211 |
-rename to docs/conf/modules.conf |
212 |
-index d236d6cb9..8c80c5352 100644 |
213 |
---- a/docs/conf/modules.conf.example |
214 |
-+++ b/docs/conf/modules.conf |
215 |
-@@ -617,10 +617,10 @@ |
216 |
- #<module name="codepage"> |
217 |
- # |
218 |
- # You should include one of the following files to set your codepage: |
219 |
--#<include file="examples/codepages/ascii.conf.example"> |
220 |
--#<include file="examples/codepages/latin1.conf.example"> |
221 |
--#<include file="examples/codepages/rfc1459.conf.example"> |
222 |
--#<include file="examples/codepages/strict-rfc1459.conf.example"> |
223 |
-+#<include file="/etc/inspircd/codepages/ascii.conf"> |
224 |
-+#<include file="/etc/inspircd/codepages/latin1.conf"> |
225 |
-+#<include file="/etc/inspircd/codepages/rfc1459.conf"> |
226 |
-+#<include file="/etc/inspircd/codepages/strict-rfc1459.conf"> |
227 |
- # |
228 |
- # You can also define a custom codepage. For details on how to do this |
229 |
- # please refer to the docs site: |
230 |
-@@ -904,7 +904,7 @@ |
231 |
- # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, # |
232 |
- # censor, filter, flood, nickflood, noctcp, nonick, nonotice, # |
233 |
- # regmoderated, stripcolor, and topiclock. # |
234 |
--# See <options:exemptchanops> in inspircd.conf.example for a more # |
235 |
-+# See <options:exemptchanops> in inspircd.conf for a more # |
236 |
- # detailed list of the restriction modes that can be exempted. # |
237 |
- # These are settable using: /MODE #chan +X <restriction>:<status> # |
238 |
- # Furthermore, the exemptions configured in <options:exemptchanops> # |
239 |
-@@ -942,7 +942,7 @@ |
240 |
- # Your choice of regex engine must match on all servers network-wide. # |
241 |
- # # |
242 |
- # To learn more about the configuration of this module, read # |
243 |
--# examples/filter.conf.example, which covers the various types of # |
244 |
-+# filter.conf, which covers the various types of # |
245 |
- # filters and shows how to add exemptions. # |
246 |
- # # |
247 |
- #-#-#-#-#-#-#-#-#-#-#- FILTER CONFIGURATION -#-#-#-#-#-#-#-#-#-#-#-# |
248 |
-@@ -951,7 +951,7 @@ |
249 |
- # specify below the path to the filter.conf file, or define some # |
250 |
- # <keyword> tags. # |
251 |
- # # |
252 |
--#<include file="examples/filter.conf.example"> |
253 |
-+#<include file="/etc/inspircd/filter.conf"> |
254 |
- |
255 |
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# |
256 |
- # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)# |
257 |
-@@ -1041,7 +1041,7 @@ |
258 |
- # If you specify to use the helpop module, then specify below the # |
259 |
- # path to the helpop.conf file. # |
260 |
- # # |
261 |
--#<include file="examples/helpop.conf.example"> |
262 |
-+#<include file="/etc/inspircd/helpop.conf"> |
263 |
- |
264 |
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# |
265 |
- # Hide chans module: Allows users to hide their channels list from non- |
266 |
-@@ -1646,7 +1646,7 @@ |
267 |
- # onoper - If on, the message is sent on /OPER, otherwise it's # |
268 |
- # only sent when /OPERMOTD is used. # |
269 |
- # # |
270 |
--#<opermotd file="examples/opermotd.txt.example" onoper="yes"> |
271 |
-+#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes"> |
272 |
- |
273 |
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# |
274 |
- # Override module: Adds support for oper override. |
275 |
-@@ -2260,7 +2260,7 @@ |
276 |
- # connections in order to oper up. It is highly recommended to load |
277 |
- # this module if you use TLS (SSL) on your network. |
278 |
- # For how to use the oper features, please see the first |
279 |
--# example <oper> tag in opers.conf.example. |
280 |
-+# example <oper> tag in opers.conf. |
281 |
- # |
282 |
- #<module name="sslinfo"> |
283 |
- # |
284 |
-diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt |
285 |
-similarity index 96% |
286 |
-rename from docs/conf/motd.txt.example |
287 |
-rename to docs/conf/motd.txt |
288 |
-index cd993e9a3..0687a8aa0 100644 |
289 |
---- a/docs/conf/motd.txt.example |
290 |
-+++ b/docs/conf/motd.txt |
291 |
-@@ -21,7 +21,7 @@ |
292 |
- \__/ /(_/ \__/ |
293 |
- (__/ |
294 |
- |
295 |
-- +---- To change this see \bmotd.txt.example\x ----+ |
296 |
-+ +---- To change this see \bmotd.txt \x ----+ |
297 |
- | | |
298 |
- | * \bWeb:\x https://www.inspircd.org | |
299 |
- | * \bIRC:\x irc.inspircd.org #inspircd | |
300 |
-diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt |
301 |
-similarity index 96% |
302 |
-rename from docs/conf/opermotd.txt.example |
303 |
-rename to docs/conf/opermotd.txt |
304 |
-index b0d9b4816..b0d37f385 100644 |
305 |
---- a/docs/conf/opermotd.txt.example |
306 |
-+++ b/docs/conf/opermotd.txt |
307 |
-@@ -21,7 +21,7 @@ |
308 |
- \__/ /(_/ \__/ |
309 |
- (__/ |
310 |
- |
311 |
-- +-- To change this see \bopermotd.txt.example\x --+ |
312 |
-+ +-- To change this see \bopermotd.txt \x --+ |
313 |
- | | |
314 |
- | * \bWeb:\x https://www.inspircd.org | |
315 |
- | * \bIRC:\x irc.inspircd.org #inspircd | |
316 |
-diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf |
317 |
-similarity index 99% |
318 |
-rename from docs/conf/opers.conf.example |
319 |
-rename to docs/conf/opers.conf |
320 |
-index d8c266b1f..9517b3685 100644 |
321 |
---- a/docs/conf/opers.conf.example |
322 |
-+++ b/docs/conf/opers.conf |
323 |
-@@ -182,4 +182,4 @@ |
324 |
- |
325 |
- # Once you have edited this file you can remove this line. This is just to |
326 |
- # ensure that you don't hastily include the file without reading it. |
327 |
--<die reason="Using opers.conf.example without editing it is a security risk"> |
328 |
-+<die reason="Using opers.conf without editing it is a security risk"> |
329 |
-diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf |
330 |
-similarity index 100% |
331 |
-rename from docs/conf/providers/irccloud.conf.example |
332 |
-rename to docs/conf/providers/irccloud.conf |
333 |
-diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt |
334 |
-similarity index 100% |
335 |
-rename from docs/conf/quotes.txt.example |
336 |
-rename to docs/conf/quotes.txt |
337 |
-diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf |
338 |
-similarity index 86% |
339 |
-rename from docs/conf/services/anope.conf.example |
340 |
-rename to docs/conf/services/anope.conf |
341 |
-index 5c8f859ff..69a1ab50a 100644 |
342 |
---- a/docs/conf/services/anope.conf.example |
343 |
-+++ b/docs/conf/services/anope.conf |
344 |
-@@ -2,7 +2,7 @@ |
345 |
- # by Anope. See https://www.anope.org for more information on Anope. |
346 |
- |
347 |
- # This file inherits from the generic config to avoid repetition. |
348 |
--<include file="examples/services/generic.conf.example"> |
349 |
-+<include file="/etc/inspircd/services/generic.conf"> |
350 |
- |
351 |
- # /GLOBAL <message> |
352 |
- # Sends a global notice. |
353 |
-diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf |
354 |
-similarity index 98% |
355 |
-rename from docs/conf/services/atheme.conf.example |
356 |
-rename to docs/conf/services/atheme.conf |
357 |
-index d509522b8..c1e906ff7 100644 |
358 |
---- a/docs/conf/services/atheme.conf.example |
359 |
-+++ b/docs/conf/services/atheme.conf |
360 |
-@@ -3,7 +3,7 @@ |
361 |
- # information on Atheme. |
362 |
- |
363 |
- # This file inherits from the generic config to avoid repetition. |
364 |
--<include file="examples/services/generic.conf.example"> |
365 |
-+<include file="/etc/inspircd/services/generic.conf"> |
366 |
- |
367 |
- # Long hand aliases for services pseudoclients. |
368 |
- <alias text="ALIS" replace="SQUERY $requirement :$2-" requires="ALIS" uline="yes"> |
369 |
-diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf |
370 |
-similarity index 100% |
371 |
-rename from docs/conf/services/generic.conf.example |
372 |
-rename to docs/conf/services/generic.conf |
373 |
-diff --git a/make/template/main.mk b/make/template/main.mk |
374 |
-index a8783aa05..de9bbaa4e 100644 |
375 |
---- a/make/template/main.mk |
376 |
-+++ b/make/template/main.mk |
377 |
-@@ -214,10 +214,10 @@ install: target |
378 |
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH) |
379 |
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH) |
380 |
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH) |
381 |
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages |
382 |
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers |
383 |
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services |
384 |
-- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql |
385 |
-+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/codepages |
386 |
-+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers |
387 |
-+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services |
388 |
-+ @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql |
389 |
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH) |
390 |
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH) |
391 |
- @-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH) |
392 |
-@@ -238,11 +238,11 @@ endif |
393 |
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.1 $(MANPATH) 2>/dev/null |
394 |
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null |
395 |
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null |
396 |
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH) |
397 |
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages |
398 |
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers |
399 |
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services |
400 |
-- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql |
401 |
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH) |
402 |
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/* $(CONPATH)/codepages |
403 |
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers |
404 |
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services |
405 |
-+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql |
406 |
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH) |
407 |
- -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null |
408 |
- @echo "" |
409 |
-@@ -256,7 +256,6 @@ endif |
410 |
- @echo ' Data:' $(DATPATH) |
411 |
- @echo 'To start the ircd, run:' $(SCRPATH)/inspircd start |
412 |
- @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf |
413 |
-- @echo 'Examples are available at:' $(EXAPATH) |
414 |
- |
415 |
- GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@ |
416 |
- ./configure --update |
417 |
--- |
418 |
-2.26.2 |
419 |
- |
420 |
|
421 |
diff --git a/net-irc/inspircd/inspircd-3.9.0.ebuild b/net-irc/inspircd/inspircd-3.9.0.ebuild |
422 |
deleted file mode 100644 |
423 |
index 024100c3274..00000000000 |
424 |
--- a/net-irc/inspircd/inspircd-3.9.0.ebuild |
425 |
+++ /dev/null |
426 |
@@ -1,121 +0,0 @@ |
427 |
-# Copyright 1999-2021 Gentoo Authors |
428 |
-# Distributed under the terms of the GNU General Public License v2 |
429 |
- |
430 |
-EAPI="7" |
431 |
- |
432 |
-inherit toolchain-funcs |
433 |
- |
434 |
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" |
435 |
-HOMEPAGE="https://www.inspircd.org/" |
436 |
-SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
437 |
- |
438 |
-LICENSE="GPL-2" |
439 |
-SLOT="0" |
440 |
-KEYWORDS="amd64 ~ppc ~ppc64 x86" |
441 |
-IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre" |
442 |
- |
443 |
-RDEPEND=" |
444 |
- acct-group/inspircd |
445 |
- acct-user/inspircd |
446 |
- dev-lang/perl |
447 |
- gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) |
448 |
- ldap? ( net-nds/openldap ) |
449 |
- maxminddb? ( dev-libs/libmaxminddb ) |
450 |
- mbedtls? ( net-libs/mbedtls:= ) |
451 |
- mysql? ( dev-db/mysql-connector-c:= ) |
452 |
- pcre? ( dev-libs/libpcre ) |
453 |
- postgres? ( dev-db/postgresql:= ) |
454 |
- re2? ( dev-libs/re2:= ) |
455 |
- sqlite? ( >=dev-db/sqlite-3.0 ) |
456 |
- ssl? ( dev-libs/openssl:= ) |
457 |
- tre? ( dev-libs/tre )" |
458 |
-DEPEND="${RDEPEND}" |
459 |
- |
460 |
-DOCS=( docs/. ) |
461 |
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch ) |
462 |
- |
463 |
-src_prepare() { |
464 |
- default |
465 |
- |
466 |
- # Patch the inspircd launcher with the inspircd user |
467 |
- sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die |
468 |
-} |
469 |
- |
470 |
-src_configure() { |
471 |
- local extras="" |
472 |
- |
473 |
- use gnutls && extras+="m_ssl_gnutls.cpp," |
474 |
- use ldap && extras+="m_ldap.cpp," |
475 |
- use maxminddb && extras+="m_geo_maxmind.cpp," |
476 |
- use mbedtls && extras+="m_ssl_mbedtls.cpp," |
477 |
- use mysql && extras+="m_mysql.cpp," |
478 |
- use pcre && extras+="m_regex_pcre.cpp," |
479 |
- use postgres && extras+="m_pgsql.cpp," |
480 |
- use re2 && extras+="m_regex_re2.cpp," |
481 |
- use regex-posix && extras+="m_regex_posix.cpp," |
482 |
- use regex-stdlib && extras+="m_regex_stdlib.cpp," |
483 |
- use sqlite && extras+="m_sqlite3.cpp," |
484 |
- use ssl && extras+="m_ssl_openssl.cpp," |
485 |
- use sslrehashsignal && extras+="m_sslrehashsignal.cpp," |
486 |
- use tre && extras+="m_regex_tre.cpp," |
487 |
- |
488 |
- # The first configuration run enables certain "extra" InspIRCd |
489 |
- # modules, the second run generates the actual makefile. |
490 |
- if [[ -n "${extras}" ]]; then |
491 |
- ./configure --disable-interactive --enable-extras=${extras%,} |
492 |
- fi |
493 |
- |
494 |
- local myconf=( |
495 |
- --disable-interactive |
496 |
- --disable-auto-extras |
497 |
- --prefix="/usr/$(get_libdir)/${PN}" |
498 |
- --config-dir="/etc/${PN}" |
499 |
- --data-dir="/var/lib/${PN}/data" |
500 |
- --log-dir="/var/log/${PN}" |
501 |
- --binary-dir="/usr/bin" |
502 |
- --module-dir="/usr/$(get_libdir)/${PN}/modules" |
503 |
- --manual-dir="/usr/share/man") |
504 |
- CXX="$(tc-getCXX)" ./configure "${myconf[@]}" |
505 |
-} |
506 |
- |
507 |
-src_compile() { |
508 |
- emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1 |
509 |
-} |
510 |
- |
511 |
-src_install() { |
512 |
- default |
513 |
- |
514 |
- insinto "/usr/include/${PN}" |
515 |
- doins -r include/. |
516 |
- |
517 |
- newinitd "${FILESDIR}/${PN}.initd" "${PN}" |
518 |
- newconfd "${FILESDIR}/${PN}.confd" "${PN}" |
519 |
- |
520 |
- keepdir "/var/log/${PN}" |
521 |
- |
522 |
- diropts -o"${PN}" -g"${PN}" -m0700 |
523 |
- keepdir "/var/lib/${PN}/data" |
524 |
-} |
525 |
- |
526 |
-pkg_postinst() { |
527 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
528 |
- # This is a new installation |
529 |
- elog "You will find example configuration files under " |
530 |
- elog "/usr/share/doc/${PN}" |
531 |
- elog "Read the ${PN}.conf.example file carefully before " |
532 |
- elog "starting the service." |
533 |
- fi |
534 |
- local pv |
535 |
- for pv in ${REPLACING_VERSIONS}; do |
536 |
- if ver_test "${pv}" -lt "2.0.24-r1"; then |
537 |
- elog "Starting with 2.0.24-r1 the daemon is no longer started" |
538 |
- elog "with the --logfile option and you are thus expected to define" |
539 |
- elog "logging in the InspIRCd configuration file if you want it." |
540 |
- fi |
541 |
- if ver_test "${pv}" -lt "3.0.0"; then |
542 |
- elog "Version 3.0 is a major upgrade which contains breaking" |
543 |
- elog "changes. You will need to update your configuration files." |
544 |
- elog "See: https://docs.inspircd.org/3/configuration-changes" |
545 |
- fi |
546 |
- done |
547 |
-} |