[gentoo-commits] repo/gentoo:master commit in: net-irc/inspircd/, net-irc/inspircd/files/

[Sam James]

commit:     6cdc4b65290f229e928c4c67c1ff4bb29d5ffaca
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 28 03:47:00 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 28 03:47:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdc4b65

net-irc/inspircd: fix SizeViolation

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-irc/inspircd/Manifest                          |   1 +
 .../files/inspircd-3.10.0-fix-path-builds.patch    | 493 ---------------------
 net-irc/inspircd/inspircd-3.10.0.ebuild            |   3 +-
 3 files changed, 3 insertions(+), 494 deletions(-)

diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest
index 0d3fc592437..53ada51b850 100644
--- a/net-irc/inspircd/Manifest
+++ b/net-irc/inspircd/Manifest
@@ -1,2 +1,3 @@
+DIST inspircd-3.10.0-fix-path-builds.patch.bz2 5316 BLAKE2B 42831f5f1c442b0492dee1d49469361ca797e743399bf8cffd6069227fbaf0123ab43eda81ad0f732bed289111238e00f0e9b3351a555fc4b14f24fe18bb8251 SHA512 e1479970050dca02be092d5575077342ce3e517baf1c9b1d80e4b2a52559786dca387c685505d6c42b812c9206961eef057ad07a2f4966f9922a16a387559eb0
 DIST inspircd-3.10.0.tar.gz 854024 BLAKE2B b6aed621c6c5c4ea082d07605c6a9fe8be5fce04896c820a9055b17103853b0091515f8a52448ecb1accbe39eef3f49b01acbecae73894b76f91bb4b75edf821 SHA512 6cb1c66ce2a4531628264fc4b4836b47b7cba2c8aa6ffef5d72489ae663815254783b09aeb149d8ae9e41cf51be3c703612d443da84995695449a94db86f8944
 DIST inspircd-3.9.0.tar.gz 853862 BLAKE2B 68134412f12ac06dc5ab5f9ffc94cb6053d88430210cb516e3569aad5e06dacd985038f51e057c9d7bd88179f472f685be5cd6fb31031e79948b0d3aee60eac3 SHA512 2adc4c39fc80d0095a9157a4c72f1df8288c364d909b2200eb04fb7e6bf5eb6172fe80153b79fdd437882d0b252999abad5912cef28f29cbceb9ab540df8db70

diff --git a/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch
deleted file mode 100644
index e1def8043c5..00000000000
--- a/net-irc/inspircd/files/inspircd-3.10.0-fix-path-builds.patch
+++ /dev/null
@@ -1,493 +0,0 @@
-diff --git a/docs/conf/codepages/ascii.conf.example b/docs/conf/codepages/ascii.conf
-similarity index 100%
-rename from docs/conf/codepages/ascii.conf.example
-rename to docs/conf/codepages/ascii.conf
-diff --git a/docs/conf/codepages/iso-8859-1.conf.example b/docs/conf/codepages/iso-8859-1.conf.example
-deleted file mode 100644
-index 83a772600..000000000
---- a/docs/conf/codepages/iso-8859-1.conf.example
-+++ /dev/null
-@@ -1,42 +0,0 @@
--# This file contains ISO 8859-1 codepage rules for use with the codepage module.
--
--<codepage name="iso-8859-1">
--
--<cpchars begin="192" end="214" front="yes"> # ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ
--<cpchars begin="216" end="246" front="yes"> # ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö
--<cpchars begin="248" end="255" front="yes"> # øùúûüýþÿ
--
--<cpcase lower="83"  upper="223"> # ß => S
--<cpcase lower="192" upper="224"> # à => À
--<cpcase lower="193" upper="225"> # á => Á
--<cpcase lower="194" upper="226"> # â => Â
--<cpcase lower="195" upper="227"> # ã => Ã
--<cpcase lower="196" upper="228"> # ä => Ä
--<cpcase lower="197" upper="229"> # å => Å
--<cpcase lower="198" upper="230"> # æ => Æ
--<cpcase lower="199" upper="231"> # ç => Ç
--<cpcase lower="200" upper="232"> # è => È
--<cpcase lower="201" upper="233"> # é => É
--<cpcase lower="202" upper="234"> # ê => Ê
--<cpcase lower="203" upper="235"> # ë => Ë
--<cpcase lower="204" upper="236"> # ì => Ì
--<cpcase lower="205" upper="237"> # í => Í
--<cpcase lower="206" upper="238"> # î => Î
--<cpcase lower="207" upper="239"> # ï => Ï
--<cpcase lower="208" upper="240"> # ð => Ð
--<cpcase lower="209" upper="241"> # ñ => Ñ
--<cpcase lower="210" upper="242"> # ò => Ò
--<cpcase lower="211" upper="243"> # ó => Ó
--<cpcase lower="212" upper="244"> # ô => Ô
--<cpcase lower="213" upper="245"> # õ => Õ
--<cpcase lower="214" upper="246"> # ö => Ö
--<cpcase lower="216" upper="248"> # ø => Ø
--<cpcase lower="217" upper="249"> # ù => Ù
--<cpcase lower="218" upper="250"> # ú => Ú
--<cpcase lower="219" upper="251"> # û => Û
--<cpcase lower="220" upper="252"> # ü => Ü
--<cpcase lower="221" upper="253"> # ý => Ý
--<cpcase lower="222" upper="254"> # þ => Þ
--
--# Include the ASCII rules to avoid duplication.
--<include file="examples/codepages/ascii.conf.example">
-diff --git a/docs/conf/codepages/iso-8859-2.conf.example b/docs/conf/codepages/iso-8859-2.conf.example
-deleted file mode 100644
-index df41d88fb..000000000
---- a/docs/conf/codepages/iso-8859-2.conf.example
-+++ /dev/null
-@@ -1,60 +0,0 @@
--# This file contains ISO 8859-2 codepage rules for use with the codepage module.
--
--<codepage name="iso-8859-2">
--
--<cpchars index="161" front="yes">           # Ą
--<cpchars index="163" front="yes">           # Ł
--<cpchars begin="165" end="166" front="yes"> # ĽŚ
--<cpchars begin="169" end="172" front="yes"> # ŠŞŤŹ
--<cpchars begin="174" end="175" front="yes"> # ŽŻ
--<cpchars index="177" front="yes">           # ą
--<cpchars index="179" front="yes">           # ł
--<cpchars begin="181" end="182" front="yes"> # ľś
--<cpchars begin="185" end="188" front="yes"> # šşťź
--<cpchars begin="190" end="214" front="yes"> # žżŔÁÂĂÄĹĆÇČÉĘËĚÍÎĎĐŃŇÓÔŐÖ
--<cpchars begin="216" end="246" front="yes"> # ŘŮÚŰÜÝŢßŕáâăäĺćçčéęëěíîďđńňóôőö
--<cpchars begin="248" end="254" front="yes"> # řůúűüýţ
--
--<cpcase lower="177" upper="161"> # ą => Ą
--<cpcase lower="179" upper="163"> # ł => Ł
--<cpcase lower="181" upper="165"> # ľ => Ľ
--<cpcase lower="182" upper="166"> # ś => Ś
--<cpcase lower="185" upper="169"> # š => Š
--<cpcase lower="186" upper="170"> # ş => Ş
--<cpcase lower="187" upper="171"> # ť => Ť
--<cpcase lower="188" upper="172"> # ź => Ź
--<cpcase lower="190" upper="174"> # ž => Ž
--<cpcase lower="191" upper="175"> # ż => Ż
--<cpcase lower="224" upper="192"> # ŕ => Ŕ
--<cpcase lower="225" upper="193"> # á => Á
--<cpcase lower="226" upper="194"> # â => Â
--<cpcase lower="227" upper="195"> # ă => Ă
--<cpcase lower="228" upper="196"> # ä => Ä
--<cpcase lower="229" upper="197"> # ĺ => Ĺ
--<cpcase lower="230" upper="198"> # ć => Ć
--<cpcase lower="231" upper="199"> # ç => Ç
--<cpcase lower="232" upper="200"> # č => Č
--<cpcase lower="233" upper="201"> # é => É
--<cpcase lower="234" upper="202"> # ę => Ę
--<cpcase lower="235" upper="203"> # ë => Ë
--<cpcase lower="236" upper="204"> # ě => Ě
--<cpcase lower="237" upper="205"> # í => Í
--<cpcase lower="238" upper="206"> # î => Î
--<cpcase lower="239" upper="207"> # ď => Ď
--<cpcase lower="240" upper="208"> # đ => Đ
--<cpcase lower="241" upper="209"> # ń => Ń
--<cpcase lower="242" upper="210"> # ň => Ň
--<cpcase lower="243" upper="211"> # ó => Ó
--<cpcase lower="244" upper="212"> # ô => Ô
--<cpcase lower="245" upper="213"> # ő => Ő
--<cpcase lower="246" upper="214"> # ö => Ö
--<cpcase lower="248" upper="216"> # ř => Ř
--<cpcase lower="249" upper="217"> # ů => Ů
--<cpcase lower="250" upper="218"> # ú => Ú
--<cpcase lower="251" upper="219"> # ű => Ű
--<cpcase lower="252" upper="220"> # ü => Ü
--<cpcase lower="253" upper="221"> # ý => Ý
--<cpcase lower="254" upper="222"> # ţ => Ţ
--
--# Include the ASCII rules to avoid duplication.
--<include file="examples/codepages/ascii.conf.example">
-diff --git a/docs/conf/codepages/rfc1459.conf.example b/docs/conf/codepages/rfc1459.conf
-similarity index 100%
-rename from docs/conf/codepages/rfc1459.conf.example
-rename to docs/conf/codepages/rfc1459.conf
-diff --git a/docs/conf/codepages/strict-rfc1459.conf.example b/docs/conf/codepages/strict-rfc1459.conf
-similarity index 100%
-rename from docs/conf/codepages/strict-rfc1459.conf.example
-rename to docs/conf/codepages/strict-rfc1459.conf
-diff --git a/docs/conf/filter.conf.example b/docs/conf/filter.conf
-similarity index 100%
-rename from docs/conf/filter.conf.example
-rename to docs/conf/filter.conf
-diff --git a/docs/conf/helpop.conf.example b/docs/conf/helpop.conf
-similarity index 100%
-rename from docs/conf/helpop.conf.example
-rename to docs/conf/helpop.conf
-diff --git a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf
-similarity index 99%
-rename from docs/conf/inspircd.conf.example
-rename to docs/conf/inspircd.conf
-index f07f21cdd..a731c0c1c 100644
---- a/docs/conf/inspircd.conf.example
-+++ b/docs/conf/inspircd.conf
-@@ -242,7 +242,7 @@
- # This can be done by using <connect registered="no">                 #
- 
- # To enable IRCCloud on your network uncomment this:
--#<include file="examples/providers/irccloud.conf.example">
-+#<include file="/etc/inspircd/providers/irccloud.conf">
- 
- # A connect class with <connect:deny> set denies connections from the specified host/IP range.
- <connect
-@@ -494,11 +494,11 @@
- 
- # This file has all the information about oper classes, types and o:lines.
- # You *MUST* edit it.
--#<include file="examples/opers.conf.example">
-+#<include file="/etc/inspircd/opers.conf">
- 
- # This file has all the information about server links and ulined servers.
- # You *MUST* edit it if you intend to link servers.
--#<include file="examples/links.conf.example">
-+#<include file="/etc/inspircd/links.conf">
- 
- #-#-#-#-#-#-#-#-#-#-  MISCELLANEOUS CONFIGURATION  -#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -507,7 +507,7 @@
- #
- #   motd - displayed on connect and when a user executes /MOTD
- # Modules can also define their own files
--<files motd="examples/motd.txt.example">
-+<files motd="/etc/inspircd/motd.txt">
- 
- # Example of an executable file include. Note this will be read on rehash,
- # not when the command is run.
-@@ -543,7 +543,7 @@
- # default of 'inspircd.pid' is used.                                  #
- #                                                                     #
- 
--#<pid file="/path/to/inspircd.pid">
-+#<pid file="/var/run/inspircd/inspircd.pid">
- 
- #-#-#-#-#-#-#-#-#-#-#-#-#- LIST MODE LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -698,7 +698,7 @@
-          #  - topiclock       Channel mode +t - limits changing the topic to (half)ops
-          # You can also configure this on a per-channel basis with a channel mode and
-          # even negate the configured exemptions below.
--         # See exemptchanops in modules.conf.example for more details.
-+         # See exemptchanops in modules.conf for more details.
-          exemptchanops="censor:o filter:o nickflood:o nonick:v regmoderated:o"
- 
-          # invitebypassmodes: This allows /INVITE to bypass other channel modes.
-@@ -1041,7 +1041,7 @@
- # provide almost all the features of InspIRCd. :)                     #
- #                                                                     #
- # The default does nothing -- we include it for simplicity for you.   #
--#<include file="examples/modules.conf.example">
-+#<include file="/etc/inspircd/modules.conf">
- 
- #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION  #-#-#-#-#-#-#-#-#-#-#-#
- #                                                                     #
-@@ -1050,13 +1050,13 @@
- # exemptions for services pseudoclients:                              #
- #
- # Anope users should uncomment this:
--#<include file="examples/services/anope.conf.example">
-+#<include file="/etc/inspircd/aliases/anope.conf">
- #
- # Atheme users should uncomment this:
--#<include file="examples/services/atheme.conf.example">
-+#<include file="/etc/inspircd/aliases/atheme.conf">
- #
- # Users of other services should uncomment this:
--#<include file="examples/services/generic.conf.example">
-+#<include file="/etc/inspircd/aliases/generic.conf">
- 
- #########################################################################
- #                                                                       #
-diff --git a/docs/conf/links.conf.example b/docs/conf/links.conf
-similarity index 98%
-rename from docs/conf/links.conf.example
-rename to docs/conf/links.conf
-index 19d770d35..32986de9d 100644
---- a/docs/conf/links.conf.example
-+++ b/docs/conf/links.conf
-@@ -143,4 +143,4 @@
- 
- # Once you have edited this file you can remove this line. This is just to
- # ensure that you don't hastily include the file without reading it.
--<die reason="Using links.conf.example without editing it is a security risk">
-+<die reason="Using links.conf without editing it is a security risk">
-diff --git a/docs/conf/modules.conf.example b/docs/conf/modules.conf
-similarity index 99%
-rename from docs/conf/modules.conf.example
-rename to docs/conf/modules.conf
-index 6eb61cc38..feed59e18 100644
---- a/docs/conf/modules.conf.example
-+++ b/docs/conf/modules.conf
-@@ -617,11 +617,11 @@
- #<module name="codepage">
- #
- # You should include one of the following files to set your codepage:
--#<include file="examples/codepages/ascii.conf.example">
--#<include file="examples/codepages/iso-8859-1.conf.example">
--#<include file="examples/codepages/iso-8859-2.conf.example">
--#<include file="examples/codepages/rfc1459.conf.example">
--#<include file="examples/codepages/strict-rfc1459.conf.example">
-+#<include file="/etc/inspircd/codepages/ascii.conf.example">
-+#<include file="/etc/inspircd/codepages/iso-8859-1.conf.example">
-+#<include file="/etc/inspircd/codepages/iso-8859-2.conf.example">
-+#<include file="/etc/inspircd/codepages/rfc1459.conf.example">
-+#<include file="/etc/inspircd/codepages/strict-rfc1459.conf.example">
- #
- # You can also define a custom codepage. For details on how to do this
- # please refer to the docs site:
-@@ -905,7 +905,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>     #
- # Furthermore, the exemptions configured in <options:exemptchanops>   #
-@@ -943,7 +943,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  -#-#-#-#-#-#-#-#-#-#-#-#
-@@ -952,7 +952,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)#
-@@ -1042,7 +1042,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-
-@@ -1647,7 +1647,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.
-@@ -2261,7 +2261,7 @@
- # connections in order to oper up. It is highly recommended to load
- # this module if you use TLS (SSL) on your network.
- # For how to use the oper features, please see the first
--# example <oper> tag in opers.conf.example.
-+# example <oper> tag in opers.conf.
- #
- #<module name="sslinfo">
- #
-diff --git a/docs/conf/motd.txt.example b/docs/conf/motd.txt
-similarity index 96%
-rename from docs/conf/motd.txt.example
-rename to docs/conf/motd.txt
-index cd993e9a3..0687a8aa0 100644
---- a/docs/conf/motd.txt.example
-+++ b/docs/conf/motd.txt
-@@ -21,7 +21,7 @@
-         \__/  /(_/     \__/
-           (__/
- 
--      +---- To change this see \bmotd.txt.example\x ----+
-+      +---- To change this see \bmotd.txt        \x ----+
-       |                                             |
-       |   * \bWeb:\x https://www.inspircd.org           |
-       |   * \bIRC:\x irc.inspircd.org #inspircd         |
-diff --git a/docs/conf/opermotd.txt.example b/docs/conf/opermotd.txt
-similarity index 96%
-rename from docs/conf/opermotd.txt.example
-rename to docs/conf/opermotd.txt
-index b0d9b4816..b0d37f385 100644
---- a/docs/conf/opermotd.txt.example
-+++ b/docs/conf/opermotd.txt
-@@ -21,7 +21,7 @@
-         \__/  /(_/     \__/
-           (__/
- 
--      +-- To change this see \bopermotd.txt.example\x --+
-+      +-- To change this see \bopermotd.txt        \x --+
-       |                                             |
-       |   * \bWeb:\x https://www.inspircd.org           |
-       |   * \bIRC:\x irc.inspircd.org #inspircd         |
-diff --git a/docs/conf/opers.conf.example b/docs/conf/opers.conf
-similarity index 99%
-rename from docs/conf/opers.conf.example
-rename to docs/conf/opers.conf
-index d8c266b1f..9517b3685 100644
---- a/docs/conf/opers.conf.example
-+++ b/docs/conf/opers.conf
-@@ -182,4 +182,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/dronebl.conf.example b/docs/conf/providers/dronebl.conf.example
-deleted file mode 100644
-index 72055d522..000000000
---- a/docs/conf/providers/dronebl.conf.example
-+++ /dev/null
-@@ -1,11 +0,0 @@
--# This file contains configuration for using the dnsbl module with
--# the DroneBL DNSBL. See https://dronebl.org/ for more information on
--# DroneBL.
--
--<dnsbl name="DroneBL"
--       domain="dnsbl.dronebl.org"
--       type="record"
--       records="3,5,6,7,8,9,10,11,13,14,15,16,17,19"
--       action="zline"
--       duration="7d"
--       reason="You are listed in DroneBL. Please visit https://dronebl.org/lookup.do?ip=%ip% for more information.">
-diff --git a/docs/conf/providers/efnet-rbl.conf.example b/docs/conf/providers/efnet-rbl.conf.example
-deleted file mode 100644
-index 78dce53cb..000000000
---- a/docs/conf/providers/efnet-rbl.conf.example
-+++ /dev/null
-@@ -1,11 +0,0 @@
--# This file contains configuration for using the dnsbl module with
--# the EFnet RBL. See https://rbl.efnetrbl.org/ for more information
--# on the EFnet RBL.
--
--<dnsbl name="EFnet RBL"
--       domain="rbl.efnetrbl.org"
--       type="record"
--       records="1,2,3,4,5"
--       action="zline"
--       duration="7d"
--       reason="You are listed in the EFnet RBL. Please visit https://rbl.efnetrbl.org/?i=%ip% for more information.">
-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/torexit.conf.example b/docs/conf/providers/torexit.conf.example
-deleted file mode 100644
-index abc35c696..000000000
---- a/docs/conf/providers/torexit.conf.example
-+++ /dev/null
-@@ -1,12 +0,0 @@
--# This file contains configuration for using the dnsbl module with
--# the dan.me.uk Tor exit node DNSBL. See https://www.dan.me.uk/dnsbl
--# for more information on the dan.me.uk Tor exit node DNSBL.
--
--<dnsbl name="torexit.dan.me.uk"
--       domain="torexit.dan.me.uk"
--       type="record"
--       records="100"
--       timeout="10s"
--       action="zline"
--       duration="7d"
--       reason="Tor exit nodes are not allowed on this network. See https://metrics.torproject.org/rs.html#search/%ip% for more information.">
-diff --git a/docs/conf/quotes.txt.example b/docs/conf/quotes.txt
-similarity index 100%
-rename from docs/conf/quotes.txt.example
-rename to docs/conf/quotes.txt
-diff --git a/docs/conf/services/anope.conf.example b/docs/conf/services/anope.conf
-similarity index 86%
-rename from docs/conf/services/anope.conf.example
-rename to docs/conf/services/anope.conf
-index 5c8f859ff..69a1ab50a 100644
---- a/docs/conf/services/anope.conf.example
-+++ b/docs/conf/services/anope.conf
-@@ -2,7 +2,7 @@
- # by Anope. See https://www.anope.org for more information on Anope.
- 
- # This file inherits from the generic config to avoid repetition.
--<include file="examples/services/generic.conf.example">
-+<include file="/etc/inspircd/services/generic.conf">
- 
- # /GLOBAL <message>
- # Sends a global notice.
-diff --git a/docs/conf/services/atheme.conf.example b/docs/conf/services/atheme.conf
-similarity index 98%
-rename from docs/conf/services/atheme.conf.example
-rename to docs/conf/services/atheme.conf
-index d509522b8..c1e906ff7 100644
---- a/docs/conf/services/atheme.conf.example
-+++ b/docs/conf/services/atheme.conf
-@@ -3,7 +3,7 @@
- # information on Atheme.
- 
- # This file inherits from the generic config to avoid repetition.
--<include file="examples/services/generic.conf.example">
-+<include file="/etc/inspircd/services/generic.conf">
- 
- # Long hand aliases for services pseudoclients.
- <alias text="ALIS"      replace="SQUERY $requirement :$2-" requires="ALIS"      uline="yes">
-diff --git a/docs/conf/services/generic.conf.example b/docs/conf/services/generic.conf
-similarity index 100%
-rename from docs/conf/services/generic.conf.example
-rename to docs/conf/services/generic.conf
-diff --git a/make/template/main.mk b/make/template/main.mk
-index a8783aa05..de9bbaa4e 100644
---- a/make/template/main.mk
-+++ b/make/template/main.mk
-@@ -214,10 +214,10 @@ install: target
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(BINPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(DATPATH)
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/codepages
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/providers
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/services
--	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(EXAPATH)/sql
-+	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/codepages
-+	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/providers
-+	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/services
-+	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(CONPATH)/sql
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(LOGPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MANPATH)
- 	@-$(INSTALL) -d -g @GID@ -o @UID@ -m $(INSTMODE_DIR) $(MODPATH)
-@@ -238,11 +238,11 @@ endif
- 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/inspircd-testssl.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_BIN) tools/testssl $(BINPATH)/inspircd-testssl 2>/dev/null
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.example $(EXAPATH)
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/*.example $(EXAPATH)/codepages
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/*.example $(EXAPATH)/providers
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/*.example $(EXAPATH)/services
--	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(EXAPATH)/sql
-+	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/*.{conf,txt} $(CONPATH)
-+	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/codepages/* $(CONPATH)/codepages
-+	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/providers/* $(CONPATH)/providers
-+	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services
-+	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql
- 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) @CONFIGURE_DIRECTORY@/help.txt $(CONPATH)
- 	-$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) @CONFIGURE_DIRECTORY@/*.pem $(CONPATH) 2>/dev/null
- 	@echo ""
-@@ -256,7 +256,6 @@ endif
- 	@echo '  Data:' $(DATPATH)
- 	@echo 'To start the ircd, run:' $(SCRPATH)/inspircd start
- 	@echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf
--	@echo 'Examples are available at:' $(EXAPATH)
- 
- GNUmakefile: make/template/main.mk src/version.sh configure @CONFIGURE_CACHE_FILE@
- 	./configure --update

diff --git a/net-irc/inspircd/inspircd-3.10.0.ebuild b/net-irc/inspircd/inspircd-3.10.0.ebuild
index 3dfa1dea335..ca68956f4dc 100644
--- a/net-irc/inspircd/inspircd-3.10.0.ebuild
+++ b/net-irc/inspircd/inspircd-3.10.0.ebuild
@@ -8,6 +8,7 @@ inherit toolchain-funcs
 DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd"
 HOMEPAGE="https://www.inspircd.org/"
 SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-fix-path-builds.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -32,7 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 
 DOCS=( docs/. )
-PATCHES=( "${FILESDIR}"/${P}-fix-path-builds.patch )
+PATCHES=( "${WORKDIR}"/${P}-fix-path-builds.patch )
 
 src_prepare() {
 	default