From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- .../files/inspircd-2.0.17-fix-path-builds.patch | 208 +++++++++++++++++++++ net-irc/inspircd/files/inspircd-2.0.17-init | 39 ++++ .../files/inspircd-2.0.18-fix-path-builds.patch | 208 +++++++++++++++++++++ net-irc/inspircd/files/inspircd-2.0.18-init | 39 ++++ 4 files changed, 494 insertions(+) create mode 100644 net-irc/inspircd/files/inspircd-2.0.17-fix-path-builds.patch create mode 100644 net-irc/inspircd/files/inspircd-2.0.17-init create mode 100644 net-irc/inspircd/files/inspircd-2.0.18-fix-path-builds.patch create mode 100644 net-irc/inspircd/files/inspircd-2.0.18-init (limited to 'net-irc/inspircd/files') diff --git a/net-irc/inspircd/files/inspircd-2.0.17-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.17-fix-path-builds.patch new file mode 100644 index 000000000000..a4e12bbda61f --- /dev/null +++ b/net-irc/inspircd/files/inspircd-2.0.17-fix-path-builds.patch @@ -0,0 +1,208 @@ +diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example +--- a/docs/conf/inspircd.conf.example 2014-07-24 14:24:00.000000000 +0200 ++++ b/docs/conf/inspircd.conf.example 2014-08-09 10:21:01.439999954 +0200 +@@ -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/make/template/main.mk b/make/template/main.mk +--- a/make/template/main.mk 2014-07-24 14:24:00.000000000 +0200 ++++ b/make/template/main.mk 2014-08-09 10:24:59.039999948 +0200 +@@ -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) icc +- 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,41 +75,41 @@ + 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 + + DBGOK=0 +-@IFEQ $(D) 0 +- CXXFLAGS += -O2 ++@IFEQ $(DEBUGLEVEL) 0 ++ MYCXXFLAGS += -O2 + @IFEQ $(CC) gcc +- 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 + +@@ -128,10 +128,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 +@@ -144,10 +145,10 @@ + @GNU_ONLY TARGET = modules/$(M:.so=).so + @ENDIF + +-@IFDEF T ++@IFDEF TGT + HEADER = + FOOTER = target +- TARGET = $(T) ++ TARGET = $(TGT) + @ENDIF + + @IFEQ $(DBGOK) 0 +@@ -222,8 +223,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 +@@ -231,9 +232,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! *" +@@ -246,7 +247,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 2014-07-24 14:24:00.000000000 +0200 ++++ b/make/unit-cc.pl 2014-08-09 10:25:15.089999947 +0200 +@@ -97,7 +97,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-2.0.17-init b/net-irc/inspircd/files/inspircd-2.0.17-init new file mode 100644 index 000000000000..9c81a6bcc95f --- /dev/null +++ b/net-irc/inspircd/files/inspircd-2.0.17-init @@ -0,0 +1,39 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +extra_commands="rehash version" + +depend() { + need net + provide ircd +} + +start() { + ebegin "Starting InspIRCd" + checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd + start-stop-daemon --start --quiet --user inspircd \ + --exec /usr/bin/inspircd -- \ + --config /etc/inspircd/inspircd.conf \ + --logfile /var/log/inspircd/ircd.log + eend $? +} + +stop() { + ebegin "Stopping InspIRCd" + start-stop-daemon --stop --quiet --exec /usr/bin/inspircd + eend $? +} + +rehash() { + ebegin "Rehashing InspIRCd" + /usr/lib/inspircd/inspircd.launcher/inspircd rehash + eend $? +} + +version() { + ebegin "Retrieve InspIRCd version" + /usr/lib/inspircd/inspircd.launcher/inspircd version + eend $? +} diff --git a/net-irc/inspircd/files/inspircd-2.0.18-fix-path-builds.patch b/net-irc/inspircd/files/inspircd-2.0.18-fix-path-builds.patch new file mode 100644 index 000000000000..065ff2ca7fc6 --- /dev/null +++ b/net-irc/inspircd/files/inspircd-2.0.18-fix-path-builds.patch @@ -0,0 +1,208 @@ +diff -Nuar a/docs/conf/inspircd.conf.example b/docs/conf/inspircd.conf.example +--- a/docs/conf/inspircd.conf.example 2014-10-26 18:05:40.000000000 +0100 ++++ b/docs/conf/inspircd.conf.example 2014-10-27 15:03:54.039999807 +0100 +@@ -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/make/template/main.mk b/make/template/main.mk +--- a/make/template/main.mk 2014-10-26 18:05:40.000000000 +0100 ++++ b/make/template/main.mk 2014-10-27 15:08:05.289999800 +0100 +@@ -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,41 +75,41 @@ + 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 + + 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 + +@@ -128,10 +128,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 +@@ -144,10 +145,10 @@ + @GNU_ONLY TARGET = modules/$(M:.so=).so + @ENDIF + +-@IFDEF T ++@IFDEF TGT + HEADER = + FOOTER = target +- TARGET = $(T) ++ TARGET = $(TGT) + @ENDIF + + @IFEQ $(DBGOK) 0 +@@ -222,8 +223,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 +@@ -231,9 +232,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! *" +@@ -246,7 +247,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 2014-10-26 18:05:40.000000000 +0100 ++++ b/make/unit-cc.pl 2014-10-27 15:08:33.819999800 +0100 +@@ -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-2.0.18-init b/net-irc/inspircd/files/inspircd-2.0.18-init new file mode 100644 index 000000000000..9c81a6bcc95f --- /dev/null +++ b/net-irc/inspircd/files/inspircd-2.0.18-init @@ -0,0 +1,39 @@ +#!/sbin/runscript +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +extra_commands="rehash version" + +depend() { + need net + provide ircd +} + +start() { + ebegin "Starting InspIRCd" + checkpath -d -m 0750 -o inspircd:inspircd /var/run/inspircd + start-stop-daemon --start --quiet --user inspircd \ + --exec /usr/bin/inspircd -- \ + --config /etc/inspircd/inspircd.conf \ + --logfile /var/log/inspircd/ircd.log + eend $? +} + +stop() { + ebegin "Stopping InspIRCd" + start-stop-daemon --stop --quiet --exec /usr/bin/inspircd + eend $? +} + +rehash() { + ebegin "Rehashing InspIRCd" + /usr/lib/inspircd/inspircd.launcher/inspircd rehash + eend $? +} + +version() { + ebegin "Retrieve InspIRCd version" + /usr/lib/inspircd/inspircd.launcher/inspircd version + eend $? +} -- cgit v1.2.3-65-gdbad