net-analyzer/rrdtool: Drop since all patches were applied upstream

16 files changed, 0 insertions, 632 deletions

diff --git a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1 b/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
deleted file mode 100644
index 41a47d19..00000000
--- a/metadata/md5-cache/net-analyzer/rrdtool-1.4.8-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers ) sys-apps/groff virtual/pkgconfig virtual/awk !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A system to store and display time-series data
-EAPI=5
-HOMEPAGE=http://oss.oetiker.ch/rrdtool/
-IUSE=dbi doc +graph lua perl python rrdcgi ruby static-libs tcl tcpd python_targets_python2_7
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-PDEPEND=ruby? ( dev-ruby/rrdtool-bindings )
-RDEPEND=>=dev-libs/glib-2.28.7:2[static-libs(+)?] >=dev-libs/libxml2-2.7.8:2[static-libs(+)?] dbi? ( dev-db/libdbi[static-libs(+)?] ) graph? ( >=media-libs/libpng-1.5.10:0=[static-libs(+)?] >=x11-libs/cairo-1.10.2[svg,static-libs(+)?] >=x11-libs/pango-1.28 ) lua? ( dev-lang/lua:*[deprecated] ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) tcl? ( dev-lang/tcl:0= ) tcpd? ( sys-apps/tcp-wrappers )
-SLOT=0
-SRC_URI=http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.8.tar.gz
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	perl-functions	aac50de73be0a80ebe780e0b20850130	perl-module	c584f9e0fe426f3dcc2c46c6f7cb95ce	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	unpacker	45d07319df5f40ee6af58418b0f930be	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=42190a77664e17472b4a6b1c07ded9d4
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
deleted file mode 100644
index 3f48f7b0..00000000
--- a/net-analyzer/rrdtool/Manifest
+++ /dev/null
@@ -1,14 +0,0 @@
-AUX 1.4.8-Add-prototype-for-bad_format_imginfo.patch 1054 SHA256 2e45ce6be78a2064ebd29d70a582656695141e349bd3c390f48ef7289ad5ce1e WHIRLPOOL 3f0720db86325ac2e0c001b6efd9663ff7b45ab76c92e1fbc698b0a79a1eb96c61a230fefff7ca11603a96bf757eddf2fb42767c8bf5b5fe10848135d5af6530
-AUX 1.4.8-Add-support-for-MINNAN-and-MAXNAN-operators.patch 3765 SHA256 3b48274483ba270e4898e6fbd2919a90b07190477ce4fbada1f41fb10be08c1f WHIRLPOOL 91aed4192b446ea986ecfdd43929c4c33def12186034f346e4134028b94edf4f5af5adfcc1a9d7246b346b666694ece21804245227413566cc432fe5ab5799ee
-AUX 1.4.8-Added-imginfo-format-check.patch 2339 SHA256 86b052119406b884b0c688a9b0b015c3c8476ff786808ffa2e77185eb093b8b0 WHIRLPOOL 0d16f5c4eee89712123fef6683bf170d419746384161309ca21c14b982533c8ef08df05d544fbfdf13009e34d9bb5f7ed88c6e9a13107b1eca4182fd63a8f739
-AUX 1.4.8-Allow-empty-imginfo-string-format.patch 1300 SHA256 119bcee22413c0dee8e815187684f5c6998ef3fb60a7ceaeae148a2f951150b6 WHIRLPOOL fab7448a2d38f85f868768d5c6e3bcdf1395bafd55775bceb6f2fbadddc421eb8f2dad35bf93a1b3e9de081bddf04d91bd65aa2841a5e5fc6117a048d2a833f4
-AUX 1.4.8-Fix-json-output-when-printing-infinity-values.patch 1127 SHA256 0a96d6c62d0a879fb0ff8e498028d0f64b9f987bfc4c106f66facd2470fe9ff7 WHIRLPOOL 1cc7acb3af2a5fada0e21ccb6b8ea2535aebcee91c02ceb934ccffdad8c0cb195326803ef12dd873ac9b9e4b0ade76b7c55042769f6c3a9c12f77bb2e0a1cb7b
-AUX 1.4.8-Fix-json-output-when-printing-legend-entries.patch 893 SHA256 e843c1bd3ae80eabc96c335766601ba60e2829bc8df784fd5c2ed19f3efb8686 WHIRLPOOL 2e82f2f533218b580b562b24630ea3e56cbb90738eba2f21643aa4fa6a1ddabeb81600a269f4a0d54f887b94564250c689baeae06d3affab11c3dd8f0efb072a
-AUX 1.4.8-fix-a-bunch-of-json-syntax-issues-issue-380.patch 727 SHA256 cdf476991152c89fb9c616ad450e767f4636716b26c30fa980c476dcd95fd2d1 WHIRLPOOL 2bf33ba21607e387294b299d6a2d57635eeb3ad55f55da62820ca798c1f347ee41a09167b6a63112e9a1ab9a719238656d6982d6628c02bd9b79ee0dc6efd7f3
-AUX rrdcached.confd 150 SHA256 f544145d142ab85f5efa578c24ab6b813c4a236af2b3ddc51d5fb2cd847cf976 WHIRLPOOL af0317711dfd276e8047dbf285125104931a9ea696d8b73e54d41bbce7d1d7c08da0d71564346a95b485171d4990005b2f944be227962aed44b332807f300838
-AUX rrdcached.init 449 SHA256 063798427765d08d2c3592480a7a4a480a3efc0d04459f85448648dfae1f9653 WHIRLPOOL 873a708d6429fb26178e61a97b31d94352ec29d6d35882734cd7428cdc1635e7abb0e8893b5549254cd63a2ee6c7af3456ec7ef94794b684906f33f28e0dd0be
-AUX rrdtool-1.4.5-automake-1.11.2.patch 857 SHA256 d72b5b9f7713832fa946f2310938f8df14b980548f789a4e629951cc4040b3ef WHIRLPOOL 46a707e5aba8f7577a8d9cd40fa96886209a5f55ce3919aae9f0fd9b5209ffefb6ef103ce54155b8de2cf7fdca92a86c1bddf13f6574941aabab90e917ed1bc9
-AUX rrdtool-1.4.7-configure.ac.patch 492 SHA256 00ac12cee29a579532cfa82d3bba88588f4cc938667801743c40097dd38f73e5 WHIRLPOOL f453a9ae54853a9d2546edc6394e71eae2c28ca77c9751b8d5add5495360c20cd5d70046d5a9a9122ec5979cfba238fe799a965814399f51588758ed5fe37b6b
-DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
-EBUILD rrdtool-1.4.8-r1.ebuild 4537 SHA256 6e528036bb35ce8173b54dc1846b756f2b82f73e8dba167e15087e420d769e16 WHIRLPOOL 91b8a9ac6bc9a4b52cd281e110d843ba5d102a93f8dc53af4bc1c11b0b464079e41e92b0e527c831b9498412d6fc9f56f6925c07c1a2c7fdab168509c19717af
-MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
diff --git a/net-analyzer/rrdtool/files/1.4.8-Add-prototype-for-bad_format_imginfo.patch b/net-analyzer/rrdtool/files/1.4.8-Add-prototype-for-bad_format_imginfo.patch
deleted file mode 100644
index 6f8015f2..00000000
--- a/net-analyzer/rrdtool/files/1.4.8-Add-prototype-for-bad_format_imginfo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5d5616019cfc25e2ab08a14cc475628addcb5106 Mon Sep 17 00:00:00 2001
-From: Julien Thomas <jthomas@exosec.fr>
-Date: Tue, 25 Jun 2013 13:11:27 +0200
-Subject: [PATCH] Add prototype for bad_format_imginfo
-
-This patch solve implicit declaration of function 'bad_format_imginfo'
-warning introduced by commit 37d3050 "Added imginfo format check".
-
-rrd_graph.c: In function 'rrd_graph_v':
-rrd_graph.c:4025: warning: implicit declaration of function 'bad_format_imginfo'
-rrd_graph.c:4025: warning: nested extern declaration of 'bad_format_imginfo'
-rrd_graph.c: At top level:
-rrd_graph.c:4836: warning: no previous prototype for 'bad_format_imginfo'
----
- src/rrd_graph.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/rrd_graph.h b/src/rrd_graph.h
-index 397c5b2..b97a742 100644
---- a/src/rrd_graph.h
-+++ b/src/rrd_graph.h
-@@ -452,6 +452,8 @@ int       rrd_graph_color(
-     int);
- int       bad_format(
-     char *);
-+int       bad_format_imginfo(
-+    char *);
- int       vdef_parse(
-     struct graph_desc_t *,
-     const char *const);
--- 
-1.8.3.2
-
diff --git a/net-analyzer/rrdtool/files/1.4.8-Add-support-for-MINNAN-and-MAXNAN-operators.patch b/net-analyzer/rrdtool/files/1.4.8-Add-support-for-MINNAN-and-MAXNAN-operators.patch
deleted file mode 100644
index 4fad9fb2..00000000
--- a/net-analyzer/rrdtool/files/1.4.8-Add-support-for-MINNAN-and-MAXNAN-operators.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From fd8a2045de43f1ed6cd47d554534b0aab7a0e594 Mon Sep 17 00:00:00 2001
-From: Julien Thomas <jthomas@exosec.fr>
-Date: Fri, 7 Feb 2014 14:21:53 +0100
-Subject: [PATCH] Add support for MINNAN and MAXNAN operators
-
-NAN-safe version of MIN and MAX. If one of the input numbers is
-unknown then the result of the operation will be the other one.
-If both are unknown, then the result of the operation is unknown.
----
- doc/rrdgraph_rpn.pod |  6 ++++++
- src/rrd_rpncalc.c    | 22 ++++++++++++++++++++++
- src/rrd_rpncalc.h    |  3 ++-
- 3 files changed, 30 insertions(+), 1 deletion(-)
-
-diff --git a/doc/rrdgraph_rpn.pod b/doc/rrdgraph_rpn.pod
-index 894fef1..c7847a2 100644
---- a/doc/rrdgraph_rpn.pod
-+++ b/doc/rrdgraph_rpn.pod
-@@ -79,6 +79,12 @@ respectively.  Note that I<infinite> is larger than anything else.
- If one of the input numbers is I<unknown> then the result of the operation will be
- I<unknown> too.
- 
-+B<MINNAN, MAXNAN>
-+
-+NAN-safe version of MIN and MAX. If one of the input numbers is I<unknown>
-+then the result of the operation will be the other one. If both are
-+I<unknown>, then the result of the operation is I<unknown>.
-+
- B<LIMIT>
- 
- Pops two elements from the stack and uses them to define a range.
-diff --git a/src/rrd_rpncalc.c b/src/rrd_rpncalc.c
-index 630a94c..c847ee4 100644
---- a/src/rrd_rpncalc.c
-+++ b/src/rrd_rpncalc.c
-@@ -185,6 +185,8 @@ void rpn_compact2str(
-             add_op(OP_AVG, AVG)
-             add_op(OP_ABS, ABS)
-             add_op(OP_ADDNAN, ADDNAN)
-+            add_op(OP_MINNAN, MINNAN)
-+            add_op(OP_MAXNAN, MAXNAN)
- #undef add_op
-     }
-     (*str)[offset] = '\0';
-@@ -388,6 +390,8 @@ rpnp_t   *rpn_parse(
-             match_op(OP_AVG, AVG)
-             match_op(OP_ABS, ABS)
-             match_op(OP_ADDNAN, ADDNAN)
-+            match_op(OP_MINNAN, MINNAN)
-+            match_op(OP_MAXNAN, MAXNAN)
- #undef match_op
-             else if ((sscanf(expr, DEF_NAM_FMT "%n", vname, &pos) == 1)
-                      && ((rpnp[steps].ptr = (*lookup) (key_hash, vname)) !=
-@@ -735,6 +739,15 @@ short rpn_calc(
-                 rpnstack->s[stptr - 1] = rpnstack->s[stptr];
-             stptr--;
-             break;
-+        case OP_MINNAN:
-+            stackunderflow(1);
-+            if (isnan(rpnstack->s[stptr - 1]))
-+                rpnstack->s[stptr - 1] = rpnstack->s[stptr];
-+            else if (isnan(rpnstack->s[stptr]));
-+            else if (rpnstack->s[stptr - 1] > rpnstack->s[stptr])
-+                rpnstack->s[stptr - 1] = rpnstack->s[stptr];
-+            stptr--;
-+            break;
-         case OP_MAX:
-             stackunderflow(1);
-             if (isnan(rpnstack->s[stptr - 1]));
-@@ -744,6 +757,15 @@ short rpn_calc(
-                 rpnstack->s[stptr - 1] = rpnstack->s[stptr];
-             stptr--;
-             break;
-+        case OP_MAXNAN:
-+            stackunderflow(1);
-+            if (isnan(rpnstack->s[stptr - 1]))
-+                rpnstack->s[stptr - 1] = rpnstack->s[stptr];
-+            else if (isnan(rpnstack->s[stptr]));
-+            else if (rpnstack->s[stptr - 1] < rpnstack->s[stptr])
-+                rpnstack->s[stptr - 1] = rpnstack->s[stptr];
-+            stptr--;
-+            break;
-         case OP_LIMIT:
-             stackunderflow(2);
-             if (isnan(rpnstack->s[stptr - 2]));
-diff --git a/src/rrd_rpncalc.h b/src/rrd_rpncalc.h
-index ea6b87c..c032d8e 100644
---- a/src/rrd_rpncalc.h
-+++ b/src/rrd_rpncalc.h
-@@ -19,7 +19,8 @@ enum op_en { OP_NUMBER = 0, OP_VARIABLE, OP_INF, OP_PREV, OP_NEGINF,
-     OP_ATAN, OP_SQRT, OP_SORT, OP_REV, OP_TREND, OP_TRENDNAN,
-     OP_ATAN2, OP_RAD2DEG, OP_DEG2RAD,
-     OP_PREDICT,OP_PREDICTSIGMA,
--    OP_AVG, OP_ABS, OP_ADDNAN
-+    OP_AVG, OP_ABS, OP_ADDNAN,
-+    OP_MINNAN, OP_MAXNAN
- };
- 
- typedef struct rpnp_t {
--- 
-1.9.2
-
diff --git a/net-analyzer/rrdtool/files/1.4.8-Added-imginfo-format-check.patch b/net-analyzer/rrdtool/files/1.4.8-Added-imginfo-format-check.patch
deleted file mode 100644
index 23182113..00000000
--- a/net-analyzer/rrdtool/files/1.4.8-Added-imginfo-format-check.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From f23edd9010b2331a2047cab9d1c7ae6c966564f4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
-Date: Mon, 3 Jun 2013 17:06:26 +0200
-Subject: [PATCH] Added imginfo format check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Resolves: http://bugzilla.redhat.com/show_bug.cgi?id=969296
-(CVE-2013-2131)
-
-Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
----
- src/rrd_graph.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 51 insertions(+)
-
-diff --git a/src/rrd_graph.c b/src/rrd_graph.c
-index d783a35..223063b 100644
---- a/src/rrd_graph.c
-+++ b/src/rrd_graph.c
-@@ -4022,6 +4022,12 @@ rrd_info_t *rrd_graph_v(
-         char     *path;
-         char     *filename;
- 
-+        if (bad_format_imginfo(im.imginfo)) {
-+            rrd_info_free(im.grinfo);
-+            im_free(&im);
-+            rrd_set_error("bad format for imginfo");
-+            return NULL;
-+        }
-         path = strdup(im.graphfile);
-         filename = basename(path);
-         info.u_str =
-@@ -4827,6 +4833,51 @@ int bad_format(
- }
- 
- 
-+int bad_format_imginfo(
-+    char *fmt)
-+{
-+    char     *ptr;
-+    int       n = 0;
-+
-+    ptr = fmt;
-+    while (*ptr != '\0')
-+        if (*ptr++ == '%') {
-+
-+            /* line cannot end with percent char */
-+            if (*ptr == '\0')
-+                return 1;
-+            /* '%%' is allowed */
-+            if (*ptr == '%')
-+                ptr++;
-+            /* '%s', '%S' are allowed */
-+            else if (*ptr == 's' || *ptr == 'S') {
-+                n = 1;
-+                ptr++;
-+            }
-+
-+            /* or else '% 4lu' and such are allowed */
-+            else {
-+                /* optional padding character */
-+                if (*ptr == ' ')
-+                    ptr++;
-+                /* This should take care of 'm' */
-+                while (*ptr >= '0' && *ptr <= '9')
-+                    ptr++;
-+                /* 'lu' must follow here */
-+                if (*ptr++ != 'l')
-+                    return 1;
-+                if (*ptr == 'u')
-+                    ptr++;
-+                else
-+                    return 1;
-+                n++;
-+            }
-+        }
-+
-+    return (n != 3);
-+}
-+
-+
- int vdef_parse(
-     struct graph_desc_t
-     *gdes,
--- 
-1.8.3.2
-
diff --git a/net-analyzer/rrdtool/files/1.4.8-Allow-empty-imginfo-string-format.patch b/net-analyzer/rrdtool/files/1.4.8-Allow-empty-imginfo-string-format.patch
deleted file mode 100644
index b90e02f7..00000000
--- a/net-analyzer/rrdtool/files/1.4.8-Allow-empty-imginfo-string-format.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c6145ebf927bb4be899b71df630522d0cfdde6ba Mon Sep 17 00:00:00 2001
-From: Julien Thomas <jthomas@exosec.fr>
-Date: Tue, 25 Jun 2013 13:22:40 +0200
-Subject: [PATCH] Allow empty imginfo string format
-
-Commit 37d3050 "Added imginfo format check" breaks -f "" which used
-to be very usefull to print data as text format on stdout. Allowing
-an empty -f was particularly interesting because there was no
-<width>x<height> printed out.
-
-Before :
-
-[root@nagios-2b ~]# rrdtool graph /dev/null -f "" --start -1d \
-    DEF:d=/var/lib/rrd/nagios-2b/load.rrd:load5:AVERAGE \
-    VDEF:v=d,AVERAGE \
-    PRINT:v:%.6lf
-5.284605
-
-After :
-
-[root@nagios-2b ~]# rrdtool graph /dev/null -f "" --start -1d \
-    DEF:d=/var/lib/rrd/nagios-2b/load.rrd:load5:AVERAGE \
-    VDEF:v=d,AVERAGE \
-    PRINT:v:%.6lf
-ERROR: bad format for imginfo
----
- src/rrd_graph.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rrd_graph.c b/src/rrd_graph.c
-index e714e4f..4d91793 100644
---- a/src/rrd_graph.c
-+++ b/src/rrd_graph.c
-@@ -4139,7 +4139,7 @@ rrd_info_t *rrd_graph_v(
-      ** Also, if needed, print a line with information about the image.
-      */
- 
--    if (im.imginfo) {
-+    if (im.imginfo && *im.imginfo) {
-         rrd_infoval_t info;
-         char     *path;
-         char     *filename;
--- 
-1.8.3.2
-
diff --git a/net-analyzer/rrdtool/files/1.4.8-Fix-json-output-when-printing-infinity-values.patch b/net-analyzer/rrdtool/files/1.4.8-Fix-json-output-when-printing-infinity-values.patch
deleted file mode 100644
index 1c0920c9..00000000
--- a/net-analyzer/rrdtool/files/1.4.8-Fix-json-output-when-printing-infinity-values.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d43be0938c2a2fbc1499b0d0fa5e8680b2d07a19 Mon Sep 17 00:00:00 2001
-From: Julien Thomas <jthomas@exosec.fr>
-Date: Wed, 20 Nov 2013 15:48:06 +0100
-Subject: [PATCH] Fix json output when printing infinity values
-
-The printf of a rrd_value_t variable can output inf in case of an
-infinity value. That inf value is not JSON valid, nor are Infinity,
-NaN, Number.NEGATIVE_INFINITY or Number.POSITIVE_INFINITY.
-
-This commit adds a test for infinity values by using isinf() and
-outputs a null in such case.
----
- src/rrd_tool.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rrd_tool.c b/src/rrd_tool.c
-index 57e22ce..3002d38 100644
---- a/src/rrd_tool.c
-+++ b/src/rrd_tool.c
-@@ -804,7 +804,7 @@ int HandleInputLine(
-                     rrd_value_t newval = DNAN;
-                     newval = *ptr;
-                     if (json){
--                        if (isnan(newval)){
-+                        if (isnan(newval) || isinf(newval)){
-                             printf("null");                        
-                         } else {
-                             printf("%0.10e",newval);
--- 
-1.8.3.2
-
diff --git a/net-analyzer/rrdtool/files/1.4.8-Fix-json-output-when-printing-legend-entries.patch b/net-analyzer/rrdtool/files/1.4.8-Fix-json-output-when-printing-legend-entries.patch
deleted file mode 100644
index 628994f1..00000000
--- a/net-analyzer/rrdtool/files/1.4.8-Fix-json-output-when-printing-legend-entries.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ebaf3b1d197a17a20d00960508af80db5fb06401 Mon Sep 17 00:00:00 2001
-From: Julien Thomas <jthomas@exosec.fr>
-Date: Fri, 8 Nov 2013 01:07:16 +0100
-Subject: [PATCH] Fix json output when printing legend entries
-
-Branch 1.4 is missing this patch in order to produce valid json output.
-This is related to issue #380 reported by apfeiffe.
----
- src/rrd_tool.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rrd_tool.c b/src/rrd_tool.c
-index ddcdccc..57e22ce 100644
---- a/src/rrd_tool.c
-+++ b/src/rrd_tool.c
-@@ -766,7 +766,7 @@ int HandleInputLine(
-                 char     *entry = NULL;
-                 entry = legend_v[j];
-                 if (json){
--                    printf("      '%s'", entry);
-+                    printf("      \"%s\"", entry);
-                     if (j < col_cnt -1){
-                         printf(",");
-                     }
--- 
-1.8.3.2
-
diff --git a/net-analyzer/rrdtool/files/1.4.8-fix-a-bunch-of-json-syntax-issues-issue-380.patch b/net-analyzer/rrdtool/files/1.4.8-fix-a-bunch-of-json-syntax-issues-issue-380.patch
deleted file mode 100644
index 2543ce0a..00000000
--- a/net-analyzer/rrdtool/files/1.4.8-fix-a-bunch-of-json-syntax-issues-issue-380.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d7374efc3b39679828138073bf1330752a560dc5 Mon Sep 17 00:00:00 2001
-From: Tobias Oetiker <tobi@oetiker.ch>
-Date: Mon, 19 Aug 2013 16:48:11 +0200
-Subject: [PATCH] fix a bunch of json syntax issues (issue 380)
-
----
- src/rrd_tool.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rrd_tool.c b/src/rrd_tool.c
-index ea80d18..ddcdccc 100644
---- a/src/rrd_tool.c
-+++ b/src/rrd_tool.c
-@@ -737,7 +737,7 @@ int HandleInputLine(
-                 printf("  <%s>\n", META_TAG);
-             }
-             else {
--                printf("{ about: 'RRDtool xport JSON output',\n  meta: {\n");
-+                printf("{ \"about\": \"RRDtool xport JSON output\",\n  \"meta\": {\n");
-             }
- 
- 
--- 
-1.8.3.2
-
diff --git a/net-analyzer/rrdtool/files/rrdcached.confd b/net-analyzer/rrdtool/files/rrdcached.confd
deleted file mode 100644
index 0463a792..00000000
--- a/net-analyzer/rrdtool/files/rrdcached.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-RRCACHE_ARGS="-l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F  -b /var/lib/rrdcached/db/ -B"
-
-USER=""
-GROUP=""
-
-MODE=""
-
-MAXWAIT=30
diff --git a/net-analyzer/rrdtool/files/rrdcached.init b/net-analyzer/rrdtool/files/rrdcached.init
deleted file mode 100644
index 90f6248a..00000000
--- a/net-analyzer/rrdtool/files/rrdcached.init
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/files/rrdcached.init,v 1.1 2012/09/06 16:50:41 maksbotan Exp $
-
-command="/usr/bin/rrdcached"
-command_args="${RRCACHE_ARGS} -p /run/rrdcached.pid"
-start_stop_daemon_args="--quiet"
-description="RRDtool data caching daemon"
-
-depend() {
-	need localmount net
-	use logger
-}
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.5-automake-1.11.2.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.5-automake-1.11.2.patch
deleted file mode 100644
index 64206f44..00000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.5-automake-1.11.2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Install dir:
-    /usr/$(get_libdir)/rrdtool/ifOctets.tcl
-    /usr/$(get_libdir)/rrdtool/pkgIndex.tcl
-
-Due to the following change, pkglib_{DATA,SCRIPTS} is invalid:
-    http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
-
----
- bindings/tcl/Makefile.am |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/bindings/tcl/Makefile.am b/bindings/tcl/Makefile.am
-index c0e8b0f..b7205e7 100644
---- a/bindings/tcl/Makefile.am
-+++ b/bindings/tcl/Makefile.am
-@@ -27,8 +27,9 @@ tclpkgdir = @TCL_PACKAGE_DIR@
- tclpkg_DATA = pkgIndex.tcl
- tclpkg_SCRIPTS = ifOctets.tcl
- else
--pkglib_DATA = pkgIndex.tcl
--pkglib_SCRIPTS = ifOctets.tcl
-+tclpkgdir = $(libdir)/@PACKAGE@
-+tclpkg_DATA = pkgIndex.tcl
-+tclpkg_SCRIPTS = ifOctets.tcl
- endif
- 
- # Automake doen't like `tclrrd$(VERSION)$(TCL_SHLIB_SUFFIX)' as
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch
deleted file mode 100644
index ad97bec2..00000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.7-configure.ac.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -148,7 +148,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"
-@@ -204,9 +204,6 @@
- AC_CHECK_FUNC(acos, , AC_CHECK_LIB(m, acos))
- 
- 
--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.
diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
deleted file mode 100644
index 36e53733..00000000
--- a/net-analyzer/rrdtool/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <herd>netmon</herd>
-  <longdescription>A system to store and display time-series data</longdescription>
-  <use>
-    <flag name='rrdcgi'>Build rrdcgi support</flag>
-    <flag name='graph'>Enable support for graphing functions</flag>
-  </use>
-</pkgmetadata>
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
deleted file mode 100644
index f2d50301..00000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL="true"
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python2_7 )
-inherit eutils distutils-r1 flag-o-matic multilib perl-module autotools
-
-DESCRIPTION="A system to store and display time-series data"
-HOMEPAGE="http://oss.oetiker.ch/rrdtool/"
-SRC_URI="http://oss.oetiker.ch/rrdtool/pub/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="dbi doc +graph lua perl python rrdcgi ruby static-libs tcl tcpd"
-
-CDEPEND="
-	>=dev-libs/glib-2.28.7:2[static-libs(+)?]
-	>=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
-	dbi? ( dev-db/libdbi[static-libs(+)?] )
-	graph? (
-		>=media-libs/libpng-1.5.10:0=[static-libs(+)?]
-		>=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
-		>=x11-libs/pango-1.28
-	)
-	lua? ( dev-lang/lua:*[deprecated] )
-	perl? ( dev-lang/perl:= )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )
-	tcpd? ( sys-apps/tcp-wrappers )
-"
-
-DEPEND="
-	${CDEPEND}
-	sys-apps/groff
-	virtual/pkgconfig
-	virtual/awk
-"
-RDEPEND="
-	${CDEPEND}
-"
-PDEPEND="
-	ruby? ( dev-ruby/rrdtool-bindings )
-"
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.7-configure.ac.patch
-
-	epatch "${FILESDIR}/${PV}-Added-imginfo-format-check.patch"
-	epatch "${FILESDIR}/${PV}-fix-a-bunch-of-json-syntax-issues-issue-380.patch"
-	epatch "${FILESDIR}/${PV}-Fix-json-output-when-printing-legend-entries.patch"
-	epatch "${FILESDIR}/${PV}-Fix-json-output-when-printing-infinity-values.patch"
-	epatch "${FILESDIR}/${PV}-Add-prototype-for-bad_format_imginfo.patch"
-	epatch "${FILESDIR}/${PV}-Allow-empty-imginfo-string-format.patch"
-	epatch "${FILESDIR}/${PV}-Add-support-for-MINNAN-and-MAXNAN-operators.patch"
-
-	# bug 281694
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -ffast-math
-
-	export RRDDOCDIR=${EPREFIX}/usr/share/doc/${PF}
-
-	# to solve bug #260380
-	[[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
-
-	# Stub configure.ac
-	local myconf=()
-	if ! use tcpd; then
-		myconf+=( "--disable-libwrap" )
-	fi
-	if ! use dbi; then
-		myconf+=( "--disable-libdbi" )
-	fi
-
-	econf \
-		$(use_enable graph rrd_graph) \
-		$(use_enable lua lua-site-install) \
-		$(use_enable lua) \
-		$(use_enable perl perl-site-install) \
-		$(use_enable perl) \
-		$(use_enable python) \
-		$(use_enable rrdcgi) \
-		$(use_enable static-libs static) \
-		$(use_enable tcl) \
-		$(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
-		--with-perl-options=INSTALLDIRS=vendor \
-		--disable-ruby-site-install \
-		--disable-ruby \
-		${myconf[@]}
-}
-
-src_compile() {
-	default
-
-	use python && distutils-r1_src_compile
-}
-
-src_install() {
-	default
-
-	if ! use doc ; then
-		rm -rf "${ED}"usr/share/doc/${PF}/{html,txt}
-	fi
-
-	if use !rrdcgi ; then
-		# uses rrdcgi, causes invalid shebang error in Prefix, useless
-		# without rrdcgi installed
-		rm -f "${ED}"usr/share/${PN}/examples/cgi-demo.cgi
-	fi
-
-	if use perl ; then
-		perl_delete_localpod
-		perl_delete_packlist
-	fi
-
-	dodoc CHANGES CONTRIBUTORS NEWS README THREADS TODO
-
-	find "${ED}"usr -name '*.la' -exec rm -f {} +
-
-	keepdir /var/lib/rrdcached/journal/
-	keepdir /var/lib/rrdcached/db/
-
-	newconfd "${FILESDIR}"/rrdcached.confd rrdcached
-	newinitd "${FILESDIR}"/rrdcached.init rrdcached
-
-	use python && distutils-r1_src_install
-}
-
-pkg_postinst() {
-	ewarn "Since version 1.3, rrdtool dump emits completely legal xml.  Basically this"
-	ewarn "means that it contains an xml header and a DOCTYPE definition.  Unfortunately"
-	ewarn "this causes older versions of rrdtool restore to be unhappy."
-	ewarn
-	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
-	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
-	ewarn "or use rrdtool dump --no-header."
-	ewarn
-	ewarn ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
-	ewarn ">you've upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn ">lables visible, please, install some font, e.g.  media-fonts/dejavu."
-}
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 3624b59f..3ceff12a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -53,8 +53,6 @@ media-gfx/natural-gentoo:grub - Enable support for sys-boot/grub
 media-libs/x265:10bit - Set output bit depth to 10.
 media-video/rtmpdump:gnutls - Use GnuTLS library instead of the default OpenSSL
 media-video/rtmpdump:polarssl - Use PolarSSL library instead of the default OpenSSL
-net-analyzer/rrdtool:graph - Enable support for graphing functions
-net-analyzer/rrdtool:rrdcgi - Build rrdcgi support
 net-misc/icmptx:client - Enable client support
 net-misc/icmptx:server - Enable server support
 net-misc/openvpn:iproute2 - Enabled iproute2 support instead of net-tools