gentoo resync : 02.06.2019

8 files changed, 406 insertions, 9 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index ebdf13c324fa..f553bdb4dc1b 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 732693cb1e1a..8b21753e0806 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,9 +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.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
 EBUILD inspircd-2.0.25.ebuild 3376 BLAKE2B 802a96022a2cad65801d6dab88d2069523ce72914b2558718b39dde9891e6e0b78cd432541add655cdf1a01376ec1f8d216640c9480a84deb36b703345377859 SHA512 fd9a2c56b35f6855a68e8d697df1e63100c0abafdcd7a79b4ca53bc0f65a23876870352c3203e09a4a668844fd01735896d93ace6e60bd8a01e5253c5af9f99e
 EBUILD inspircd-2.0.27.ebuild 3168 BLAKE2B 06c0815778898c90477b49aae366e2f250a30a716da12d6d3414fd164107a9deb5b1e580937aee3be226cbf09df14af7bce301a6d09e0e6fc30e3b5963363952 SHA512 ae539416d593d8602a900ea8cfebf450d4c5762163bf9a0ee0556d1ad51d42302e93c5d20788d1285d6a26a714a1f5d413ffd547c7c74f517779e873b9689476
-MISC metadata.xml 1674 BLAKE2B 4d00f675f380e0bd75adca0eabbf455cdb27dab9a5c8cb170abc670909d647cf5dda0a2f3fbfd9b9cad2ce210cad3ea5d2fa07683d236f6f437be6d6d8be7c40 SHA512 ae6a96d1093024c9796788dea7fb23c8d2bb51ddea56eeb041e2443db2730f7f38cdb5fde42911ba75dd0cdfc4eac2c9c424f87660361d65cac6766729a60d98
+EBUILD inspircd-3.1.0.ebuild 3878 BLAKE2B e52ff76092c5b72d1a8338929980b7f11479daac448eada0d758e8237d7fa1e93f03c81282f61017f9a6bd5439f0f65638b63173867fba829fd8c2844c1a2276 SHA512 36021b543acd0cb0d4757483914433e9b5125093dee686c1edf97adb391e0451079966e36e65f357e288fb6b246f937f7da596ddbd454f677a3f63a729943a66
+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.1.0-fix-path-builds.patch
new file mode 100644
index 000000000000..0f4738c70123
--- /dev/null
+++ b/net-irc/inspircd/files/inspircd-3.1.0-fix-path-builds.patch
@@ -0,0 +1,260 @@
+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 9baaa5261..60e277310 100644
+--- a/docs/conf/inspircd.conf.example
++++ b/docs/conf/inspircd.conf
+@@ -465,11 +465,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  -#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -478,7 +478,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.
+@@ -514,7 +514,7 @@
+ # the default of 'inspircd.pid' is used.                              #
+ #                                                                     #
+ 
+-#<pid file="/path/to/inspircd.pid">
++#<pid file="/var/run/inspircd/inspircd.pid">
+ 
+ #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -1012,7 +1012,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  #-#-#-#-#-#-#-#-#-#-#-#
+ #                                                                     #
+@@ -1021,13 +1021,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 bb8a74dbc..397b61295 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">
+@@ -862,7 +862,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  -#-#-#-#-#-#-#-#-#-#-#-#
+@@ -871,7 +871,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)#
+@@ -961,7 +961,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-
+@@ -1533,7 +1533,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.
+@@ -2106,7 +2106,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/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 e39a24f87..e0fcbf4fc 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)
+ 	@-$(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)/services
++	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
+ 	@-$(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
+ 	-$(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/*.{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
+ 	@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)
+ 
+ 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.1.0.ebuild
new file mode 100644
index 000000000000..98fed20a13d3
--- /dev/null
+++ b/net-irc/inspircd/inspircd-3.1.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2019 Gentoo Foundation
+# 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}"/${P}-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}/" "${S}/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/metadata.xml b/net-irc/inspircd/metadata.xml
index 5bcadd4c1b6e..55b39da0b0eb 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -12,16 +12,19 @@
 		para ser estable, moderno y ligero.
 	</longdescription>
 	<use>
-		<flag name="geoip">Add geoip support for country and city lookup based on IPs</flag>
 		<flag name="gnutls">Enable TLS support</flag>
-		<flag name="ipv6">Enable support for IP version 6</flag>
 		<flag name="ldap">Enable LDAP support</flag>
+		<flag name="maxminddb">Add support for geolocation using libMaxMindDB</flag>
+		<flag name="mbedtls">Add support for TLS using the mbedTLS library</flag>
 		<flag name="mysql">Enable MySQL database backend</flag>
 		<flag name="pcre">Adds support for Perl Compatible Regular Expressions</flag>
-		<flag name="posix">Adds support for POSIX-compatible functions</flag>
 		<flag name="postgres">Enable PostgreSQL database backend</flag>
+		<flag name="re2">Add support for Google RE2 regular expressions library</flag>
+		<flag name="regex-posix">Adds support for POSIX Regular Expressions</flag>
+		<flag name="regex-stdlib">Add support for C++ stdlib regular expressions</flag>
 		<flag name="sqlite">Enable Sqlite database backend</flag>
 		<flag name="ssl">Enable SSL support</flag>
+		<flag name="sslrehashsignal">Enable rehashing SSL module by SIGUSR1</flag>
 		<flag name="tre">Enable support for TRE, a lightweight, robust, and efficient POSIX compliant regexp matching library</flag>
 	</use>
 	<upstream>
diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest
index 736f8df6c722..d3bf8a65d13d 100644
--- a/net-irc/irssi/Manifest
+++ b/net-irc/irssi/Manifest
@@ -2,6 +2,6 @@ AUX libressl.patch 1373 BLAKE2B 8cc6dd14a7f79d95ef037be9267570ca476dd92ca002cdae
 DIST irssi-1.1.2.tar.xz 1084328 BLAKE2B 6f4e49097d97a511d0fd679806bfa3d261c26f9160ed66d34e7d314b3f330accf90c5e019c31dafd5418c25d538fcb44fc35fcdf6210370f640ff95743556a9a SHA512 706f811c810b976888101a29bab6ff6b9aa6116678994b3710d6b266bfbc0ae2be1d4fd889aedfbf0a13a2e3da3f1affcce0018346ecc582865eaccd8cc79f84
 DIST irssi-1.2.0.tar.xz 1138984 BLAKE2B 940b8fb0c6633ea82ccd242241a39b67fa1a356aa58758ca9e0388971ccaabbdfe954140d27abd06d1ca36d0aac14decbb1fd0929d969305abfaa9c9dbeafd24 SHA512 343530ca63355dd6683e84f31602c9162e1e3158e52ce81e37519d1e42abbdcb621fb710fcb605fcafd7e7ea3f2c30ed62607d4ea91d8c8dc29bf893e54aee40
 EBUILD irssi-1.1.2.ebuild 1410 BLAKE2B e4afbeeef63408b98189f96df84a368068e8d1985158629928c0a8d7acd1eb6784b1a66eb34a1313873b529552012a3bb6bdb59af7e091c5e7398ee81370b926 SHA512 8ce49e74840ebdfa69fc56b9ec1d99bbd336990eb94e53a6a91beddafbd26f5c2f0ab519a31590aab1fa1bdf61d91d1c26432957d7883d99805132ade9dd0421
-EBUILD irssi-1.2.0-r2.ebuild 1562 BLAKE2B 117e46598c8bad0b62dd2b87be220217181d035cdc959ba378c7516222e2ba1671755fbb073f3dfc08d3622d0c200d0897e464e4ddbeedf7563e912a20a861d0 SHA512 719dd3f38e52fd2fd0710cefe66e9c162b7a6de2d36ee05d45d055d412919843f7c46de9da2b69df102e73f5e7a67a5b7015a819593306e8fbc1dfe1ea2a04d2
-EBUILD irssi-9999.ebuild 1487 BLAKE2B 3f83206f2b22dc6de4636cd749549383cbf82068e6415564ec5afa1aeb6a4d06e99b8f0f6e2cc7cd8db4d455c37bc89f28e67d9412c7342f79634620074cd118 SHA512 035223cce0c3bd26a1862c4bb88e60e3d7138e84d01bacbc21d621b6d2ccefbbcac6106ba5eef9ca5f40205a2065a8eb1956064c89899dd956ed0b04bed581d3
+EBUILD irssi-1.2.0-r2.ebuild 1561 BLAKE2B 1071df359650b4e3cc737aa83b4ce0eadbb71bee59f8461706e00ae01a79703e1ba46b4f3a5d38fc96db0f173cc818ee443a42d6ddebc70d73b52c4d1fa9a8e5 SHA512 82d93c6d99cc7563a3460e0a739955c89ab5132d704f9734d3d19d4cc300182c27e5838a37e20ebaa86f10d83e0832ad244c0e67fbb937ec9ed0dcaa5363cf08
+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.0-r2.ebuild b/net-irc/irssi/irssi-1.2.0-r2.ebuild
index 3fd4c3836773..83dffcd5041b 100644
--- a/net-irc/irssi/irssi-1.2.0-r2.ebuild
+++ b/net-irc/irssi/irssi-1.2.0-r2.ebuild
@@ -22,11 +22,11 @@ IUSE="otr +perl selinux socks5 +proxy libressl"
 COMMON_DEPEND="
 	sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
+	!net-irc/irssi-otr
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( >=dev-libs/libressl-2.7.4:= )
 	otr? ( >=dev-libs/libgcrypt-1.2.0:0=
-		>=net-libs/libotr-4.1.0
-		!net-irc/irssi-otr )
+		>=net-libs/libotr-4.1.0 )
 	perl? ( dev-lang/perl:= )
 	socks5? ( >=net-proxy/dante-1.1.18 )"
 
diff --git a/net-irc/irssi/irssi-9999.ebuild b/net-irc/irssi/irssi-9999.ebuild
index 73df7ceb2125..e0ecc363aa78 100644
--- a/net-irc/irssi/irssi-9999.ebuild
+++ b/net-irc/irssi/irssi-9999.ebuild
@@ -18,12 +18,12 @@ IUSE="otr +perl selinux socks5 +proxy libressl"
 
 CDEPEND="sys-libs/ncurses:0=
 	>=dev-libs/glib-2.6.0
+	!net-irc/irssi-otr
 	!libressl? ( dev-libs/openssl:= )
 	libressl? ( dev-libs/libressl:= )
 	otr? (
 		>=dev-libs/libgcrypt-1.2.0:0=
 		>=net-libs/libotr-4.1.0
-		!net-irc/irssi-otr
 	)
 	perl? ( dev-lang/perl:= )
 	socks5? ( >=net-proxy/dante-1.1.18 )"