gentoo resync : 03.11.2019

9 files changed, 12 insertions, 539 deletions

diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 7510681c31fb..16c4e76d4747 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index be9c55c91bc7..a609eafac2cc 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,16 +1,14 @@
 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-2.0.28-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402
 AUX inspircd-3.2.0-fix-path-builds.patch 12593 BLAKE2B fe6e74da76321c4be5bd736e84385ccd73a267f175b9eb3b613a4cb5a19b4388ad66eb0be7740e58fb3ab9af5bddfca9b27454e586853c0db461eb5d62ed2b25 SHA512 288205a8f9b26019ac3a682d9d168839ead435ffbe6423e069f98d1213ea00a18a30fb05ad63555001411fd7043b88f3fb7005081e7433a2ebf28927776e6e0a
-AUX inspircd-3.3.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.28.tar.gz 735981 BLAKE2B d467b4d31db4cbafeba655a4e129766ec780b2244f1945da6e25e9d70a8c7f946ea6258cc4e1189029a9f3be4d93b3d943f0bd20ccb85951f001268c2e460805 SHA512 0e8082a03e65f350ac423cc0781506c0eb40151d6e8d250067288b2a1d42087f10c159472ad76028aa986f6764180fdc493893984cadc0064715853472fa3e2a
 DIST inspircd-3.2.0.tar.gz 799842 BLAKE2B 87f8465479f01587b669c926c9097e14e441d40d6f37be2971863b40c2cef3d962acaf2cc84879d1d813819bcb512adfc58723b6adac5dfc35b240d4068b40f6 SHA512 8792614785d7f0415a38d49cc1786204d838917df54792ee6755b9ad8fd895020539364fdfc6daae60a911b8f39af1326e172ac40335b700241ca832410a4498
 DIST inspircd-3.3.0.tar.gz 803449 BLAKE2B 2b396db9d4bc84af33367715acb7f82299211ab31975310de0da4e3fe74385085b801c3bce6fe835b0f9e9857b1b457e037eb72e91d4455dc5918ad8d5bc844d SHA512 067904d877803c370873b5e79860fe0ac68529e740283e7e78dcd4dbbea30e19841a1f2e7e57e3e0b701704224369dbd484562e7edbbcd775bf85c18a4d340c3
-EBUILD inspircd-2.0.25.ebuild 3376 BLAKE2B 802a96022a2cad65801d6dab88d2069523ce72914b2558718b39dde9891e6e0b78cd432541add655cdf1a01376ec1f8d216640c9480a84deb36b703345377859 SHA512 fd9a2c56b35f6855a68e8d697df1e63100c0abafdcd7a79b4ca53bc0f65a23876870352c3203e09a4a668844fd01735896d93ace6e60bd8a01e5253c5af9f99e
-EBUILD inspircd-2.0.28.ebuild 3136 BLAKE2B 79c05f2b3fda1124718cc167a73ffd8f7dec5147644c34dfb843979c055ae4f368eed3e477add255047c096e51d1099ca49176dbd2f5c9cc5de4ad667f966097 SHA512 6c20ee1747c9e2c0610cb989d54b80d352525592f2f581c35b4654da443343bdc70c60397b3261348961bdd65e25247db4f4ff8579264da3468afd2c50f22950
-EBUILD inspircd-3.2.0.ebuild 3869 BLAKE2B 05a59a672e9801d3699b1687193a97a87348d5710b18c966f64af770e8b65a903283d4b5f2b82567a14e0a0a733c51a7e1c77e2d802f8951c1e1f44b130d2b42 SHA512 02a2b299f15b22c6ecc5dcddf44e62439f6d9ebee3e1e91c564a2de1ff2ee27877ad54ff9ab58c4bd8058fc93cbb068cff734fba89f8e713af8741bf0e904a2c
-EBUILD inspircd-3.3.0.ebuild 3841 BLAKE2B 7a061872092b58bee29379ac8bb4d97ddb807748096352cfb900c8ea048985364d62d4aa7fd508b0cd331f8c8780121c930cee28527ef968dc75145d6e1b44cc SHA512 16e00bb9ef7b5ccb110e39cf6440782320e82c8e9fbffb9cd26106ec5474658a80df7e49649e3130e55a70d5a11e6b5d376f6aaa47fa8ee6e8e366c15b929ab4
-MISC metadata.xml 1928 BLAKE2B b3c78c7526b07644b61532293634647d5db2c60f3f69e7cae15f4cc7fb7ad12dcbe980467d2c433e509817a8e200d0e674e0a1b12f5cec3ffbf5a80ebe5a2d53 SHA512 8c373da73fdad81bce0533aa767716fe16bbdbe909818f1a022a43b307e6679456150a077a155076d221b48759b00a0f09947d32608876787c306fac88918098
+EBUILD inspircd-2.0.25.ebuild 3381 BLAKE2B aac34555ca6d261d75ed5ca7b436c85d4825e9db8862e9874df72a5565add35584b1e44ed5bbfb003255d3467216e8647f20697e561ce5125432d52e18571fd3 SHA512 1088fc518c4cdfbf3b7b76ebf4615981f3088ae74db89f6dae411e1d60679ab8c207f609b42b6780e02d62538a7e56ff4d767438fba05f2c1bb76886ee8950a6
+EBUILD inspircd-2.0.28.ebuild 3144 BLAKE2B 1318ec1b16835ee703a3ae7b3de69a91d257eb50763a98ed2d1597a04660b14f3e3458e762477071657c33cbf3757a2007184b757e4abd8b5cb18719b38fdfa6 SHA512 27e9ba6c17d790d1b9a7d9f36dff44675537d6bc117e3b5d77a244548cfc4741be8cf70038b236e1e9533625117f94509cba30773ecbec5e6dbe1fbc7dc0043e
+EBUILD inspircd-3.2.0.ebuild 3876 BLAKE2B 0aa4b3bff009c0b8e1bc4e71fad4463abb7cfda9fd0a596c5504f3607e82b0a2ff39d546566ee38a21821d481d872b775538d936630d80a9b7038fb4332f572b SHA512 36300359f12398ed11e405a0dd495d82ec916a34cf849152d68926edba6251cf1068959bdc03209694f98b8fb2ce0d20079caa92e40fc433e07a925e133bbb77
+EBUILD inspircd-3.3.0.ebuild 3846 BLAKE2B 8eeb8a0f3b7dee37aa33e9d54999ec8da48bcbd8b902ad96e2dc03d112f66659e8f4cb7272eda4ba0b1afbd3ac0da664484cf20b3bfd5c2c1b352706e191d3c8 SHA512 c79804131ab8673528af997b85eb624dfc53d7520a4433b026a6e3171184c94a781ca6523e442d93180ef2a5f8de10bac312c02b02ecee206b5fc222df2b16fd
+MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4
diff --git a/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch
deleted file mode 100644
index da00a8491d1f..000000000000
--- a/net-irc/inspircd/files/inspircd-2.0.28-fix-path-builds.patch
+++ /dev/null
@@ -1,257 +0,0 @@
-diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example
-index d54cdc916..ee21be7f3 100644
---- a/docs/conf/inspircd.conf.example
-+++ b/docs/conf/inspircd.conf.example
-@@ -425,11 +425,11 @@
- 
- # This file has all the information about oper classes, types and o:lines.
- # You *MUST* edit it.
--<include file="conf/examples/opers.conf.example">
-+<include file="/etc/inspircd/opers.conf.example">
- 
- # This file has all the information about server links and ulined servers.
- # You *MUST* edit it if you intend to link servers.
--<include file="conf/examples/links.conf.example">
-+<include file="/etc/inspircd/links.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -439,7 +439,8 @@
- #   motd - displayed on connect and when a user executes /MOTD
- #   rules - displayed when the user executes /RULES
- # Modules can also define their own files
--<files motd="conf/examples/motd.txt.example" rules="conf/examples/rules.txt.example">
-+<files motd="/etc/inspircd/motd.txt.example"
-+       rules="/etc/inspircd/rules.txt.example">
- 
- # Example of an executable file include. Note this will be read on rehash,
- # not when the command is run.
-@@ -485,7 +486,7 @@
- # the default of 'inspircd.pid' is used.                              #
- #                                                                     #
- 
--#<pid file="/path/to/inspircd.pid">
-+<pid file="/var/run/inspircd/inspircd.pid">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -994,7 +995,7 @@
- # provide almost all the features of InspIRCd. :)                     #
- #                                                                     #
- # The default does nothing -- we include it for simplicity for you.   #
--<include file="conf/examples/modules.conf.example">
-+<include file="/etc/inspircd/modules.conf.example">
- 
- # Here are some pre-built modules.conf files that closely match the
- # default configurations of some popular IRCd's. You still may want to
-@@ -1006,10 +1007,10 @@
- # recommended that you make your own modules file based on modules.conf.example.
- 
- # Settings similar to UnrealIRCd defaults.
--#<include file="conf/examples/modules/unrealircd.conf.example">
-+#<include file="/etc/inspircd/modules/unrealircd.conf.example">
- 
- # Settings similar to Charybdis IRCd defaults.
--#<include file="conf/examples/modules/charybdis.conf.example">
-+#<include file="/etc/inspircd/modules/charybdis.conf.example">
- 
- 
- #########################################################################
-diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example
-index c3f074b94..4b0a584bb 100644
---- a/docs/conf/modules.conf.example
-+++ b/docs/conf/modules.conf.example
-@@ -315,7 +315,7 @@
- # specify some censor tags. See also:                                 #
- # https://wiki.inspircd.org/Modules/2.0/censor                        #
- #
--#<include file="conf/examples/censor.conf.example">
-+#<include file="/etc/inspircd/censor.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # CGI:IRC module: Adds support for automatic host changing in CGI:IRC
-@@ -790,7 +790,7 @@
- # specify below the path to the filter.conf file, or define some      #
- # <filter> tags.                                                      #
- #                                                                     #
--#<include file="conf/examples/filter.conf.example">
-+#<include file="/etc/inspircd/filter.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Gecos ban: Implements extended ban 'r', which stops anyone matching
-@@ -849,7 +849,7 @@
- #                                                                     #
- # If you specify to use the m_helpop.so module, then specify below    #
- # the path to the helpop.conf file.                                   #
--#<include file="conf/examples/helpop-full.conf.example">
-+#<include file="/etc/inspircd/helpop-full.conf.example">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Hide chans module: Allows users to hide their channels list from non-
-@@ -1304,7 +1304,7 @@
- #                 Read the comment above <connect:allowmotdcolors> in #
- #                 inspircd.conf.example for details.                  #
- #                                                                     #
--#<opermotd file="conf/examples/opermotd.txt.example" onoper="yes" processcolors="false">
-+#<opermotd file="/etc/inspircd/opermotd.txt.example" onoper="yes" processcolors="false">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Override module: Adds support for oper override.
-diff --git a/make/template/main.mk b/make/template/main.mk
-index 23daa7efc..386e0138a 100644
---- a/make/template/main.mk
-+++ b/make/template/main.mk
-@@ -34,7 +34,7 @@ CC = @CC@
- SYSTEM = @SYSTEM@
- BUILDPATH = @BUILD_DIR@
- SOCKETENGINE = @SOCKETENGINE@
--CXXFLAGS = -pipe -fPIC -DPIC
-+MYCXXFLAGS = -pipe -fPIC -DPIC
- LDLIBS = -pthread -lstdc++
- LDFLAGS = 
- CORELDFLAGS = -rdynamic -L. $(LDFLAGS)
-@@ -52,9 +52,9 @@ INSTMODE_BIN = 0755
- INSTMODE_LIB = 0644
- 
- @IFEQ $(CC) icpc
--  CXXFLAGS += -Wshadow
-+  MYCXXFLAGS += -Wshadow
- @ELSE
--  CXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
-+  MYCXXFLAGS += -pedantic -Woverloaded-virtual -Wshadow -Wformat=2 -Wmissing-format-attribute -Wall
- @ENDIF
- 
- 
-@@ -76,46 +76,46 @@ INSTMODE_LIB = 0644
- 	INSTALL = ginstall
- @ENDIF
- @IFEQ $(SYSTEM) darwin
--  CXXFLAGS += -DDARWIN -frtti
-+  MYCXXFLAGS += -DDARWIN -frtti
-   LDLIBS += -ldl
-   CORELDFLAGS = -dynamic -bind_at_load -L. $(LDFLAGS)
-   PICLDFLAGS = -fPIC -shared -twolevel_namespace -undefined dynamic_lookup $(LDFLAGS)
- @ENDIF
- @IFEQ $(SYSTEM) interix
--  CXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
-+  MYCXXFLAGS += -D_ALL_SOURCE -I/usr/local/include
- @ENDIF
- 
--@IFNDEF D
--  D=0
-+@IFNDEF DEBUGLEVEL
-+  DEBUGLEVEL=0
- @ENDIF
- 
- GCC6=@GCC6@
- @IFEQ $(GCC6) true
--  CXXFLAGS += -fno-delete-null-pointer-checks
-+  MYCXXFLAGS += -fno-delete-null-pointer-checks
- @ENDIF
- 
- DBGOK=0
--@IFEQ $(D) 0
--  CXXFLAGS += -O2
-+@IFEQ $(DEBUGLEVEL) 0
-+  MYCXXFLAGS += -O2
- @IFEQ $(CC) g++
--    CXXFLAGS += -g1
-+    MYCXXFLAGS += -g1
- @ENDIF
-   HEADER = std-header
-   DBGOK=1
- @ENDIF
--@IFEQ $(D) 1
--  CXXFLAGS += -O0 -g3 -Werror
-+@IFEQ $(DEBUGLEVEL) 1
-+  MYCXXFLAGS += -O0 -g3 -Werror
-   HEADER = debug-header
-   DBGOK=1
- @ENDIF
--@IFEQ $(D) 2
--  CXXFLAGS += -O2 -g3
-+@IFEQ $(DEBUGLEVEL) 2
-+  MYCXXFLAGS += -O2 -g3
-   HEADER = debug-header
-   DBGOK=1
- @ENDIF
- FOOTER = finishmessage
- 
--CXXFLAGS += -Iinclude
-+MYCXXFLAGS += -Iinclude
- 
- @GNU_ONLY MAKEFLAGS += --no-print-directory
- 
-@@ -135,10 +135,11 @@ CXXFLAGS += -Iinclude
- @ENDIF
- 
- @IFDEF PURE_STATIC
--  CXXFLAGS += -DPURE_STATIC
-+  MYCXXFLAGS += -DPURE_STATIC
- @ENDIF
- 
--@DO_EXPORT RUNCC RUNLD CXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
-+MYCXXFLAGS += $(CXXFLAGS)
-+@DO_EXPORT RUNCC RUNLD MYCXXFLAGS LDLIBS PICLDFLAGS VERBOSE SOCKETENGINE CORELDFLAGS
- @DO_EXPORT SOURCEPATH BUILDPATH PURE_STATIC SPLIT_CC
- 
- # Default target
-@@ -151,10 +152,10 @@ TARGET = all
-     @GNU_ONLY TARGET = modules/$(M:.so=).so
- @ENDIF
- 
--@IFDEF T
-+@IFDEF TGT
-     HEADER =
-     FOOTER = target
--    TARGET = $(T)
-+    TARGET = $(TGT)
- @ENDIF
- 
- @IFEQ $(DBGOK) 0
-@@ -229,8 +230,8 @@ install: target
- 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
- 	@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
- 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
--	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
--	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/aliases
-+	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/modules
- 	@-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)
- 	[ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
- @IFNDEF PURE_STATIC
-@@ -238,9 +239,9 @@ install: target
- @ENDIF
- 	-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
- 	-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
--	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
--	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
--	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
-+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)
-+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/aliases
-+	-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/modules
- 	@echo ""
- 	@echo "*************************************"
- 	@echo "*        INSTALL COMPLETE!          *"
-@@ -253,7 +254,7 @@ install: target
- 	@echo '  Data:' $(DATPATH)
- 	@echo 'To start the ircd, run:' $(BASE)/inspircd start
- 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
--	@echo 'Examples are available at:' $(CONPATH)/examples/
-+	@echo 'Examples are available at:' $(CONPATH)
- 
- @GNU_ONLY RCS_FILES = $(wildcard .git/index src/version.sh)
- @BSD_ONLY RCS_FILES = src/version.sh
-diff --git a/make/unit-cc.pl b/make/unit-cc.pl
-index a494fb74b..2a570ec91 100755
---- a/make/unit-cc.pl
-+++ b/make/unit-cc.pl
-@@ -113,7 +113,7 @@ sub do_compile {
- 	my $libs = '';
- 	my $binary = $ENV{RUNCC};
- 	if ($do_compile) {
--		$flags = $ENV{CXXFLAGS};
-+		$flags = $ENV{MYCXXFLAGS};
- 		$flags =~ s/ -pedantic// if nopedantic($file);
- 		$flags .= ' ' . getcompilerflags($file);
- 
diff --git a/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
deleted file mode 100644
index 955b2be79095..000000000000
--- a/net-irc/inspircd/files/inspircd-3.3.0-fix-path-builds.patch
+++ /dev/null
@@ -1,267 +0,0 @@
-diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf
-similarity index 100%
-rename from docs/conf/filter.conf.example
-rename to docs/conf/filter.conf
-diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf
-similarity index 100%
-rename from docs/conf/helpop.conf.example
-rename to docs/conf/helpop.conf
-diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
-similarity index 99%
-rename from docs/conf/inspircd.conf.example
-rename to docs/conf/inspircd.conf
-index dbd56d2fe..4a7aab514 100644
---- a/docs/conf/inspircd.conf.example
-+++ b/docs/conf/inspircd.conf
-@@ -494,11 +494,11 @@
- 
- # This file has all the information about oper classes, types and o:lines.
- # You *MUST* edit it.
--#<include file="examples/opers.conf.example">
-+#<include file="/etc/inspircd/opers.conf">
- 
- # This file has all the information about server links and ulined servers.
- # You *MUST* edit it if you intend to link servers.
--#<include file="examples/links.conf.example">
-+#<include file="/etc/inspircd/links.conf">
- 
- #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -507,7 +507,7 @@
- #
- #   motd - displayed on connect and when a user executes /MOTD
- # Modules can also define their own files
--<files motd="examples/motd.txt.example">
-+<files motd="/etc/inspircd/motd.txt">
- 
- # Example of an executable file include. Note this will be read on rehash,
- # not when the command is run.
-@@ -543,7 +543,7 @@
- # the default of 'inspircd.pid' is used.                              #
- #                                                                     #
- 
--#<pid file="/path/to/inspircd.pid">
-+#<pid file="/var/run/inspircd/inspircd.pid">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -1041,7 +1041,7 @@
- # provide almost all the features of InspIRCd. :)                     #
- #                                                                     #
- # The default does nothing -- we include it for simplicity for you.   #
--#<include file="examples/modules.conf.example">
-+#<include file="/etc/inspircd/modules.conf">
- 
- #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION  #-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -1050,13 +1050,13 @@
- # exemptions for services pseudoclients:                              #
- #
- # Anope users should uncomment this:
--#<include file="examples/services/anope.conf.example">
-+#<include file="/etc/inspircd/aliases/anope.conf">
- #
- # Atheme users should uncomment this:
--#<include file="examples/services/atheme.conf.example">
-+#<include file="/etc/inspircd/aliases/atheme.conf">
- #
- # Users of other services should uncomment this:
--#<include file="examples/services/generic.conf.example">
-+#<include file="/etc/inspircd/aliases/generic.conf">
- 
- #########################################################################
- #                                                                       #
-diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf
-similarity index 100%
-rename from docs/conf/links.conf.example
-rename to docs/conf/links.conf
-diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
-similarity index 99%
-rename from docs/conf/modules.conf.example
-rename to docs/conf/modules.conf
-index 3bf1c2e99..b451a2f18 100644
---- a/docs/conf/modules.conf.example
-+++ b/docs/conf/modules.conf
-@@ -832,7 +832,7 @@
- # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor,    #
- # censor, filter, flood, nickflood, noctcp, nonick, nonotice,         #
- # regmoderated, stripcolor, and topiclock.                            #
--# See <options:exemptchanops> in inspircd.conf.example for a more     #
-+# See <options:exemptchanops> in inspircd.conf for a more             #
- # detailed list of the restriction modes that can be exempted.        #
- # These are settable using: /MODE #chan +X <restriction>:<status>     #
- #<module name="exemptchanops">
-@@ -868,7 +868,7 @@
- # Your choice of regex engine must match on all servers network-wide. #
- #                                                                     #
- # To learn more about the configuration of this module, read          #
--# examples/filter.conf.example, which covers the various types of     #
-+# filter.conf, which covers the various types of                      #
- # filters and shows how to add exemptions.                            #
- #                                                                     #
- #-#-#-#-#-#-#-#-#-#-#-  FILTER  CONFIGURATION  -#-#-#-#-#-#-#-#-#-#-#-#
-@@ -877,7 +877,7 @@
- # specify below the path to the filter.conf file, or define some      #
- # <keyword> tags.                                                     #
- #                                                                     #
--#<include file="examples/filter.conf.example">
-+#<include file="/etc/inspircd/filter.conf">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)#
-@@ -967,7 +967,7 @@
- # If you specify to use the helpop module, then specify below the     #
- # path to the helpop.conf file.                                       #
- #                                                                     #
--#<include file="examples/helpop.conf.example">
-+#<include file="/etc/inspircd/helpop.conf">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Hide chans module: Allows users to hide their channels list from non-
-@@ -1545,7 +1545,7 @@
- # onoper        - If on, the message is sent on /OPER, otherwise it's #
- #                 only sent when /OPERMOTD is used.                   #
- #                                                                     #
--#<opermotd file="examples/opermotd.txt.example" onoper="yes">
-+#<opermotd file="/etc/inspircd/opermotd.txt" onoper="yes">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#
- # Override module: Adds support for oper override.
-@@ -2123,7 +2123,7 @@
- # connections in order to oper up. It is highly recommended to load
- # this module if you use SSL on your network.
- # For how to use the oper features, please see the first
--# example <oper> tag in opers.conf.example.
-+# example <oper> tag in opers.conf.
- #
- #<module name="sslinfo">
- #
-diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt
-similarity index 97%
-rename from docs/conf/motd.txt.example
-rename to docs/conf/motd.txt
-index c5266f844..34d85d965 100644
---- a/docs/conf/motd.txt.example
-+++ b/docs/conf/motd.txt
-@@ -24,7 +24,7 @@
-                     `-.__  `----"""    __.-'
-                          `--..____..--'
- 
--        ---- To change, see motd.txt.example -----
-+        ---- To change, see motd.txt         -----
-        /                                          \
-       /   * Web: https://www.inspircd.org          \
-       |   * IRC: irc.inspircd.org #inspircd        |
-diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
-similarity index 97%
-rename from docs/conf/opermotd.txt.example
-rename to docs/conf/opermotd.txt
-index 7e1c82f33..73ad28621 100644
---- a/docs/conf/opermotd.txt.example
-+++ b/docs/conf/opermotd.txt
-@@ -24,7 +24,7 @@
-                     `-.__  `----"""    __.-'
-                          `--..____..--'
- 
--        -- To change, see opermotd.txt.example ---
-+        -- To change, see opermotd.txt         ---
-        /                                          \
-       /   * Web: https://www.inspircd.org          \
-       |   * IRC: irc.inspircd.org #inspircd        |
-diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf
-similarity index 99%
-rename from docs/conf/opers.conf.example
-rename to docs/conf/opers.conf
-index 7cad2589c..082009da9 100644
---- a/docs/conf/opers.conf.example
-+++ b/docs/conf/opers.conf
-@@ -178,4 +178,4 @@
- 
- # Once you have edited this file you can remove this line. This is just to
- # ensure that you don't hastily include the file without reading it.
--<die reason="Using opers.conf.example without editing it is a security risk">
-+<die reason="Using opers.conf without editing it is a security risk">
-diff --git a/docs/conf/providers/irccloud.conf.example b/docs/conf/providers/irccloud.conf
-similarity index 100%
-rename from docs/conf/providers/irccloud.conf.example
-rename to docs/conf/providers/irccloud.conf
-diff --git a/docs/conf/providers/kiwiirc-com.conf.example b/docs/conf/providers/kiwiirc-com.conf
-similarity index 100%
-rename from docs/conf/providers/kiwiirc-com.conf.example
-rename to docs/conf/providers/kiwiirc-com.conf
-diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt
-similarity index 100%
-rename from docs/conf/quotes.txt.example
-rename to docs/conf/quotes.txt
-diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf
-similarity index 86%
-rename from docs/conf/services/anope.conf.example
-rename to docs/conf/services/anope.conf
-index 5c8f859ff..b1179eb8c 100644
---- a/docs/conf/services/anope.conf.example
-+++ b/docs/conf/services/anope.conf
-@@ -2,7 +2,7 @@
- # by Anope. See https://www.anope.org for more information on Anope.
- 
- # This file inherits from the generic config to avoid repetition.
--<include file="examples/services/generic.conf.example">
-+<include file="examples/services/generic.conf">
- 
- # /GLOBAL <message>
- # Sends a global notice.
-diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf
-similarity index 98%
-rename from docs/conf/services/atheme.conf.example
-rename to docs/conf/services/atheme.conf
-index d509522b8..7605251db 100644
---- a/docs/conf/services/atheme.conf.example
-+++ b/docs/conf/services/atheme.conf
-@@ -3,7 +3,7 @@
- # information on Atheme.
- 
- # This file inherits from the generic config to avoid repetition.
--<include file="examples/services/generic.conf.example">
-+<include file="examples/services/generic.conf">
- 
- # Long hand aliases for services pseudoclients.
- <alias text="ALIS"      replace="SQUERY $requirement :$2-" requires="ALIS"      uline="yes">
-diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf
-similarity index 100%
-rename from docs/conf/services/generic.conf.example
-rename to docs/conf/services/generic.conf
-diff --git a/make/template/main.mk b/make/template/main.mk
-index d77d59fa5..b28d7180d 100644
---- a/make/template/main.mk
-+++ b/make/template/main.mk
-@@ -210,8 +210,8 @@ install: target
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
-+	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
-+	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
-@@ -229,9 +229,9 @@ endif
- 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd.1 $(MANPATH) 2>/dev/null
- 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-genssl.1 $(MANPATH) 2>/dev/null
- 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_BIN) tools/genssl $(BINPATH)/inspircd-genssl 2>/dev/null
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
-+	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
-+	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
-+	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
- 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null
- 	@echo ""
- 	@echo "*************************************"
-@@ -245,7 +245,6 @@ endif
- 	@echo '  Data:' $(DATPATH)
- 	@echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
- 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
--	@echo 'Examples are available at:' $(EXAPATH)
- 
- GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
- 	./configure --update
diff --git a/net-irc/inspircd/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild
index 792cca4e9ae7..7258f2c4e9f3 100644
--- a/net-irc/inspircd/inspircd-2.0.25.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.25.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="6"
@@ -28,7 +28,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.0.25-fix-path-builds.patch )
 
 pkg_setup() {
 	enewgroup ${PN}
diff --git a/net-irc/inspircd/inspircd-2.0.28.ebuild b/net-irc/inspircd/inspircd-2.0.28.ebuild
index 41581c0c6c15..86ef749f1222 100644
--- a/net-irc/inspircd/inspircd-2.0.28.ebuild
+++ b/net-irc/inspircd/inspircd-2.0.28.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-2.0.27-fix-path-builds.patch )
 
 src_prepare() {
 	default
diff --git a/net-irc/inspircd/inspircd-3.2.0.ebuild b/net-irc/inspircd/inspircd-3.2.0.ebuild
index 90aad649918c..021dc47d8a8d 100644
--- a/net-irc/inspircd/inspircd-3.2.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.2.0.ebuild
@@ -30,7 +30,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-fix-path-builds.patch )
 
 pkg_setup() {
 	enewgroup ${PN}
diff --git a/net-irc/inspircd/inspircd-3.3.0.ebuild b/net-irc/inspircd/inspircd-3.3.0.ebuild
index 0223cc46790f..4661639e589b 100644
--- a/net-irc/inspircd/inspircd-3.3.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.3.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-fix-path-builds.patch )
 
 src_prepare() {
 	default
@@ -83,7 +83,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D%/}" install
+	emake DESTDIR="${D}" install
 
 	# Default is '0750', which causes init errors.
 	fperms 0755 /usr/bin/inspircd{,-genssl}
diff --git a/net-irc/inspircd/metadata.xml b/net-irc/inspircd/metadata.xml
index 55b39da0b0eb..f1f04d7eca62 100644
--- a/net-irc/inspircd/metadata.xml
+++ b/net-irc/inspircd/metadata.xml
@@ -17,10 +17,9 @@
 		<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="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-posix">Add 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>