gentoo resync : 23.09.2020

5 files changed, 0 insertions, 149 deletions

diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch
deleted file mode 100644
index 67f0ce2fb292..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-cgi.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/rrd_cgi.c
-+++ b/src/rrd_cgi.c
-@@ -56,6 +56,7 @@
-     const char **);
- 
- /* call rrd_graph and insert appropriate image tag */
-+#ifdef HAVE_RRD_GRAPH
- char     *drawgraph(
-     long,
-     const char **);
-@@ -64,6 +65,7 @@
- char     *drawprint(
-     long,
-     const char **);
-+#endif /* HAVE_RRD_GRAPH */
- 
- /* pretty-print the <last></last> value for some.rrd via strftime() */
- char     *printtimelast(
-@@ -542,9 +544,13 @@
-         }
-         parse(&buffer, i, "<RRD::GETVAR", rrdgetvar);
-         parse(&buffer, i, "<RRD::GOODFOR", rrdgoodfor);
-+#ifdef HAVE_RRD_GRAPH
-         parse(&buffer, i, "<RRD::GRAPH", drawgraph);
-+#endif /* HAVE_RRD_GRAPH */
-         parse(&buffer, i, "<RRD::INCLUDE", includefile);
-+#ifdef HAVE_RRD_GRAPH
-         parse(&buffer, i, "<RRD::PRINT", drawprint);
-+#endif /* HAVE_RRD_GRAPH */
-         parse(&buffer, i, "<RRD::SETCONSTVAR", rrdsetvarconst);
-         parse(&buffer, i, "<RRD::SETENV", rrdsetenv);
-         parse(&buffer, i, "<RRD::SETVAR", rrdsetvar);
-@@ -929,7 +935,7 @@
- }
- 
- 
--
-+#ifdef HAVE_RRD_GRAPH
- char     *drawgraph(
-     long argc,
-     const char **args)
-@@ -961,6 +967,7 @@
-     }
-     return NULL;
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- char     *drawprint(
-     long argc,
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch
deleted file mode 100644
index 6b3a3abf26bb..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-lua.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/bindings/lua/rrdlua.c
-+++ b/bindings/lua/rrdlua.c
-@@ -367,7 +367,9 @@
- #if defined(DINF)
-   {"info", lua_rrd_info},
-   {"updatev", lua_rrd_updatev},
-+#ifdef HAVE_RRD_GRAPH
-   {"graphv", lua_rrd_graphv},
-+#endif /* HAVE_RRD_GRAPH */
- #endif
-   {NULL, NULL}
- };
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch b/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch
deleted file mode 100644
index db3daaf47345..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.0_rc1-disable-rrd_graph-python.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/bindings/python/rrdtoolmodule.c
-+++ b/bindings/python/rrdtoolmodule.c
-@@ -675,8 +676,6 @@
-     return r;
- }
- 
--#endif
--
- static char PyRRD_dump__doc__[] =
-     "dump - dump an RRD to XML\n"
-     "[--header|-h {none,xsd,dtd}] [--no-header]file.rrd [file.xml]";
-@@ -704,6 +703,7 @@
-     destroy_args(&argv);
-     return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- /* List of methods defined in the module */
- #define meth(name, func, doc) {name, (PyCFunction)func, METH_VARARGS, doc}
-@@ -717,14 +717,16 @@
-     meth("last", PyRRD_last, PyRRD_last__doc__),
-     meth("resize", PyRRD_resize, PyRRD_resize__doc__),
-     meth("info", PyRRD_info, PyRRD_info__doc__),
--#ifdef HAVE_RRD_GRAPH    
-+#ifdef HAVE_RRD_GRAPH
-     meth("graph", PyRRD_graph, PyRRD_graph__doc__),
-     meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__),
-     meth("xport", PyRRD_xport, PyRRD_xport__doc__),
--#endif
-+#endif /* HAVE_RRD_GRAPH */
-     meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__),
-     meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__),
-+#ifdef HAVE_RRD_GRAPH
-     meth("dump", PyRRD_dump, PyRRD_dump__doc__),
-+#endif /* HAVE_RRD_GRAPH */
-     {NULL, NULL, 0, NULL}
- };
- 
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch
deleted file mode 100644
index a0bee695b7ae..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.6.0-configure.ac.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -177,7 +177,7 @@
- AC_PROG_CPP
- AC_PROG_CC
- AM_PROG_CC_C_O
--AC_PROG_LIBTOOL
-+LT_INIT
- 
- dnl Try to detect/use GNU features
- CFLAGS="$CFLAGS -D_GNU_SOURCE"
-@@ -239,13 +239,6 @@
- AC_CHECK_FUNC(acos,  , AC_CHECK_LIB(m, acos))
- AC_CHECK_FUNC(round, , AC_CHECK_LIB(m, round))
- 
--
--
--dnl add pic flag in any case this makes sure all our code is relocatable
--eval `./libtool --config | grep pic_flag=`
--CFLAGS="$CFLAGS $pic_flag"
--
--
- dnl Checks for library functions.
- AC_FUNC_STRFTIME
- AC_FUNC_VPRINTF
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch b/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch
deleted file mode 100644
index 5dd214504419..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.7.1-rrdcached.socket.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/etc/Makefile.am
-+++ b/etc/Makefile.am
-@@ -3,6 +3,6 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
- 
- if HAVE_SYSTEMD
- systemdsystemunit_DATA = \
--	etc/rrdcached.socket \
--	etc/rrdcached.service
-+	rrdcached.socket \
-+	rrdcached.service
- endif
-\ No newline at end of file
---- a/etc/Makefile.in
-+++ b/etc/Makefile.in
-@@ -368,8 +368,8 @@ EXTRA_DIST = rrdcached-default-redhat rrdcached-init-redhat rrdcached-default-ls
- 	rrdcached.socket.in rrdcached.service.in
- 
- @HAVE_SYSTEMD_TRUE@systemdsystemunit_DATA = \
--@HAVE_SYSTEMD_TRUE@	etc/rrdcached.socket \
--@HAVE_SYSTEMD_TRUE@	etc/rrdcached.service
-+@HAVE_SYSTEMD_TRUE@	rrdcached.socket \
-+@HAVE_SYSTEMD_TRUE@	rrdcached.service
- 
- all: all-am
-