gentoo resync : 19.07.2019

20 files changed, 219 insertions, 58 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index d05f918957ec..f30ab39df872 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 8e5ebf3579c7..f7d0b67f6a57 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -3,4 +3,4 @@ AUX anope-init.d 724 BLAKE2B afe0abfaebf66408ecc1a3c99fdb5795898559551700073078f
 AUX pid-patch.patch 521 BLAKE2B 4fb40f4913c41a2fa1925707ebdc50cceeb129b01f2487beba97242366da8577fde882a7389477aa051e03f519d71dfe6f7332a91f68bd7747179eebfd26af38 SHA512 55690d4057bd3703dff0674a6b339bda659db88d242c4216aa1cf14f06e1a95af33b2fffafa18540d37b7fc5620359dcab895e2365713ad243fa99ed572a6f3f
 DIST anope-2.0.6-source.tar.gz 1792912 BLAKE2B 00c70723c887821d2dda065f9fdb4c4fc79a1534217dd567c2247c3ae9d0b3c1c07a9e1e9d87bfdf5f7f9be212af5139e29710224e02e80154290dd6d4b5ee7c SHA512 c100758d6159023832bc7a4dceb7d554a9b3cd9120b033efc9a93c7ff28e76a086d0594b66b9cd2946b231421217674990f2a3ebaa8a6598c2a25e2dafd1b65b
 EBUILD anope-2.0.6.ebuild 5472 BLAKE2B 9eb30e33b088cc841ead1f0678da659dc34eefa949105bff0ae1736dd2569d6a14c8ed31908ab4bf864b40b1664e7688d12b12ab884922a4b7c44f6b89cce259 SHA512 8ab01aac403162946f3cae74b07c128bf04fd63b1ec7ae5f8491cc52575caa5abe4380ba05e2f644f493effe6de15bfbea6e7494893ad5c6ee6ba08b37930948
-MISC metadata.xml 1305 BLAKE2B 681d4017f00d2513f7709f4b26ac16267dcddae92d685cf43660b1117206a96f6e831bc768e03dbd8eff19082c86e643d04330a9d0378756b6f9f1c7ee95ad4f SHA512 82be3f2cb514543d6696037b0c6a90da8a6b06813dfde77cfb37c8c40b312ccf9e79ec637113bdd2d0bffa57a8fc539fe0a14941371bb8ed0d71399b34c343b9
+MISC metadata.xml 1331 BLAKE2B 2c87bdde31c173b08fb14714c279b060854876b5f5d2920efc6510dc3c084d3f1ee9dc620a3cd5958a593a9e1b12c6bfdaf2038ed5409a5f5b5e5196fdf8da37 SHA512 aa6aa50a0d55c886e29d57c53cbb6d7976ad36fd497475319fb60506b81da24bd2eb21d244737edd9c35dea767f0364af59c804bbabe912fc0fd80c6155af3c4
diff --git a/net-irc/anope/metadata.xml b/net-irc/anope/metadata.xml
index 7a4bd9256ef0..078496567f21 100644
--- a/net-irc/anope/metadata.xml
+++ b/net-irc/anope/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription>Anope IRC Services</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">anope</remote-id>
diff --git a/net-irc/eiwic/Manifest b/net-irc/eiwic/Manifest
index 3c409a7813d1..b7753ceae80b 100644
--- a/net-irc/eiwic/Manifest
+++ b/net-irc/eiwic/Manifest
@@ -1,4 +1,4 @@
 AUX eiwic-1.1.3-ldflags.patch 648 BLAKE2B 1165ef25efda1341c65bbb54f5773f74e2b79ebf453be61b3b27df88ae6959858dce906e68b9a099573dbd8a5bafcdcffa742d7208593ae841e085c3c78f2be2 SHA512 1baa5f4ef8481b7401379140a5c68faffd25ba94bfef827794209358214bf43374ef729ebfe40182f6dfae698785923f5f426546701c48be2df73aa9c91d16a6
 DIST eiwic-1.1.4.tar.gz 117593 BLAKE2B a8410d549ba85d12c05275990d4424590b12417b33b0d5f6113cd7e7e8c8da303d7fc54be5150a90259682970e449375b0b5c60c4b0fcb7c2613c4e05cedbd80 SHA512 f4c6ac9853df2d26803bd3acd0987f6f4445ef0020a2e02b695eb362043f985eec8440ea9875c282e4f070e89b3ce7357947b99f86461a3bddef8cb2a85f8ce1
 EBUILD eiwic-1.1.4.ebuild 953 BLAKE2B 1132bf582a0284cd8dcea284c47f549c4d590da400c837423cf9f93d9c75f8db8496ab50708783a0e6353b76c607c1bf337ec78e60038641d0bd06c0b7c04a63 SHA512 907f6985139257de574b1155180307ee07622282fd4a89c70f01de459fe2273c55553322eaae2dcb3f23969b45eb5159d5beac0dc232bc2d6ba83d754fe2ce15
-MISC metadata.xml 553 BLAKE2B 7fb115cf0c7b4887d763269e51d20c34f203ee36867ec875e040cb3b1e81ffa23f4bdd7471550ed30b95e213501baaa84807f74f24e5577c5e8d2336b732750b SHA512 536fb40b8189b0ecb230bb202f10e514396dca5c88b3f3f99a4f302343a3b046d9e1e39bc63905b3ae529f45ebb3db0a44d9b602186fe2dd545b42762e33d052
+MISC metadata.xml 579 BLAKE2B 47bf3eadf806e3ec86f1f47152b3b7a64dab859018665f64bd434eb0afbf236096b254d533e47cdf487d7203b4f4edba78687414681652b065c67abcbafc42b2 SHA512 bf2fbe67aa2a1d1afeec86d66416078dd57ee3c6746ae1e20fc17c34641eb303debdb029abb02d08cb7c37fc1e38a2261ae70616943f9720292954ecfb904006
diff --git a/net-irc/eiwic/metadata.xml b/net-irc/eiwic/metadata.xml
index c5c6f524c9e9..33044664e9af 100644
--- a/net-irc/eiwic/metadata.xml
+++ b/net-irc/eiwic/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<longdescription lang="en">
 		Eiwic is an IRC-bot written in pure C. It can be easily extended by own modules,
 		that can be loaded at runtime. It has an module API which is designed to make
diff --git a/net-irc/epic5/Manifest b/net-irc/epic5/Manifest
index 627239613849..b8da5f597e6c 100644
--- a/net-irc/epic5/Manifest
+++ b/net-irc/epic5/Manifest
@@ -1,4 +1,4 @@
 AUX epic5-2.0.1-openssl-1.1.patch 2817 BLAKE2B f3ed4fa602b174f41700fdf5fcddb8a20626637fb5e416b82fd1e1216a846987a3afcf3fffd73317a6e2090e49b0fe3b1777ee4e870f597ca981be078c4e3c0e SHA512 af1f822f1660bc7528beef26b991a69896d0e94005aacd412256a5f8789024bfba6eec169d2115c626a70c0e89cc6625999c7b939390742aef932f1020e4fdad
 DIST epic5-2.0.1.tar.xz 808612 BLAKE2B 48bc1305f955f524e26b5a2122f061b0251b874ad102e3a95c65b15646f7d5c95f661bdbac3e6ea118ce5d5b5e3ca58a94cfce288ee32c7483ea6dc1b6d24950 SHA512 29721cb097946fae3d64f71be4047f8348f7821ccdea870b4c756098f07adee90f03decb2f37fc5fa5c7c9d1aac5a16f4944adc9c9bc66097ceb609c69da2e25
-EBUILD epic5-2.0.1.ebuild 1562 BLAKE2B 8d7526dece005ef05ffa782398aa6f051219d718c814073ffdf6febe1f1b554d39ad4dddd8dd7f98fd13fe55645eacae3036bcc18ab25454ed3deef3081749df SHA512 197b594c2c2d32906bedfdd18f4e3d98b8eef5c0a5aefc2197c4f63a27038b84e4e15258c99dc37dffbba221a4f9bcc9e28e4d566aea7418c20f1e890674483c
+EBUILD epic5-2.0.1.ebuild 1569 BLAKE2B 34e93620274417a94bc46e3957893ad4bd22bf741d0877d2518820aff1898421860bc82173ecb83735c912cc269f4e2942df107f0a8eb4990672c9df00de0c40 SHA512 305f6b36c9c77f2ea2363f2cfb688fd71b4287bd56f7664f856de3bfe08ea7289e721b2ee17e658f8ed6c3e761a5edf69164d9cb806933d5e12dd4a8bc126162
 MISC metadata.xml 447 BLAKE2B f5ff4e910d6fd13784c843496888c28eac53df6973350b2839f581f07740f4a8cf03ea71d53e5ed11d5531d6512abb9a4727843094870c7ce5fae5dd90ccf38f SHA512 a3f99db42705f69febe961e85d76a3c4686918e253fc1c979941daa135ae65d920ad5127a4ea6ad9a8628df405ef937731168eb47b7a69fb92131d4ce703947a
diff --git a/net-irc/epic5/epic5-2.0.1.ebuild b/net-irc/epic5/epic5-2.0.1.ebuild
index 62ee7a864b6c..bc14d30432e7 100644
--- a/net-irc/epic5/epic5-2.0.1.ebuild
+++ b/net-irc/epic5/epic5-2.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 inherit autotools ruby-single toolchain-funcs
 
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 8b21753e0806..14c9d464b7bb 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,12 +1,12 @@
 AUX inspircd-2.0.25-fix-path-builds.patch 9669 BLAKE2B 8b6612800028658cf231be62fbdd92638bfbc64fc1e9634bfbbdfe997f2915f583aba8ee41fbf98f44e016b1bdf17936017d5e9217c29aa404576167526f9d1b SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9
 AUX inspircd-2.0.27-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
-AUX inspircd-3.1.0-fix-path-builds.patch 12262 BLAKE2B cef2d7bac65cbf90d219852e5692154c659cc3947bc1626ec2b47f34b617c0bb2f3aef451925b2dd59f37da02055049aff250d8cbb60e770ac11fe6ef7ee636c SHA512 7ca1a2a7218797775238bd68d2c1fbcfc1797de4a2b4e9e2e64c7e12c84acc285f9576c056e18989b10279f5314f6f910fde60ae2e11b993f3523c6f328363f5
+AUX inspircd-3.2.0-fix-path-builds.patch 12593 BLAKE2B fe6e74da76321c4be5bd736e84385ccd73a267f175b9eb3b613a4cb5a19b4388ad66eb0be7740e58fb3ab9af5bddfca9b27454e586853c0db461eb5d62ed2b25 SHA512 288205a8f9b26019ac3a682d9d168839ead435ffbe6423e069f98d1213ea00a18a30fb05ad63555001411fd7043b88f3fb7005081e7433a2ebf28927776e6e0a
 AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2
 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff
 DIST inspircd-2.0.25.tar.gz 734017 BLAKE2B d67af67a68d55e107c4492561fcc181ca17fda8b59d53e14e2a585057507f035d3178a9f5f04a22b8969f0fe6f331833e412f410f3276a610dc179ebf16c2399 SHA512 c404d3c296b48d34ad43f576eba1a1fe96ae3d644f032d11cb6050b8e777f93efe33715b0676f481ac3878eea1c17c884a26bff86b909f71f7329ebcfb97add8
 DIST inspircd-2.0.27.tar.gz 735970 BLAKE2B 74a262ddd5f7d2fd61a1a01cddb0d61bf58e9fcdb3a69ebda15d711f3439b7b8e4387ee9ef3b55309e213e1e8bdc2978ca5b319720b0fcf71d9645f13102c2a2 SHA512 56f03c3259fad54365e97fd82f4e309edc60b641ccadd7916d04156fd157858f79930c8b9df99aa98c5505f76ab19e6bcd150ae5ed04d2bddfff572e18226cdd
-DIST inspircd-3.1.0.tar.gz 795435 BLAKE2B 86f4c62b61ea2692be4f0bba21976e738f733187640f7fa43f3e90fb29b5a6e1bd4769fcdb86f1912a43cd856f5d1d28a335c2e6e4c86db6097588247ec6e119 SHA512 77e5602115d612be6bb1dc0123f5fde2e6ff0547376de04cd5c24de9376797654bbd62a01d058b6f27858bd338ae9126cdd0dcd8571ba0c33afc1f3e166e000c
+DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
 EBUILD inspircd-2.0.25.ebuild 3376 BLAKE2B 802a96022a2cad65801d6dab88d2069523ce72914b2558718b39dde9891e6e0b78cd432541add655cdf1a01376ec1f8d216640c9480a84deb36b703345377859 SHA512 fd9a2c56b35f6855a68e8d697df1e63100c0abafdcd7a79b4ca53bc0f65a23876870352c3203e09a4a668844fd01735896d93ace6e60bd8a01e5253c5af9f99e
 EBUILD inspircd-2.0.27.ebuild 3168 BLAKE2B 06c0815778898c90477b49aae366e2f250a30a716da12d6d3414fd164107a9deb5b1e580937aee3be226cbf09df14af7bce301a6d09e0e6fc30e3b5963363952 SHA512 ae539416d593d8602a900ea8cfebf450d4c5762163bf9a0ee0556d1ad51d42302e93c5d20788d1285d6a26a714a1f5d413ffd547c7c74f517779e873b9689476
-EBUILD inspircd-3.1.0.ebuild 3878 BLAKE2B e52ff76092c5b72d1a8338929980b7f11479daac448eada0d758e8237d7fa1e93f03c81282f61017f9a6bd5439f0f65638b63173867fba829fd8c2844c1a2276 SHA512 36021b543acd0cb0d4757483914433e9b5125093dee686c1edf97adb391e0451079966e36e65f357e288fb6b246f937f7da596ddbd454f677a3f63a729943a66
+EBUILD inspircd-3.2.0.ebuild 3870 BLAKE2B 38bca33d824c7bba4c79612d70bc638a1bcd47af3561ea6bc2b3a8eed2b235dd5d41e3644b65beab54f7f7cc2b59bd7eb4325c33bb059b05486402ab07c62b40 SHA512 2df090adea36eec1f3312cee25cc39fae7014f7187125a16d56b7a4f8dbaba4768be7159d760da22fd592cc4a02ea583329d7e3bc4849431e9a4d85ba5b44f79
 MISC metadata.xml 1928 BLAKE2B b3c78c7526b07644b61532293634647d5db2c60f3f69e7cae15f4cc7fb7ad12dcbe980467d2c433e509817a8e200d0e674e0a1b12f5cec3ffbf5a80ebe5a2d53 SHA512 8c373da73fdad81bce0533aa767716fe16bbdbe909818f1a022a43b307e6679456150a077a155076d221b48759b00a0f09947d32608876787c306fac88918098
diff --git a/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
index 0f4738c70123..955b2be79095 100644
--- a/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch
+++ b/net-irc/inspircd/files/inspircd-3.2.0-fix-path-builds.patch
@@ -10,10 +10,10 @@ diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
 similarity index 99%
 rename from docs/conf/inspircd.conf.example
 rename to docs/conf/inspircd.conf
-index 9baaa5261..60e277310 100644
+index dbd56d2fe..4a7aab514 100644
 --- a/docs/conf/inspircd.conf.example
 +++ b/docs/conf/inspircd.conf
-@@ -465,11 +465,11 @@
+@@ -494,11 +494,11 @@
  
  # This file has all the information about oper classes, types and o:lines.
  # You *MUST* edit it.
@@ -27,7 +27,7 @@ index 9baaa5261..60e277310 100644
  
  #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
  #                                                                     #
-@@ -478,7 +478,7 @@
+@@ -507,7 +507,7 @@
  #
  #   motd - displayed on connect and when a user executes /MOTD
  # Modules can also define their own files
@@ -36,7 +36,7 @@ index 9baaa5261..60e277310 100644
  
  # Example of an executable file include. Note this will be read on rehash,
  # not when the command is run.
-@@ -514,7 +514,7 @@
+@@ -543,7 +543,7 @@
  # the default of 'inspircd.pid' is used.                              #
  #                                                                     #
  
@@ -45,7 +45,7 @@ index 9baaa5261..60e277310 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
  #                                                                     #
-@@ -1012,7 +1012,7 @@
+@@ -1041,7 +1041,7 @@
  # provide almost all the features of InspIRCd. :)                     #
  #                                                                     #
  # The default does nothing -- we include it for simplicity for you.   #
@@ -54,7 +54,7 @@ index 9baaa5261..60e277310 100644
  
  #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION  #-#-#-#-#-#-#-#-#-#-#-#
  #                                                                     #
-@@ -1021,13 +1021,13 @@
+@@ -1050,13 +1050,13 @@
  # exemptions for services pseudoclients:                              #
  #
  # Anope users should uncomment this:
@@ -79,7 +79,7 @@ diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
 similarity index 99%
 rename from docs/conf/modules.conf.example
 rename to docs/conf/modules.conf
-index bb8a74dbc..397b61295 100644
+index 3bf1c2e99..b451a2f18 100644
 --- a/docs/conf/modules.conf.example
 +++ b/docs/conf/modules.conf
 @@ -832,7 +832,7 @@
@@ -91,7 +91,7 @@ index bb8a74dbc..397b61295 100644
  # detailed list of the restriction modes that can be exempted.        #
  # These are settable using: /MODE #chan +X <restriction>:<status>     #
  #<module name="exemptchanops">
-@@ -862,7 +862,7 @@
+@@ -868,7 +868,7 @@
  # Your choice of regex engine must match on all servers network-wide. #
  #                                                                     #
  # To learn more about the configuration of this module, read          #
@@ -100,7 +100,7 @@ index bb8a74dbc..397b61295 100644
  # filters and shows how to add exemptions.                            #
  #                                                                     #
  #-#-#-#-#-#-#-#-#-#-#-  FILTER  CONFIGURATION  -#-#-#-#-#-#-#-#-#-#-#-#
-@@ -871,7 +871,7 @@
+@@ -877,7 +877,7 @@
  # specify below the path to the filter.conf file, or define some      #
  # <keyword> tags.                                                     #
  #                                                                     #
@@ -109,7 +109,7 @@ index bb8a74dbc..397b61295 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)#
-@@ -961,7 +961,7 @@
+@@ -967,7 +967,7 @@
  # If you specify to use the helpop module, then specify below the     #
  # path to the helpop.conf file.                                       #
  #                                                                     #
@@ -118,7 +118,7 @@ index bb8a74dbc..397b61295 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  # Hide chans module: Allows users to hide their channels list from non-
-@@ -1533,7 +1533,7 @@
+@@ -1545,7 +1545,7 @@
  # onoper        - If on, the message is sent on /OPER, otherwise it's #
  #                 only sent when /OPERMOTD is used.                   #
  #                                                                     #
@@ -127,7 +127,7 @@ index bb8a74dbc..397b61295 100644
  
  #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
  # Override module: Adds support for oper override.
-@@ -2106,7 +2106,7 @@
+@@ -2123,7 +2123,7 @@
  # connections in order to oper up. It is highly recommended to load
  # this module if you use SSL on your network.
  # For how to use the oper features, please see the first
@@ -181,6 +181,14 @@ index 7cad2589c..082009da9 100644
  # ensure that you don't hastily include the file without reading it.
 -<die reason="Using opers.conf.example without editing it is a security risk">
 +<die reason="Using opers.conf without editing it is a security risk">
+diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
+similarity index 100%
+rename from docs/conf/providers/irccloud.conf.example
+rename to docs/conf/providers/irccloud.conf
+diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
+similarity index 100%
+rename from docs/conf/providers/kiwiirc-com.conf.example
+rename to docs/conf/providers/kiwiirc-com.conf
 diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt
 similarity index 100%
 rename from docs/conf/quotes.txt.example
@@ -222,39 +230,38 @@ similarity index 100%
 rename from docs/conf/services/generic.conf.example
 rename to docs/conf/services/generic.conf
 diff --git a/make/template/main.mk b/make/template/main.mk
-index e39a24f87..e0fcbf4fc 100644
+index d77d59fa5..b28d7180d 100644
 --- a/make/template/main.mk
 +++ b/make/template/main.mk
-@@ -207,8 +207,8 @@ install: target
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
+@@ -210,8 +210,8 @@ install: target
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/services
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/examples/sql
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
+-	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
 +	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
 +	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
+ 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
  	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(SCRPATH)
-@@ -225,9 +225,9 @@ endif
+@@ -229,9 +229,9 @@ endif
  	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
  	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
  	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(CONPATH)/examples
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(CONPATH)/examples/services
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/examples/sql
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
+-	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
 +	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
 +	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
 +	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
  	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
  	@echo ""
  	@echo "*************************************"
-@@ -241,7 +241,7 @@ endif
+@@ -245,7 +245,6 @@ endif
  	@echo '  Data:' $(DATPATH)
  	@echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
  	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
--	@echo 'Examples are available at:' $(CONPATH)/examples/
-+	@echo 'Examples are available at:' $(CONPATH)
+-	@echo 'Examples are available at:' $(EXAPATH)
  
  GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
  	./configure --update
diff --git a/net-irc/inspircd/inspircd-3.1.0.ebuild b/net-irc/inspircd/inspircd-3.2.0.ebuild
index 98fed20a13d3..2416d94a03a4 100644
--- a/net-irc/inspircd/inspircd-3.1.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -41,7 +41,7 @@ src_prepare() {
 	default
 
 	# Patch the inspircd launcher with the inspircd user
-	sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die
+	sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die
 }
 
 src_configure() {
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index f472d278f33b..9100a843d325 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -4,6 +4,6 @@ DIST irssi-1.2.0.tar.xz 1138984 BLAKE2B 940b8fb0c6633ea82ccd242241a39b67fa1a356a
 DIST irssi-1.2.1.tar.xz 1140380 BLAKE2B 11ab48ce6d7efa0a4c33f823dd414660107d94b9f00c863feb8377f4586e6c62043932bdcf35f1f4e9e9ab545ccc3bb0bfd207727e55856243c8494ae6172cf9 SHA512 67c4501b5a0055c1b24fa6753305658de809cd66e952e6f9233701a112989fd8721a065b1c681725b82346b40b53a29bd2b6b8b8315ac0ad196235a9e5156d5a
 EBUILD irssi-1.1.2.ebuild 1410 BLAKE2B e4afbeeef63408b98189f96df84a368068e8d1985158629928c0a8d7acd1eb6784b1a66eb34a1313873b529552012a3bb6bdb59af7e091c5e7398ee81370b926 SHA512 8ce49e74840ebdfa69fc56b9ec1d99bbd336990eb94e53a6a91beddafbd26f5c2f0ab519a31590aab1fa1bdf61d91d1c26432957d7883d99805132ade9dd0421
 EBUILD irssi-1.2.0-r2.ebuild 1561 BLAKE2B 1071df359650b4e3cc737aa83b4ce0eadbb71bee59f8461706e00ae01a79703e1ba46b4f3a5d38fc96db0f173cc818ee443a42d6ddebc70d73b52c4d1fa9a8e5 SHA512 82d93c6d99cc7563a3460e0a739955c89ab5132d704f9734d3d19d4cc300182c27e5838a37e20ebaa86f10d83e0832ad244c0e67fbb937ec9ed0dcaa5363cf08
-EBUILD irssi-1.2.1.ebuild 1585 BLAKE2B 6f62bd4e0b0244cfa4b59bf1eeee95b64d641ac22bb2d51d7faf5d991969fa5533517829012fa60e62a74bf587bf075166ade3ffde4755c9b78aed6f4086b022 SHA512 5587598daa648d41fd38dd1fcd2c27db9c9c2d9782b0868e3fab6830b4ab1725f990423ec0649e7ba639d562b9003a51d9715a2ff8867e482c21adfcdcfb100f
+EBUILD irssi-1.2.1.ebuild 1578 BLAKE2B 4ca97e543571e31494079a554d418607741a0a64c4320a789a29c37bf647839a726516e07de8f2237db8177a68ec499b70ac3b9ba1574340de28bb844f912bfe SHA512 98895d9f04521dc7f35c6725555bb37e251f750cc618abf9de2739c0f82bb0a09e14c8303365ac3ed10eea356f6c75ceda5ac5974263ec8105e31247cd6aabb4
 EBUILD irssi-9999.ebuild 1486 BLAKE2B 2742c15d0b3f5a2787aeea9db79693e36845957a28b5146e8eb839278681f538d7be2e46d37875e5f230b0edc7fa37a79809f2ba93f6927363398201335c030f SHA512 ba8be2fe7989ed59714cc454b372edf377261cb5b2fcbe6cfaec10f9fef1b1871d238ab3920f05b1c8da93d2f35b7049dbf12418659eedff457e99b225959159
 MISC metadata.xml 700 BLAKE2B 9d12cb98cc2a5204d423141bcb42222cb5aca53888eac4158927a40f2b5b8a28eb0fa4171f1a4467aa795df45673f21dec09ddbf9c22f897c131d137a10a1d98 SHA512 9d510764f9f5dbfaaa2c027ac79ccbcfc92552d48de3bb3491b6e9b1abdb8be7dcd4e59be4fdf82b9ba4c240a8bc63e5f18548b3c3da4e77eff0b87a457db470
diff --git a/net-irc/irssi/irssi-1.2.1.ebuild b/net-irc/irssi/irssi-1.2.1.ebuild
index 2d615aee4aae..7e00a0652972 100644
--- a/net-irc/irssi/irssi-1.2.1.ebuild
+++ b/net-irc/irssi/irssi-1.2.1.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 ~x86-fbsd ~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 ~x86-fbsd ~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/psybnc/Manifest b/net-irc/psybnc/Manifest
index 152d35ad6b47..d5eb214aaca8 100644
--- a/net-irc/psybnc/Manifest
+++ b/net-irc/psybnc/Manifest
@@ -9,5 +9,5 @@ AUX psybnc.conf 313 BLAKE2B c56022b42942b100479b6c539e9da85178db679b6596fc2b4162
 AUX psybnc.confd 113 BLAKE2B e4fddc3cb37c5b9defea0d4d6e6c2b26f34bf50fbbe51679b8f0e686b504c2caf980c5a97864fac86a251431126c5a0338bb50a8eba9d3976156cf1eaf1b7681 SHA512 e58704dec299271d9a450eb243d0af1323aca58d555b61fc3aa899324a6bdc9aa82afc0597c190dc07c278f22c7cb448592a271e9ee6e4aa3552518ce6254753
 AUX psybnc.initd 898 BLAKE2B 7be60ef0dda81cb917e23e06e3fec88af952d71c2eef4255c316baf5a218e8bdc2d8d8bc4eb353ab7c19a697e97685441ec2a0c3503e4f22adf0d55c9a895e13 SHA512 2ea77dfd515b81d53d7fe1b38fe3069d7d2081d939fdbb2c6ff97cd859a86ad8a52dd1b40e0b592a9368488759a3fb35741e25c6a5ade3045eb7159acd64bbbd
 DIST psyBNC-2.3.2-9.tar.gz 318676 BLAKE2B 0197aa3bc8c770738a7d4d5a5a79b77f7a0cafeef60ccca1167172b28af05c0cd9836f7e9816c873dafa2e55b0bf9ce54cfbe3958939405f58f7f3874ec7ea64 SHA512 b664f57610e54fadd938b359a0e8052b8fe3dd36bd1ee339f36ee22ae4d36a76e803425c5133f925ac18c01767ffbc8a2f471c014b5b76b05894cfea9fe5416b
-EBUILD psybnc-2.3.2.9-r3.ebuild 4618 BLAKE2B d27e82e18d1cb713f282278dacdb1a9fb61b92ce8bbbe3698355bfa353fce156204567a1f816ba0f712f98e1c016ac8166a3054efd095c0aace4e54cf4592ed2 SHA512 5c9500a9f673200841ba7cf14aa46889ba4b42312d7ce3a11158b640ec4e9fe1d8eb4539353cab767f7380c82c25d4b4aebd09b1da5c21fca4713ad75a639ebb
-MISC metadata.xml 434 BLAKE2B 7e478f33125a86a9298854d4f3196e74cdf7b7138139048d4d20bcb9a15b88ef988776fabacdbf247dbf08c99a5756007283e6e6ba20ec38529dc34c106a4abd SHA512 79ea36967c0e1d45d332e64c054e45114689f66d5c290bb1eb9c901244fb2f9a3629564d67581589cfee2e8764b9887bde66f07cc2d74e7abfaeb290ceac2286
+EBUILD psybnc-2.3.2.9-r3.ebuild 4615 BLAKE2B bcb79a60491e976cfe5965d7cbdb9c730ace03aa418fc6fd3786b857963c02475b23e1af19e741d77ff3c593d6aad900bf8d5d59c37ac05f8849f22dd679fae3 SHA512 e2d1b8e401ef8362bc6ce5ceffd5a5a0d5b3b5e5826ded3c9a0832068375fba86279eb0094df8b4058d4870048ea6358a67e8cba33f5eaf3b52f9c90ba3751fc
+MISC metadata.xml 460 BLAKE2B 9554a25262c0fdd96e72775c6a91ec6aa8fee77165662bb9f212b6528ca08e467a43348bb811edef351a0bf5fd9340041a4137cad3e905e8aeb9df32fb447733 SHA512 f76632eec835a8c915dab631fbe0cf0f5bb1f9bb7bedce8d83f4ee2035cb05e754ee3ff6372fd9886a2a5d99957193446f6b0f8a31811ce2f9a1895c7361f5d1
diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml
index 99886fc47cc4..403e7c957a67 100644
--- a/net-irc/psybnc/metadata.xml
+++ b/net-irc/psybnc/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<!--maintainer-needed-->
 	<use>
 		<flag name="oidentd">Adds support for oidentd</flag>
 		<flag name="scripting">Adds scripting support</flag>
diff --git a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
index f7dc538ded25..b6593d48d197 100644
--- a/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
+++ b/net-irc/psybnc/psybnc-2.3.2.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="http://www.psybnc.at/download/beta/psyBNC-${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86 ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="ipv6 ssl oidentd scripting multinetwork"
 
 DEPEND="ssl? ( >=dev-libs/openssl-0.9.7d )
diff --git a/net-irc/ptlink-opm/Manifest b/net-irc/ptlink-opm/Manifest
index 56ce09e01f43..6b84d8f402d7 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 1004 BLAKE2B 6434d85f8c22334d856db7330f9ea996d09e2b238927f6e388d273e0ffc53c2c9858e6121445745b33e7d0ebe1caa02b57b93081e8be01e6d5ee8c5e27e0f4ef SHA512 59f030ec2c9f5e23b24ca5ac834fac44497fed5e89c85de6a47847671f597a599cc4916619069dc2d882e07e36e1d4cdd973a433d285bf5ad13db01ce8c6c452
+EBUILD ptlink-opm-1.3.1-r1.ebuild 1001 BLAKE2B 6ff4d47d97af4ee01b63c9e190348b5f8017d05b15206e6b1b1dbf0d271fbeb88a55591ab50df7fd487562ccff6c593a1408588f2a0b45470805061ce27ae32c SHA512 b77cc6d1e04488aa6eeb95653106c14ce20935d22b9e75b9f13d4fb0dad34da818885d7acc516abbaedf88bcce6245e5e8d974dbff0dbaa0ecb132e51656b89c
 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 1f705ea294b7..982206e1e300 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.ptlink.net/"
 SRC_URI="ftp://ftp.sunsite.dk/projects/ptlink/ptopm/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~ppc ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/net-irc/rhapsody/Manifest b/net-irc/rhapsody/Manifest
index 36cf7a7a64ea..97caeb102ae1 100644
--- a/net-irc/rhapsody/Manifest
+++ b/net-irc/rhapsody/Manifest
@@ -1,4 +1,5 @@
+AUX rhapsody-0.28b-tinfo.patch 5392 BLAKE2B 412ed32dd0e3719af1a16d44da17303301055139b65c7ff7984982a0b5eaaa258d98a63d6c11a0961595104c0389db6e65e62d6f4f0c90860bed0ea316873454 SHA512 4fbfbc54004bb5402868309a2df1911f993fce9fc18a799eda10ee7417802a10069f2379737eb85d721030afaa5c80886827a1bbe67864f69f8fb7ea51eb24f0
 AUX rhapsody-0.28b-uclibc.patch 382 BLAKE2B 9bd47da75b9fa0771025cd8993bba7e66b213abc66a13b0a06ea5426fee8caf9d30955ef4e5074caa02844702b2bcbacb9ffe2a3c59b67f9eb1e6c96bcf5aadf SHA512 6bb29efcca48fbab3e53f0d71f21ae558b3aff14c1ced6188fb3f1ae4f627ffa723d70ca65c4f05fe85943224f784dcb968340f1d0ebe2677fd26e1d25a49525
 DIST rhapsody_0.28b.tgz 110062 BLAKE2B 58f4a37efc11f019eac815e43fefb55b39da298682588519671b449f25be3fa89e807f92b55f1f62ef04321ff0ba5adc40f625c5c1c75aa2824138419e06f671 SHA512 1ff9f29d281421b7fe3dcdccbd8b2559572cc6e7167ff9e0f1a46dcff07486115de245055b3d72107f40f40a484d9aef94c7ed21b55a7bdf80094198d69dec6d
-EBUILD rhapsody-0.28b.ebuild 811 BLAKE2B 2c6f985ce12f8287367a578b0adc8b37aa8783484a50b7aede106b29195b0908e81ac4b753a89e2f37f9e1349572c3a8cc66d25e595cfbe16206cb9d2993fe03 SHA512 4fb67f5e3c9ec56ba7915df6c370380199c6d011fd59d19b6be95bf990af0c10a4c5592b08e07c9db05bfc517df797eeb1594c29698efa745ebdaf83e9adf381
+EBUILD rhapsody-0.28b.ebuild 795 BLAKE2B 775f24ea0090c980e5ceff109acf9e37ce748e6c877186959cebcf24b8c07bd146b62527f90e1adbf02c0650f26aa3195277a4691f6ce6562035a4c45025b6e8 SHA512 84bb81e002c125beb031604b97d6b9d40dc3e7c89edad800651a4c444bda778d9e5e5f88639ce9ea78ba5e9d48d2ee62e7671be9911795b361214c92b14ffece
 MISC metadata.xml 245 BLAKE2B f059db0d75f6addf564b9ba45029962f855144c1f7ea684dda39b60bb47e8b298b0827add3cea31e0c1d12da4f5d2e5f6819022a2afa6631351e876f62a0e0d3 SHA512 513af093eab23f31409638d76341a397635e358dde908edc462bc80ed46a95e37f7c1a7c8d9d30c7935c214e2e8ea4d071603b294ba133e7092f4bc71bdfe192
diff --git a/net-irc/rhapsody/files/rhapsody-0.28b-tinfo.patch b/net-irc/rhapsody/files/rhapsody-0.28b-tinfo.patch
new file mode 100644
index 000000000000..834b93165abf
--- /dev/null
+++ b/net-irc/rhapsody/files/rhapsody-0.28b-tinfo.patch
@@ -0,0 +1,147 @@
+https://bugs.gentoo.org/690088
+
+--- rhapsody-0.28b/configure
++++ rhapsody-0.28b/configure
+@@ -66,6 +66,7 @@
+ OSNAME=`uname -o 2>/dev/null`
+ OSVER=`uname -r 2>/dev/null`
+ USER=`whoami 2>/dev/null`
++PKGCONFIG="${PKGCONFIG:-pkg-config}"
+ 
+ echo "The OS appears to be $OS ($OSNAME) version $OSVER."
+ echo ""
+@@ -75,7 +76,7 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses"
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
+ 	GCCBASELIBPATHS="-L/usr/lib"
+ 	GCCBASEINCPATHS="-I/usr/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+@@ -86,12 +87,12 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses -lnsl -lsocket" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses) -lnsl -lsocket" 
+ 	GCCBASELIBPATHS=""
+ 	GCCBASEINCPATHS="-I/usr/local/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses -lnsl -lsocket" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses) -lnsl -lsocket" 
+ 	CCBASELIBPATHS=""
+ 	CCBASEINCPATHS="-I/usr/local/include"
+ 	CCBASEFLAGS="-g -Wall"
+@@ -102,7 +103,7 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/sw/include /usr/include /sw/include/ncurses /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/sw/lib"
+ 	GCCBASEINCPATHS="/usr/include /usr/local/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused -no-cpp-precomp"
+@@ -113,7 +114,7 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/lib"
+ 	GCCBASEINCPATHS="-I/usr/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+@@ -124,12 +125,12 @@
+ 	CCPATH="/usr/freeware/bin /usr/bin"
+ 	CURSESPATH="/usr/freeware/include/ncurses /usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/freeware/lib64"
+ 	GCCBASEINCPATHS=""
+ 	GCCBASEFLAGS="-mabi=64 -g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	CCBASELIBPATHS=""
+ 	CCBASEINCPATHS=""
+ 	CCBASEFLAGS="-mabi=64"
+@@ -140,12 +141,12 @@
+ 	CCPATH="/usr/freeware/bin /usr/bin"
+ 	CURSESPATH="/usr/freeware/include/ncurses /usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/freeware/lib32"
+ 	GCCBASEINCPATHS=""
+ 	GCCBASEFLAGS="-mabi=n32 -g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	CCBASELIBPATHS=""
+ 	CCBASEINCPATHS=""
+ 	CCBASEFLAGS="-mabi=n32 -g -Wall"
+@@ -156,7 +157,7 @@
+ 	CCPATH="/boot/develop/bin /bin /usr/bin /usr/local/bin"
+ 	CURSESPATH="/boot/develop/headers /boot/develop/headers/gnu /boot/home/config/include"
+ 
+-	GCCBASELIBS="-lncurses -lsocket -lbind"
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses) -lsocket -lbind"
+ 	GCCBASELIBPATHS="-L/boot/home/config/lib"
+ 	GCCBASEINCPATHS="-I/boot/home/config/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+@@ -172,12 +173,12 @@
+ 	CCPATH="/bin /usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
+ 	GCCBASEINCPATHS="-I/usr/local/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	CCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
+ 	CCBASEINCPATHS="-I/usr/local/include"
+ 	CCBASEFLAGS="-g"
+@@ -188,12 +189,12 @@
+ 	CCPATH="/bin /usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
+ 	GCCBASEINCPATHS="-I/usr/include -I/usr/local/include"
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+ 
+-	CCBASELIBS="-lncurses" 
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	CCBASELIBPATHS="-L/usr/lib -L/lib -L/usr/local/lib"
+ 	CCBASEINCPATHS="-I/usr/include -I/usr/local/include"
+ 	CCBASEFLAGS="-g"
+@@ -204,7 +205,7 @@
+ 	CCPATH="/usr/bin /usr/local/bin"
+ 	CURSESPATH="/usr/freeware/include/ncurses /usr/include /usr/local/include /usr/include/ncurses /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses" 
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)" 
+ 	GCCBASELIBPATHS="-L/usr/lib -L/lib"
+ 	GCCBASEINCPATHS=""
+ 	GCCBASEFLAGS="-g -Wall -Wno-unused"
+@@ -217,12 +218,12 @@
+ 	CCPATH="/bin /sbin /usr/bin /usr/sbin/ /usr/local/bin/ /usr/local/sbin" 
+ 	CURSESPATH="/include /usr/include /include/ncurses /usr/include/ncurses /usr/local/include /usr/local/include/ncurses"
+ 
+-	GCCBASELIBS="-lncurses"
++	GCCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
+ 	GCCBASELIBPATHS="-L/usr/lib"
+ 	GCCBASEINCPATHS="-I/usr/include -I/include"
+ 	GCCBASEFLAGS=""
+ 
+-	CCBASELIBS="-lncurses"
++	CCBASELIBS="$(${PKGCONFIG} --libs ncurses)"
+ 	CCBASELIBPATHS="-L/usr/lib"
+ 	CCBASEINCPATHS="-I/usr/include -I/include"
+ 	CCBASEFLAGS=""
diff --git a/net-irc/rhapsody/rhapsody-0.28b.ebuild b/net-irc/rhapsody/rhapsody-0.28b.ebuild
index 892b4df67e4a..52d276a3bb78 100644
--- a/net-irc/rhapsody/rhapsody-0.28b.ebuild
+++ b/net-irc/rhapsody/rhapsody-0.28b.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="IRC client intended to be displayed on a text console"
 HOMEPAGE="http://rhapsody.sourceforge.net/"
@@ -14,25 +14,28 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND=">=sys-libs/ncurses-5.0"
+DEPEND=">=sys-libs/ncurses-5.0:0="
+BDEPEND="virtual/pkgconfig"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+PATCHES=(
+	"${FILESDIR}"/${P}-uclibc.patch
+	"${FILESDIR}"/${P}-tinfo.patch
+)
 
-	epatch "${FILESDIR}"/${P}-uclibc.patch
+src_configure() {
+	PKGCONFIG="$(tc-getPKG_CONFIG)" \
+	./configure -i /usr/share/rhapsody || die "configure failed"
 }
 
 src_compile() {
-	./configure -i /usr/share/rhapsody || die "configure failed"
-	emake CC="$(tc-getCC)" LOCALFLAGS="${CFLAGS}" || die "emake failed"
+	emake CC="$(tc-getCC)" LOCALFLAGS="${CFLAGS}"
 }
 
 src_install() {
-	dobin rhapsody || die "dobin failed"
+	dobin rhapsody
 
 	insinto /usr/share/rhapsody/help
-	doins help/*.hlp || die "doins failed"
+	doins help/*.hlp
 
-	dodoc docs/CHANGELOG || die "dodoc failed"
+	dodoc docs/CHANGELOG
 }