From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- net-irc/inspircd/Manifest | 13 +- .../files/inspircd-2.0.23-fix-path-builds.patch | 253 --------------------- net-irc/inspircd/files/inspircd-r2.initd | 48 ---- net-irc/inspircd/files/inspircd-r3.confd | 33 --- net-irc/inspircd/files/inspircd-r3.initd | 48 ---- net-irc/inspircd/files/inspircd.confd | 5 - net-irc/inspircd/files/inspircd.initd | 48 ++++ net-irc/inspircd/inspircd-2.0.23.ebuild | 106 --------- net-irc/inspircd/inspircd-2.0.25.ebuild | 6 +- net-irc/inspircd/inspircd-2.0.26.ebuild | 6 +- 10 files changed, 58 insertions(+), 508 deletions(-) delete mode 100644 net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch delete mode 100644 net-irc/inspircd/files/inspircd-r2.initd delete mode 100644 net-irc/inspircd/files/inspircd-r3.confd delete mode 100644 net-irc/inspircd/files/inspircd-r3.initd create mode 100644 net-irc/inspircd/files/inspircd.initd delete mode 100644 net-irc/inspircd/inspircd-2.0.23.ebuild (limited to 'net-irc/inspircd') diff --git a/net-irc/inspircd/Manifest b/net-irc/inspircd/Manifest index 9dd1e5194324..1b39767ceb6b 100644 --- a/net-irc/inspircd/Manifest +++ b/net-irc/inspircd/Manifest @@ -1,14 +1,9 @@ -AUX inspircd-2.0.23-fix-path-builds.patch 9669 BLAKE2B 8b6612800028658cf231be62fbdd92638bfbc64fc1e9634bfbbdfe997f2915f583aba8ee41fbf98f44e016b1bdf17936017d5e9217c29aa404576167526f9d1b SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9 AUX inspircd-2.0.25-fix-path-builds.patch 9669 BLAKE2B 8b6612800028658cf231be62fbdd92638bfbc64fc1e9634bfbbdfe997f2915f583aba8ee41fbf98f44e016b1bdf17936017d5e9217c29aa404576167526f9d1b SHA512 0595199d8c5c44ea3dff19e08d4a1fe9bb5011befbafe7b58fce2cf7678f30cbaa6ceedb408141519f4068c3b96dbc41aecb8112d180ca66e9deff00390935d9 AUX inspircd-2.0.26-fix-path-builds.patch 9655 BLAKE2B eaf233df43b48a156bee13e8113ff185b9fd3fb04686620e4759a5cc3a1d055f984b8cfe2ba32e2ad48d32386c34579b37161f7a1a82b9aa9e2356263f865314 SHA512 86117ecf4cdbec2181b48ff3737c6c4eda71d7bfdd3c6b3b6a195a79cfc6c884b5d6b9e7ba41a1943c39458e1d69a3a0f2e6b6338da7b846230e50f51064b402 -AUX inspircd-r2.initd 1390 BLAKE2B 870d3d458d28d7e6b7622659e712e4dfa4f525c8e77a5f92e64bc63c1ec50db702d484a389eaca014e1e5fb572bd092c17768d0d23b187dacdddeaac6d0e65a3 SHA512 88dcc6c50ebf4d16b97c193ca42185d66e7184c1b5bfb10bf807aef773e868ceb814dbcb57e121cc69d55f541aa7aaff093bb0d91938887e5bacd126ba931700 -AUX inspircd-r3.confd 1224 BLAKE2B 84545ec9acdb9c0a4368f64cbfb4a2483d487f3664818951aa0a952b4dfa270f5738a5016fe64057791f2b4002ce207fb42ff8128734cab4ab9b856c8a0ebda4 SHA512 5c47c8588bf39e33e07584492fc672ffe5529b80d7d357ff48d7b6b3bd89a58915c856eeb78d7a68aa2897760a086c193b661641d8a0741c602010d9d0d0efd2 -AUX inspircd-r3.initd 1189 BLAKE2B 1149e138cdcc189e53857538023a63b68261d6434f3b987fd74a2fe4c5b58087bcac6c42bd5c09262db2eafc29ef11847d1f8c000db663bec9851d64ae168dda SHA512 30bf71ec6fde9eb73f87179f55d33ec64367e447dba2c2ab5e383cd6b16e8f7db446a28017b115443e321305e245558f1f706185c4c2fb45c709380ac8cf67ff -AUX inspircd.confd 1343 BLAKE2B d2ecb9509e9be700894bb2c9c85d8f68aed7b082f6b32bebed936424df294f7bf1ab80d0d1225744463b782165ec4c07e02c709b8f958ddcc5e4084527cc72c6 SHA512 23cd6b51f92c3054152bb268e87461e5b59960ffd2f8ce209223ba03a9de7d9e76336d104805904dcfdb59c65af318dbfab11417848b2433cb96a17f0af74903 -DIST inspircd-2.0.23.tar.gz 731695 BLAKE2B 58cd38af6244926f620a7e65b14d44062cc5aacb3aed394b736062f9f5ac0c2b689f8967e2e9577570766547bf8f694e1762bab71114dda9414e05ba8e01bfd2 SHA512 93a3dab04e797cfde158de8c2e959d1bb5df115aa3fe5a4066cdf9f56cb0c548fd2664a12d61bf2dbdb45549577974be99a0d6ffc6114c72cf0697f5ca4f85bb +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.26.tar.gz 735414 BLAKE2B 817a96c95b3360cadfcf69ab093b0bbd0f5b89e66a1b03f0c5916e2a4c514fa529dc4094368b2f03ef98bfe89c584a9a6a555d2ee9e33c7e6b0b4784bccba946 SHA512 950982629eab0dabeac9e7f2ab6e8b923bc5dafa978280cb91aa28c40997b7cfac2e4d39d74bb4c9cdb8f818205cc17bf782ec86f0aae966cb9c47bbf8143d1a -EBUILD inspircd-2.0.23.ebuild 2881 BLAKE2B 27bcd6028bcfbf5f0cf8889669b53fb4d0197c8d0fe366497a413f49c73d8fbf6ff930c1e499c3bb0980ba4ba7a29eb2b746dc50b1df3fba8955412f50444250 SHA512 bfa28ed4e8cf27389745b8b0582d76c2265350b2e6f980a40b65a914e5429d9e1bc4c2d88094c36834d86b9dea3479e2be91a554be43f7d51ba9ac4841fd51cb -EBUILD inspircd-2.0.25.ebuild 3369 BLAKE2B daacb1c493bdbec1a6c5ca8e99503c0e868dc5d625737cff09eec5b380c78f6043f5a6d2747b6f5d1c74ae6b5d58f3a5664dd623faed00084a996c2bc0120444 SHA512 7890ce1b66d0a16cdd1576ae4067b65cae3fed113bf5d86aaca1d818b5423c22563e1ba5edb4f9df5e1ad5a21dd6b54dd429b59cbe51d3e0ff83032ea2abdda1 -EBUILD inspircd-2.0.26.ebuild 3171 BLAKE2B 2f0bec0034565b69f1631672ac995a878085cf461db81c35d3831b3dc9b2bf3c39a029763343bb92a09e8d86286a3b67343ca6cb72709b8618cf4b6ea3dfada8 SHA512 d88ac63c77fd88fa468d29900ce4aed990efce30281c985ccb57c44d5f15663b912d384a9dfc42fa6908f2bb8cad6691c8395689d272080475c0a75356b49a37 +EBUILD inspircd-2.0.25.ebuild 3376 BLAKE2B 802a96022a2cad65801d6dab88d2069523ce72914b2558718b39dde9891e6e0b78cd432541add655cdf1a01376ec1f8d216640c9480a84deb36b703345377859 SHA512 fd9a2c56b35f6855a68e8d697df1e63100c0abafdcd7a79b4ca53bc0f65a23876870352c3203e09a4a668844fd01735896d93ace6e60bd8a01e5253c5af9f99e +EBUILD inspircd-2.0.26.ebuild 3178 BLAKE2B c9609fd1e6aab25b0cbe0c6642f57bf9b80eeb7afbe8f7e799c7053e3d8fde884c1424b3a1457b97694fb508c8d45e6e1fa60cd0e6c14a2f24e550e54a9445cc SHA512 ff05b05089ed8ea807efa9b1ec499304b32aac74711e9bf33ec0491147fb678159bdffcb4d9658a77e6276f9c5f7bf63718478a782e27f8464e30c685707d441 MISC metadata.xml 1674 BLAKE2B 4d00f675f380e0bd75adca0eabbf455cdb27dab9a5c8cb170abc670909d647cf5dda0a2f3fbfd9b9cad2ce210cad3ea5d2fa07683d236f6f437be6d6d8be7c40 SHA512 ae6a96d1093024c9796788dea7fb23c8d2bb51ddea56eeb041e2443db2730f7f38cdb5fde42911ba75dd0cdfc4eac2c9c424f87660361d65cac6766729a60d98 diff --git a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch deleted file mode 100644 index debf62a15f5e..000000000000 --- a/net-irc/inspircd/files/inspircd-2.0.23-fix-path-builds.patch +++ /dev/null @@ -1,253 +0,0 @@ -diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example ---- a/docs/conf/inspircd.conf.example 2015-05-10 00:24:10.000000000 -0500 -+++ b/docs/conf/inspircd.conf.example 2015-07-27 05:22:26.107849785 -0500 -@@ -412,11 +412,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 -#-#-#-#-#-#-#-#-#-# - # # -@@ -426,7 +426,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. -@@ -472,7 +473,7 @@ - # the default of 'inspircd.pid' is used. # - # # - --# -+ - - #-#-#-#-#-#-#-#-#-#-#-#-#- BANLIST LIMITS #-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # # -@@ -953,7 +954,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 -@@ -965,10 +966,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 -Nuar a/docs/conf/modules.conf.example b/docs/conf/modules.conf.example ---- a/docs/conf/modules.conf.example 2016-02-28 17:38:30.492335461 -0600 -+++ b/docs/conf/modules.conf.example 2016-02-28 17:39:20.068559846 -0600 -@@ -315,7 +315,7 @@ - # specify some censor tags. See also: # - # http://wiki.inspircd.org/Modules/censor # - # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # CGI:IRC module: Adds support for automatic host changing in CGI:IRC -@@ -778,7 +778,7 @@ - # specify below the path to the filter.conf file, or define some # - # tags. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Gecos ban: Implements extended ban 'r', which stops anyone matching -@@ -834,7 +834,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- -@@ -1284,7 +1284,7 @@ - # Read the comment above in # - # inspircd.conf.example for details. # - # # --# -+# - - #-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-#-# - # Override module: Adds support for oper override. -diff -Nuar a/make/template/main.mk b/make/template/main.mk ---- a/make/template/main.mk 2015-05-10 00:24:10.000000000 -0500 -+++ b/make/template/main.mk 2015-07-27 05:22:26.107849785 -0500 -@@ -34,7 +34,7 @@ - SYSTEM = @SYSTEM@ - BUILDPATH = @BUILD_DIR@ - SOCKETENGINE = @SOCKETENGINE@ --CXXFLAGS = -pipe -fPIC -DPIC -+MYCXXFLAGS = -pipe -fPIC -DPIC - LDLIBS = -pthread -lstdc++ - LDFLAGS = - CORELDFLAGS = -rdynamic -L. $(LDFLAGS) -@@ -51,9 +51,9 @@ - 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 - - -@@ -75,46 +75,46 @@ - 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 - -@@ -134,10 +134,11 @@ - @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 -@@ -150,10 +151,10 @@ - @GNU_ONLY TARGET = modules/$(M:.so=).so - @ENDIF - --@IFDEF T -+@IFDEF TGT - HEADER = - FOOTER = target -- TARGET = $(T) -+ TARGET = $(TGT) - @ENDIF - - @IFEQ $(DBGOK) 0 -@@ -228,8 +229,8 @@ - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/data - @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)/logs - @-$(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 -@@ -237,9 +238,9 @@ - @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! *" -@@ -252,7 +253,7 @@ - @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 -Nuar a/make/unit-cc.pl b/make/unit-cc.pl ---- a/make/unit-cc.pl 2015-05-10 00:24:10.000000000 -0500 -+++ b/make/unit-cc.pl 2015-07-27 05:22:26.107849785 -0500 -@@ -113,7 +113,7 @@ - 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-r2.initd b/net-irc/inspircd/files/inspircd-r2.initd deleted file mode 100644 index 653e501627e6..000000000000 --- a/net-irc/inspircd/files/inspircd-r2.initd +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -INSPIRCD_USER=${INSPIRCD_USER:-"inspircd"} -INSPIRCD_GROUP=${INSPIRCD_GROUP:-"inspircd"} -INSPIRCD_CONFIGFILE=${INSPIRCD_CONFIGFILE:-"/etc/inspircd/inspircd.conf"} -INSPIRCD_LOGFILE=${INSPIRCD_LOGFILE:-"/var/log/inspircd/ircd.log"} -INSPIRCD_PIDFILE=${INSPIRCD_PIDFILE:-"/run/inspircd/inspircd.pid"} -INSPIRCD_SSDARGS=${INSPIRCD_SSDARGS:-"--quiet --user \"${INSPIRCD_USER}\" --wait 1000"} -INSPIRCD_TERMTIMEOUT=${INSPIRCD_TERMTIMEOUT:-"TERM/25/KILL/5"} -INSPIRCD_OPTS=${INSPIRCD_OPTS:-""} - -command="/usr/bin/inspircd" -command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\" --logfile \"${INSPIRCD_LOGFILE}\"" -start_stop_daemon_args="${INSPIRCD_SSDARGS}" -pidfile="${INSPIRCD_PIDFILE}" -retry="${INSPIRCD_TERMTIMEOUT}" - -required_files="${INSPIRCD_CONFIGFILE}" - -name="InspIRCd" - -description="InspIRCd is a modular Internet Relay Chat (IRC) server." - -extra_commands="version" -extra_started_commands="rehash" - -depend() { - use dns - provide ircd -} - -start_pre() { - checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")" -} - -rehash() { - ebegin "Rehashing InspIRCd" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} - -version() { - ebegin "Retrieve InspIRCd version" - ${command} --version - eend $? -} diff --git a/net-irc/inspircd/files/inspircd-r3.confd b/net-irc/inspircd/files/inspircd-r3.confd deleted file mode 100644 index af9b3fe15e22..000000000000 --- a/net-irc/inspircd/files/inspircd-r3.confd +++ /dev/null @@ -1,33 +0,0 @@ -# Distributed under the terms of the GNU General Public License v2 - -# Location of configuration file. Modify if you don't like the standard -# one. -# -#INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf" - -# File used to store the PID file. Usually you won't need to touch it. -# If you are changing PID file do not forget to set new PID file in -# INSPIRCD_CONFIGFILE as well. -# -#INSPIRCD_PIDFILE="/run/inspircd/inspircd.pid" - -# User to run InspIRCd as -# -#INSPIRCD_USER="inspircd" -#INSPIRCD_GROUP="inspircd" - -# You can use this configuration option to pass additional options to the -# start-stop-daemon, see start-stop-daemon(8) for more details. -# Per default we start InspIRCd without any output (quiet) -# as user $INSPIRCD_USER and wait 1000ms after we have started the service -# to ensure that the daemon is really up and running. -#INSPIRCD_SSDARGS="--quiet --user \"${INSPIRCD_USER}\" --wait 1000" - -# The termination timeout (start-stop-daemon parameter "retry") ensures -# that the service will be terminated within a given time (25 + 5 seconds -# per default) when you are stopping the service. -#INSPIRCD_TERMTIMEOUT="TERM/25/KILL/5" - -# Options to collectd -# See `/usr/bin/inspircd --help` for more details -#INSPIRCD_OPTS="" diff --git a/net-irc/inspircd/files/inspircd-r3.initd b/net-irc/inspircd/files/inspircd-r3.initd deleted file mode 100644 index 4d8dac819368..000000000000 --- a/net-irc/inspircd/files/inspircd-r3.initd +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -: ${INSPIRCD_USER:="inspircd"} -: ${INSPIRCD_GROUP:="inspircd"} -: ${INSPIRCD_CONFIGFILE:="/etc/inspircd/inspircd.conf"} -: ${INSPIRCD_PIDFILE:="/run/inspircd/inspircd.pid"} -: ${INSPIRCD_SSDARGS:="--quiet --wait 1000"} -: ${INSPIRCD_TERMTIMEOUT:="TERM/25/KILL/5"} -: ${INSPIRCD_OPTS:=""} - -command="/usr/bin/inspircd" -command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\"" -command_user="${INSPIRCD_USER}" -start_stop_daemon_args="${INSPIRCD_SSDARGS}" -pidfile="${INSPIRCD_PIDFILE}" -retry="${INSPIRCD_TERMTIMEOUT}" - -required_files="${INSPIRCD_CONFIGFILE}" - -name="InspIRCd" - -description="InspIRCd is a modular Internet Relay Chat (IRC) server." - -extra_commands="version" -extra_started_commands="rehash" - -depend() { - use dns - provide ircd -} - -start_pre() { - checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")" -} - -rehash() { - ebegin "Rehashing InspIRCd" - start-stop-daemon --signal HUP --pidfile "${pidfile}" - eend $? -} - -version() { - ebegin "Retrieve InspIRCd version" - ${command} --version - eend $? -} diff --git a/net-irc/inspircd/files/inspircd.confd b/net-irc/inspircd/files/inspircd.confd index 1291f9fd552f..af9b3fe15e22 100644 --- a/net-irc/inspircd/files/inspircd.confd +++ b/net-irc/inspircd/files/inspircd.confd @@ -5,11 +5,6 @@ # #INSPIRCD_CONFIGFILE="/etc/inspircd/inspircd.conf" -# Location of log file. Modify if you don't like the standard -# one. -# -#INSPIRCD_LOGFILE="/var/log/inspircd/ircd.log" - # File used to store the PID file. Usually you won't need to touch it. # If you are changing PID file do not forget to set new PID file in # INSPIRCD_CONFIGFILE as well. diff --git a/net-irc/inspircd/files/inspircd.initd b/net-irc/inspircd/files/inspircd.initd new file mode 100644 index 000000000000..4d8dac819368 --- /dev/null +++ b/net-irc/inspircd/files/inspircd.initd @@ -0,0 +1,48 @@ +#!/sbin/openrc-run +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +: ${INSPIRCD_USER:="inspircd"} +: ${INSPIRCD_GROUP:="inspircd"} +: ${INSPIRCD_CONFIGFILE:="/etc/inspircd/inspircd.conf"} +: ${INSPIRCD_PIDFILE:="/run/inspircd/inspircd.pid"} +: ${INSPIRCD_SSDARGS:="--quiet --wait 1000"} +: ${INSPIRCD_TERMTIMEOUT:="TERM/25/KILL/5"} +: ${INSPIRCD_OPTS:=""} + +command="/usr/bin/inspircd" +command_args="${INSPIRCD_OPTS} --config \"${INSPIRCD_CONFIGFILE}\"" +command_user="${INSPIRCD_USER}" +start_stop_daemon_args="${INSPIRCD_SSDARGS}" +pidfile="${INSPIRCD_PIDFILE}" +retry="${INSPIRCD_TERMTIMEOUT}" + +required_files="${INSPIRCD_CONFIGFILE}" + +name="InspIRCd" + +description="InspIRCd is a modular Internet Relay Chat (IRC) server." + +extra_commands="version" +extra_started_commands="rehash" + +depend() { + use dns + provide ircd +} + +start_pre() { + checkpath --directory --mode 0750 --owner ${INSPIRCD_USER}:${INSPIRCD_GROUP} "$(dirname "${INSPIRCD_PIDFILE}")" +} + +rehash() { + ebegin "Rehashing InspIRCd" + start-stop-daemon --signal HUP --pidfile "${pidfile}" + eend $? +} + +version() { + ebegin "Retrieve InspIRCd version" + ${command} --version + eend $? +} diff --git a/net-irc/inspircd/inspircd-2.0.23.ebuild b/net-irc/inspircd/inspircd-2.0.23.ebuild deleted file mode 100644 index 78dbcfc29285..000000000000 --- a/net-irc/inspircd/inspircd-2.0.23.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -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="geoip gnutls ipv6 ldap mysql pcre posix postgres sqlite ssl tre" - -RDEPEND=" - dev-lang/perl - ssl? ( dev-libs/openssl:= ) - geoip? ( dev-libs/geoip ) - gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) - ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql:= ) - pcre? ( dev-libs/libpcre ) - sqlite? ( >=dev-db/sqlite-3.0 ) - tre? ( dev-libs/tre )" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}"/${PN}-2.0.23-fix-path-builds.patch ) - -pkg_setup() { - enewgroup ${PN} - enewuser ${PN} -1 -1 -1 ${PN} -} - -src_prepare() { - # Patch the inspircd launcher with the inspircd user - sed -i -e "s/@UID@/${PN}/" "${S}/make/template/${PN}" || die - - default_src_prepare -} - -src_configure() { - local extras="" - - use geoip && extras="${extras}m_geoip.cpp," - use gnutls && extras="${extras}m_ssl_gnutls.cpp," - use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp," - use mysql && extras="${extras}m_mysql.cpp," - use pcre && extras="${extras}m_regex_pcre.cpp," - use posix && extras="${extras}m_regex_posix.cpp," - use postgres && extras="${extras}m_pgsql.cpp," - use sqlite && extras="${extras}m_sqlite3.cpp," - use ssl && extras="${extras}m_ssl_openssl.cpp," - use tre && extras="${extras}m_regex_tre.cpp," - - if [[ -n "${extras}" ]]; then - econf --disable-interactive --enable-extras=${extras%,} - fi - - econf \ - --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' '') -} - -src_compile() { - emake V=1 LDFLAGS="${LDFLAGS}" CXXFLAGS="${CXXFLAGS}" -} - -src_install() { - emake INSTUID=${PN} DESTDIR="${D%/}" install - - insinto "/usr/include/${PN}" - doins -r include/. - - diropts -o"${PN}" -g"${PN}" -m0700 - dodir "/var/lib/${PN}" - dodir "/var/lib/${PN}/data" - - newinitd "${FILESDIR}/${PN}-r2.initd" "${PN}" - newconfd "${FILESDIR}/${PN}.confd" "${PN}" - - keepdir "/var/log/${PN}" -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog "Before starting ${PN} the first time, you should create" - elog "the /etc/${PN}/${PN}.conf file." - elog "You can find example configuration files under /etc/${PN}" - elog "Read the ${PN}.conf.example file carefully before " - elog "(re)starting the service." - elog - fi -} diff --git a/net-irc/inspircd/inspircd-2.0.25.ebuild b/net-irc/inspircd/inspircd-2.0.25.ebuild index 746628c56e7b..792cca4e9ae7 100644 --- a/net-irc/inspircd/inspircd-2.0.25.ebuild +++ b/net-irc/inspircd/inspircd-2.0.25.ebuild @@ -20,7 +20,7 @@ RDEPEND=" geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) + mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) @@ -90,8 +90,8 @@ src_install() { dodir "/var/lib/${PN}" dodir "/var/lib/${PN}/data" - newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}" - newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" keepdir "/var/log/${PN}" diff --git a/net-irc/inspircd/inspircd-2.0.26.ebuild b/net-irc/inspircd/inspircd-2.0.26.ebuild index ead8598ef2c7..902f26ec9266 100644 --- a/net-irc/inspircd/inspircd-2.0.26.ebuild +++ b/net-irc/inspircd/inspircd-2.0.26.ebuild @@ -20,7 +20,7 @@ RDEPEND=" geoip? ( dev-libs/geoip ) gnutls? ( net-libs/gnutls:= dev-libs/libgcrypt:0 ) ldap? ( net-nds/openldap ) - mysql? ( virtual/mysql ) + mysql? ( dev-db/mysql-connector-c:= ) postgres? ( dev-db/postgresql:= ) pcre? ( dev-libs/libpcre ) sqlite? ( >=dev-db/sqlite-3.0 ) @@ -89,8 +89,8 @@ src_install() { einstalldocs - newinitd "${FILESDIR}/${PN}-r3.initd" "${PN}" - newconfd "${FILESDIR}/${PN}-r3.confd" "${PN}" + newinitd "${FILESDIR}/${PN}.initd" "${PN}" + newconfd "${FILESDIR}/${PN}.confd" "${PN}" keepdir "/var/log/${PN}" -- cgit v1.2.3