gentoo resync : 25.08.2020

3 files changed, 25 insertions, 33 deletions

diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 885aa51e6047..3d09f504e7fa 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,12 +1,12 @@
 AUX inspircd-2.0.27-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
 AUX inspircd-3.4.0-fix-path-builds.patch 12942 BLAKE2B 7fe7bc904331f2cff3a27268af3a0bfe4db6fdec57ca3b846af43d8949aa047340cdc5c7d858fa96527aa3fa8af0774dbe2a8b3035f17962511b21ab94707b07 SHA512 54c773df0c4b48af2f83bcf6923c2679a9c46ac57232834cb1157b9d6528f39b2de1187e6b6989046509d434b3cfa427b77ff80b33b58b88c72d73087dc7a14b
-AUX inspircd-3.5.0-fix-path-builds.patch 16773 BLAKE2B 0cd63c080579fab035e44c965c56be5c57a738dad8cb2e118e96889a5e7413d7bf7a0a322132e6e47965aacd815e2b4b65fd17335f3baeaadf4bc0891391f597 SHA512 e45dffd981aa129d8628cd5272de4dd252763c4932b8b7d852eeab6f8590a046c173479b72f199604976d33a343d8055ae34c0354209c683b1aa6f56750a1f39
+AUX inspircd-3.7.0-fix-path-builds.patch 16417 BLAKE2B 9961fa65037cd34eec1cd07ad6093d0cded8d6a148bec41ac396dc67329ec97f3533aeab4cb38be0c2c0c783659b603e6d69e7b9a01faf81a9b2dfe5214288a6 SHA512 a74516ef425269d15beee9568cc8ecb3016c595f1c1a5157848ab81c9644aaeb8cb61899f81b426485881e27c4564373519d1a36412816d97bde168d138b449b
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-2.0.29.tar.gz 736116 BLAKE2B bd634b81e5a21f4d5e12a4057c4dfb65a241b696be373d24a047594d1d175028dcabff2f28defcf4c340859cfc50637afec755f399c24366e1134c7d69c843f2 SHA512 83da7b089dca8035ffa4f30a2e757661150bb9337aa8124958daa317b44a98fb15fdcb872f8512737b5a39f1b641616eb27c4398d4c8d8fcd40d1f8872bd2052
 DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
-DIST inspircd-3.6.0.tar.gz 851768 BLAKE2B e1cbad4e5f00e769e804abc432dbac24ae4c988aac690d009dd87f28d75c4229a174c1703395cae42306b45ba167268c2032a3c2533fdde8154a67f53f2e18f8 SHA512 b1feaf983f30aa3192860d931f85bb2e5b5f10d3b7582b7e5faa8fc16a349c79506f5a7ba9e1f4f8b24d62639c0e0e88f2d97a3130473ee10eda93dd5c131630
+DIST inspircd-3.7.0.tar.gz 855041 BLAKE2B 8b65c6d29ecf448503201d6d3d9b5416775f7ea97dd3e3acb947cbfcecd4a137f5c4dfd5902f8de43c03b5c5d799acc4a833631982f9815053beec07366a7ccb SHA512 d683d54a046f9bf17ae1a7bb1e2ce94000455c0249478250fd7263f8ede12048ce3982b990bb47461a1c7d9ea5fc20836b3dd255924e72d187eb3a6d591fd51d
 EBUILD inspircd-2.0.29.ebuild 3142 BLAKE2B 6a7434a1bf5841638268931c4106c2ff684ba00a7c6887a5d665632bd97ac99f1a38210cd0217c4951ec7a4585397685a3effe3298f9902b020c872056964cf1 SHA512 b0c245ef1d277fd8b9d728a98cef25b30e593faa847b6d5032d606957f5c2b77157dd4878baa8c20bc48ade6a9d471b49b159d2f7d6f5759cd519b6d6fe2d4b8
 EBUILD inspircd-3.4.0-r1.ebuild 3620 BLAKE2B b7e49e080ce8d5a7b418ec12462ebf53af247c494d9c299027d952eede5e9cce243f53ccbd90e000aac7e2a4c490fd6f54228a92943a0093a033e918f169afba SHA512 e0809008918e85cf50af088e13d1c09953fb88416bcb9d63f009ef339ab420329cb7a4eea9189bde9bad1eb51fe3ef7c97d49ce53d2b471e09962ccddafedf76
-EBUILD inspircd-3.6.0.ebuild 3622 BLAKE2B 4ed8b42b32fcdb354add43029533c45a5ae35300564d93699c5d114d167670593f6a23ae8bb212b8367ab611af7ca18c26ba547c410decf839d050aa7e401311 SHA512 2c940d423fd048d8857f07df0617071beb925bfc6d8684df41882ecb6d13f291d9435986f2c74a0fdd6c5b0fd49b910316a67b122e915f28b2ae66b2c2e062d7
+EBUILD inspircd-3.7.0.ebuild 3622 BLAKE2B 6418faafa0282e095add6dfa6f5ba4601cf3df33d50e3a9e957cfde7a475edee1cc40c9ccecd0f3bb2f21e0b5efde1645efdde1b57dddb73c776e5ad06a723b5 SHA512 0595ddf6fce1510bf5800490d357da72027d242454a484c3d03ff5f478220e43fdebf3329486d63bb54dd13fe47d742ed8d86fcea4ee6ec18ac25d6ff6fa1c97
 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
diff --git a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch
index 578453934c8f..92e1c4b6032f 100644
--- a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch
+++ b/net-irc/inspircd/files/inspircd-3.7.0-fix-path-builds.patch
@@ -32,23 +32,19 @@ similarity index 100%
 rename from docs/conf/helpop.conf.example
 rename to docs/conf/helpop.conf
 diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
-similarity index 98%
+similarity index 99%
 rename from docs/conf/inspircd.conf.example
 rename to docs/conf/inspircd.conf
-index dbd56d2fe..665d4dfb5 100644
+index d678b5be3..607141381 100644
 --- a/docs/conf/inspircd.conf.example
 +++ b/docs/conf/inspircd.conf
-@@ -247,10 +247,10 @@
+@@ -250,7 +250,7 @@
  # This can be done by using <connect registered="no">                 #
  
  # To enable IRCCloud on your network uncomment this:
 -#<include file="examples/providers/irccloud.conf.example">
 +#<include file="/etc/inspircd/providers/irccloud.conf">
  
- # To enable KiwiIRC.com on your network uncomment this:
--#<include file="examples/providers/kiwiirc-com.conf.example">
-+#<include file="/etc/inspircd/providers/kiwiirc-com.conf">
- 
  # A connect class with <connect:deny> set denies connections from the specified host/IP range.
  <connect
 @@ -494,11 +494,11 @@
@@ -79,11 +75,11 @@ index dbd56d2fe..665d4dfb5 100644
  #                                                                     #
  
 -#<pid file="/path/to/inspircd.pid">
-+<pid file="/var/run/inspircd/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
  
  #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
  #                                                                     #
-@@ -693,7 +693,7 @@
+@@ -697,7 +697,7 @@
           #                    messages (requires the stripcolor module).
           #  - topiclock       Channel mode +t - limits changing the topic to (half)ops
           # You can also configure this on a per-channel basis with a channel mode.
@@ -92,7 +88,7 @@ index dbd56d2fe..665d4dfb5 100644
           exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o"
  
           # invitebypassmodes: This allows /INVITE to bypass other channel modes.
-@@ -1041,7 +1041,7 @@
+@@ -1045,7 +1045,7 @@
  # provide almost all the features of InspIRCd. :)                     #
  #                                                                     #
  # The default does nothing -- we include it for simplicity for you.   #
@@ -101,7 +97,7 @@ index dbd56d2fe..665d4dfb5 100644
  
  #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION  #-#-#-#-#-#-#-#-#-#-#-#
  #                                                                     #
-@@ -1050,13 +1050,13 @@
+@@ -1054,13 +1054,13 @@
  # exemptions for services pseudoclients:                              #
  #
  # Anope users should uncomment this:
@@ -122,7 +118,7 @@ diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf
 similarity index 98%
 rename from docs/conf/links.conf.example
 rename to docs/conf/links.conf
-index 09b3bb3d5..22db1bdab 100644
+index 256ac10f9..40f5be35d 100644
 --- a/docs/conf/links.conf.example
 +++ b/docs/conf/links.conf
 @@ -121,4 +121,4 @@
@@ -135,7 +131,7 @@ diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
 similarity index 99%
 rename from docs/conf/modules.conf.example
 rename to docs/conf/modules.conf
-index d68248163..b55d368fb 100644
+index 2e50977bd..315d376cf 100644
 --- a/docs/conf/modules.conf.example
 +++ b/docs/conf/modules.conf
 @@ -576,10 +576,10 @@
@@ -189,7 +185,7 @@ index d68248163..b55d368fb 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  # Hide chans module: Allows users to hide their channels list from non-
-@@ -1575,7 +1575,7 @@
+@@ -1581,7 +1581,7 @@
  # onoper        - If on, the message is sent on /OPER, otherwise it's #
  #                 only sent when /OPERMOTD is used.                   #
  #                                                                     #
@@ -198,9 +194,9 @@ index d68248163..b55d368fb 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  # Override module: Adds support for oper override.
-@@ -2153,7 +2153,7 @@
+@@ -2172,7 +2172,7 @@
  # connections in order to oper up. It is highly recommended to load
- # this module if you use SSL on your network.
+ # this module if you use TLS (SSL) on your network.
  # For how to use the oper features, please see the first
 -# example <oper> tag in opers.conf.example.
 +# example <oper> tag in opers.conf.
@@ -243,10 +239,10 @@ diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf
 similarity index 99%
 rename from docs/conf/opers.conf.example
 rename to docs/conf/opers.conf
-index 7cad2589c..082009da9 100644
+index d8c266b1f..9517b3685 100644
 --- a/docs/conf/opers.conf.example
 +++ b/docs/conf/opers.conf
-@@ -178,4 +178,4 @@
+@@ -182,4 +182,4 @@
  
  # Once you have edited this file you can remove this line. This is just to
  # ensure that you don't hastily include the file without reading it.
@@ -256,10 +252,6 @@ diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irc
 similarity index 100%
 rename from docs/conf/providers/irccloud.conf.example
 rename to docs/conf/providers/irccloud.conf
-diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
-similarity index 100%
-rename from docs/conf/providers/kiwiirc-com.conf.example
-rename to docs/conf/providers/kiwiirc-com.conf
 diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt
 similarity index 100%
 rename from docs/conf/quotes.txt.example
@@ -301,10 +293,10 @@ similarity index 100%
 rename from docs/conf/services/generic.conf.example
 rename to docs/conf/services/generic.conf
 diff --git a/make/template/main.mk b/make/template/main.mk
-index a57595c9d..42fef2563 100644
+index 9f905f970..c87da5d73 100644
 --- a/make/template/main.mk
 +++ b/make/template/main.mk
-@@ -220,10 +220,10 @@ install: target
+@@ -221,10 +221,10 @@ install: target
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
@@ -319,10 +311,10 @@ index a57595c9d..42fef2563 100644
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
-@@ -240,11 +240,11 @@ endif
- 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
- 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
+@@ -244,11 +244,11 @@ endif
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.1 $(MANPATH) 2>/dev/null
  	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null
 -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
 -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
 -	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
@@ -333,10 +325,10 @@ index a57595c9d..42fef2563 100644
 +	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
 +	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
 +	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
  	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
  	@echo ""
- 	@echo "*************************************"
-@@ -258,7 +258,6 @@ endif
+@@ -263,7 +263,6 @@ endif
  	@echo '  Data:' $(DATPATH)
  	@echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
  	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
diff --git a/net-irc/inspircd/inspircd-3.6.0.ebuild b/net-irc/inspircd/inspircd-3.7.0.ebuild
index 92c0dfe18f1a..60448a5f4f90 100644
--- a/net-irc/inspircd/inspircd-3.6.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.7.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${PN}-3.5.0-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.7.0-fix-path-builds.patch )
 
 src_prepare() {
 	default