From 129160ec854dca4c3fedb5bcfbcb56930371da0f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 1 Jan 2021 21:06:00 +0000 Subject: gentoo new year resync : 01.01.2021 --- net-irc/inspircd/Manifest | 6 - .../files/inspircd-2.0.27-fix-path-builds.patch | 257 ------------------- .../files/inspircd-3.4.0-fix-path-builds.patch | 271 --------------------- net-irc/inspircd/inspircd-2.0.29.ebuild | 115 --------- net-irc/inspircd/inspircd-3.4.0-r1.ebuild | 121 --------- 5 files changed, 770 deletions(-) delete mode 100644 net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch delete mode 100644 net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch delete mode 100644 net-irc/inspircd/inspircd-2.0.29.ebuild delete mode 100644 net-irc/inspircd/inspircd-3.4.0-r1.ebuild (limited to 'net-irc/inspircd') diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest index a519c123abe1..2c7cad7bea0c 100644 --- a/net-irc/inspircd/Manifest +++ b/net-irc/inspircd/Manifest @@ -1,12 +1,6 @@ -AUX inspircd-2.0.27-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402 -AUX inspircd-3.4.0-fix-path-builds.patch 12942 BLAKE2B 7fe7bc904331f2cff3a27268af3a0bfe4db6fdec57ca3b846af43d8949aa047340cdc5c7d858fa96527aa3fa8af0774dbe2a8b3035f17962511b21ab94707b07 SHA512 54c773df0c4b48af2f83bcf6923c2679a9c46ac57232834cb1157b9d6528f39b2de1187e6b6989046509d434b3cfa427b77ff80b33b58b88c72d73087dc7a14b AUX inspircd-3.7.0-fix-path-builds.patch 16417 BLAKE2B 9961fa65037cd34eec1cd07ad6093d0cded8d6a148bec41ac396dc67329ec97f3533aeab4cb38be0c2c0c783659b603e6d69e7b9a01faf81a9b2dfe5214288a6 SHA512 a74516ef425269d15beee9568cc8ecb3016c595f1c1a5157848ab81c9644aaeb8cb61899f81b426485881e27c4564373519d1a36412816d97bde168d138b449b AUX inspircd.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2 AUX inspircd.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff -DIST inspircd-2.0.29.tar.gz 736116 BLAKE2B bd634b81e5a21f4d5e12a4057c4dfb65a241b696be373d24a047594d1d175028dcabff2f28defcf4c340859cfc50637afec755f399c24366e1134c7d69c843f2 SHA512 83da7b089dca8035ffa4f30a2e757661150bb9337aa8124958daa317b44a98fb15fdcb872f8512737b5a39f1b641616eb27c4398d4c8d8fcd40d1f8872bd2052 -DIST inspircd-3.4.0.tar.gz 809845 BLAKE2B 6529d53c3cbff07727eceea5e1eb321bb8b7f6b231b3d5ea3ed0ced01fe5b66c2da83039a1ac11ff49e6536ef482483a9be26762feb30511a0016bab07d6790a SHA512 871fefff5e337dc6228fae223ff7ac534e159b5bfb838419247b1d16339c860b0b939a28dd4610cf3b8c37328b5e6ccba2ddd80adbd27638f4f3fa28e4f99066 DIST inspircd-3.8.1.tar.gz 850997 BLAKE2B aebf085b21b99fae989d5d75c28223cf5ef5aa8f872886af099800683718e51aa3650a8968968e2434de738a5d5770a26f84a02c9b1270dffdc9efdd2e8c9f86 SHA512 be16dd18882bdb424ebeb131e382db073adaf37914e7c8333bd1c266242f2c48e6c721f0ecae72159bca229790413dabee67fd4a4a3c83588c48c8bb15e604fa -EBUILD inspircd-2.0.29.ebuild 3142 BLAKE2B 6a7434a1bf5841638268931c4106c2ff684ba00a7c6887a5d665632bd97ac99f1a38210cd0217c4951ec7a4585397685a3effe3298f9902b020c872056964cf1 SHA512 b0c245ef1d277fd8b9d728a98cef25b30e593faa847b6d5032d606957f5c2b77157dd4878baa8c20bc48ade6a9d471b49b159d2f7d6f5759cd519b6d6fe2d4b8 -EBUILD inspircd-3.4.0-r1.ebuild 3620 BLAKE2B b7e49e080ce8d5a7b418ec12462ebf53af247c494d9c299027d952eede5e9cce243f53ccbd90e000aac7e2a4c490fd6f54228a92943a0093a033e918f169afba SHA512 e0809008918e85cf50af088e13d1c09953fb88416bcb9d63f009ef339ab420329cb7a4eea9189bde9bad1eb51fe3ef7c97d49ce53d2b471e09962ccddafedf76 EBUILD inspircd-3.8.1.ebuild 3620 BLAKE2B 66d60ac155d62c825f6518eb62bbe5e753f0e9e2a2e9e23edc4d233587752149985a1e113508ce1525f7f45d05c742e3d220193e04bf296c1f54e7938f1782f8 SHA512 8a964f1149da171be11c16a397b3343f68f6229697ef7c64f75b069d2022a73eddb278ff89024bbadf5cd135afc599644184d44b6e52ff87451dc6651f6ae26f MISC metadata.xml 1847 BLAKE2B cc3736547cc080f27ac421bba35aee729750ad3a88727fdf3a091641662ee7099a7b736393ec48f97b91d5801cde731e81c433f36dac6bfe1b7195f4a558c33b SHA512 bf96f8b7fbb64c07543f3f89dbfc31b16486a32ba6aba5c30cd90f10ee1c3f97e7d92139f84a985fc0a9f73bec7cd64bc767a33fcf06b1762129a6bd977a94c4 diff --git a/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.27-fix-path-builds.patch deleted file mode 100644 index da00a8491d1f..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.27-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. -- -+ - - # This file has all the information about server links and ulined servers. - # You *MUST* edit it if you intend to link servers. -- -+ - - #-#-#-#-#-#-#-#-#-#- 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 -- -+ - - # 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. # - # # - --# -+ - - #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -994,7 +995,7 @@ - # provide almost all the features of InspIRCd. :) # - # # - # The default does nothing -- we include it for simplicity for you. # -- -+ - - # 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. --# -+# - - # Settings similar to Charybdis IRCd defaults. --# -+# - - - ######################################################################### -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 # - # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # 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 # - # tags. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # 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. # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Hide chans module: Allows users to hide their channels list from non- -@@ -1304,7 +1304,7 @@ - # Read the comment above in # - # inspircd.conf.example for details. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # 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.4.0-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch deleted file mode 100644 index 9bf99a6e74d9..000000000000 --- a/net-irc/inspircd/files/inspircd-3.4.0-fix-path-builds.patch +++ /dev/null @@ -1,271 +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..9cda4baa7 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. --# -+# - - # This file has all the information about server links and ulined servers. - # You *MUST* edit it if you intend to link servers. --# -+# - - #-#-#-#-#-#-#-#-#-#- MISCELLANEOUS CONFIGURATION -#-#-#-#-#-#-#-#-#-# - # # -@@ -507,7 +507,7 @@ - # - # motd - displayed on connect and when a user executes /MOTD - # Modules can also define their own files -- -+ - - # 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. # - # # - --# -+ - - #-#-#-#-#-#-#-#-#-#-#-#-#- 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. # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-# SERVICES CONFIGURATION #-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -1050,13 +1050,13 @@ - # exemptions for services pseudoclients: # - # - # Anope users should uncomment this: --# -+# - # - # Atheme users should uncomment this: --# -+# - # - # Users of other services should uncomment this: --# -+# - - ######################################################################### - # # -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 639f02335..ea51e9b67 100644 ---- a/docs/conf/modules.conf.example -+++ b/docs/conf/modules.conf -@@ -838,7 +838,7 @@ - # anticaps, auditorium-see, auditorium-vis, blockcaps, blockcolor, # - # censor, filter, flood, nickflood, noctcp, nonick, nonotice, # - # regmoderated, stripcolor, and topiclock. # --# See in inspircd.conf.example for a more # -+# See in inspircd.conf for a more # - # detailed list of the restriction modes that can be exempted. # - # These are settable using: /MODE #chan +X : # - # -@@ -874,7 +874,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 -#-#-#-#-#-#-#-#-#-#-#-# -@@ -883,7 +883,7 @@ - # specify below the path to the filter.conf file, or define some # - # tags. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Flash Policy Daemon module: Allows Flash IRC clients (e.g. LightIRC)# -@@ -973,7 +973,7 @@ - # If you specify to use the helpop module, then specify below the # - # path to the helpop.conf file. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Hide chans module: Allows users to hide their channels list from non- -@@ -1551,7 +1551,7 @@ - # onoper - If on, the message is sent on /OPER, otherwise it's # - # only sent when /OPERMOTD is used. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Override module: Adds support for oper override. -@@ -2129,7 +2129,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 tag in opers.conf.example. -+# example tag in opers.conf. - # - # - # -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. -- -+ -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. -- -+ - - # /GLOBAL - # 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. -- -+ - - # Long hand aliases for services pseudoclients. - -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 1e6ba5cd0..3751937eb 100644 ---- a/make/template/main.mk -+++ b/make/template/main.mk -@@ -210,9 +210,9 @@ 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)/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)/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) -@@ -229,10 +229,10 @@ 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/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/providers/* $(CONPATH)/providers -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/conf/services/* $(CONPATH)/services -+ -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_TXT) docs/sql/*.sql $(CONPATH)/sql - -$(INSTALL) -g @GID@ -o @UID@ -m $(INSTMODE_PRV) *.pem $(CONPATH) 2>/dev/null - @echo "" - @echo "*************************************" -@@ -246,7 +246,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.29.ebuild b/net-irc/inspircd/inspircd-2.0.29.ebuild deleted file mode 100644 index 5e0f22ce4574..000000000000 --- a/net-irc/inspircd/inspircd-2.0.29.ebuild +++ /dev/null @@ -1,115 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" -HOMEPAGE="https://inspircd.github.com/" -SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre" - -RDEPEND=" - acct-group/inspircd - acct-user/inspircd - dev-lang/perl - ssl? ( dev-libs/openssl:= ) - geoip? ( dev-libs/geoip ) - gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) - ldap? ( net-nds/openldap ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - pcre? ( dev-libs/libpcre ) - sqlite? ( >=dev-db/sqlite-3.0 ) - tre? ( dev-libs/tre )" -DEPEND="${RDEPEND}" - -DOCS=( docs/. ) -PATCHES=( "${FILESDIR}"/${PN}-2.0.27-fix-path-builds.patch ) - -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 geoip && extras+="m_geoip.cpp," - use gnutls && extras+="m_ssl_gnutls.cpp," - use ldap && extras+="m_ldapauth.cpp,m_ldapoper.cpp," - use mysql && extras+="m_mysql.cpp," - use pcre && extras+="m_regex_pcre.cpp," - use posix && extras+="m_regex_posix.cpp," - use postgres && extras+="m_pgsql.cpp," - use sqlite && extras+="m_sqlite3.cpp," - use ssl && extras+="m_ssl_openssl.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=( - --with-cc="$(tc-getCXX)" - --disable-interactive - --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" - $(usex ipv6 '' '--disable-ipv6') - $(usex gnutls '--enable-gnutls' '') - $(usex ssl '--enable-openssl' '')) - ./configure "${myconf[@]}" -} - -src_compile() { - emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" -} - -src_install() { - emake INSTUID=${PN} DESTDIR="${D}" install - - 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." - break - fi - done -} diff --git a/net-irc/inspircd/inspircd-3.4.0-r1.ebuild b/net-irc/inspircd/inspircd-3.4.0-r1.ebuild deleted file mode 100644 index 174cabeb02b4..000000000000 --- a/net-irc/inspircd/inspircd-3.4.0-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit toolchain-funcs - -DESCRIPTION="Inspire IRCd - The Stable, High-Performance Modular IRCd" -HOMEPAGE="https://inspircd.github.com/" -SRC_URI="https://github.com/inspircd/inspircd/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="debug gnutls ldap maxminddb mbedtls mysql pcre postgres re2 regex-posix regex-stdlib sqlite ssl sslrehashsignal tre" - -RDEPEND=" - acct-group/inspircd - acct-user/inspircd - dev-lang/perl - gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) - ldap? ( net-nds/openldap ) - maxminddb? ( dev-libs/libmaxminddb ) - mbedtls? ( net-libs/mbedtls:= ) - mysql? ( dev-db/mysql-connector-c:= ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql:= ) - re2? ( dev-libs/re2:= ) - sqlite? ( >=dev-db/sqlite-3.0 ) - ssl? ( dev-libs/openssl:= ) - tre? ( dev-libs/tre )" -DEPEND="${RDEPEND}" - -DOCS=( docs/. ) -PATCHES=( "${FILESDIR}"/${PN}-3.4.0-fix-path-builds.patch ) - -src_prepare() { - default - - # Patch the inspircd launcher with the inspircd user - sed -i -e "s/@UID@/${PN}/" "make/template/${PN}" || die -} - -src_configure() { - local extras="" - - use gnutls && extras+="m_ssl_gnutls.cpp," - use ldap && extras+="m_ldap.cpp," - use maxminddb && extras+="m_geo_maxmind.cpp," - use mbedtls && extras+="m_ssl_mbedtls.cpp," - use mysql && extras+="m_mysql.cpp," - use pcre && extras+="m_regex_pcre.cpp," - use postgres && extras+="m_pgsql.cpp," - use re2 && extras+="m_regex_re2.cpp," - use regex-posix && extras+="m_regex_posix.cpp," - use regex-stdlib && extras+="m_regex_stdlib.cpp," - use sqlite && extras+="m_sqlite3.cpp," - use ssl && extras+="m_ssl_openssl.cpp," - use sslrehashsignal && extras+="m_sslrehashsignal.cpp," - use tre && extras+="m_regex_tre.cpp," - - # The first configuration run enables certain "extra" InspIRCd - # modules, the second run generates the actual makefile. - if [[ -n "${extras}" ]]; then - ./configure --disable-interactive --enable-extras=${extras%,} - fi - - local myconf=( - --disable-interactive - --disable-auto-extras - --prefix="/usr/$(get_libdir)/${PN}" - --config-dir="/etc/${PN}" - --data-dir="/var/lib/${PN}/data" - --log-dir="/var/log/${PN}" - --binary-dir="/usr/bin" - --module-dir="/usr/$(get_libdir)/${PN}/modules" - --manual-dir="/usr/share/man") - CXX="$(tc-getCXX)" ./configure "${myconf[@]}" -} - -src_compile() { - emake LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" $(usex debug 'INSPIRCD_DEBUG=2' '') INSPIRCD_VERBOSE=1 -} - -src_install() { - default - - insinto "/usr/include/${PN}" - doins -r include/. - - newinitd "${FILESDIR}/${PN}.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - - keepdir "/var/log/${PN}" - - diropts -o"${PN}" -g"${PN}" -m0700 - keepdir "/var/lib/${PN}/data" -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "You will find example configuration files under " - elog "/usr/share/doc/${PN}" - elog "Read the ${PN}.conf.example file carefully before " - elog "starting the service." - fi - local pv - for pv in ${REPLACING_VERSIONS}; do - if ver_test "${pv}" -lt "2.0.24-r1"; then - elog "Starting with 2.0.24-r1 the daemon is no longer started" - elog "with the --logfile option and you are thus expected to define" - elog "logging in the InspIRCd configuration file if you want it." - fi - if ver_test "${pv}" -lt "3.0.0"; then - elog "Version 3.0 is a major upgrade which contains breaking" - elog "changes. You will need to update your configuration files." - elog "See: https://docs.inspircd.org/3/configuration-changes" - fi - done -} -- cgit v1.2.3