gentoo resync : 19.07.2019

3 files changed, 38 insertions, 31 deletions

diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 8b21753e0806..14c9d464b7bb 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,12 +1,12 @@
 AUX inspircd-2.0.25-fix-path-builds.patch 9669 BLAKE2B 8b6612800028658cf231be62fbdd92638bfbc64fc1e9634bfbbdfe997f2915f583aba8ee41fbf98f44e016b1bdf17936017d5e9217c29aa404576167526f9d1b SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9
 AUX inspircd-2.0.27-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
-AUX inspircd-3.1.0-fix-path-builds.patch 12262 BLAKE2B cef2d7bac65cbf90d219852e5692154c659cc3947bc1626ec2b47f34b617c0bb2f3aef451925b2dd59f37da02055049aff250d8cbb60e770ac11fe6ef7ee636c SHA512 7ca1a2a7218797775238bd68d2c1fbcfc1797de4a2b4e9e2e64c7e12c84acc285f9576c056e18989b10279f5314f6f910fde60ae2e11b993f3523c6f328363f5
+AUX inspircd-3.2.0-fix-path-builds.patch 12593 BLAKE2B fe6e74da76321c4be5bd736e84385ccd73a267f175b9eb3b613a4cb5a19b4388ad66eb0be7740e58fb3ab9af5bddfca9b27454e586853c0db461eb5d62ed2b25 SHA512 288205a8f9b26019ac3a682d9d168839ead435ffbe6423e069f98d1213ea00a18a30fb05ad63555001411fd7043b88f3fb7005081e7433a2ebf28927776e6e0a
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
 DIST inspircd-2.0.27.tar.gz 735970 BLAKE2B 74a262ddd5f7d2fd61a1a01cddb0d61bf58e9fcdb3a69ebda15d711f3439b7b8e4387ee9ef3b55309e213e1e8bdc2978ca5b319720b0fcf71d9645f13102c2a2 SHA512 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd
-DIST inspircd-3.1.0.tar.gz 795435 BLAKE2B 86f4c62b61ea2692be4f0bba21976e738f733187640f7fa43f3e90fb29b5a6e1bd4769fcdb86f1912a43cd856f5d1d28a335c2e6e4c86db6097588247ec6e119 SHA512 77e5602115d612be6bb1dc0123f5fde2e6ff0547376de04cd5c24de9376797654bbd62a01d058b6f27858bd338ae9126cdd0dcd8571ba0c33afc1f3e166e000c
+DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
 EBUILD inspircd-2.0.25.ebuild 3376 BLAKE2B 802a96022a2cad65801d6dab88d2069523ce72914b2558718b39dde9891e6e0b78cd432541add655cdf1a01376ec1f8d216640c9480a84deb36b703345377859 SHA512 fd9a2c56b35f6855a68e8d697df1e63100c0abafdcd7a79b4ca53bc0f65a23876870352c3203e09a4a668844fd01735896d93ace6e60bd8a01e5253c5af9f99e
 EBUILD inspircd-2.0.27.ebuild 3168 BLAKE2B 06c0815778898c90477b49aae366e2f250a30a716da12d6d3414fd164107a9deb5b1e580937aee3be226cbf09df14af7bce301a6d09e0e6fc30e3b5963363952 SHA512 ae539416d593d8602a900ea8cfebf450d4c5762163bf9a0ee0556d1ad51d42302e93c5d20788d1285d6a26a714a1f5d413ffd547c7c74f517779e873b9689476
-EBUILD inspircd-3.1.0.ebuild 3878 BLAKE2B e52ff76092c5b72d1a8338929980b7f11479daac448eada0d758e8237d7fa1e93f03c81282f61017f9a6bd5439f0f65638b63173867fba829fd8c2844c1a2276 SHA512 36021b543acd0cb0d4757483914433e9b5125093dee686c1edf97adb391e0451079966e36e65f357e288fb6b246f937f7da596ddbd454f677a3f63a729943a66
+EBUILD inspircd-3.2.0.ebuild 3870 BLAKE2B 38bca33d824c7bba4c79612d70bc638a1bcd47af3561ea6bc2b3a8eed2b235dd5d41e3644b65beab54f7f7cc2b59bd7eb4325c33bb059b05486402ab07c62b40 SHA512 2df090adea36eec1f3312cee25cc39fae7014f7187125a16d56b7a4f8dbaba4768be7159d760da22fd592cc4a02ea583329d7e3bc4849431e9a4d85ba5b44f79
 MISC metadata.xml 1928 BLAKE2B b3c78c7526b07644b61532293634647d5db2c60f3f69e7cae15f4cc7fb7ad12dcbe980467d2c433e509817a8e200d0e674e0a1b12f5cec3ffbf5a80ebe5a2d53 SHA512 8c373da73fdad81bce0533aa767716fe16bbdbe909818f1a022a43b307e6679456150a077a155076d221b48759b00a0f09947d32608876787c306fac88918098
diff --git a/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
index 0f4738c70123..955b2be79095 100644
--- a/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch
+++ b/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
@@ -10,10 +10,10 @@ diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
 similarity index 99%
 rename from docs/conf/inspircd.conf.example
 rename to docs/conf/inspircd.conf
-index 9baaa5261..60e277310 100644
+index dbd56d2fe..4a7aab514 100644
 --- a/docs/conf/inspircd.conf.example
 +++ b/docs/conf/inspircd.conf
-@@ -465,11 +465,11 @@
+@@ -494,11 +494,11 @@
  
  # This file has all the information about oper classes, types and o:lines.
  # You *MUST* edit it.
@@ -27,7 +27,7 @@ index 9baaa5261..60e277310 100644
  
  #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
  #                                                                     #
-@@ -478,7 +478,7 @@
+@@ -507,7 +507,7 @@
  #
  #   motd - displayed on connect and when a user executes /MOTD
  # Modules can also define their own files
@@ -36,7 +36,7 @@ index 9baaa5261..60e277310 100644
  
  # Example of an executable file include. Note this will be read on rehash,
  # not when the command is run.
-@@ -514,7 +514,7 @@
+@@ -543,7 +543,7 @@
  # the default of 'inspircd.pid' is used.                              #
  #                                                                     #
  
@@ -45,7 +45,7 @@ index 9baaa5261..60e277310 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
  #                                                                     #
-@@ -1012,7 +1012,7 @@
+@@ -1041,7 +1041,7 @@
  # provide almost all the features of InspIRCd. :)                     #
  #                                                                     #
  # The default does nothing -- we include it for simplicity for you.   #
@@ -54,7 +54,7 @@ index 9baaa5261..60e277310 100644
  
  #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION  #-#-#-#-#-#-#-#-#-#-#-#
  #                                                                     #
-@@ -1021,13 +1021,13 @@
+@@ -1050,13 +1050,13 @@
  # exemptions for services pseudoclients:                              #
  #
  # Anope users should uncomment this:
@@ -79,7 +79,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 bb8a74dbc..397b61295 100644
+index 3bf1c2e99..b451a2f18 100644
 --- a/docs/conf/modules.conf.example
 +++ b/docs/conf/modules.conf
 @@ -832,7 +832,7 @@
@@ -91,7 +91,7 @@ index bb8a74dbc..397b61295 100644
  # detailed list of the restriction modes that can be exempted.        #
  # These are settable using: /MODE #chan +X <restriction>:<status>     #
  #<module name="exemptchanops">
-@@ -862,7 +862,7 @@
+@@ -868,7 +868,7 @@
  # Your choice of regex engine must match on all servers network-wide. #
  #                                                                     #
  # To learn more about the configuration of this module, read          #
@@ -100,7 +100,7 @@ index bb8a74dbc..397b61295 100644
  # filters and shows how to add exemptions.                            #
  #                                                                     #
  #-#-#-#-#-#-#-#-#-#-#-  FILTER  CONFIGURATION  -#-#-#-#-#-#-#-#-#-#-#-#
-@@ -871,7 +871,7 @@
+@@ -877,7 +877,7 @@
  # specify below the path to the filter.conf file, or define some      #
  # <keyword> tags.                                                     #
  #                                                                     #
@@ -109,7 +109,7 @@ index bb8a74dbc..397b61295 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)#
-@@ -961,7 +961,7 @@
+@@ -967,7 +967,7 @@
  # If you specify to use the helpop module, then specify below the     #
  # path to the helpop.conf file.                                       #
  #                                                                     #
@@ -118,7 +118,7 @@ index bb8a74dbc..397b61295 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  # Hide chans module: Allows users to hide their channels list from non-
-@@ -1533,7 +1533,7 @@
+@@ -1545,7 +1545,7 @@
  # onoper        - If on, the message is sent on /OPER, otherwise it's #
  #                 only sent when /OPERMOTD is used.                   #
  #                                                                     #
@@ -127,7 +127,7 @@ index bb8a74dbc..397b61295 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  # Override module: Adds support for oper override.
-@@ -2106,7 +2106,7 @@
+@@ -2123,7 +2123,7 @@
  # connections in order to oper up. It is highly recommended to load
  # this module if you use SSL on your network.
  # For how to use the oper features, please see the first
@@ -181,6 +181,14 @@ index 7cad2589c..082009da9 100644
  # ensure that you don't hastily include the file without reading it.
 -<die reason="Using opers.conf.example without editing it is a security risk">
 +<die reason="Using opers.conf without editing it is a security risk">
+diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
+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
@@ -222,39 +230,38 @@ 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 e39a24f87..e0fcbf4fc 100644
+index d77d59fa5..b28d7180d 100644
 --- a/make/template/main.mk
 +++ b/make/template/main.mk
-@@ -207,8 +207,8 @@ install: target
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
+@@ -210,8 +210,8 @@ install: target
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
 +	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
 +	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
+ 	@-$(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)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH)
-@@ -225,9 +225,9 @@ endif
+@@ -229,9 +229,9 @@ 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
  	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
 +	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
 +	-$(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_PRV) *.pem $(CONPATH) 2>/dev/null
  	@echo ""
  	@echo "*************************************"
-@@ -241,7 +241,7 @@ endif
+@@ -245,7 +245,6 @@ endif
  	@echo '  Data:' $(DATPATH)
  	@echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
  	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
--	@echo 'Examples are available at:' $(CONPATH)/examples/
-+	@echo 'Examples are available at:' $(CONPATH)
+-	@echo 'Examples are available at:' $(EXAPATH)
  
  GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
  	./configure --update
diff --git a/net-irc/inspircd/inspircd-3.1.0.ebuild b/net-irc/inspircd/inspircd-3.2.0.ebuild
index 98fed20a13d3..2416d94a03a4 100644
--- a/net-irc/inspircd/inspircd-3.1.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -41,7 +41,7 @@ src_prepare() {
 	default
 
 	# Patch the inspircd launcher with the inspircd user
-	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+	sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
 }
 
 src_configure() {