gentoo resync : 15.12.2019

38 files changed, 660 insertions, 1008 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 337f26f1a87c..5f820f91872b 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 0b6ad4dda687..69a30cc2d400 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,15 +1,9 @@
-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.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.4.0.ebuild 3622 BLAKE2B ccdbc543cdbcd838e24dd9a6af7ab04644087f745b8448f3a789cee8e9586486eb76f3b98b78193c0bf2554b15b6e0c756bc17bfcffbb007f54a2ed6a7d1b812 SHA512 2e3820784f043662866b4a9d4c63dc8ed4b14462ddf26f1b46e195db4ca8bc950364785ca3518318ec4e8c5287c145251f3d467279b2e98192a3abac84a035ee
+EBUILD inspircd-3.4.0.ebuild 3620 BLAKE2B b7e49e080ce8d5a7b418ec12462ebf53af247c494d9c299027d952eede5e9cce243f53ccbd90e000aac7e2a4c490fd6f54228a92943a0093a033e918f169afba SHA512 e0809008918e85cf50af088e13d1c09953fb88416bcb9d63f009ef339ab420329cb7a4eea9189bde9bad1eb51fe3ef7c97d49ce53d2b471e09962ccddafedf76
 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
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
deleted file mode 100644
index debf62a15f5e..000000000000
--- a/net-irc/inspircd/files/inspircd-2.0.25-fix-path-builds.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
---- a/docs/conf/inspircd.conf.example	2015-05-10 00:24:10.000000000 -0500
-+++ b/docs/conf/inspircd.conf.example	2015-07-27 05:22:26.107849785 -0500
-@@ -412,11 +412,11 @@
- 
- # This file has all the information about oper classes, types and o:lines.
- # You *MUST* edit it.
--<include file="conf/examples/opers.conf.example">
-+<include file="/etc/inspircd/opers.conf.example">
- 
- # This file has all the information about server links and ulined servers.
- # You *MUST* edit it if you intend to link servers.
--<include file="conf/examples/links.conf.example">
-+<include file="/etc/inspircd/links.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -426,7 +426,8 @@
- #   motd - displayed on connect and when a user executes /MOTD
- #   rules - displayed when the user executes /RULES
- # Modules can also define their own files
--<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
-+<files motd="/etc/inspircd/motd.txt.example"
-+       rules="/etc/inspircd/rules.txt.example">
- 
- # Example of an executable file include. Note this will be read on rehash,
- # not when the command is run.
-@@ -472,7 +473,7 @@
- # the default of 'inspircd.pid' is used.                              #
- #                                                                     #
- 
--#<pid file="/path/to/inspircd.pid">
-+<pid file="/var/run/inspircd/inspircd.pid">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -953,7 +954,7 @@
- # provide almost all the features of InspIRCd. :)                     #
- #                                                                     #
- # The default does nothing -- we include it for simplicity for you.   #
--<include file="conf/examples/modules.conf.example">
-+<include file="/etc/inspircd/modules.conf.example">
- 
- # Here are some pre-built modules.conf files that closely match the
- # default configurations of some popular IRCd's. You still may want to
-@@ -965,10 +966,10 @@
- # recommended that you make your own modules file based on modules.conf.example.
- 
- # Settings similar to UnrealIRCd defaults.
--#<include file="conf/examples/modules/unrealircd.conf.example">
-+#<include file="/etc/inspircd/modules/unrealircd.conf.example">
- 
- # Settings similar to Charybdis IRCd defaults.
--#<include file="conf/examples/modules/charybdis.conf.example">
-+#<include file="/etc/inspircd/modules/charybdis.conf.example">
- 
- 
- #########################################################################
-diff -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
---- a/docs/conf/modules.conf.example    2016-02-28 17:38:30.492335461 -0600
-+++ b/docs/conf/modules.conf.example    2016-02-28 17:39:20.068559846 -0600
-@@ -315,7 +315,7 @@
- # specify some censor tags. See also:                                 #
- # http://wiki.inspircd.org/Modules/censor                             #
- #
--#<include file="conf/examples/censor.conf.example">
-+#<include file="/etc/inspircd/censor.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
-@@ -778,7 +778,7 @@
- # specify below the path to the filter.conf file, or define some      #
- # <filter> tags.                                                      #
- #                                                                     #
--#<include file="conf/examples/filter.conf.example">
-+#<include file="/etc/inspircd/filter.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Gecos ban: Implements extended ban 'r', which stops anyone matching
-@@ -834,7 +834,7 @@
- #                                                                     #
- # If you specify to use the m_helpop.so module, then specify below    #
- # the path to the helpop.conf file.                                   #
--#<include file="conf/examples/inspircd.helpop-full.example">
-+#<include file="/etc/inspircd/inspircd.helpop-full.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Hide chans module: Allows users to hide their channels list from non-
-@@ -1284,7 +1284,7 @@
- #                 Read the comment above <connect:allowmotdcolors> in #
- #                 inspircd.conf.example for details.                  #
- #                                                                     #
--#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
-+#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Override module: Adds support for oper override.
-diff -Nuar a/make/template/main.mk b/make/template/main.mk
---- a/make/template/main.mk	2015-05-10 00:24:10.000000000 -0500
-+++ b/make/template/main.mk	2015-07-27 05:22:26.107849785 -0500
-@@ -34,7 +34,7 @@
- SYSTEM = @SYSTEM@
- BUILDPATH = @BUILD_DIR@
- SOCKETENGINE = @SOCKETENGINE@
--CXXFLAGS = -pipe -fPIC -DPIC
-+MYCXXFLAGS = -pipe -fPIC -DPIC
- LDLIBS = -pthread -lstdc++
- LDFLAGS = 
- CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
-@@ -51,9 +51,9 @@
- INSTMODE_LIB = 0644
- 
- @IFEQ $(CC) icpc
--  CXXFLAGS += -Wshadow
-+  MYCXXFLAGS += -Wshadow
- @ELSE
--  CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
-+  MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
- @ENDIF
- 
- 
-@@ -75,46 +75,46 @@
- 	INSTALL = ginstall
- @ENDIF
- @IFEQ $(SYSTEM) darwin
--  CXXFLAGS += -DDARWIN -frtti
-+  MYCXXFLAGS += -DDARWIN -frtti
-   LDLIBS += -ldl
-   CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
-   PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
- @ENDIF
- @IFEQ $(SYSTEM) interix
--  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
-+  MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
- @ENDIF
- 
--@IFNDEF D
--  D=0
-+@IFNDEF DEBUGLEVEL
-+  DEBUGLEVEL=0
- @ENDIF
- 
- GCC6=@GCC6@
- @IFEQ $(GCC6) true
--  CXXFLAGS += -fno-delete-null-pointer-checks
-+  MYCXXFLAGS += -fno-delete-null-pointer-checks
- @ENDIF
- 
- DBGOK=0
--@IFEQ $(D) 0
--  CXXFLAGS += -O2
-+@IFEQ $(DEBUGLEVEL) 0
-+  MYCXXFLAGS += -O2
- @IFEQ $(CC) g++
--    CXXFLAGS += -g1
-+    MYCXXFLAGS += -g1
- @ENDIF
-   HEADER = std-header
-   DBGOK=1
- @ENDIF
--@IFEQ $(D) 1
--  CXXFLAGS += -O0 -g3 -Werror
-+@IFEQ $(DEBUGLEVEL) 1
-+  MYCXXFLAGS += -O0 -g3 -Werror
-   HEADER = debug-header
-   DBGOK=1
- @ENDIF
--@IFEQ $(D) 2
--  CXXFLAGS += -O2 -g3
-+@IFEQ $(DEBUGLEVEL) 2
-+  MYCXXFLAGS += -O2 -g3
-   HEADER = debug-header
-   DBGOK=1
- @ENDIF
- FOOTER = finishmessage
- 
--CXXFLAGS += -Iinclude
-+MYCXXFLAGS += -Iinclude
- 
- @GNU_ONLY MAKEFLAGS += --no-print-directory
- 
-@@ -134,10 +134,11 @@
- @ENDIF
- 
- @IFDEF PURE_STATIC
--  CXXFLAGS += -DPURE_STATIC
-+  MYCXXFLAGS += -DPURE_STATIC
- @ENDIF
- 
--@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
-+MYCXXFLAGS += $(CXXFLAGS)
-+@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
- @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
- 
- # Default target
-@@ -150,10 +151,10 @@
-     @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
- 
--@IFDEF T
-+@IFDEF TGT
-     HEADER =
-     FOOTER = target
--    TARGET = $(T)
-+    TARGET = $(TGT)
- @ENDIF
- 
- @IFEQ $(DBGOK) 0
-@@ -228,8 +229,8 @@
- 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data
- 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs
- 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
--	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
--	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
- 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
- 	[ $(BUILDPATH)/bin/ -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) $(BUILDPATH)/bin/inspircd $(BINPATH)
- @IFNDEF PURE_STATIC
-@@ -237,9 +238,9 @@
- @ENDIF
- 	-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
- 	-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
--	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
--	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
--	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
-+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
-+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
-+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
- 	@echo ""
- 	@echo "*************************************"
- 	@echo "*        INSTALL COMPLETE!          *"
-@@ -252,7 +253,7 @@
- 	@echo '  Data:' $(DATPATH)
- 	@echo 'To start the ircd, run:' $(BASE)/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)
- 
- @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
- @BSD_ONLY RCS_FILES = src/version.sh
-diff -Nuar a/make/unit-cc.pl b/make/unit-cc.pl
---- a/make/unit-cc.pl	2015-05-10 00:24:10.000000000 -0500
-+++ b/make/unit-cc.pl	2015-07-27 05:22:26.107849785 -0500
-@@ -113,7 +113,7 @@
- 	my $libs = '';
- 	my $binary = $ENV{RUNCC};
- 	if ($do_compile) {
--		$flags = $ENV{CXXFLAGS};
-+		$flags = $ENV{MYCXXFLAGS};
- 		$flags =~ s/ -pedantic// if nopedantic($file);
- 		$flags .= ' ' . getcompilerflags($file);
- 
diff --git a/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
deleted file mode 100644
index 955b2be79095..000000000000
--- a/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-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 3bf1c2e99..b451a2f18 100644
---- a/docs/conf/modules.conf.example
-+++ b/docs/conf/modules.conf
-@@ -832,7 +832,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">
-@@ -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          #
--# 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  -#-#-#-#-#-#-#-#-#-#-#-#
-@@ -877,7 +877,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)#
-@@ -967,7 +967,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-
-@@ -1545,7 +1545,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.
-@@ -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
--# 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 d77d59fa5..b28d7180d 100644
---- a/make/template/main.mk
-+++ b/make/template/main.mk
-@@ -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)
- 	@-$(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)
-@@ -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 $(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 "*************************************"
-@@ -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:' $(EXAPATH)
- 
- GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
- 	./configure --update
diff --git a/net-irc/inspircd/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild
deleted file mode 100644
index 7258f2c4e9f3..000000000000
--- a/net-irc/inspircd/inspircd-2.0.25.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit toolchain-funcs user versionator
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://inspircd.github.com/"
-SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre"
-
-RDEPEND="
-	dev-lang/perl
-	ssl? ( dev-libs/openssl:= )
-	geoip? ( dev-libs/geoip )
-	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
-	ldap? ( net-nds/openldap )
-	mysql? ( dev-db/mysql-connector-c:= )
-	postgres? ( dev-db/postgresql:= )
-	pcre? ( dev-libs/libpcre )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${PN}-2.0.25-fix-path-builds.patch )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	# Patch the inspircd launcher with the inspircd user
-	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
-
-	default_src_prepare
-}
-
-src_configure() {
-	local extras=""
-
-	use geoip && extras="${extras}m_geoip.cpp,"
-	use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
-	use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
-	use mysql && extras="${extras}m_mysql.cpp,"
-	use pcre && extras="${extras}m_regex_pcre.cpp,"
-	use posix && extras="${extras}m_regex_posix.cpp,"
-	use postgres && extras="${extras}m_pgsql.cpp,"
-	use sqlite && extras="${extras}m_sqlite3.cpp,"
-	use ssl && extras="${extras}m_ssl_openssl.cpp,"
-	use tre && extras="${extras}m_regex_tre.cpp,"
-
-	if [[ -n "${extras}" ]]; then
-		econf --disable-interactive --enable-extras=${extras%,}
-	fi
-
-	econf \
-		--with-cc="$(tc-getCXX)" \
-		--disable-interactive \
-		--prefix="/usr/$(get_libdir)/${PN}" \
-		--config-dir="/etc/${PN}" \
-		--data-dir="/var/lib/${PN}/data" \
-		--log-dir="/var/log/${PN}" \
-		--binary-dir="/usr/bin" \
-		--module-dir="/usr/$(get_libdir)/${PN}/modules" \
-		$(usex ipv6 '' '--disable-ipv6') \
-		$(usex gnutls '--enable-gnutls' '') \
-		$(usex ssl '--enable-openssl' '')
-}
-
-src_compile() {
-	emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}"
-}
-
-src_install() {
-	emake INSTUID=${PN} DESTDIR="${D%/}" install
-
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-
-	einstalldocs
-
-	diropts -o"${PN}" -g"${PN}" -m0700
-	dodir "/var/lib/${PN}"
-	dodir "/var/lib/${PN}/data"
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	keepdir "/var/log/${PN}"
-
-	rm -r "${D%/}/etc/${PN}" || die
-	dodir "/etc/${PN}"
-	dodir "/etc/${PN}/aliases"
-	dodir "/etc/${PN}/modules"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "Before starting ${PN} the first time, you *must* create"
-		elog "the /etc/${PN}/${PN}.conf file."
-		elog "You will find example configuration files under "
-		elog "/usr/share/doc/${PN}"
-		elog "Read the ${PN}.conf.example file carefully before "
-		elog "starting the service."
-	fi
-	local pv=""
-	for pv in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least "2.0.24-r1" "${pv}"; then
-			elog "Starting with 2.0.24-r1 the daemon is no longer started"
-			elog "with the --logfile option and you are thus expected to define"
-			elog "logging in the InspIRCd configuration file if you want it."
-			break
-		fi
-	done
-}
diff --git a/net-irc/inspircd/inspircd-3.2.0.ebuild b/net-irc/inspircd/inspircd-3.2.0.ebuild
deleted file mode 100644
index 021dc47d8a8d..000000000000
--- a/net-irc/inspircd/inspircd-3.2.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
-HOMEPAGE="https://inspircd.github.com/"
-SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
-
-RDEPEND="
-	dev-lang/perl
-	gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 )
-	ldap? ( net-nds/openldap )
-	maxminddb? ( dev-libs/libmaxminddb )
-	mbedtls? ( net-libs/mbedtls:= )
-	mysql? ( dev-db/mysql-connector-c:= )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	re2? ( dev-libs/re2:= )
-	sqlite? ( >=dev-db/sqlite-3.0 )
-	ssl? ( dev-libs/openssl:= )
-	tre? ( dev-libs/tre )"
-DEPEND="${RDEPEND}"
-
-DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-fix-path-builds.patch )
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-
-	# Patch the inspircd launcher with the inspircd user
-	sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
-}
-
-src_configure() {
-	local extras=""
-
-	use gnutls && extras+="m_ssl_gnutls.cpp,"
-	use ldap && extras+="m_ldap.cpp,"
-	use maxminddb && extras+="m_geo_maxmind.cpp,"
-	use mbedtls && extras+="m_ssl_mbedtls.cpp,"
-	use mysql && extras+="m_mysql.cpp,"
-	use pcre && extras+="m_regex_pcre.cpp,"
-	use postgres && extras+="m_pgsql.cpp,"
-	use re2 && extras+="m_regex_re2.cpp,"
-	use regex-posix && extras+="m_regex_posix.cpp,"
-	use regex-stdlib && extras+="m_regex_stdlib.cpp,"
-	use sqlite && extras+="m_sqlite3.cpp,"
-	use ssl && extras+="m_ssl_openssl.cpp,"
-	use sslrehashsignal && extras+="m_sslrehashsignal.cpp,"
-	use tre && extras+="m_regex_tre.cpp,"
-
-	# The first configuration run enables certain "extra" InspIRCd
-	# modules, the second run generates the actual makefile.
-	if [[ -n "${extras}" ]]; then
-		./configure --disable-interactive --enable-extras=${extras%,}
-	fi
-
-	local myconf=(
-		--disable-interactive
-		--disable-auto-extras
-		--prefix="/usr/$(get_libdir)/${PN}"
-		--config-dir="/etc/${PN}"
-		--data-dir="/var/lib/${PN}/data"
-		--log-dir="/var/log/${PN}"
-		--binary-dir="/usr/bin"
-		--module-dir="/usr/$(get_libdir)/${PN}/modules"
-		--manual-dir="/usr/share/man")
-	CXX="$(tc-getCXX)" ./configure "${myconf[@]}"
-}
-
-src_compile() {
-	emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1
-}
-
-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/."
-
-	insinto "/usr/include/${PN}"
-	doins -r include/.
-
-	einstalldocs
-
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	keepdir "/var/log/${PN}"
-
-	diropts -o"${PN}" -g"${PN}" -m0700
-	keepdir "/var/lib/${PN}/data"
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		elog "You will find example configuration files under "
-		elog "/usr/share/doc/${PN}"
-		elog "Read the ${PN}.conf.example file carefully before "
-		elog "starting the service."
-	fi
-	local pv
-	for pv in ${REPLACING_VERSIONS}; do
-		if ver_test "${pv}" -lt "2.0.24-r1"; then
-			elog "Starting with 2.0.24-r1 the daemon is no longer started"
-			elog "with the --logfile option and you are thus expected to define"
-			elog "logging in the InspIRCd configuration file if you want it."
-		fi
-		if ver_test "${pv}" -lt "3.0.0"; then
-			elog "Version 3.0 is a major upgrade which contains breaking"
-			elog "changes.  You will need to update your configuration files."
-			elog "See: https://docs.inspircd.org/3/configuration-changes"
-		fi
-	done
-}
diff --git a/net-irc/inspircd/inspircd-3.4.0.ebuild b/net-irc/inspircd/inspircd-3.4.0.ebuild
index 170cc7aafaeb..174cabeb02b4 100644
--- a/net-irc/inspircd/inspircd-3.4.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre"
 
 RDEPEND="
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 9f791bd097c3..fb53a4f769ad 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 1546 BLAKE2B 6866ea5ea71f10efdeb7ae7f8fa6ff84097b488c7ca3feb34655112f6b86ae94c728adcea23ab16b22739b9929837bc45b3027a444bc3cbf946d597501aac0ff SHA512 f96b298e3069cd333d1878032899b5b859bc8df7566ece216e271383b7e8187d7d249576664310ec6f2be368d8eedf1d9e5d849f6c90033ede54f3202b19a595
-EBUILD irssi-9999.ebuild 1466 BLAKE2B af291b2cb7e69fdcd937c0562ff9055cbf51f755be0cd49792e94e40c238a098b7515a11bb41b9b67eb0e780fbcce7a4dda9d13271bd6a83e3b45bb0fabd193b SHA512 04c4c627ea9af6196b377eb553631e36c93e0942b0c777835d848be4297320ac8e28bad307e14b975d04ec37754bacffd05ebca47159bdcd9beead82ce50f77a
+EBUILD irssi-1.2.2.ebuild 1515 BLAKE2B 0194ba612159943eb763952bc4d748765a35a37290ae46df932b761bb2e13bc7cfcc046d0394f245fc94d0d05a8cda6070323102601c95e1ba845da07d48820e SHA512 ec27df61f02401a54df64a463ba150486ca0cf038651e1a91aaceeeb3db2b45749af73e7b795e9e4d5022890e4bff7feee39cc703bfc42f71fd1cc3b741f7988
+EBUILD irssi-9999.ebuild 1435 BLAKE2B ae2047886382dcd58f74370d05fd0bf7359e92643b2dc743e8fdfd55d5733da28640adf63cd7a660c32f9335bc8496fbf8727519ad804fd729462c2acf3ec8e3 SHA512 4cadc7202856ad2db25296289a0267b4b5db95243075d1ae16401e7cd55a3b86fb7ee4ae19e5797d11201992c1900b714c1ac2318e446164bb7be90844943796
 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 8513ebdf5a73..22cbabf8c870 100644
--- a/net-irc/irssi/irssi-1.2.2.ebuild
+++ b/net-irc/irssi/irssi-1.2.2.ebuild
@@ -35,8 +35,7 @@ DEPEND="
 
 RDEPEND="
 	${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
+	selinux? ( sec-policy/selinux-irc )"
 
 RESTRICT="test"
 
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index d5f740941fc2..0574746289d4 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -38,8 +38,7 @@ DEPEND="
 
 RDEPEND="
 	${CDEPEND}
-	selinux? ( sec-policy/selinux-irc )
-	perl? ( !net-im/silc-client )"
+	selinux? ( sec-policy/selinux-irc )"
 
 src_prepare() {
 	sed -i -e /^autoreconf/d autogen.sh || die
diff --git a/net-irc/konversation/Manifest b/net-irc/konversation/Manifest
index a720782671e2..fdc60a4fe037 100644
--- a/net-irc/konversation/Manifest
+++ b/net-irc/konversation/Manifest
@@ -2,5 +2,5 @@ AUX konversation-1.7.5-fix-regex-for-cap-ack.patch 1040 BLAKE2B fb0e34812623079f
 AUX konversation-1.7.5-missing-header.patch 574 BLAKE2B a2a88b4d071685301fcf071f676eac814ab21ce4dcdcd9af7ced5ea2e595d0335f73a36011393fa7c54ae26d60486d9b4319d2e197bee79adda79c6158b1a0d5 SHA512 b9b1b2e4b231d2a4beb63a6e757467ec0d32bfc9005dd990d7649cc6ac9c34d106b0b15bc3918490ef4ded81699e5d84161b3a1d8541aa6232ba485124b65386
 AUX konversationrc 350 BLAKE2B 7670666f4d36cc9b0ba303890dd1f1d3b5f331070f3982e73b2ff82aae17257f9d1aaf584ac2cfb751c4457eeee09f14c73740aa700371f06a40e045c4c47398 SHA512 29e77d6e00953ca1a11ebd21defed8b2fd49762208ca757477f4409f611815049d54a16e82c545cdd46fee0e2d88dbdbd3a4fd61fa421eff3482737009ad5731
 DIST konversation-1.7.5.tar.xz 3739392 BLAKE2B 92a068d57f19f3cf8822d1dbc219949ae34388eaa00f4542aaee28b1c78cdc68e80c2c032e54efd842c1925a689a1ee2f05458322d106a677829a623dd61432a SHA512 001534c7f6c5110ca5e210977cc4275e083f5c3704078a74aa573af659154e0fa4c3c960be08f41256db1ac4568f0734741bf10cfb2e15d9e6f6440250682504
-EBUILD konversation-1.7.5-r1.ebuild 1837 BLAKE2B 772a337adf4236626228f97292dce4d0c82727ced7190055c4c7083ee4a8b586417493aacce2427791aae92c8b0a1bcefc52236a60d41187e96d237d5ce59022 SHA512 78d40daed9100b0195c6e45605c71e288c5c9876f2f8b68b47aab61ea07afad2e7532187c3ff2fc4b04c65e0ceaaaedf34f13dbe6a94035bfb788d7600e23c52
+EBUILD konversation-1.7.5-r1.ebuild 1844 BLAKE2B bbdd2c34ef325e62318fc386bd3c7ce7a5e771000ecddf245b1430b5c5ce02e8979374da40c0cf1e1003b00f52b60dc38ed3839c4ac3df8363ef905fd5a7f048 SHA512 c2500d12a6d5d1da102fce2d033d1d45b83bb7b080b34d1fcc0699fb01a29d30171a2828784ac4f0e359d163c596103bf9f4824635f6243d485a776b1a38d9ae
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-irc/konversation/konversation-1.7.5-r1.ebuild b/net-irc/konversation/konversation-1.7.5-r1.ebuild
index c53563084a21..7b1f0f864bb1 100644
--- a/net-irc/konversation/konversation-1.7.5-r1.ebuild
+++ b/net-irc/konversation/konversation-1.7.5-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://kde.org/applications/internet/konversation/ https://konversati
 SRC_URI="mirror://kde/stable/${PN}/${PV/_/-}/src/${P/_/-}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+crypt"
 
 BDEPEND="sys-devel/gettext"
diff --git a/net-irc/kvirc/Manifest b/net-irc/kvirc/Manifest
index 10ae24e87c9e..fc41a89ca9b1 100644
--- a/net-irc/kvirc/Manifest
+++ b/net-irc/kvirc/Manifest
@@ -1,5 +1,7 @@
 AUX kvirc-5.2_pre20190628041642-python-3.patch 2036 BLAKE2B 71de965fcd6d3ff6ec74c52662d894b60ff15d7b9dd895f18a6c31d4404291c227ae0f15362b0eebd86c377adce5ebd1a6a65975c40d2a391c928748dcb144d1 SHA512 3dcdf021f9c78df31031f25a86dea332996d489e482ba3da867856f262fd001c7858da51f5cb9dc0a3c208674a60105e484c3426d73816c61f0fbdca0a88b3cb
 DIST kvirc-5.2_pre20190628041642.tar.gz 5967194 BLAKE2B b1a2e2775056e2db058f82656ac90e43828d497019e9c6ae0431a1092423425558c6eb91a3a8301616cc4cdc7ef1acbab3729702484d703e00dc8e09f7cf243f SHA512 5f532739d9837f357a36fa1df67db0fbf8d8eddb990e686224e53c5678d26ba18c6c7c60422cef4e08ee587156638b278f534b1be1d49251fdeea19858227a5f
+DIST kvirc-5.2_pre20191202122540.tar.gz 5967654 BLAKE2B 059e57f0b8a789388f351c536dc3b57a7fc119cc78206a6a42266a1296e1edc6410ab9f564959d77aabb98ca55c9d4ec63505b4c1d46ad27a7f0f2ee748eae55 SHA512 2e3b7683070446a80642ef07abbc69912e47af59966cbc95698f5b8b1a1726b85ae78890dcc85d3f546f32b3c5f2a6c64ec4049467c6b336798ad91542d48c42
 EBUILD kvirc-5.2_pre20190628041642.ebuild 4322 BLAKE2B 1ffc73c27abbcb7a101829cf4a8197713e48d5bb3bdba3584beee23ba57c5f4c8cde9df6da004b7885b617929d88cc04aa72e7ed94474ef691eea74a582741da SHA512 cbb66d43ce0c829f82edecd611f7fcdfa27863a67d89d053a53f4529985c3b822c663eb93df023ae59feab7339bdf71926f94a4c2fdf5b9a51a56fbc789d7340
-EBUILD kvirc-9999.ebuild 4261 BLAKE2B 796cbac383831084f9b9677d7888b02a394b9ab1d9d5720b3660193d9f3accb2a6c44d850ee4f1756fb75640cc85f08bec8d237da8c1901c0fce3fefb893f4cf SHA512 6136cbaf6f4dd7d1c4effb3fabe341d69a2cee6e802e44f46d3ad400c920860e631d1a12b6ca1a5c900a220334ab182a096d3f20a0d8195c7bb9e23f2e132918
+EBUILD kvirc-5.2_pre20191202122540.ebuild 4325 BLAKE2B 7af23814810c6863700412b5307c4e6df818fd09ef859365ba1d8eae2172d896c408f4bcdbbfdca0e03c46c9445ea8154fe81877a17280a2ec042da6beaa5ce1 SHA512 b3dcb64f67dd31d4bdb80070c0de988c29855298e866c1d4c4e20752380b86440ff1d6e7fc451d2806cf75c9e0f31805d97152972046afb5c610b23f0c4667b0
+EBUILD kvirc-9999.ebuild 4262 BLAKE2B 8ab4e5e2a642574e0c812e89a9f05241eb093e9590d2e1eba6556393c6c9cf92eee0fdccc98c2efc138025f1e0ffb12ab8fb770f091d70ff133a9a2ea3152809 SHA512 ff91f6b7567ce639ac04ea4c184a9a51866802052c5e392ded07924472e93c74295975b941b6877e6dc84d1a1cfa7ce313d5e72043b56e3787ec5437472ae38e
 MISC metadata.xml 643 BLAKE2B 820a98f07a4cfb58e857d5c7b863ed7adc174497a7ea05e66245a2c40c328ee0bdb644b98ba1d923834ccf05f23f8128abfe462d433fe2136078225b152a633f SHA512 3dd50caac7ff50679cabad216d4ec28b60351febc419f5d32f60b785043eba6f2f379c06e5af28af26355845ebcfe8439bca9d141bc3b9d0401fb0ee0a0c704c
diff --git a/net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild b/net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild
new file mode 100644
index 000000000000..5a3b79274188
--- /dev/null
+++ b/net-irc/kvirc/kvirc-5.2_pre20191202122540.ebuild
@@ -0,0 +1,174 @@
+# Copyright 2009-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+
+inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	inherit git-r3
+
+	EGIT_REPO_URI="https://github.com/kvirc/KVIrc"
+	KVIRC_GIT_REVISION=""
+	KVIRC_GIT_SOURCES_DATE=""
+else
+	KVIRC_GIT_REVISION="0df9f22f2f4d013b91d5a8905cbd47c32e8fb9e5"
+	KVIRC_GIT_SOURCES_DATE="${PV#*_pre}"
+	KVIRC_GIT_SOURCES_DATE="${KVIRC_GIT_SOURCES_DATE:0:4}-${KVIRC_GIT_SOURCES_DATE:4:2}-${KVIRC_GIT_SOURCES_DATE:6:2}"
+fi
+
+DESCRIPTION="Advanced IRC Client"
+HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+if [[ "${PV}" == "9999" ]]; then
+	SRC_URI=""
+else
+	SRC_URI="https://github.com/kvirc/KVIrc/archive/${KVIRC_GIT_REVISION}.tar.gz -> ${P}.tar.gz"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="audiofile +dbus dcc_video debug doc gsm kde +nls oss +perl +phonon profile +python spell +ssl theora webkit"
+REQUIRED_USE="audiofile? ( oss ) python? ( ${PYTHON_REQUIRED_USE} )"
+
+BDEPEND="dev-lang/perl:0
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+	kde? ( kde-frameworks/extra-cmake-modules:5 )
+	nls? ( sys-devel/gettext )"
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	dev-qt/qtxml:5
+	sys-libs/zlib:0=
+	x11-libs/libX11
+	x11-libs/libXScrnSaver
+	audiofile? ( media-libs/audiofile )
+	dbus? ( dev-qt/qtdbus:5 )
+	dcc_video? ( dev-qt/qtmultimedia:5[widgets] )
+	kde? (
+		kde-frameworks/kcoreaddons:5
+		kde-frameworks/ki18n:5
+		kde-frameworks/knotifications:5
+		kde-frameworks/kservice:5
+		kde-frameworks/kwindowsystem:5
+		kde-frameworks/kxmlgui:5
+	)
+	perl? ( dev-lang/perl:0= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	python? ( ${PYTHON_DEPS} )
+	spell? ( app-text/enchant:0= )
+	ssl? ( dev-libs/openssl:0= )
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		media-libs/libvorbis
+	)
+	webkit? ( dev-qt/qtwebkit:5 )"
+RDEPEND="${DEPEND}
+	gsm? ( media-sound/gsm )"
+
+if [[ "${PV}" != "9999" ]]; then
+	S="${WORKDIR}/KVIrc-${KVIRC_GIT_REVISION}"
+fi
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2_pre20190628041642-python-3.patch"
+)
+
+DOCS=()
+
+pkg_setup() {
+	if use python; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if [[ "${PV}" == "9999" ]]; then
+		KVIRC_GIT_REVISION="$(git show -s --format=%H)"
+		KVIRC_GIT_SOURCES_DATE="$(git show -s --format=%cd --date=short)"
+	fi
+	einfo "Setting of revision number to ${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE}"
+	sed -e "/#define KVI_DEFAULT_FRAME_CAPTION/s/KVI_VERSION/& \" (${KVIRC_GIT_REVISION} ${KVIRC_GIT_SOURCES_DATE})\"/" -i src/kvirc/ui/KviMainWindow.cpp || die "Setting of revision number failed"
+}
+
+src_configure() {
+	append-flags -fno-strict-aliasing
+
+	local libdir="$(get_libdir)"
+	local mycmakeargs=(
+		-DLIB_SUFFIX=${libdir#lib}
+		-DMANUAL_REVISION=${KVIRC_GIT_REVISION}
+		-DMANUAL_SOURCES_DATE=${KVIRC_GIT_SOURCES_DATE//-/}
+		-DWANT_ENV_FLAGS=ON
+		-DWANT_VERBOSE=ON
+
+		-DWANT_CRYPT=ON
+		-DWANT_DCC_VOICE=ON
+		-DWANT_IPC=ON
+		-DWANT_IPV6=ON
+		-DWANT_TRANSPARENCY=ON
+
+		-DWANT_AUDIOFILE=$(usex audiofile ON OFF)
+		-DWANT_DCC_VIDEO=$(usex dcc_video ON OFF)
+		-DWANT_DEBUG=$(usex debug ON OFF)
+		-DWANT_DOXYGEN=$(usex doc ON OFF)
+		-DWANT_GETTEXT=$(usex nls ON OFF)
+		-DWANT_GSM=$(usex gsm ON OFF)
+		-DWANT_KDE=$(usex kde ON OFF)
+		-DWANT_MEMORY_PROFILE=$(usex profile ON OFF)
+		-DWANT_OGG_THEORA=$(usex theora ON OFF)
+		-DWANT_OPENSSL=$(usex ssl ON OFF)
+		-DWANT_OSS=$(usex oss ON OFF)
+		-DWANT_PERL=$(usex perl ON OFF)
+		-DWANT_PHONON=$(usex phonon ON OFF)
+		-DWANT_PYTHON=$(usex python ON OFF)
+		-DWANT_QTDBUS=$(usex dbus ON OFF)
+		-DWANT_QTWEBKIT=$(usex webkit ON OFF)
+		-DWANT_SPELLCHECKER=$(usex spell ON OFF)
+
+		# COMPILE_SVG_SUPPORT not used in source code.
+		-DWANT_QTSVG=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	if use doc; then
+		cmake-utils_src_compile devdocs
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use doc; then
+		(
+			docinto html
+			dodoc -r "${BUILD_DIR}/doc/api/html/"*
+		)
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/net-irc/kvirc/kvirc-9999.ebuild b/net-irc/kvirc/kvirc-9999.ebuild
index 46a0772c2758..76c8d1a158fd 100644
--- a/net-irc/kvirc/kvirc-9999.ebuild
+++ b/net-irc/kvirc/kvirc-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=(python{2_7,3_6,3_7})
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
 
 inherit cmake-utils flag-o-matic python-single-r1 xdg-utils
 
@@ -20,7 +20,7 @@ else
 fi
 
 DESCRIPTION="Advanced IRC Client"
-HOMEPAGE="http://www.kvirc.net/ https://github.com/kvirc/KVIrc"
+HOMEPAGE="https://www.kvirc.net/ https://github.com/kvirc/KVIrc"
 if [[ "${PV}" == "9999" ]]; then
 	SRC_URI=""
 else
diff --git a/net-irc/limnoria/Manifest b/net-irc/limnoria/Manifest
index e7d5939ecae0..76fbd52ba587 100644
--- a/net-irc/limnoria/Manifest
+++ b/net-irc/limnoria/Manifest
@@ -1,8 +1,4 @@
-DIST limnoria-20150523.tar.gz 937583 BLAKE2B 7e27a3f415ad8623da3a149feb235bcf9261f936e93bd494e4c07183691d66003f3d3e18aa282f7bbb5cf41f44984ea78d96687d6047be731947abe971ed3877 SHA512 d94ea8fe64a648605e8e45317f3283fac837e8bfe1465407fa7522ea5e2259c64a0ea3aa4585313b5c21def735fa7b0e62d7774fabfc2647683efc2f4c38d599
-DIST limnoria-20150829.tar.gz 939733 BLAKE2B 606284c5fb5d05e8c932a3c092a0a18a75f3b9fe4224c07113446be22e61707725a6bbe4ae8e0aa10d207a0988d72f832735faab5a0d3f8bcea4af810ca86c8a SHA512 51c941adf596716a610f6233a606958eae39fb90ad2ab02fcde670596c174b99196da7d29d31c438db0eeb79bd2d8c1067fdf21f0e6e42ba25a80cd5249b89a2
-DIST limnoria-20171025.tar.gz 957078 BLAKE2B 74c1f7cb2ab9123706f265e471533dac4224848ba9a78a79749ca5cac7e9f67c33a884cef30706f3c36440b385ae2e1d5748f4b7aedaf9bfd8e38839d13e4865 SHA512 513a04b860e1fc1788de41238c858fa487899988111d9f5bfaa4acde6506dbd4bdf4dd26e48d268f6ca2f1b301b3e8d9aad8a2733013c09db69ffb4f925a7c12
-EBUILD limnoria-20150523.ebuild 2618 BLAKE2B db3ec1cfddfc2d339b226beabcf1b093a6f5a93ff59c3ead380093208c0306324b189d28ed2cc30ce844f182f750d5c6b038979c7c3c3e3aaec60dcc71929814 SHA512 1e26a786a4fa188de59571e8857981d09a1e6f296561b8ee09369c8c821ce829fa4ea8ddd243d0eb17beec9f02ae2d6c27766e34ecb1b78900c4bfca8fcba9e9
-EBUILD limnoria-20150829.ebuild 2624 BLAKE2B 5497319bccd5cb23dcb77608ef1919fe0daf775095fb1f512d7d8408aaab8cfa80e353fbf29abd61f6686b5e5e9b3f2b907b5e4d82d1b91755742cd4dd773c16 SHA512 80a53b414a94ba24c22c797268603c2d4036cb5a50fed15954cf11c4db8f9249fc0382bdbe4bc9cbd9bdb5ed58d5aacf5722227ec9b26a0ba44bbc312433d00d
-EBUILD limnoria-20171025.ebuild 2628 BLAKE2B 0089087fa8b6b4054fa6ada804a63a5aa4f2f8cc0f31f7800719e055100fa5924d8d194f6b7d5cdde2549611263e165e1c0fbb2dc1e349108ac9cad8ccca3e01 SHA512 cad64f8d9155722ffe7b80e50c8c05bede056b52d0ee9d78963f1efa17b74985881ef5810a1b119cdbda36fdfb575d76f1d4eb3574f5d099d674fffae5a18b51
-EBUILD limnoria-99999999.ebuild 2628 BLAKE2B 0089087fa8b6b4054fa6ada804a63a5aa4f2f8cc0f31f7800719e055100fa5924d8d194f6b7d5cdde2549611263e165e1c0fbb2dc1e349108ac9cad8ccca3e01 SHA512 cad64f8d9155722ffe7b80e50c8c05bede056b52d0ee9d78963f1efa17b74985881ef5810a1b119cdbda36fdfb575d76f1d4eb3574f5d099d674fffae5a18b51
+DIST limnoria-20191123.tar.gz 975077 BLAKE2B b5bc425013a30043c79a5dc53fc346e3b65cafbae154789f43634fc8beb4c7dcfaea34b0c1e22eae28e044eaa2801b0c29ef106fd6e2cc0095e6acbf4c4bf931 SHA512 5822f83a5d7fae0e45e526d9a72c1bbfd2acb7f625cff38e4d6e59222aca4c68204ae03069e991e274b108391cd4feff85783805657554771a7d24789589d14b
+EBUILD limnoria-20191123.ebuild 2526 BLAKE2B 53f2de19f2822a0dd51de9d8caf943ed4b337b42d73344c165fdbcfd9f04a8df7b0528e3d23834a529faa157d75c0db724fa65064c34a9e998a3fcb8ed48adf8 SHA512 d7f024b8a95e7415e8f6ac2b9d8f123fcd70cfc192a2a49aba9e6a248274ab94f05a059b5df880abf755e2a52a5104569cc0eeb1c031cd862140fea867228893
+EBUILD limnoria-99999999.ebuild 2526 BLAKE2B 53f2de19f2822a0dd51de9d8caf943ed4b337b42d73344c165fdbcfd9f04a8df7b0528e3d23834a529faa157d75c0db724fa65064c34a9e998a3fcb8ed48adf8 SHA512 d7f024b8a95e7415e8f6ac2b9d8f123fcd70cfc192a2a49aba9e6a248274ab94f05a059b5df880abf755e2a52a5104569cc0eeb1c031cd862140fea867228893
 MISC metadata.xml 408 BLAKE2B 5328f97d256c4e5dc340d7ce1c6090983c84948326bff34ee0a94c6dd644fb72b5bf348a10e841e520ccf80d1238f159af64e5a3dc1991b9646da17baf3ff0d0 SHA512 6be6681e4b0f8555cd0e769937580068315acae5b1d1c722c354748b8c0a16c0146950b716a1b7b46f0230623580b2576f53c757b13125577698f458f824732e
diff --git a/net-irc/limnoria/limnoria-20150829.ebuild b/net-irc/limnoria/limnoria-20150829.ebuild
deleted file mode 100644
index 47c217b5d5f7..000000000000
--- a/net-irc/limnoria/limnoria-20150829.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-inherit distutils-r1
-
-MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PN="Limnoria"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${PV} == "99999999" ]]; then
-	EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git"
-	EGIT_BRANCH="testing"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
-fi
-
-DESCRIPTION="Python based extensible IRC infobot and channel bot"
-HOMEPAGE="https://supybot.aperio.fr/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="crypt ssl test"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	!net-irc/supybot
-	!net-irc/supybot-plugins
-	"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-}
-
-python_prepare(){
-	distutils-r1_python_prepare
-	if python_is_python3; then
-		einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
-		einfo "bindings and feedparser."
-		rm -rf "plugins/RSS" || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/*
-}
-
-python_test() {
-	pushd "${T}" > /dev/null
-	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS=( --exclude="${PLUGINS_DIR}/Scheduler" )
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Filter" )
-	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
-	# runs successfully when running the tests on the installed system
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
-	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
-		--plugins-dir="${PLUGINS_DIR}" --no-network \
-		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
-		|| die "Tests failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/"
-	elog ""
-	elog "Use supybot-wizard to create a configuration file."
-	elog "Run supybot </path/to/config> to use the bot."
-}
diff --git a/net-irc/limnoria/limnoria-20171025.ebuild b/net-irc/limnoria/limnoria-20171025.ebuild
deleted file mode 100644
index 0c64a0acb20e..000000000000
--- a/net-irc/limnoria/limnoria-20171025.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-MY_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PN="Limnoria"
-MY_P="${MY_PN}-${MY_PV}"
-
-if [[ ${PV} == "99999999" ]]; then
-	EGIT_REPO_URI="https://github.com/ProgVal/${MY_PN}.git"
-	EGIT_BRANCH="testing"
-	inherit git-r3
-	SRC_URI=""
-else
-	SRC_URI="https://github.com/ProgVal/${MY_PN}/archive/master-${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${MY_PN}-master-${MY_PV}"
-fi
-
-DESCRIPTION="Python based extensible IRC infobot and channel bot"
-HOMEPAGE="https://supybot.aperio.fr/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="crypt ssl test"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/ecdsa[${PYTHON_USEDEP}]
-	dev-python/feedparser[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/sqlalchemy[${PYTHON_USEDEP}]
-	crypt? ( dev-python/python-gnupg[${PYTHON_USEDEP}] )
-	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
-	!net-irc/supybot
-	!net-irc/supybot-plugins
-	"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]]; then
-		git-r3_src_unpack
-	else
-		unpack ${P}.tar.gz
-	fi
-}
-
-python_prepare(){
-	distutils-r1_python_prepare
-	if python_is_python3; then
-		einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
-		einfo "bindings and feedparser."
-		rm -rf "plugins/RSS" || die
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman man/*
-}
-
-python_test() {
-	pushd "${T}" > /dev/null
-	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS=( --exclude="${PLUGINS_DIR}/Scheduler" )
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Filter" )
-	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
-	# runs successfully when running the tests on the installed system
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
-	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
-		--plugins-dir="${PLUGINS_DIR}" --no-network \
-		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
-		|| die "Tests failed under ${EPYTHON}"
-	popd > /dev/null
-}
-
-pkg_postinst() {
-	elog "Complete user documentation is available at https://limnoria-doc.readthedocs.org/"
-	elog ""
-	elog "Use supybot-wizard to create a configuration file."
-	elog "Run supybot </path/to/config> to use the bot."
-}
diff --git a/net-irc/limnoria/limnoria-20150523.ebuild b/net-irc/limnoria/limnoria-20191123.ebuild
index a18cf8c73618..204411eeee8f 100644
--- a/net-irc/limnoria/limnoria-20150523.ebuild
+++ b/net-irc/limnoria/limnoria-20191123.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -43,6 +43,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
 
+RESTRICT="!test? ( test )"
+
 src_unpack() {
 	if [[ ${PV} == "99999999" ]]; then
 		git-r3_src_unpack
@@ -52,7 +54,6 @@ src_unpack() {
 }
 
 python_prepare(){
-	distutils-r1_python_prepare
 	if python_is_python3; then
 		einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
 		einfo "bindings and feedparser."
@@ -68,13 +69,12 @@ python_install_all() {
 python_test() {
 	pushd "${T}" > /dev/null
 	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS=( --exclude="${PLUGINS_DIR}/Scheduler" )
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Filter" )
+	EXCLUDE_PLUGINS=()
 	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
 	# runs successfully when running the tests on the installed system
 	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
+	# Runs despite --no-network (GH #1392)
+	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Aka" )
 	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
 		--plugins-dir="${PLUGINS_DIR}" --no-network \
 		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
diff --git a/net-irc/limnoria/limnoria-99999999.ebuild b/net-irc/limnoria/limnoria-99999999.ebuild
index 0c64a0acb20e..204411eeee8f 100644
--- a/net-irc/limnoria/limnoria-99999999.ebuild
+++ b/net-irc/limnoria/limnoria-99999999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit distutils-r1
 
@@ -43,6 +43,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )"
 
+RESTRICT="!test? ( test )"
+
 src_unpack() {
 	if [[ ${PV} == "99999999" ]]; then
 		git-r3_src_unpack
@@ -52,7 +54,6 @@ src_unpack() {
 }
 
 python_prepare(){
-	distutils-r1_python_prepare
 	if python_is_python3; then
 		einfo "Removing the RSS plugin because of clashes between libxml2's Python3"
 		einfo "bindings and feedparser."
@@ -68,13 +69,12 @@ python_install_all() {
 python_test() {
 	pushd "${T}" > /dev/null
 	PLUGINS_DIR="${BUILD_DIR}/lib/supybot/plugins"
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS=( --exclude="${PLUGINS_DIR}/Scheduler" )
-	# recommended by upstream, unknown random failure
-	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Filter" )
+	EXCLUDE_PLUGINS=()
 	# intermittent failure due to issues loading libsandbox.so from LD_PRELOAD
 	# runs successfully when running the tests on the installed system
 	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Unix" )
+	# Runs despite --no-network (GH #1392)
+	EXCLUDE_PLUGINS+=( --exclude="${PLUGINS_DIR}/Aka" )
 	"${PYTHON}" "${BUILD_DIR}"/scripts/supybot-test "${BUILD_DIR}/../test" \
 		--plugins-dir="${PLUGINS_DIR}" --no-network \
 		--disable-multiprocessing "${EXCLUDE_PLUGINS[@]}" \
diff --git a/net-irc/pisg/Manifest b/net-irc/pisg/Manifest
index e6b26b1d2d2a..071099a95880 100644
--- a/net-irc/pisg/Manifest
+++ b/net-irc/pisg/Manifest
@@ -1,3 +1,3 @@
 DIST pisg-0.73.tar.gz 236539 BLAKE2B 148d73419f958f9c0c7ec2db522f7c5c198bd22f7df25064fcf1771d9bbef4177556faae5edb60060a3167c9b8a01e533c48a742fb795c371c680f8bce5114af SHA512 290656fc556090fa8a263eaf123bad8e12b0ac50a2c1eb4619c50faf70fd3ee8afc7a8d97dbc4ff6338dd0fa9f73f7b19c60ca996b6612def95f1c494b3ef91e
-EBUILD pisg-0.73-r1.ebuild 969 BLAKE2B b58bc685a89714615a29a19cbcd9717f9676c6d17cb2be40a70a21048cd1f53255e1ef606ea3e3033f74066ac5ce90e46f932806f4befd184d234b7242528c93 SHA512 edd07e64b224950258745d240a54d82a3ceee9b30c5de8a607798bbf968bd704997a39b8b8c3905456ad65ae268be5c187e94d78e7eb1ee2f21a154fb90b073f
+EBUILD pisg-0.73-r1.ebuild 947 BLAKE2B 2e8301d288490af121b389a3c96a45674e0a7a3dd03ebb3dfd4f3f000e7b730c82615e4dce5ec8a66334165d9aab8b5bbc2d94ae589c20af19153db032ff5263 SHA512 586735f10a88ef09ca30384243fc42873614bce12838a6bc3f73bf59f402e27387c9e21283d5319c4cfd94409dabd5cfc7a4c07439bcec05e5e07aebb75b1ee5
 MISC metadata.xml 241 BLAKE2B 7866f09039b1b4926d7e870b8292039c0ca87323de3966428a9d0846ffee64ed027510b9aad12007e12324956c3ae3fc915f1cf57dd02571e51447d580870165 SHA512 1fb73fbdd72b001e72b07c527a4b50a52fc0dd03645230521f018cf0f26cd3a31fef6d09099a8d5a991278404661e3654331999bb85b59d5fac94e78481d9493
diff --git a/net-irc/pisg/pisg-0.73-r1.ebuild b/net-irc/pisg/pisg-0.73-r1.ebuild
index 0f18934b56e2..54dc6db49cb8 100644
--- a/net-irc/pisg/pisg-0.73-r1.ebuild
+++ b/net-irc/pisg/pisg-0.73-r1.ebuild
@@ -32,7 +32,7 @@ src_compile() {
 src_install() {
 	perl_set_version
 
-	dobin pisg || die "dobin failed"
+	dobin pisg
 
 	insinto "${VENDOR_LIB}"
 	doins -r modules/.
diff --git a/net-irc/polari/Manifest b/net-irc/polari/Manifest
index e2c92f8ff7a6..a2a1e805f0b7 100644
--- a/net-irc/polari/Manifest
+++ b/net-irc/polari/Manifest
@@ -1,3 +1,3 @@
 DIST polari-3.30.2.tar.xz 1153792 BLAKE2B 992f39e989179617164fb9d955a5211aa466293882d773c5783792503741cf62ae7fa848697046f2888bdc04c083e0b3fef0be18055e2d2c2607cc029eb2c816 SHA512 4aae1bd70498ddbddab494c9484c039bc5fabc13860ddd6a2001858808baea004c9f463b37c9392eaac62cf951867ea6e24e77053976bd4524dd711ac52a5b4d
-EBUILD polari-3.30.2.ebuild 1119 BLAKE2B 8c48f6479165e8159cf2089a5184426c282f6f988f449d00acf57b6800a7332360218306cb7d4d964f5be61078eddc31ecaa747b49081be00f30a5500dc0b1f0 SHA512 ede8349b7bcb9a8299823e791afe3c7940a6b5868c07be668262859e93e3f4e3e002edba3b912ee11bbb92b4781b6985022659563a3596b62a7367a092fa2331
+EBUILD polari-3.30.2.ebuild 1146 BLAKE2B e8775c613efc0361b613b35cc11b83808a518c39716c10490794081d34d22be42376c194d847cc2e639fb3c5dd7df20f8acfc8130088db7351a606f0b4f47eba SHA512 1aa4b700329cacd07cadc7bfa1bd85567dba50c43a5a4a16b97cdf816bd9ee8f34584d3bede96cc8e131d90043a71d3822f2a91bb6c4acc8bc2aa088b59467c2
 MISC metadata.xml 383 BLAKE2B fe4acd5e1d8f9336124e6a8588c3d25df25d7a60fac88b1eb637a1b169fd0805bc59030ec776257bfd664df72e6a3dfefcbde1d60bd08384281587ec062f2ad7 SHA512 98707a009259fafe782cd442524620d79465fadf8304becb5c4de4e15763245bd7c21fda7081749a7bfb551e1dd9d3168236862bb704bfb9091ca087ce348deb
diff --git a/net-irc/polari/polari-3.30.2.ebuild b/net-irc/polari/polari-3.30.2.ebuild
index d25b4a62e8b5..73f90a880739 100644
--- a/net-irc/polari/polari-3.30.2.ebuild
+++ b/net-irc/polari/polari-3.30.2.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~arm x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.43.4:2
diff --git a/net-irc/ptlink-opm/Manifest b/net-irc/ptlink-opm/Manifest
index 6b84d8f402d7..a3107039c1b4 100644
--- a/net-irc/ptlink-opm/Manifest
+++ b/net-irc/ptlink-opm/Manifest
@@ -1,5 +1,5 @@
 AUX ptlink-opm.conf.d 164 BLAKE2B e7a3faec359c78cb13c8a1c05383586a79d615a9ada1f6ca9e12c1ad61870cfc4d9098f5a6462c826d23fa9c81f8587ad5c490f5ab071e0a9ae7cb8a605347b9 SHA512 a0fd7fca178cc1b8416c7f08d0d86e756c84bfed8256b77051a05d3a1aed95406c4eb759438b50a05cf81b4e3755b606265e2fb1cb2d1edf92b442a1aebc2f4a
 AUX ptlink-opm.init.d 428 BLAKE2B af23dd6900040472e8d06ace9de5e05716ac5e53825cb12fe38e18f95f47a6b401d865e0fbac49161579dcd33fe5daaa65e8f66ac340ea0b711fcd05a231b202 SHA512 411034db9dec378ddfe2692fb85eba1fc6f2124fd9dd4ec79224dcd3cf6219748e6dfd43151a99f86978f8eb577cb304f1fde6b7b835156d9dee7c22ce3ece6d
 DIST PTlink.OPM1.3.1.tar.gz 156068 BLAKE2B 2b74391e5dc45ef3a9e37b4390b0a39e61c8f041bfcb549cf9951cb216975e6b398b31a9fe1d8932bac732ad70c65595d6154157c010d330e3a7d77f2d2a50e6 SHA512 1a8955486db8c1a318dda1b7bfdaf1be9f55d68a5acafde37a5f15e80e21b8d45c51138efb9d5ca1d1fad9f46d0ccdc4b91cf9128ba2ca7086f1c0925a36a141
-EBUILD ptlink-opm-1.3.1-r1.ebuild 1001 BLAKE2B 6ff4d47d97af4ee01b63c9e190348b5f8017d05b15206e6b1b1dbf0d271fbeb88a55591ab50df7fd487562ccff6c593a1408588f2a0b45470805061ce27ae32c SHA512 b77cc6d1e04488aa6eeb95653106c14ce20935d22b9e75b9f13d4fb0dad34da818885d7acc516abbaedf88bcce6245e5e8d974dbff0dbaa0ecb132e51656b89c
+EBUILD ptlink-opm-1.3.1-r1.ebuild 979 BLAKE2B 1f0718facdbdaae3ae8d14a3a0005064519f098c531112f68c651be6f53a3c209e2bca1e8f488a725ad4e73b067935f4c1619e077a199927d7b7c225fc1d6ccd SHA512 6f23f03b8149135a86fdaeda853f4cf2a870878f7c747b4532331c2fc643ed1168fbc189301aa4b00411f6e762b42df832faa442d52569ddd386065b5a68dda8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild
index 982206e1e300..7ad9abad1cc4 100644
--- a/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild
+++ b/net-irc/ptlink-opm/ptlink-opm-1.3.1-r1.ebuild
@@ -36,7 +36,7 @@ src_install() {
 	keepdir /var/{lib,log}/ptlink-opm
 	dosym /var/log/ptlink-opm /var/lib/ptlink-opm/log
 
-	dodoc CHANGES README || die "dodoc failed"
+	dodoc CHANGES README
 
 	newinitd "${FILESDIR}"/ptlink-opm.init.d ptlink-opm
 	newconfd "${FILESDIR}"/ptlink-opm.conf.d ptlink-opm
diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest
index 2a5bfcff8f89..28bd4998c3c0 100644
--- a/net-irc/telepathy-idle/Manifest
+++ b/net-irc/telepathy-idle/Manifest
@@ -1,3 +1,5 @@
+AUX telepathy-idle-0.2.0-fixes.patch 9363 BLAKE2B 6980114c9b030c1589f618fe67e88051bc414abe849fa6e08152625d1f66c00634cf572f4220fd9e31bb1706167869541e571fca04ca70e19c648dd094af263e SHA512 2c7b8f4069bc3907fea7c506af671a3d46ca56b55cbe6798589437751c598b549fcec4cf7cfdde93b2b7f5f3d858decf8218a7633f0e91cd3b2c883a301b746f
 DIST telepathy-idle-0.2.0.tar.gz 566492 BLAKE2B d0e12bb23b96b7df5afb101ae2c62994777de616d5ea70a10fb2141e68066c7dfaae713340c7f8a2d8ce1f259f302729efa1927eaf7d2a9555120c58e89046f2 SHA512 f5e36afc3ab4b52eb865f2c1e6565b99011a7540fc1a7783d3bbd7bbf50bc671a2147df6bde646c82059a466cc1df9bdb10e2500db5b7bb06d57a989a75c261b
-EBUILD telepathy-idle-0.2.0-r1.ebuild 985 BLAKE2B bffc265aab91e06755f33c4fefed06ffb5712df7069851c29edcd83a09f9a4966ec8685b73ca1bdba38248a36e0a5417f1193a00eb45b8814f2122f5b56c7903 SHA512 283bdd80e70c44635aa3d287351fddcdd13fe6d51a5982f364ea0c50c9b5719bc8a42b90b25a1689a9521064fad652cc1a92b3b484ceb796092631bbfa6a3455
+EBUILD telepathy-idle-0.2.0-r1.ebuild 1012 BLAKE2B 7529d29f82eb3eab9663bb55a44e42282c4cdd20a0c44141cd738451abafcfbcb5a2ce5eeb0a9c3d2d728a545dcaa1667f766e850fd9bc154ff7b5ed3cd47dac SHA512 053c1c42c9216ca0e73367ee334aad59f5c6348e65ed74487a3b9166dc5dbbcaab536e79106ecb5f3894e9cb7f5889419519c4237eaf69737db6c8585e4bec0b
+EBUILD telepathy-idle-0.2.0-r2.ebuild 1058 BLAKE2B 4c47daad0167e997667166d517ea25c8e252d0999fb31b2801784423c3b3147a9bbc8daec1abf2039405b285e961c8649d254bcef531423317cda7e9fc3396aa SHA512 7d5a37120962a00120e44879a624d3ab8794fe9bdb3e5027c65a45673b81225f8fee528bed5ff43134c1ba0d528896cfe764ec579bdb34e0da4b4901cec06486
 MISC metadata.xml 349 BLAKE2B 0d82c3faf7643837ffb97efe203a7ababac9a0576673270294b9a68a5ce557e6f91b06bf6efc14217147fcceb6635aa287ec7c8c449d9060d407095e0226b7cc SHA512 f40f301daf4884299f797c2effeaaf6fec1f1a8cca1cd85cea1ff3e7853919c9803a9dfe0eea19a59e11a0e58f8686602708528d141434479708c485f2f8892a
diff --git a/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch b/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch
new file mode 100644
index 000000000000..07f14f9f4dde
--- /dev/null
+++ b/net-irc/telepathy-idle/files/telepathy-idle-0.2.0-fixes.patch
@@ -0,0 +1,223 @@
+From bf6d596e40e5b9426a68dcd22aa62a697457c4f7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
+Date: Sat, 13 Feb 2016 10:08:42 +0100
+Subject: [PATCH 1/6] ctcp: Don't bling the non-bling
+
+When stripping color codes, we currently remove any sequence of digits
+following ^C. As color codes use at most two digits, this means that we
+also remove any numbers at the start of the colored text - make sure we
+stop doing that and only remove digits that are actually part of a color
+code.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=94189
+---
+ src/idle-ctcp.c | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/idle-ctcp.c b/src/idle-ctcp.c
+index f282360..f28bf4b 100644
+--- a/src/idle-ctcp.c
++++ b/src/idle-ctcp.c
+@@ -98,13 +98,18 @@ gchar *idle_ctcp_kill_blingbling(const gchar *msg) {
+ 			case '\x03': /* ^C */
+ 				iter++;
+ 
+-				while (isdigit(*iter))
++				/* Color codes are 1-2 digits */
++                                if (isdigit(*iter))
++					iter++;
++                                if (isdigit(*iter))
+ 					iter++;
+ 
+ 				if (*iter == ',') {
+ 					iter++;
+ 
+-					while (isdigit(*iter))
++	                                if (isdigit(*iter))
++						iter++;
++	                                if (isdigit(*iter))
+ 						iter++;
+ 				}
+ 				break;
+-- 
+2.23.0
+
+From 5a2510ddea8f165f0808a8841e1dca311c003e20 Mon Sep 17 00:00:00 2001
+From: Diane Trout <diane@ghic.org>
+Date: Sat, 4 Nov 2017 23:03:26 -0700
+Subject: [PATCH 2/6] Update self-signed certificate to 2048 bytes with SHA-256
+ signature
+
+Valid for 10 years
+---
+ tests/twisted/tools/idletest.cert | 26 +++++++++++++++++--------
+ tests/twisted/tools/idletest.key  | 32 ++++++++++++++++++++++++-------
+ 2 files changed, 43 insertions(+), 15 deletions(-)
+
+diff --git a/tests/twisted/tools/idletest.cert b/tests/twisted/tools/idletest.cert
+index 655abc2..7ea6bcc 100644
+--- a/tests/twisted/tools/idletest.cert
++++ b/tests/twisted/tools/idletest.cert
+@@ -1,10 +1,20 @@
+ -----BEGIN CERTIFICATE-----
+-MIIBTzCB+gIBATANBgkqhkiG9w0BAQQFADAzMRIwEAYDVQQKEwl0ZWxlcGF0aHkx
+-HTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTA5MDExNDE3NDc0N1oX
+-DTA5MDExNDE3NDg0N1owMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYDVQQLExR0
+-ZWxlcGF0aHkgZGV2ZWxvcGVyczBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQC9z/pi
+-zEMeL+bO3giJVGHGrOHLE7AfDorArwmA0u8Cgu06+J+SW+NJnkj8At4bioxREge6
+-yeD6+cHCC9kzXrmXAgMBAAEwDQYJKoZIhvcNAQEEBQADQQBf1qg0gzSztx5pqqM8
+-3wI5cEc7k13EzU6X2SkSCSxlMc4pF0hPdr0LuZJpeKBohIgKQ59+3Ny0LuUMEKYW
+-ikGr
++MIIDUDCCAjigAwIBAgIBATANBgkqhkiG9w0BAQsFADAzMRIwEAYDVQQKEwl0ZWxl
++cGF0aHkxHTAbBgNVBAsTFHRlbGVwYXRoeSBkZXZlbG9wZXJzMB4XDTE3MTEwNTAw
++NTEwMFoXDTE4MTEwNTAwNTEwMFowMzESMBAGA1UEChMJdGVsZXBhdGh5MR0wGwYD
++VQQLExR0ZWxlcGF0aHkgZGV2ZWxvcGVyczCCASIwDQYJKoZIhvcNAQEBBQADggEP
++ADCCAQoCggEBAL3wfZoTzmJqQyjw0tToAflpdmQMTNpzgXvH+uiuu4rWk7oGJsBN
++HZfe4gkoYNLL8PwOGEQcIUN4Y0JU/mc9mSe44Vi0G0t/uJ/gI+CNtHzHjwtwCnYP
++XsbCE69CsarvDVbsQHS6kWfgCYxMA0l+cydUfxuyIoFWjeM4hZs0JwdBGBTAtZkj
++3xo+7Ee3xNBaaOtmoJO/QduAVA0UgiWU69m7Q+5aIuIl9PGOSL4MHqNXq/nwX5Ky
++aFBpXdzmrVn8BophkBgOawp0e+Rhk5fCelyy54lIfpUxeOTP6EtAgsZYbZBPjsuz
++8ewJbdnzcOCwTJpKQv9aHhkTKcK2PkN6tJMCAwEAAaNvMG0wDAYDVR0TAQH/BAIw
++ADAdBgNVHQ4EFgQUuG8blqmQ1SEj/x5OhBc58XFv6vcwCwYDVR0PBAQDAgXgMBEG
++CWCGSAGG+EIBAQQEAwIGQDAeBglghkgBhvhCAQ0EERYPeGNhIGNlcnRpZmljYXRl
++MA0GCSqGSIb3DQEBCwUAA4IBAQBJCT/EPWqv/wUDn7jK4nRXXXwtIL7eYYTAvcJh
++gxtrkkNB1LAp6mnb1WOw+Wbdpf2IgTqfAvpzCRL+kCM80Pqh365JlA5JflzhWxsJ
++xtJQfNfiZhgXKN1rm5lT+U/WgGR6A1serbxUiRN2O6wB8nxtoc7sBJh18pcrwpam
++vOGAolbePV8HPfyBRkCnSw1X6BdifEtxlRCfVWELSI6xQHX8OPTU+uGcvte5uAEi
++7CRRJHlUoojyLOxlJ6IeXh7MjrDIi6tHDqVR9MlRRN3oXhvsN/TtsZUuuC7s280W
++oapk/x7WNDSQsdsi0bmTLrJoZgHzaPRJPCwBFzbj/T1kCC0B
+ -----END CERTIFICATE-----
+diff --git a/tests/twisted/tools/idletest.key b/tests/twisted/tools/idletest.key
+index 3a80dab..d579266 100644
+--- a/tests/twisted/tools/idletest.key
++++ b/tests/twisted/tools/idletest.key
+@@ -1,9 +1,27 @@
+ -----BEGIN RSA PRIVATE KEY-----
+-MIIBOwIBAAJBAL3P+mLMQx4v5s7eCIlUYcas4csTsB8OisCvCYDS7wKC7Tr4n5Jb
+-40meSPwC3huKjFESB7rJ4Pr5wcIL2TNeuZcCAwEAAQJBAJLaJc3qWsMwLFJAVjpp
+-nnwnpUmIoeplRdRtl9yjVWeKrvD2gSh2Qz693dgJbDUGURJecJ+LSS4YMOS+8FLp
+-KgECIQDhgvqh9KahKphn2/vvcCx3DKBZ7wh9lYIaaAay6IuAhwIhANd5cF48u0ID
+-39kZCwfhpAKQDxvpqmbnRzB0hISjEpJxAiARfZIo24vM9jvJ2mMI6B9awGzzbLmw
+-29aya50RZT3kowIhALrT2NJc5iB/K4AZbq8Ovh5auj8Bg3Zl4hvpa11154yBAiAO
+-F+44Mb+YQi+r526cDv983vCuoU5EM0PbPvJxaWmwtQ==
++MIIEpAIBAAKCAQEAvfB9mhPOYmpDKPDS1OgB+Wl2ZAxM2nOBe8f66K67itaTugYm
++wE0dl97iCShg0svw/A4YRBwhQ3hjQlT+Zz2ZJ7jhWLQbS3+4n+Aj4I20fMePC3AK
++dg9exsITr0Kxqu8NVuxAdLqRZ+AJjEwDSX5zJ1R/G7IigVaN4ziFmzQnB0EYFMC1
++mSPfGj7sR7fE0Fpo62agk79B24BUDRSCJZTr2btD7loi4iX08Y5Ivgweo1er+fBf
++krJoUGld3OatWfwGimGQGA5rCnR75GGTl8J6XLLniUh+lTF45M/oS0CCxlhtkE+O
++y7Px7Alt2fNw4LBMmkpC/1oeGRMpwrY+Q3q0kwIDAQABAoIBAQC4gJyxh53KMait
++Y0mZcQlB6nULeHtLFDpqL/cGAX3BvvBfGkyYLhCaDvKIrMVo3pxna5Wcy6pwLMhW
++jdNWHBri4A9eKA3/h8Ci5IpVPbFeKEdGd/5hckrBTZLrgyCsh2vwzKtL+FL4kUMV
++Gl1zDbb0NHsIP0CPXLGVT7lQ6xciTidcEcWUh25reGPMew+Xv/fuN2xVOFxwCe5Q
++VdXR7yUFy7ihAyhEhK+TmF5eNRaqKA06KhbA6IME03RiiS/qxVRJgEfarXaibHiX
++KYM612VvZ6GCbQaQBXYGpl2Gnzumro1E49+KgZ6SQlm+2iaDJn1P/vg3rzCUiR37
++JvgNlap5AoGBAOQxtU5s+PbfdnW4SZu8+k0AtnwxwEvgwZUE5vdij/YApqIHfb2G
++MnuqJ9gNaMBHRoEAM4FXfl6Fjnc2w2fpQxg9U5wFX8bA6EXiqJLgfEbNu5YKPB9e
++BOTgNNrP6FbhwIM6mb0I47Fqzq17uS/GYYd3yRKdL34H9RPgzQms9Ov3AoGBANUV
++doxGnqLoJWb/lLdk7+yRuCmTYwQmIBrAsdWK9mxrlvP5PTc1QRi11E1hcumViFdy
++PBks7TUVmNqynRMaEw5W4VoLl2OrYrDkHxgP6clqwxYFYbldZohxueIdvNDCMLyu
++5/efwEl/NgvnQwb+Z2UHHEP8E3xSl/LrkgCw3P1FAoGBAJlzj+/AOh+RoBCDsAQp
++rcwwaYbU0fJ0ntj+Je8/+X09bNDS5syXPMWKZCbWxZVfmNrQ7tHQq2sWtvoV+oub
++AgJ/4wStXH3EZa3xQNkcWpYmbTn1gf658+KRnxlx7FTYlOPqeU30d2FsaLWi2KJ2
++7kjx1WZOC4zd/wGyD0+tXjp7AoGAcNM9gwb9hkqfS0s25mhWtY9u0OzOd+rsAt5X
++CzfaRQwu0J3+8NWM01WrxRE9NDtOBudgtP/Z1crKtbnve6bJwkT0a6ZJkae0yO7x
++G9+JLXIPPAC7ftfaq5J0Fyshx/OatL1z6+S1fvURm/nmvrRD8PVz3PeDJcfh1uku
++1JjRWnUCgYAFnAsOddzyRMe52WbeoDbl/AFJZMBbLDb2fI9yGNzy2Y79V0Bvxi3k
++iSp6vHXA2tiVysyeEgVWYOdPmblQ6GRivAW75sgyuma1A0GJqkmd1EPXwbFNod8K
++Ax0XXK2/olLTWtSOs8Cxmopb+V1rpyuTwlhyHc9J4HGEEBeazlYg3A==
+ -----END RSA PRIVATE KEY-----
+-- 
+2.23.0
+
+From 0ce3a8fa2bd3f4e72358bb53ecd0acf8fe448483 Mon Sep 17 00:00:00 2001
+From: Diane Trout <diane@ghic.org>
+Date: Sat, 4 Nov 2017 23:32:32 -0700
+Subject: [PATCH 3/6] Avoid errors from Python caused by the deliberatly
+ invalid Unicode
+
+Because stream.nick is Unicode when sendMessage combines the command,
+nick, and invalid utf8 python 2.7 ends up converting everything to
+Unicode. Since this test deliberately includes invalid Unicode, Python
+notices and throws an exception.
+
+In Python 3, network traffic is usually encoded as bytes. So I thought
+coercing the nick to bytes would be appropriate, and as bytes can contain
+anything including invalid Unicode, Python doesn't throw an exception.
+---
+ tests/twisted/messages/invalid-utf8.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/twisted/messages/invalid-utf8.py b/tests/twisted/messages/invalid-utf8.py
+index a48c2f4..725e3bd 100644
+--- a/tests/twisted/messages/invalid-utf8.py
++++ b/tests/twisted/messages/invalid-utf8.py
+@@ -33,7 +33,7 @@ def test_with_message(q, stream, parts):
+ 
+     # Idle's default character set is UTF-8. We send it a message which is
+     # basically UTF-8, except that one of its code points is invalid.
+-    stream.sendMessage('PRIVMSG', stream.nick, ':%s' % invalid_utf8,
++    stream.sendMessage('PRIVMSG', bytes(stream.nick), ':%s' % invalid_utf8,
+         prefix='remoteuser')
+ 
+     # Idle should signal that *something* was received. If it hasn't validated
+-- 
+2.23.0
+
+From acf5fcf4d830ae0b5953d8ded8eba4c17726c6f3 Mon Sep 17 00:00:00 2001
+From: Diane Trout <diane@ghic.org>
+Date: Mon, 6 Nov 2017 21:46:00 -0800
+Subject: [PATCH 4/6] Returning FALSE from the timer function causes the
+ timeout to be destroyed
+
+I asked one of the polari devs and was told that yes it is ok to set
+the timer id to zero in the timer function.
+
+With this patch make check works without changing any of the expected
+test results and without any coredumps
+---
+ src/idle-connection.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/idle-connection.c b/src/idle-connection.c
+index 6ab5fea..71c020f 100644
+--- a/src/idle-connection.c
++++ b/src/idle-connection.c
+@@ -600,6 +600,7 @@ _force_disconnect (gpointer data)
+ 
+ 	IDLE_DEBUG("gave up waiting, forcibly disconnecting");
+ 	idle_server_connection_force_disconnect(priv->conn);
++	priv->force_disconnect_id = 0;
+ 	return FALSE;
+ }
+ 
+-- 
+2.23.0
+
+From 5e5b677173ef64055b4a7073cb5a15066fc03f70 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Fri, 14 Feb 2014 12:12:54 +0100
+Subject: [PATCH 5/6] idle-connection: make sure to always reset
+ force_disconnect_id
+
+Recent GLib raises a critical when trying to remove an invalid source.
+
+(cherry picked from commit 12211654baa75db13a05b5c2b3293d1378fcf7a2)
+---
+ src/idle-connection.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/idle-connection.c b/src/idle-connection.c
+index 71c020f..8614d52 100644
+--- a/src/idle-connection.c
++++ b/src/idle-connection.c
+@@ -585,6 +585,7 @@ static gboolean _finish_shutdown_idle_func(gpointer data) {
+ 	IdleConnectionPrivate *priv = self->priv;
+ 	if (priv->force_disconnect_id != 0) {
+ 		g_source_remove(priv->force_disconnect_id);
++		priv->force_disconnect_id = 0;
+ 	}
+ 
+ 	tp_base_connection_finish_shutdown(conn);
+-- 
+2.23.0
+
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r1.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r1.ebuild
index 66a7595c94b0..fa25d3319cb4 100644
--- a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r1.ebuild
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r1.ebuild
@@ -14,6 +14,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 BDEPEND="
diff --git a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r2.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r2.ebuild
new file mode 100644
index 000000000000..7a2b194475db
--- /dev/null
+++ b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-single-r1
+
+DESCRIPTION="Full-featured IRC connection manager for Telepathy"
+HOMEPAGE="https://cgit.freedesktop.org/telepathy/telepathy-idle"
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? ( dev-python/twisted-words )
+"
+RDEPEND="
+	>=dev-libs/dbus-glib-0.51
+	>=dev-libs/glib-2.32:2
+	>=net-libs/telepathy-glib-0.21
+	sys-apps/dbus
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fixes.patch"
+)
+
+src_prepare() {
+	default
+
+	# Failed in 0.1.16 and code has not moved since october
+	# Upstream is working on 1.0
+	sed -e 's:connect/server-quit-ignore.py::' \
+		-e 's:connect/server-quit-noclose.py::' \
+		-i tests/twisted/Makefile.{am,in} || die
+}
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index 310f8aff5226..a55d9819c9ca 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1,6 +1,8 @@
 DIST weechat-2.5.tar.xz 2067180 BLAKE2B 5ef2a20d0f4e72958f8523c46eac4acf8223d70efbadc78a1a5623b0e63e11acbe1c8e5ec739f56764c6825393902626e234269646031971a0f58fbd314f8918 SHA512 af0135009b799d40790c09da5419c950a6c750264a556de418b0ba4f396ecbde2aadeae5cbea3f2e98fc9926f07439e28beac00cb0019dc6752c1a5640a9834e
 DIST weechat-2.6.tar.xz 2080092 BLAKE2B e54d8493de7783e18e0de3a7280088a27a70b270a2d7a504ad35c4091e03a0d3c2f3fd19260b700bb115e3804ab4d6d8963bea46faad1368f3dd0569c0595add SHA512 cf56692e12b2e034675d4c15a8822836b2fcf93d584948e338d263f5a7207edf4599cc72bfb940427146f5f75e7239207cf54f5ed07dd5b6119f68c445725a2d
+DIST weechat-2.7.tar.xz 2226876 BLAKE2B accb97f018c5405850df5ba7d1d8ad0b23ccfd478cedf29ebbd1f468f364efcfce7a7a34ef557ce7f64c2157392c1b281f8f74e57782ed69b4e0ada9f1b67b37 SHA512 5377cf9c37520cb2b7d1ba43251df3f33d814783ea4bd20d28cb08a2106c8db0e44a392a61929987b807a7d5e69a3c0ed1f3fec122a014b7ea7068e159341075
 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
+EBUILD weechat-2.6.ebuild 3806 BLAKE2B 1628dcae2d76ed893bee5a6aef70c698f186a0ae5986dec54e67bb6f091b4d021e84d3ba8be45cdad2380ae00c47bbf9c5970dc32e180121df5eb8ffb050e0d2 SHA512 86cec1a4fb2fb5c2b7ae79994af2ae47eb97401966785a8dfb5615cbbdef842b5c1ba484dcceaea7195d2ae426b0f3d88b47c85c1e6d6d56b49205148ebdffb6
+EBUILD weechat-2.7.ebuild 4035 BLAKE2B 289bc31dfd0db3f12cc6916af99d12cd015ab8770de3c979fb422283d6c80a1a1adf518cf7375f435ae2a7011c0963f907eb8cbaaf1971ffcf40b749ab6a8945 SHA512 2b8c211f55b141c2979211b11f1f1282b6dfb7ec18b19eabeba3cd8a99c785792ec025644a5b4be81a6f661a582df839bce52561f28f698c55754f9849ab46ff
+EBUILD weechat-9999.ebuild 4035 BLAKE2B 289bc31dfd0db3f12cc6916af99d12cd015ab8770de3c979fb422283d6c80a1a1adf518cf7375f435ae2a7011c0963f907eb8cbaaf1971ffcf40b749ab6a8945 SHA512 2b8c211f55b141c2979211b11f1f1282b6dfb7ec18b19eabeba3cd8a99c785792ec025644a5b4be81a6f661a582df839bce52561f28f698c55754f9849ab46ff
 MISC metadata.xml 988 BLAKE2B 26997114f73adc3dc8758a9241009fe8fd84c9856bbccdc31fc0ad7e8d26b20656c27451cb4475fe60421069e1df43ed5f1bd39cdf493cc47622796f20d79487 SHA512 2463ed39fd434c3dac81c46525907c76a0cdba7d321029cf8b165ee62b003ab1e7153d714b4f71664ffd758572b89db4b0d7c30280f56acd7708668d54a17046
diff --git a/net-irc/weechat/weechat-2.6.ebuild b/net-irc/weechat/weechat-2.6.ebuild
index 024f0d1b0d09..1752bb52e420 100644
--- a/net-irc/weechat/weechat-2.6.ebuild
+++ b/net-irc/weechat/weechat-2.6.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm ~ppc64 x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
diff --git a/net-irc/weechat/weechat-2.7.ebuild b/net-irc/weechat/weechat-2.7.ebuild
new file mode 100644
index 000000000000..545aee9eafe2
--- /dev/null
+++ b/net-irc/weechat/weechat-2.7.ebuild
@@ -0,0 +1,156 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
+
+inherit cmake-utils python-single-r1 xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
+else
+	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Portable and multi-interface IRC client"
+HOMEPAGE="https://weechat.org/"
+
+LICENSE="GPL-3"
+SLOT="0"
+
+NETWORKS="+irc"
+PLUGINS="+alias +buflist +charset +exec +fifo +fset +logger +relay +scripts +spell +trigger +xfer"
+# dev-lang/v8 was dropped from Gentoo so we can't enable javascript support
+SCRIPT_LANGS="guile lua +perl php +python ruby tcl"
+LANGS=" cs de es fr it ja pl ru"
+IUSE="doc man nls +ssl test ${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/libgcrypt:0=
+	net-misc/curl[ssl]
+	sys-libs/ncurses:0=
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( >=dev-scheme/guile-2.0 )
+	lua? ( dev-lang/lua:0[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl:= )
+	php? ( >=dev-lang/php-7.0:* )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( || ( dev-lang/ruby:2.6 dev-lang/ruby:2.5 dev-lang/ruby:2.4 ) )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15:0= )
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cpputest )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
+	man? ( >=dev-ruby/asciidoctor-1.5.4 )
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+DOCS="AUTHORS.adoc ChangeLog.adoc Contributing.adoc ReleaseNotes.adoc README.adoc"
+
+# tests need to be fixed to not use system plugins if weechat is already installed
+RESTRICT="test"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# install only required translations
+	local i
+	for i in ${LANGS} ; do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in $(grep add_subdirectory doc/CMakeLists.txt \
+			| sed -e 's/.*add_subdirectory(\(..\)).*/\1/' -e '/en/d'); do
+		if ! has ${i} ${LINGUAS-${i}} ; then
+			sed -i \
+				-e '/add_subdirectory('${i}')/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+
+	# install docs in correct directory
+	sed -i "s#\${SHAREDIR}/doc/\${PROJECT_NAME}#\0-${PV}/html#" doc/*/CMakeLists.txt || die
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		# fix linking error on Darwin
+		sed -i "s/+ get_config_var('LINKFORSHARED')//" \
+			cmake/FindPython.cmake || die
+		# allow to find the plugins by default
+		sed -i 's/".so,.dll"/".bundle,.so,.dll"/' \
+			src/core/wee-config.c || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLIBDIR=/usr/$(get_libdir)
+		-DENABLE_JAVASCRIPT=OFF
+		-DENABLE_LARGEFILE=ON
+		-DENABLE_NCURSES=ON
+		-DENABLE_ALIAS=$(usex alias)
+		-DENABLE_BUFLIST=$(usex buflist)
+		-DENABLE_CHARSET=$(usex charset)
+		-DENABLE_DOC=$(usex doc)
+		-DENABLE_EXEC=$(usex exec)
+		-DENABLE_FIFO=$(usex fifo)
+		-DENABLE_FSET=$(usex fset)
+		-DENABLE_GNUTLS=$(usex ssl)
+		-DENABLE_GUILE=$(usex guile)
+		-DENABLE_IRC=$(usex irc)
+		-DENABLE_LOGGER=$(usex logger)
+		-DENABLE_LUA=$(usex lua)
+		-DENABLE_MAN=$(usex man)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_PERL=$(usex perl)
+		-DENABLE_PHP=$(usex php)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_RELAY=$(usex relay)
+		-DENABLE_RUBY=$(usex ruby)
+		-DENABLE_SCRIPT=$(usex scripts)
+		-DENABLE_SCRIPTS=$(usex scripts)
+		-DENABLE_SPELL=$(usex spell)
+		-DENABLE_TCL=$(usex tcl)
+		-DENABLE_TESTS=$(usex test)
+		-DENABLE_TRIGGER=$(usex trigger)
+		-DENABLE_XFER=$(usex xfer)
+	)
+
+	if use python; then
+		python_is_python3 || mycmakeargs+=( -DENABLE_PYTHON2=ON )
+	fi
+
+	cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/net-irc/weechat/weechat-9999.ebuild b/net-irc/weechat/weechat-9999.ebuild
index 024f0d1b0d09..545aee9eafe2 100644
--- a/net-irc/weechat/weechat-9999.ebuild
+++ b/net-irc/weechat/weechat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7,3_8} )
 
 inherit cmake-utils python-single-r1 xdg-utils
 
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/weechat/weechat.git"
 else
 	SRC_URI="https://weechat.org/files/src/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86 ~x64-macos"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Portable and multi-interface IRC client"
@@ -51,6 +51,7 @@ DEPEND="${RDEPEND}
 "
 
 BDEPEND="
+	virtual/pkgconfig
 	doc? ( >=dev-ruby/asciidoctor-1.5.4 )
 	man? ( >=dev-ruby/asciidoctor-1.5.4 )
 	nls? ( >=sys-devel/gettext-0.15 )
@@ -135,13 +136,21 @@ src_configure() {
 		-DENABLE_XFER=$(usex xfer)
 	)
 
+	if use python; then
+		python_is_python3 || mycmakeargs+=( -DENABLE_PYTHON2=ON )
+	fi
+
 	cmake-utils_src_configure
 }
 
 pkg_postinst() {
+	xdg_desktop_database_update
 	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
+	xdg_desktop_database_update
 	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
 }
diff --git a/net-irc/znc/Manifest b/net-irc/znc/Manifest
index cee573b2869a..7a7c3c076c3f 100644
--- a/net-irc/znc/Manifest
+++ b/net-irc/znc/Manifest
@@ -5,7 +5,7 @@ AUX znc.initd-r2 952 BLAKE2B 81346bf0a1581543683eb5c125b29474c0bc01b8aee11c036a1
 DIST gtest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7
 DIST znc-1.7.4.tar.gz 2084756 BLAKE2B 3b389a13d7c1c59b8ac485b6996b5a56a03689e8191a65c99692ea849a99ed0a013065a47ea3d213faf883e1d3e595375a665090b4173e97261c3afe21a120e7 SHA512 ea559ee9e06bfbc51c03ef08e145bc39ee7402638cc153fab7dc1dcedae01548fa0743d726304f9e4631a66241eb96c03940b76093954093a35f69641133b2ae
 DIST znc-1.7.5.tar.gz 2170656 BLAKE2B af5548bff1d9c6e740e668f467f52e8540a59bec9363fb4a17c594e1a9638417f75321b074e2aad6380769a594fc134543681928a7a33d00083ba9babc441a69 SHA512 f067503e5f45499c0acd687ef66266c4a65b80048e2a5835d3f9dfc4cd69b35890abdc3457726d7a7b25909f507349770eec43d9941bd62094c3527e64fbd825
-EBUILD znc-1.7.4.ebuild 5109 BLAKE2B 00133f80135039f6a84504af8fca1bcf34a2c048b1eb89c261f7b25a4f947a8ac4220921c651aa0350c8b38a81e892090e3859829658a11ed6255b5583ca4bce SHA512 ba4da9e4af8002638af50bf1e8180032e051ecc05b1d3afa27c443f01121970062a8a412406bcea6a1e5349e1b745b383acf025b2c15436670c20e7b22e8ca51
-EBUILD znc-1.7.5.ebuild 5112 BLAKE2B 4803a3700c4909b0489b31ceedac2762c1f0de1736c3ac5a7ce6e76817fd857bff60d3514c695470a02daaf82540ed3ad04e368059331e6d6fac53a6265198ae SHA512 cc8978b945f89666018d3a4f277d5acd6681b101e1b25637ff63cea2f87c05b6c776d4de8bdf7e7a24b2d103b800b5a362ab45dd4ac2f7a990760d859f66ef50
-EBUILD znc-9999.ebuild 5112 BLAKE2B 4803a3700c4909b0489b31ceedac2762c1f0de1736c3ac5a7ce6e76817fd857bff60d3514c695470a02daaf82540ed3ad04e368059331e6d6fac53a6265198ae SHA512 cc8978b945f89666018d3a4f277d5acd6681b101e1b25637ff63cea2f87c05b6c776d4de8bdf7e7a24b2d103b800b5a362ab45dd4ac2f7a990760d859f66ef50
+EBUILD znc-1.7.4.ebuild 5136 BLAKE2B 9da65f5082990c05489a504872fbb653ae191cedd2c723efaef264c5d2329498b2def1143546d1adb813d348071fdb0d37a60d530f4111228d5baeecf1013248 SHA512 8ff7dd79686cc94e10e51852d5dae57a2459679c705beb890cfc810c7a262648ac25a620f48d0809ccd91855b235e17361d05900d32f9266c61339cb1e0fd78e
+EBUILD znc-1.7.5.ebuild 5139 BLAKE2B b42931651ab6253ea0b77e5d659dbac1db7915176e353392494739003d1641fb99bbcfb17f20f9d1937f225acfb8df7debf72c8338baf3064efeffb13502aa2a SHA512 2de8a6650a6b133258fe78851215860bb8daa5ea6c337fc401d9becd0208e244a7f032627aaaa61d4247700c8d088b6ab35c1c030b52c658a2eb7b9d221a7cde
+EBUILD znc-9999.ebuild 5139 BLAKE2B b42931651ab6253ea0b77e5d659dbac1db7915176e353392494739003d1641fb99bbcfb17f20f9d1937f225acfb8df7debf72c8338baf3064efeffb13502aa2a SHA512 2de8a6650a6b133258fe78851215860bb8daa5ea6c337fc401d9becd0208e244a7f032627aaaa61d4247700c8d088b6ab35c1c030b52c658a2eb7b9d221a7cde
 MISC metadata.xml 507 BLAKE2B c8926f6668f57c84f5715156a424b18f7cb01f0ea9ac6a499550f731a00c7de035ec270f89297bda07ac3115292deffdcd0f3a339484c9de5d8bd7170be00de6 SHA512 d69af8535c2e409e6b6e65bfd279d74bd89ce01e911e0d21b4079bd13328e47f3b959ef82531b833c702955225e01db6915f4fb3f94d048a05ce2107b61bf1a6
diff --git a/net-irc/znc/znc-1.7.4.ebuild b/net-irc/znc/znc-1.7.4.ebuild
index 3bd414de0020..92763dca915e 100644
--- a/net-irc/znc/znc-1.7.4.ebuild
+++ b/net-irc/znc/znc-1.7.4.ebuild
@@ -30,6 +30,7 @@ HOMEPAGE="https://znc.in"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
 
diff --git a/net-irc/znc/znc-1.7.5.ebuild b/net-irc/znc/znc-1.7.5.ebuild
index 6d5656de499d..6176d1304602 100644
--- a/net-irc/znc/znc-1.7.5.ebuild
+++ b/net-irc/znc/znc-1.7.5.ebuild
@@ -30,6 +30,7 @@ HOMEPAGE="https://znc.in"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"
 
diff --git a/net-irc/znc/znc-9999.ebuild b/net-irc/znc/znc-9999.ebuild
index 6d5656de499d..6176d1304602 100644
--- a/net-irc/znc/znc-9999.ebuild
+++ b/net-irc/znc/znc-9999.ebuild
@@ -30,6 +30,7 @@ HOMEPAGE="https://znc.in"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+ipv6 +icu libressl nls perl python +ssl sasl tcl test +zlib"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} icu )"