gentoo resync : 18.11.2019

9 files changed, 279 insertions, 19 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 5e9bce067ff6..337f26f1a87c 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index a609eafac2cc..0b6ad4dda687 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,14 +1,15 @@
 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.2.0-fix-path-builds.patch 12593 BLAKE2B fe6e74da76321c4be5bd736e84385ccd73a267f175b9eb3b613a4cb5a19b4388ad66eb0be7740e58fb3ab9af5bddfca9b27454e586853c0db461eb5d62ed2b25 SHA512 288205a8f9b26019ac3a682d9d168839ead435ffbe6423e069f98d1213ea00a18a30fb05ad63555001411fd7043b88f3fb7005081e7433a2ebf28927776e6e0a
+AUX inspircd-3.4.0-fix-path-builds.patch 12943 BLAKE2B f6d5e862ed7b7cf53f0bf9fb79c7150e7fac86459a91c2e8bb7021e875bbe8514281686658f4c88155b492f1ac11fbb0f98d11c80da63687adf50a5f5ebe3756 SHA512 517ef1adbf59fa224c1a354400d4646b5aeb2ccd885c3d9bec75f91216e3e1bef385ae390607e88f5888a843e857e2cef63fd8f6a793b4ee9a20bdc3903ba3ee
 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.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
 DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
-DIST inspircd-3.3.0.tar.gz 803449 BLAKE2B 2b396db9d4bc84af33367715acb7f82299211ab31975310de0da4e3fe74385085b801c3bce6fe835b0f9e9857b1b457e037eb72e91d4455dc5918ad8d5bc844d SHA512 067904d877803c370873b5e79860fe0ac68529e740283e7e78dcd4dbbea30e19841a1f2e7e57e3e0b701704224369dbd484562e7edbbcd775bf85c18a4d340c3
+DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
 EBUILD inspircd-2.0.25.ebuild 3381 BLAKE2B aac34555ca6d261d75ed5ca7b436c85d4825e9db8862e9874df72a5565add35584b1e44ed5bbfb003255d3467216e8647f20697e561ce5125432d52e18571fd3 SHA512 1088fc518c4cdfbf3b7b76ebf4615981f3088ae74db89f6dae411e1d60679ab8c207f609b42b6780e02d62538a7e56ff4d767438fba05f2c1bb76886ee8950a6
 EBUILD inspircd-2.0.28.ebuild 3144 BLAKE2B 1318ec1b16835ee703a3ae7b3de69a91d257eb50763a98ed2d1597a04660b14f3e3458e762477071657c33cbf3757a2007184b757e4abd8b5cb18719b38fdfa6 SHA512 27e9ba6c17d790d1b9a7d9f36dff44675537d6bc117e3b5d77a244548cfc4741be8cf70038b236e1e9533625117f94509cba30773ecbec5e6dbe1fbc7dc0043e
 EBUILD inspircd-3.2.0.ebuild 3876 BLAKE2B 0aa4b3bff009c0b8e1bc4e71fad4463abb7cfda9fd0a596c5504f3607e82b0a2ff39d546566ee38a21821d481d872b775538d936630d80a9b7038fb4332f572b SHA512 36300359f12398ed11e405a0dd495d82ec916a34cf849152d68926edba6251cf1068959bdc03209694f98b8fb2ce0d20079caa92e40fc433e07a925e133bbb77
-EBUILD inspircd-3.3.0.ebuild 3846 BLAKE2B 8eeb8a0f3b7dee37aa33e9d54999ec8da48bcbd8b902ad96e2dc03d112f66659e8f4cb7272eda4ba0b1afbd3ac0da664484cf20b3bfd5c2c1b352706e191d3c8 SHA512 c79804131ab8673528af997b85eb624dfc53d7520a4433b026a6e3171184c94a781ca6523e442d93180ef2a5f8de10bac312c02b02ecee206b5fc222df2b16fd
+EBUILD inspircd-3.4.0.ebuild 3622 BLAKE2B ccdbc543cdbcd838e24dd9a6af7ab04644087f745b8448f3a789cee8e9586486eb76f3b98b78193c0bf2554b15b6e0c756bc17bfcffbb007f54a2ed6a7d1b812 SHA512 2e3820784f043662866b4a9d4c63dc8ed4b14462ddf26f1b46e195db4ca8bc950364785ca3518318ec4e8c5287c145251f3d467279b2e98192a3abac84a035ee
 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
diff --git a/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
new file mode 100644
index 000000000000..9b1e01b5be89
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch
@@ -0,0 +1,271 @@
+diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf
+similarity index 100%
+rename from docs/conf/filter.conf.example
+rename to docs/conf/filter.conf
+diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf
+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 99%
+rename from docs/conf/inspircd.conf.example
+rename to docs/conf/inspircd.conf
+index dbd56d2fe..4a7aab514 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -494,11 +494,11 @@
+ 
+ # This file has all the information about oper classes, types and o:lines.
+ # You *MUST* edit it.
+-#<include file="examples/opers.conf.example">
++#<include file="/etc/inspircd/opers.conf">
+ 
+ # This file has all the information about server links and ulined servers.
+ # You *MUST* edit it if you intend to link servers.
+-#<include file="examples/links.conf.example">
++#<include file="/etc/inspircd/links.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -507,7 +507,7 @@
+ #
+ #   motd - displayed on connect and when a user executes /MOTD
+ # Modules can also define their own files
+-<files motd="examples/motd.txt.example">
++<files motd="/etc/inspircd/motd.txt">
+ 
+ # Example of an executable file include. Note this will be read on rehash,
+ # not when the command is run.
+@@ -543,7 +543,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -1041,7 +1041,7 @@
+ # provide almost all the features of InspIRCd. :)                     #
+ #                                                                     #
+ # The default does nothing -- we include it for simplicity for you.   #
+-#<include file="examples/modules.conf.example">
++#<include file="/etc/inspircd/modules.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION  #-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -1050,13 +1050,13 @@
+ # exemptions for services pseudoclients:                              #
+ #
+ # Anope users should uncomment this:
+-#<include file="examples/services/anope.conf.example">
++#<include file="/etc/inspircd/aliases/anope.conf">
+ #
+ # Atheme users should uncomment this:
+-#<include file="examples/services/atheme.conf.example">
++#<include file="/etc/inspircd/aliases/atheme.conf">
+ #
+ # Users of other services should uncomment this:
+-#<include file="examples/services/generic.conf.example">
++#<include file="/etc/inspircd/aliases/generic.conf">
+ 
+ #########################################################################
+ #                                                                       #
+diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf
+similarity index 100%
+rename from docs/conf/links.conf.example
+rename to docs/conf/links.conf
+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 639f02335..ea51e9b67 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf
+@@ -838,7 +838,7 @@
+ # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor,    #
+ # censor, filter, flood, nickflood, noctcp, nonick, nonotice,         #
+ # regmoderated, stripcolor, and topiclock.                            #
+-# See <options:exemptchanops> in inspircd.conf.example for a more     #
++# See <options:exemptchanops> in inspircd.conf for a more             #
+ # detailed list of the restriction modes that can be exempted.        #
+ # These are settable using: /MODE #chan +X <restriction>:<status>     #
+ #<module name="exemptchanops">
+@@ -874,7 +874,7 @@
+ # Your choice of regex engine must match on all servers network-wide. #
+ #                                                                     #
+ # To learn more about the configuration of this module, read          #
+-# examples/filter.conf.example, which covers the various types of     #
++# filter.conf, which covers the various types of                      #
+ # filters and shows how to add exemptions.                            #
+ #                                                                     #
+ #-#-#-#-#-#-#-#-#-#-#-  FILTER  CONFIGURATION  -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -883,7 +883,7 @@
+ # specify below the path to the filter.conf file, or define some      #
+ # <keyword> tags.                                                     #
+ #                                                                     #
+-#<include file="examples/filter.conf.example">
++#<include file="/etc/inspircd/filter.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)#
+@@ -973,7 +973,7 @@
+ # If you specify to use the helpop module, then specify below the     #
+ # path to the helpop.conf file.                                       #
+ #                                                                     #
+-#<include file="examples/helpop.conf.example">
++#<include file="/etc/inspircd/helpop.conf">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Hide chans module: Allows users to hide their channels list from non-
+@@ -1551,7 +1551,7 @@
+ # onoper        - If on, the message is sent on /OPER, otherwise it's #
+ #                 only sent when /OPERMOTD is used.                   #
+ #                                                                     #
+-#<opermotd file="examples/opermotd.txt.example" onoper="yes">
++#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
+ # Override module: Adds support for oper override.
+@@ -2129,7 +2129,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
+-# example <oper> tag in opers.conf.example.
++# example <oper> tag in opers.conf.
+ #
+ #<module name="sslinfo">
+ #
+diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt
+similarity index 97%
+rename from docs/conf/motd.txt.example
+rename to docs/conf/motd.txt
+index c5266f844..34d85d965 100644
+--- a/docs/conf/motd.txt.example
++++ b/docs/conf/motd.txt
+@@ -24,7 +24,7 @@
+                     `-.__  `----"""    __.-'
+                          `--..____..--'
+ 
+-        ---- To change, see motd.txt.example -----
++        ---- To change, see motd.txt         -----
+        /                                          \
+       /   * Web: https://www.inspircd.org          \
+       |   * IRC: irc.inspircd.org #inspircd        |
+diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
+similarity index 97%
+rename from docs/conf/opermotd.txt.example
+rename to docs/conf/opermotd.txt
+index 7e1c82f33..73ad28621 100644
+--- a/docs/conf/opermotd.txt.example
++++ b/docs/conf/opermotd.txt
+@@ -24,7 +24,7 @@
+                     `-.__  `----"""    __.-'
+                          `--..____..--'
+ 
+-        -- To change, see opermotd.txt.example ---
++        -- To change, see opermotd.txt         ---
+        /                                          \
+       /   * Web: https://www.inspircd.org          \
+       |   * IRC: irc.inspircd.org #inspircd        |
+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
+--- a/docs/conf/opers.conf.example
++++ b/docs/conf/opers.conf
+@@ -178,4 +178,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.
+-<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
+rename to docs/conf/quotes.txt
+diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf
+similarity index 86%
+rename from docs/conf/services/anope.conf.example
+rename to docs/conf/services/anope.conf
+index 5c8f859ff..b1179eb8c 100644
+--- a/docs/conf/services/anope.conf.example
++++ b/docs/conf/services/anope.conf
+@@ -2,7 +2,7 @@
+ # by Anope. See https://www.anope.org for more information on Anope.
+ 
+ # This file inherits from the generic config to avoid repetition.
+-<include file="examples/services/generic.conf.example">
++<include file="examples/services/generic.conf">
+ 
+ # /GLOBAL <message>
+ # Sends a global notice.
+diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf
+similarity index 98%
+rename from docs/conf/services/atheme.conf.example
+rename to docs/conf/services/atheme.conf
+index d509522b8..7605251db 100644
+--- a/docs/conf/services/atheme.conf.example
++++ b/docs/conf/services/atheme.conf
+@@ -3,7 +3,7 @@
+ # information on Atheme.
+ 
+ # This file inherits from the generic config to avoid repetition.
+-<include file="examples/services/generic.conf.example">
++<include file="examples/services/generic.conf">
+ 
+ # Long hand aliases for services pseudoclients.
+ <alias text="ALIS"      replace="SQUERY $requirement :$2-" requires="ALIS"      uline="yes">
+diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf
+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 1e6ba5cd0..3751937eb 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -210,9 +210,9 @@ 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)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
+-	@-$(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)/providers
++	@-$(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)
+@@ -229,10 +229,10 @@ 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 $(EXAPATH)
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
+-	-$(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/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_PRV) *.pem $(CONPATH) 2>/dev/null
+ 	@echo ""
+ 	@echo "*************************************"
+@@ -246,7 +246,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:' $(EXAPATH)
+ 
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ 	./configure --update
diff --git a/net-irc/inspircd/inspircd-3.3.0.ebuild b/net-irc/inspircd/inspircd-3.4.0.ebuild
index 4661639e589b..170cc7aafaeb 100644
--- a/net-irc/inspircd/inspircd-3.3.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.4.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.4.0-fix-path-builds.patch )
 
 src_prepare() {
 	default
@@ -83,18 +83,11 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-
-	# Default is '0750', which causes init errors.
-	fperms 0755 /usr/bin/inspircd{,-genssl}
-	# Default is '0640', causing module load errors.
-	fperms -R 0755 "/usr/lib64/inspircd/modules/."
+	default
 
 	insinto "/usr/include/${PN}"
 	doins -r include/.
 
-	einstalldocs
-
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 84df0af36b78..9f791bd097c3 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -1,4 +1,4 @@
 DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2 SHA512 5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610
-EBUILD irssi-1.2.2.ebuild 1566 BLAKE2B 5d305a4c34bc87ae1ab0bed296a4410882b8ccf6d326f13016a182fe8c5f7e16312291b9732933755ff009d0c78da0627ec2b61937edc3f6bd12f511a4035391 SHA512 89fe9e55c56c61a6779d72112ce9e97125c467dce36d4acdff583c49b48e930f3a57995448ca2aabca09c89b2a19752116c3ee51b9a9459e38bea84b0555bc79
-EBUILD irssi-9999.ebuild 1486 BLAKE2B 2742c15d0b3f5a2787aeea9db79693e36845957a28b5146e8eb839278681f538d7be2e46d37875e5f230b0edc7fa37a79809f2ba93f6927363398201335c030f SHA512 ba8be2fe7989ed59714cc454b372edf377261cb5b2fcbe6cfaec10f9fef1b1871d238ab3920f05b1c8da93d2f35b7049dbf12418659eedff457e99b225959159
+EBUILD irssi-1.2.2.ebuild 1546 BLAKE2B 6866ea5ea71f10efdeb7ae7f8fa6ff84097b488c7ca3feb34655112f6b86ae94c728adcea23ab16b22739b9929837bc45b3027a444bc3cbf946d597501aac0ff SHA512 f96b298e3069cd333d1878032899b5b859bc8df7566ece216e271383b7e8187d7d249576664310ec6f2be368d8eedf1d9e5d849f6c90033ede54f3202b19a595
+EBUILD irssi-9999.ebuild 1466 BLAKE2B af291b2cb7e69fdcd937c0562ff9055cbf51f755be0cd49792e94e40c238a098b7515a11bb41b9b67eb0e780fbcce7a4dda9d13271bd6a83e3b45bb0fabd193b SHA512 04c4c627ea9af6196b377eb553631e36c93e0942b0c777835d848be4297320ac8e28bad307e14b975d04ec37754bacffd05ebca47159bdcd9beead82ce50f77a
 MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
diff --git a/net-irc/irssi/irssi-1.2.2.ebuild b/net-irc/irssi/irssi-1.2.2.ebuild
index f2477cb8d5a4..8513ebdf5a73 100644
--- a/net-irc/irssi/irssi-1.2.2.ebuild
+++ b/net-irc/irssi/irssi-1.2.2.ebuild
@@ -22,7 +22,6 @@ IUSE="otr +perl selinux socks5 +proxy libressl"
 COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
-	!net-irc/irssi-otr
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( >=dev-libs/libressl-2.7.4:= )
 	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index e0ecc363aa78..d5f740941fc2 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -18,7 +18,6 @@ IUSE="otr +perl selinux socks5 +proxy libressl"
 
 CDEPEND="sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
-	!net-irc/irssi-otr
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( dev-libs/libressl:= )
 	otr? (
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 4b1834bed273..310f8aff5226 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -3,4 +3,4 @@ DIST weechat-2.6.tar.xz 2080092 BLAKE2B e54d8493de7783e18e0de3a7280088a27a70b270
 EBUILD weechat-2.5-r1.ebuild 3952 BLAKE2B 26b66730ee624a14b9e13b7573021cc1101128565c763320f2475400288dbba0492510644c315505f5c2334de780ce1476cec0f9332c98c8348d9552edec7ce3 SHA512 bae88576c77f741460eb394febcaea23163911d02c40111bd4b5d530ce48b86d6512d6f1358bd0316dcd91bd4876154e2b67bb5a46cfb7115fcfd75e7e7a41df
 EBUILD weechat-2.6.ebuild 3801 BLAKE2B db50a1a4273dc6b92332342e3cc9634683dafebe5ad4fc7740dd77f93a10985e13ac5dd85fee9bb26fc0101155d22452361246b697e9106f4c6b8f5bb242820b SHA512 f57d13e5c8a076db2e81abd8a61327bf0a0af95b8a47ee3bb07967702cbc46d62cd4b5c7736d1203345756089cf7ab0d9c35f5c20906e73031252c35b9a1375a
 EBUILD weechat-9999.ebuild 3801 BLAKE2B db50a1a4273dc6b92332342e3cc9634683dafebe5ad4fc7740dd77f93a10985e13ac5dd85fee9bb26fc0101155d22452361246b697e9106f4c6b8f5bb242820b SHA512 f57d13e5c8a076db2e81abd8a61327bf0a0af95b8a47ee3bb07967702cbc46d62cd4b5c7736d1203345756089cf7ab0d9c35f5c20906e73031252c35b9a1375a
-MISC metadata.xml 1069 BLAKE2B 4a71fbd264555e8439f6797370163ae05c3111e589d513ade407ebb5eb3b2c302d2afc46cd37d3707c85fc981ed26bfd23762b5f6f635b9f85b70d821919e2ed SHA512 dfb08a4660736e409b31088217bca60adc46c88b7e0b6e4a1b905de69262ae0cef172638f30b502e01fcb772a6d3cbb471805959ba8c6d78cb598b18640fe20f
+MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/metadata.xml b/net-irc/weechat/metadata.xml
index 76bd84de3bfb..bd9e657d8a9e 100644
--- a/net-irc/weechat/metadata.xml
+++ b/net-irc/weechat/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-	</maintainer>
-	<maintainer type="person">
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>