gentoo resync : 10.02.2019

7 files changed, 27 insertions, 266 deletions

diff --git a/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch b/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch
deleted file mode 100644
index 98500509693b..000000000000
--- a/net-irc/anope/files/anope-1.8.7-ldflags-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -aurp a/src/core/Makefile b/src/core/Makefile
---- a/src/core/Makefile	2010-10-10 19:55:31.396999906 +0000
-+++ b/src/core/Makefile	2010-10-10 19:53:54.877001245 +0000
-@@ -24,7 +24,7 @@ distclean: spotless
- 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
- 
- .o.s:
--	$(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
-+	$(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
- 	@$(TOUCH) $*.s
- 
- subs:
-diff -aurp a/src/modules/Makefile b/src/modules/Makefile
---- a/src/modules/Makefile	2010-10-10 19:55:32.486000023 +0000
-+++ b/src/modules/Makefile	2010-10-10 19:54:07.240000026 +0000
-@@ -27,7 +27,7 @@ distclean: spotless
- 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
- 
- .o.s:
--	$(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
-+	$(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
- 	@$(TOUCH) $*.s
- 
- subs:
-diff -aurp a/src/protocol/Makefile b/src/protocol/Makefile
---- a/src/protocol/Makefile	2010-10-10 19:55:33.605002302 +0000
-+++ b/src/protocol/Makefile	2010-10-10 19:54:19.271997806 +0000
-@@ -24,7 +24,7 @@ distclean: clean spotless
- 	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
- 
- .o.s:
--	$(CC) ${SHARED} ../mod_version.o  $< -o $*.so ${PROFILE}
-+	$(CC) $(CFLAGS) $(LDFLAGS) ${SHARED} ../mod_version.o  $< -o $*.so ${PROFILE}
- 	@$(TOUCH) $*.s
- 
- subs:
---- a/src/tools/Makefile	2011-12-28 20:00:00.646427623 +0000
-+++ b/src/tools/Makefile	2011-12-28 20:00:41.030430806 +0000
-@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}'
-    	   'RUNGROUP=${RUNGROUP}' 
- 
- .c.o:
--	$(CC) $(CFLAGS) -I../include/ $< -o $*
-+	$(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $*
- 
- all: ${OBJS}
- 
diff --git a/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch b/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch
deleted file mode 100644
index 7a86d0f517b9..000000000000
--- a/net-irc/anope/files/anope-1.8.7-libdir-gentoo.patch
+++ /dev/null
@@ -1,91 +0,0 @@
---- configure.in
-+++ configure.in
-@@ -286,6 +286,15 @@
- ])
- 
- AC_SUBST(DATDEST)
-+
-+AC_ARG_WITH(libdir, [ --with-libdir=libdir   Specify the location of the services lib folder], [
-+ AC_DEFINE_UNQUOTED(LIB_DIR,"$withval","services lib dir")
-+ AC_DEFINE_UNQUOTED(MODULE_PATH,"${withval}/modules/","Module dir")
-+ DATDEST=$withval
-+ MODULE_PATH=${withval}/modules/
-+])
-+
-+AC_SUBST(LIB_PATH)
- AC_SUBST(MODULE_PATH)
- 
- AC_CONFIG_FILES(		\
---- src/Makefile
-+++ src/Makefile
-@@ -115,10 +115,6 @@
- 	ln $(BINDEST)/services $(BINDEST)/listnicks
- 	ln $(BINDEST)/services $(BINDEST)/listchans
- 	(cd ../lang ; $(MAKE) install)
--	$(CP) ../data/* $(DATDEST)
--	$(INSTALL) bin/mydbgen $(DATDEST)/mydbgen
--	test -d $(DATDEST)/backups || mkdir $(DATDEST)/backups
--	test -d $(DATDEST)/logs || mkdir $(DATDEST)/logs
- 	@if [ "$(MODULE_PATH)" ] ; then \
- 		test -d ${MODULE_PATH} || mkdir ${MODULE_PATH} ; \
- 		test -d ${MODULE_PATH}/runtime || mkdir ${MODULE_PATH}/runtime ; \
---- include/sysconf.h.in
-+++ include/sysconf.h.in
-@@ -96,6 +96,9 @@
- /* "Module dir" */
- #undef MODULE_PATH
- 
-+/* "Lib dir" */
-+#undef LIB_DIR
-+
- /* "Has mysql/mysql.h" */
- #undef MYSQL_HEADER_PREFIX
- 
---- include/config.h
-+++ include/config.h
-@@ -22,10 +22,10 @@
- /******* General configuration *******/
- 
- /* Name of configuration file (in Services directory) */
--#define SERVICES_CONF	"services.conf"
-+#define SERVICES_CONF	"/etc/anope/services.conf"
- 
- /* Name of log file (in Services directory) */
--#define LOG_FILENAME	"services.log"
-+#define LOG_FILENAME	"/var/log/anope/services.log"
- 
- /* Maximum amount of data from/to the network to buffer (bytes). */
- #define NET_BUFSIZE	65536
---- src/log.c
-+++ src/log.c
-@@ -33,7 +33,7 @@
- 
-     /* fix bug 577 */
-     strftime(timestamp, sizeof(timestamp), "%Y%m%d", tm);
--    snprintf(name, count, "logs/%s.%s", log_filename, timestamp);
-+    snprintf(name, count, "%s.%s", log_filename, timestamp);
-     curday = tm->tm_yday;
- 
-     return 1;
---- src/modules.c
-+++ src/modules.c
-@@ -2846,7 +2846,7 @@
- 
- 
- #ifndef _WIN32
--    snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", services_dir);
-+    snprintf(dirbuf, BUFSIZE, "%s/modules/runtime", LIB_DIR);
- #else
-     snprintf(dirbuf, BUFSIZE, "\\%s", "modules/runtime");
- #endif
---- src/language.c
-+++ src/language.c
-@@ -71,7 +71,7 @@
-         alog("debug: Loading language %d from file `languages/%s'",
-              index, filename);
-     }
--    snprintf(buf, sizeof(buf), "languages/%s", filename);
-+    snprintf(buf, sizeof(buf), "%s/languages/%s", LIB_DIR, filename);
- #ifndef _WIN32
-     if (!(f = fopen(buf, "r"))) {
- #else
diff --git a/net-irc/anope/files/anope-1.8.7-mariadb.patch b/net-irc/anope/files/anope-1.8.7-mariadb.patch
deleted file mode 100644
index 98a1b3634b6a..000000000000
--- a/net-irc/anope/files/anope-1.8.7-mariadb.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-Author: Adam
-Date: 2012-01-11
-Subject: Fix https://bugs.gentoo.org/381119 , where -I ordering causes
-	mariadb's services.h to be #include-ed improperly.
-
-diff --git a/src/Makefile b/src/Makefile
-index 739c918..a9a2ee2 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -25,7 +25,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
- 	   'RDB=${RDB}' 'SHARED=${SHARED}' 'MODULEFLAGS=${MODULEFLAGS}'
- 
- .c.o:
--	$(CC) $(CFLAGS) -I../include/ -c $<
-+	$(CC) -I../include/ $(CFLAGS) -c $<
- 
- all: services
- 
-diff --git a/src/core/Makefile b/src/core/Makefile
-index 4ec2754..32c049f 100644
---- a/src/core/Makefile
-+++ b/src/core/Makefile
-@@ -21,7 +21,7 @@ install:
- distclean: spotless
- 
- .c.o:
--	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-+	$(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
- 
- .o.s:
- 	$(CC) ${SHARED} ../mod_version.o $< -o $*.so ${PROFILE}
-diff --git a/src/core/Makefile.sub b/src/core/Makefile.sub
-index 9fbadf3..d93e6d5 100644
---- a/src/core/Makefile.sub
-+++ b/src/core/Makefile.sub
-@@ -16,7 +16,7 @@ module: $(OBJECTS) so
- distclean: spotless
- 
- .c.o:
--	$(CC) $(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-+	$(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
- 
- so:
- 	$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
-diff --git a/src/modules/Makefile b/src/modules/Makefile
-index cafbe45..bde65b3 100644
---- a/src/modules/Makefile
-+++ b/src/modules/Makefile
-@@ -24,7 +24,7 @@ install:
- distclean: spotless
- 
- .c.o:
--	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-+	$(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
- 
- .o.s:
- 	$(CC) ${SHARED} ../mod_version.o $< -o $*.so  ${PROFILE}
-diff --git a/src/modules/Makefile.sub b/src/modules/Makefile.sub
-index 7697249..b7c244f 100644
---- a/src/modules/Makefile.sub
-+++ b/src/modules/Makefile.sub
-@@ -16,7 +16,7 @@ module: $(OBJECTS) so
- distclean: spotless
- 
- .c.o:
--	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-+	$(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
- 
- so:
- 	$(CC) ${SHARED} ../../mod_version.o  $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
-diff --git a/src/protocol/Makefile b/src/protocol/Makefile
-index ab837e4..d962d8b 100644
---- a/src/protocol/Makefile
-+++ b/src/protocol/Makefile
-@@ -21,7 +21,7 @@ install:
- distclean: clean spotless
- 
- .c.o:
--	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../${INCLUDEDIR} -c $<
-+	$(CC) -I../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
- 
- .o.s:
- 	$(CC) ${SHARED} ../mod_version.o  $< -o $*.so ${PROFILE}
-diff --git a/src/protocol/Makefile.sub b/src/protocol/Makefile.sub
-index a2d6a41..d93e6d5 100644
---- a/src/protocol/Makefile.sub
-+++ b/src/protocol/Makefile.sub
-@@ -16,7 +16,7 @@ module: $(OBJECTS) so
- distclean: spotless
- 
- .c.o:
--	$(CC) ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -I../ -I../../${INCLUDEDIR} -c $<
-+	$(CC) -I../ -I../../${INCLUDEDIR} ${CFLAGS} ${CDEFS} ${MODULEFLAGS} -c $<
- 
- so:
- 	$(CC) ${SHARED} $(OBJECTS) -o ../$(TARGET).so ${PROFILE}
-diff --git a/src/tools/Makefile b/src/tools/Makefile
-index 4dffbf0..87bd0ae 100644
---- a/src/tools/Makefile
-+++ b/src/tools/Makefile
-@@ -10,7 +10,7 @@ MAKEARGS = 'CFLAGS=${CFLAGS}' 'CC=${CC}' 'ANOPELIBS=${ANOPELIBS}' \
-    	   'RUNGROUP=${RUNGROUP}' 
- 
- .c.o:
--	$(CC) $(LDFLAGS) $(CFLAGS) -I../include/ $< -o $*
-+	$(CC) -I../include/ $(LDFLAGS) $(CFLAGS) $< -o $*
- 
- all: ${OBJS}
- 
diff --git a/net-irc/anope/files/anope-conf.d b/net-irc/anope/files/anope-conf.d
deleted file mode 100644
index ddcae9856e0c..000000000000
--- a/net-irc/anope/files/anope-conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# user to run ultimate-ircd as
-ANOPE_USER="anope"
-
-# Additional commandline parameters
-ANOPE_OPTS=""
diff --git a/net-irc/anope/files/anope-conf.d-v2 b/net-irc/anope/files/anope-conf.d-v2
new file mode 100644
index 000000000000..fbe7c3c5017a
--- /dev/null
+++ b/net-irc/anope/files/anope-conf.d-v2
@@ -0,0 +1,9 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# user to run ultimate-ircd as
+ANOPE_USER="anope"
+
+# Additional commandline parameters
+ANOPE_OPTS="--confdir=/etc/anope --logdir=/var/log/anope --dbdir=/var/lib/anope"
+ANOPE_OPTS="${ANOPE_OPTS} --localedir=/usr/share/locale --modulesdir=%LIBDIR%"
diff --git a/net-irc/anope/files/pid-patch.diff b/net-irc/anope/files/pid-patch.diff
deleted file mode 100644
index c92e1216be9c..000000000000
--- a/net-irc/anope/files/pid-patch.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/example.conf.orig	2008-12-14 20:37:22.000000000 +0000
-+++ data/example.conf	2008-12-14 20:37:43.000000000 +0000
-@@ -285,7 +285,7 @@ HostServName	"HostServ"  "vHost Server"
- # PIDFile <filename>  [REQUIRED]
- #     Specifies the name of the file containing Services' process ID.
- 
--PIDFile     services.pid
-+PIDFile     /var/run/anope/services.pid
- 
- # MOTDFile <filename>  [REQUIRED]
- #     Specifies the name of the Message of the Day file.
diff --git a/net-irc/anope/files/pid-patch.patch b/net-irc/anope/files/pid-patch.patch
new file mode 100644
index 000000000000..ddf661ba9803
--- /dev/null
+++ b/net-irc/anope/files/pid-patch.patch
@@ -0,0 +1,18 @@
+--- a/data/example.conf	2017-03-30 17:00:24.000000000 -0400
++++ a/data/example.conf	2019-02-06 15:16:20.088469043 -0500
+@@ -231,13 +231,13 @@
+ 	 * The filename containing the Services process ID. The path is relative to the
+ 	 * services root directory.
+ 	 */
+-	pid = "data/services.pid"
++	pid = "/run/anope/services.pid"
+ 
+ 	/*
+ 	 * The filename containing the Message of the Day. The path is relative to the
+ 	 * services root directory.
+ 	 */
+-	motd = "conf/services.motd"
++	motd = "/etc/anope/services.motd"
+ }
+ 
+ /*