gentoo resync : 05.02.2020

16 files changed, 481 insertions, 52 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 4bb9857cba2d..a852a55c5fa1 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/bnc/Manifest b/net-irc/bnc/Manifest
index 55120a843276..c5cb241ca68e 100644
--- a/net-irc/bnc/Manifest
+++ b/net-irc/bnc/Manifest
@@ -1,5 +1,5 @@
 AUX bnc-2.9.3-64bit.patch 402 BLAKE2B 1221f1dfef7f1c8d5c1815ec61c859882bba466cba1e9f4a3a30dda3d22024105c5a25bf9ea9ec0d46d46abfe0549082316c17b2ab55dd876d4e27fbf9abe870 SHA512 e257416b88fa147ab532389893ecbf3ee5c47a3680bf8c3c54fb03408fb97b04ffd01222ce8e6c0a1257f9618c18dd95f3eb1799ae3a83922617a630b557604f
 AUX respect-cflags-ldflags.patch 2766 BLAKE2B dff6f29ca5bce13a033c261375463c3b5081f58b0724f48dc1400ea5845ed3d477f2fb6ad025b68f7f98aafd266e8eb5a60921880738c5e99dd80230c7233c96 SHA512 2b865f67d1999cc7c5ab85c828b8d442906306df23f48fdff17ffb7e7f4f5279a5f0aed0acce3708b558b4cd2e7d7885a585b0cae06b2a78425430ee786362ed
 DIST bnc2.9.4.tar.gz 76896 BLAKE2B fcb09e8c75986d51f69fa4b75458c95419da90789a81b5dbb2504f876d610ed72eb6a15aaae5b18eee03b77a7e374f4f88dc73b67e0daf20cb59d48a5a2dc77a SHA512 131c25624c2a72494f900c6247e5569df48700223664487944ac42b0d892ea62f7d0e67a9ba4609cd936718365075c428e756074e349e1e041186c43cd16da23
-EBUILD bnc-2.9.4-r1.ebuild 968 BLAKE2B 68904952eefeb612f32ae08a3dcc60c724bb0158f62008b4e1490a11b674b5a3f456577d56ac1319037eec1f0c4486d67bf902b7fc44c44dae843f7abd348584 SHA512 351563cf687dbdea81222e808be0ab392fccfc46d43f0006ab6be41ee695e775082d2c8da03787d381dfceadf90af662eb7cf5188bc5d1398c82c67b8fec7ad8
+EBUILD bnc-2.9.4-r1.ebuild 969 BLAKE2B 0cfcba85ca1bf3c1eaab406e2ec61dd7b77bbe5910d77a621cc9df463ff1a8de54cc031e2d2a255d8d299bdf4308027dd70f112481477171b2d90a115db72269 SHA512 71254bcf85a96de034ff9a90213a38555b8e34f1717aa3224902c0449d66163d7b5e10751131b39eae1a230dda0a6d526de25efc03902ae448805b8845304498
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-irc/bnc/bnc-2.9.4-r1.ebuild b/net-irc/bnc/bnc-2.9.4-r1.ebuild
index 6d62da1735a2..8beadd39fd25 100644
--- a/net-irc/bnc/bnc-2.9.4-r1.ebuild
+++ b/net-irc/bnc/bnc-2.9.4-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://gotbnc.com/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 ~s390 sparc x86"
 IUSE="ssl"
 
 DEPEND="ssl? ( dev-libs/openssl:0= )"
diff --git a/net-irc/eggdrop/Manifest b/net-irc/eggdrop/Manifest
index 7cd7caf90744..5173ee52c3bc 100644
--- a/net-irc/eggdrop/Manifest
+++ b/net-irc/eggdrop/Manifest
@@ -1,6 +1,6 @@
 AUX eggdrop-installer 2149 BLAKE2B a9b2d7887732f1b6cabb6998ea7c128b52308a70fc46521521d92c1c3bb9f78fd2b32866c62fd0e67b360cfb32921ea900983e2892a9e37d3316364bdaabe26f SHA512 e9a99daff0e73344ab6cf73bb28fa26309b6ec85bcb5cfb84c343fe439a7e1e927960462b5f500af077a7470809d8fe4a2771f34c0727728121d9ba06792c715
 DIST eggdrop-1.8.3.tar.gz 1756536 BLAKE2B c2693bc383e1d857fe784d54f34479e73902064196021788ddf21f0bb2910977c643d820d2f6b640bb459b2acbfad8158fc0b29b4d76c588dfd76fee09a6fa25 SHA512 ad3b93d18aaa05d0eb00f1089b68d1f077f316042e64fff511ad1bbac06d35105adcb503490faaac4c9fe720dd45a9f350115b6c5d0f41fe198f228213a7a3a3
 DIST eggdrop-1.8.4.tar.gz 1784738 BLAKE2B a86cdc681ebd9c779b7da20f80ff312e4fc848e0cb0a0b9fa34941c91e1b89db1430126e3d0b94c7b4346c0bde099a6ddd343270943570744c46fc4ddd451540 SHA512 d08af09dc83045bf89eae957e7817591f16456f83ba3efe6b361fd421a3d4068348543275c26b27b006f09f06344c04cdf58ee4231f1aee0e7537ec39bc24b49
-EBUILD eggdrop-1.8.3.ebuild 1718 BLAKE2B 6a1e26f655876c6de4aeeb157662d12c5d7fed80016e8a36e18ee829bdef17dff9f4336a54ac891ebf63c414be2aaadb9a07a271dfc9eb79d1484225ba9ddefc SHA512 fbaf51a3ee4ecd4428d4bfff8a2d09b0a09e4b7f9a954906fb7c644cec70e59f7b325655c3e452a31107432f6100c3993e7bc858b818681e1a80ec0fd50deaea
+EBUILD eggdrop-1.8.3.ebuild 1719 BLAKE2B e642cbafd6bce686d5f6949b2c3be99010688b3aa95d4b944ed14513942bedd85344f74df117ef610e38059fc839c3727cc8f2fb1acd74e401051f956e22f410 SHA512 a047985d87b2fcf337af6083adcf99d495b22bdd0960ebf0d41d1ebc23f10d147ad4d4e45adfb074e2cf10f5cea30a0bc81955dc321047edb0515786cf85eaab
 EBUILD eggdrop-1.8.4.ebuild 1399 BLAKE2B f9815ed0c9b1fa803c0816ff4628af510623f9ca042b1ce76db6d197723c55a8ea96e681a0b2fb1dd175807f3c29925dcd814740d09791ed3d38039020dc3822 SHA512 bd6df9a7c19e318b210720a5669d142646ac18116a483509decf72468c47bfd81d3a024d4de92987fdd6218990d8a4efe02fb300c62edb0ac134802a1d57f61f
 MISC metadata.xml 390 BLAKE2B 1eb2981f9dc0339c56fd6a88c09b16c4ceeea6cecb6635f31c7b89d714a529d14ca8a9431d4003075e13a061fd8121e4d654299f2e5c48f6b12311f6f2b9371f SHA512 50fea1a13e327df7612a08b8ac6c5f8cd3ff76a69640ff045cc11e4da482ba6c67d893179d434106f4c739184be0de40a7e20b5717ac51b281ec728595f12708
diff --git a/net-irc/eggdrop/eggdrop-1.8.3.ebuild b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
index 2fd93b403c24..48c631bbfd92 100644
--- a/net-irc/eggdrop/eggdrop-1.8.3.ebuild
+++ b/net-irc/eggdrop/eggdrop-1.8.3.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="An IRC bot extensible with C or TCL"
 HOMEPAGE="https://www.eggheads.org/"
 SRC_URI="https://ftp.eggheads.org/pub/eggdrop/source/${PV:0:3}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc sparc x86"
+KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc sparc x86"
 LICENSE="GPL-2+"
 SLOT="0"
 IUSE="debug doc ipv6 ssl static"
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 3f942de6a90e..17282aeff2fe 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -4,7 +4,7 @@ DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d
 DIST hexchat-2.14.1.tar.xz 1281872 BLAKE2B e450fe7391b8b51a7aebeaeacdb5f1fb6c00184f668813920d98ed6a00dd4c0308863657467b7608987feb0739ac85256d93ca9ef8a220e6c7a5545d8386f25d SHA512 2728d6f084530c1a65ddb7960db6574fef2bca77e726a2155c8b5724256f37b47421e990b1bf7c9fad7987027b2f6de4534a8df28a98cb3d28da726e16ac32dd
 DIST hexchat-2.14.2.tar.xz 1288732 BLAKE2B 93001bf48516e0326c4df16945ff8a157e7a410ca202d1231657c9fb439ddd4a7515aacea0b0fff92365d477aa24c90d37aa61466495354dcdf5578d7accfa65 SHA512 488799700e439a137ad469f618cb1abf75d1f1ebf223c750d658004ef7b2c728543a5a9ae4e6317d6447428dc59e12dded619346a5d8bba12c92dab653512fca
 DIST hexchat-2.14.3.tar.xz 1292072 BLAKE2B 22bc8a0857b3ec26452843dd85c046cde055e719ce7dc23e4ec5ae33eb16251379ed84856c1812dc855a1e8d5d422c01e9352e2259f075a538226e1fcd79edd7 SHA512 c265921f2cb02c5d273bcdbb20a44a5c9f38b0f8cbba4fd56b177b676fc5d1dfd05bf80fcfa3706c7981f712f2f6c9aaaf80bccf3be0f6d96068dd393f3a7cb5
-EBUILD hexchat-2.12.4-r2.ebuild 3391 BLAKE2B 3a21d168b38fbdc21527f80f3c2c68eb4c2a26e76366addd8489c91b09e6342940e17bfd22702df64c3940d24db1f5ef0240baacfe455d771f6c45b3823cb32c SHA512 b45414fa5b7b1c32e0cdb88923fde03d0cd9c270e7c63fea692efcdf01b6ec2fe0a97c96df87ac7cf864889492be10a3584a6af52755ef43b0591cf33e87b644
+EBUILD hexchat-2.12.4-r2.ebuild 3394 BLAKE2B e550250ba3d264ab459b3bbd9efd137601ba21b651fd52724277b1a2588366cd2cea7f22f6b724c1cf332f1d0af35f8142db35f01ce35b096d889b9938e3a925 SHA512 248924b79a78050cb846c7253a081faad4c79dc648d8d84425e023c8f307906f873d68659d481592b6efa231d45a4b559f1750bbdd187a068b30d2ac6cdeaed1
 EBUILD hexchat-2.14.1.ebuild 3428 BLAKE2B cbdb884528e0d618059d676f438dd2bfa8e30582640b8f7de41c76e2db535560f9cd97b315b2c62f75951d55593329e021934872ac3dfba0dbb0cfbf63367198 SHA512 1d0e7eaa0e2dfe8466673dd9fd3243d82146f547fb2379344e688dc42a4280617e350a017fc082c9126880b11ea013dbed2dc8e002141340b573c6a8802472bd
 EBUILD hexchat-2.14.2.ebuild 3497 BLAKE2B e3ad65500058c3115459628c6ad27d504c7b85d02719ad8febf58b4be5571d5d454ea7afd8fe3ccb85d9459a3fe3f4ce0ef3bd576dd7e4f8dc1622e06eac81d4 SHA512 d91c20a9595b120a22d1b1fc6be880428c98614f3569010cfd5c2976f5cb6794c0526742d80777a65680b0ce6d25bc76f4f64306475be46cf9a9720cc0c087d3
 EBUILD hexchat-2.14.3.ebuild 3305 BLAKE2B bc257f377203432fe4d387258f537469ce93a6352156064593bc4d90b7afa812ddccaac097e3be1e9876b46b41c8f81634c3de7567a501214c1655cd2edcf9f3 SHA512 1eabde97709ab477d3b5ff3a742feb069d04e0239927bae5cdda7c2b8e2642937dc4384ff94225bd5ab63dedf45e7e7783414c43742c13fb82031ba87a47af56
diff --git a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
index b6bef524098c..0e0cf8a73831 100644
--- a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
+++ b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 else
 	SRC_URI="https://dl.hexchat.net/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
+	KEYWORDS="~alpha amd64 arm ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux"
 fi
 
 LICENSE="GPL-2 plugin-fishlim? ( MIT )"
@@ -41,7 +41,7 @@ COMMON_DEPEND="dev-libs/glib:2
 	)"
 
 RDEPEND="${COMMON_DEPEND}
-	spell? ( app-text/enchant )"
+	spell? ( app-text/enchant:0 )"
 DEPEND="${COMMON_DEPEND}
 	app-arch/xz-utils
 	virtual/pkgconfig
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 69a30cc2d400..4a45f3ab00b3 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,9 +1,12 @@
 AUX inspircd-2.0.27-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
 AUX inspircd-3.4.0-fix-path-builds.patch 12943 BLAKE2B f6d5e862ed7b7cf53f0bf9fb79c7150e7fac86459a91c2e8bb7021e875bbe8514281686658f4c88155b492f1ac11fbb0f98d11c80da63687adf50a5f5ebe3756 SHA512 517ef1adbf59fa224c1a354400d4646b5aeb2ccd885c3d9bec75f91216e3e1bef385ae390607e88f5888a843e857e2cef63fd8f6a793b4ee9a20bdc3903ba3ee
+AUX inspircd-3.5.0-fix-path-builds.patch 16774 BLAKE2B 70281b1ee4aa98bcd2239c65c8f1ed66c98aaff253ae97e5d847df3ec53be9f72c969176eff3094d4060531d426d7395d885d693173de8897073d8ff3c04c00a SHA512 4077610541ab37669bb9abb64a736139863fed9c94aee9945deac8d29b49c4b92d22a6197d7d9a137839af04da9cd7c7e9c31e66e6db172050369bfabc5ad254
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-2.0.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
 DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066
+DIST inspircd-3.5.0.tar.gz 835283 BLAKE2B d070d8f299ea2460eb58062b345e9fdef04f1aa94cbedda15bc2ed9c32a7627af383a250359dc77ee6cf2c53dd1841c9a77ce0da236d0b9852c5e9d5a0964aae SHA512 64e7be4b013c418577362b33be73b8f7045f1071ccb2c4e83fdf1a96b98656a3541e20c005bc32532007da21d9ba963f534cd14d16c2e1cf8afcf34b22ffad8c
 EBUILD inspircd-2.0.28.ebuild 3144 BLAKE2B 1318ec1b16835ee703a3ae7b3de69a91d257eb50763a98ed2d1597a04660b14f3e3458e762477071657c33cbf3757a2007184b757e4abd8b5cb18719b38fdfa6 SHA512 27e9ba6c17d790d1b9a7d9f36dff44675537d6bc117e3b5d77a244548cfc4741be8cf70038b236e1e9533625117f94509cba30773ecbec5e6dbe1fbc7dc0043e
 EBUILD inspircd-3.4.0.ebuild 3620 BLAKE2B b7e49e080ce8d5a7b418ec12462ebf53af247c494d9c299027d952eede5e9cce243f53ccbd90e000aac7e2a4c490fd6f54228a92943a0093a033e918f169afba SHA512 e0809008918e85cf50af088e13d1c09953fb88416bcb9d63f009ef339ab420329cb7a4eea9189bde9bad1eb51fe3ef7c97d49ce53d2b471e09962ccddafedf76
+EBUILD inspircd-3.5.0.ebuild 3622 BLAKE2B 4ed8b42b32fcdb354add43029533c45a5ae35300564d93699c5d114d167670593f6a23ae8bb212b8367ab611af7ca18c26ba547c410decf839d050aa7e401311 SHA512 2c940d423fd048d8857f07df0617071beb925bfc6d8684df41882ecb6d13f291d9435986f2c74a0fdd6c5b0fd49b910316a67b122e915f28b2ae66b2c2e062d7
 MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
diff --git a/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch
new file mode 100644
index 000000000000..6f156d0cce11
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.5.0-fix-path-builds.patch
@@ -0,0 +1,346 @@
+diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf
+similarity index 100%
+rename from docs/conf/codepages/ascii.conf.example
+rename to docs/conf/codepages/ascii.conf
+diff --git a/docs/conf/codepages/latin1.conf.example b/docs/conf/codepages/latin1.conf
+similarity index 97%
+rename from docs/conf/codepages/latin1.conf.example
+rename to docs/conf/codepages/latin1.conf
+index 3beb002fd..f5c6b98dc 100644
+--- a/docs/conf/codepages/latin1.conf.example
++++ b/docs/conf/codepages/latin1.conf
+@@ -39,4 +39,4 @@
+ <cpcase lower="222" upper="254"> # þ => Þ
+ 
+ # Include the ASCII rules to avoid duplication.
+-<include file="examples/codepages/ascii.conf.example">
++<include file="/etc/inspircd/codepages/ascii.conf">
+diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf
+similarity index 100%
+rename from docs/conf/codepages/rfc1459.conf.example
+rename to docs/conf/codepages/rfc1459.conf
+diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf
+similarity index 100%
+rename from docs/conf/codepages/strict-rfc1459.conf.example
+rename to docs/conf/codepages/strict-rfc1459.conf
+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 98%
+rename from docs/conf/inspircd.conf.example
+rename to docs/conf/inspircd.conf
+index dbd56d2fe..55535b1a0 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -247,10 +247,10 @@
+ # This can be done by using <connect registered="no">                 #
+ 
+ # To enable IRCCloud on your network uncomment this:
+-#<include file="examples/providers/irccloud.conf.example">
++#<include file="/etc/inspircd/providers/irccloud.conf">
+ 
+ # To enable KiwiIRC.com on your network uncomment this:
+-#<include file="examples/providers/kiwiirc-com.conf.example">
++#<include file="/etc/inspircd/providers/kiwiirc-com.conf">
+ 
+ # A connect class with <connect:deny> set denies connections from the specified host/IP range.
+ <connect
+@@ -494,11 +494,11 @@
+ 
+ # 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 #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -693,7 +693,7 @@
+          #                    messages (requires the stripcolor module).
+          #  - topiclock       Channel mode +t - limits changing the topic to (half)ops
+          # You can also configure this on a per-channel basis with a channel mode.
+-         # See m_exemptchanops in modules.conf.example for more details.
++         # See m_exemptchanops in modules.conf for more details.
+          exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o"
+ 
+          # invitebypassmodes: This allows /INVITE to bypass other channel modes.
+@@ -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 98%
+rename from docs/conf/links.conf.example
+rename to docs/conf/links.conf
+index 09b3bb3d5..22db1bdab 100644
+--- a/docs/conf/links.conf.example
++++ b/docs/conf/links.conf
+@@ -121,4 +121,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 links.conf.example without editing it is a security risk">
++<die reason="Using links.conf without editing it is a security risk">
+diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
+similarity index 99%
+rename from docs/conf/modules.conf.example
+rename to docs/conf/modules.conf
+index d68248163..b55d368fb 100644
+--- a/docs/conf/modules.conf.example
++++ b/docs/conf/modules.conf
+@@ -576,10 +576,10 @@
+ # and case mapping.
+ #
+ # You should include one of the following files to set your codepage:
+-#<include file="examples/codepages/ascii.conf.example">
+-#<include file="examples/codepages/latin1.conf.example">
+-#<include file="examples/codepages/rfc1459.conf.example">
+-#<include file="examples/codepages/strict-rfc1459.conf.example">
++#<include file="/etc/inspircd/codepages/ascii.conf">
++#<include file="/etc/inspircd/codepages/latin1.conf">
++#<include file="/etc/inspircd/codepages/rfc1459.conf">
++#<include file="/etc/inspircd/codepages/strict-rfc1459.conf">
+ #
+ # You can also define a custom codepage. For details on how to do this
+ # please refer to the docs site:
+@@ -853,7 +853,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">
+@@ -889,7 +889,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  -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -898,7 +898,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)#
+@@ -988,7 +988,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-
+@@ -1575,7 +1575,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.
+@@ -2153,7 +2153,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 96%
+rename from docs/conf/motd.txt.example
+rename to docs/conf/motd.txt
+index 9281cd4b9..a4ac6964b 100644
+--- a/docs/conf/motd.txt.example
++++ b/docs/conf/motd.txt
+@@ -23,7 +23,7 @@
+                     `-.__  `----"""    __.-'
+                          `--..____..--'
+ 
+-      +---- To change this see \bmotd.txt.example\x ----+
++      +---- To change this see \bmotd.txt        \x ----+
+       |                                             |
+       |   * \bWeb:\x https://www.inspircd.org           |
+       |   * \bIRC:\x irc.inspircd.org #inspircd         |
+diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
+similarity index 96%
+rename from docs/conf/opermotd.txt.example
+rename to docs/conf/opermotd.txt
+index a25d90380..68671a081 100644
+--- a/docs/conf/opermotd.txt.example
++++ b/docs/conf/opermotd.txt
+@@ -23,7 +23,7 @@
+                     `-.__  `----"""    __.-'
+                          `--..____..--'
+ 
+-      +-- To change this see \bopermotd.txt.example\x --+
++      +-- To change this see \bopermotd.txt        \x --+
+       |                                             |
+       |   * \bWeb:\x https://www.inspircd.org           |
+       |   * \bIRC:\x 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..69a1ab50a 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="/etc/inspircd/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..c1e906ff7 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="/etc/inspircd/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 a57595c9d..42fef2563 100644
+--- a/make/template/main.mk
++++ b/make/template/main.mk
+@@ -220,10 +220,10 @@ install: target
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
++	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/codepages
++	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
++	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
++	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
+@@ -240,11 +240,11 @@ endif
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
+ 	-$(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/codepages/*.example $(EXAPATH)/codepages
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/* $(CONPATH)/codepages
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
++	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
+ 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
+ 	@echo ""
+ 	@echo "*************************************"
+@@ -258,7 +258,6 @@ endif
+ 	@echo '  Data:' $(DATPATH)
+ 	@echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
+ 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
+-	@echo 'Examples are available at:' $(EXAPATH)
+ 
+ GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
+ 	./configure --update
diff --git a/net-irc/inspircd/inspircd-3.5.0.ebuild b/net-irc/inspircd/inspircd-3.5.0.ebuild
new file mode 100644
index 000000000000..92c0dfe18f1a
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.5.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+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="
+	acct-group/inspircd
+	acct-user/inspircd
+	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.5.0-fix-path-builds.patch )
+
+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() {
+	default
+
+	insinto "/usr/include/${PN}"
+	doins -r include/.
+
+	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/irssi/Manifest b/net-irc/irssi/Manifest
index fb53a4f769ad..00310b3d5185 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 1515 BLAKE2B 0194ba612159943eb763952bc4d748765a35a37290ae46df932b761bb2e13bc7cfcc046d0394f245fc94d0d05a8cda6070323102601c95e1ba845da07d48820e SHA512 ec27df61f02401a54df64a463ba150486ca0cf038651e1a91aaceeeb3db2b45749af73e7b795e9e4d5022890e4bff7feee39cc703bfc42f71fd1cc3b741f7988
+EBUILD irssi-1.2.2.ebuild 1516 BLAKE2B 9e2d9a149a50d1da14a6006b485af9de9d9b9d729bd8919ea43a193ffc05538ca217e2c1dac5e1766e7ce81f5de80cc8ca2532e6bd447e4d258fb2326d868711 SHA512 c47cfc4b63539f6a3c4fc9ce84cb0a7911b322e6673f41260cbd8a10c23e5ca9a0cf35f91db3ea2f6ef48845bd0d10c41e5428942c1794ef2ca944706115f89b
 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 22cbabf8c870..fdcd21740c7a 100644
--- a/net-irc/irssi/irssi-1.2.2.ebuild
+++ b/net-irc/irssi/irssi-1.2.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="otr +perl selinux socks5 +proxy libressl"
 
 COMMON_DEPEND="
diff --git a/net-irc/muh/Manifest b/net-irc/muh/Manifest
index 828b6a5d0910..ee8862aa521f 100644
--- a/net-irc/muh/Manifest
+++ b/net-irc/muh/Manifest
@@ -1,3 +1,3 @@
 DIST muh-2.2a.tar.gz 130672 BLAKE2B dd1f925539e7656822c8d66b35ea84ccbf23278e78c5c5d692400a192bb2d93197ad4205169c76de5386dc2fd1bdd191e3979082766af5d759f79c9ceaa44536 SHA512 2e3ba080f420cf063627d4d9b1f4001c76575efb1d3e99ff9c5eee4a483d5beda6e326f0c0d60c3d848b78cac092aac51a98cabc351760ccfa38fe1549c4b4ee
-EBUILD muh-2.2a-r1.ebuild 739 BLAKE2B 02a84da5365962c489fa9750c9b3f9944fe7faeb472740be38a669a170ac1f63e28938d727d5bbe74fdbde52c14df04141ae7071f29451df3fbabe0186e75ef7 SHA512 2ad4b4a3b54dccface1457044493868b21d36c3641ea3a77d5d1d1705cce0957da2dd888c18c715b2ce3b9c79f0568cb0017284686c04afcc7fc74c1aca2d6dd
+EBUILD muh-2.2a-r1.ebuild 740 BLAKE2B 544ef0415b5e81cc8538f9520a20e4918f5341582c7b366ed2467a4c5105ad132bdf5b316b5ab943255250497f54790c4f2a4e9d5ef1f357b8cc2d4db0b35829 SHA512 e4d247fb9964e29098980a653ef7fc570757b55122cc6a1e0e74200a440c886a549e3d2794fce8ffb9edc2e7ef1bddac223ed8ba82057599eff8845b16c44ea9
 MISC metadata.xml 312 BLAKE2B 6f854a035f538341f9196db3df9589460e24ba234ae497d0376e719b86a9f3566a775ebdf8f172c4a742616a2bc2dd13624fe80498351cf7dc892e040529882d SHA512 2f77f253666a974f580a98a89580870394b7e97488a21dbc80a0607842eff9c534ac061f9a66f8d8cbf576a7e0c366e0e307f35363fbe1c8b064590d02a4ec9c
diff --git a/net-irc/muh/muh-2.2a-r1.ebuild b/net-irc/muh/muh-2.2a-r1.ebuild
index a640b84e78d2..a8936d763b32 100644
--- a/net-irc/muh/muh-2.2a-r1.ebuild
+++ b/net-irc/muh/muh-2.2a-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="ipv6"
 
 RDEPEND=""
diff --git a/net-irc/telepathy-idle/Manifest b/net-irc/telepathy-idle/Manifest
index 28bd4998c3c0..1ac506b8da12 100644
--- a/net-irc/telepathy-idle/Manifest
+++ b/net-irc/telepathy-idle/Manifest
@@ -1,5 +1,4 @@
 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 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/telepathy-idle-0.2.0-r1.ebuild b/net-irc/telepathy-idle/telepathy-idle-0.2.0-r1.ebuild
deleted file mode 100644
index fa25d3319cb4..000000000000
--- a/net-irc/telepathy-idle/telepathy-idle-0.2.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# 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}"
-
-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
-}