net-analyzer/rrdtool: Sync with upstream, add patch from https://github.com/oetiker/rrdtool-1.x/commit/fd8a2045de43f1ed6cd47d554534b0aab7a0e594

Package-Manager: portage-2.2.10

4 files changed, 116 insertions, 5 deletions

diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index 8a897eca..7231e880 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,3 +1,9 @@
+  17 Apr 2014; Bertrand Jacquin <beber@meleeweb.net>
+  +files/1.4.8-Add-support-for-MINNAN-and-MAXNAN-operators.patch,
+  rrdtool-1.4.8.ebuild:
+  net-analyzer/rrdtool: Sync with upstream, add patch from https://github.com/oe
+  tiker/rrdtool-1.x/commit/fd8a2045de43f1ed6cd47d554534b0aab7a0e594
+
 *rrdtool-1.4.8 (02 Dec 2013)
 
   02 Dec 2013; Bertrand Jacquin <beber@meleeweb.net>
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index c97372a6..ea0d6680 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,4 +1,5 @@
 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
@@ -9,6 +10,6 @@ AUX rrdcached.init 449 SHA256 063798427765d08d2c3592480a7a4a480a3efc0d04459f8544
 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.ebuild 4638 SHA256 6982d775a31fc95ef657f44d13f2eb8f6f5bf606d336cdb96d6d1a23fb1791cb WHIRLPOOL de3afe9e77631bca19834c1034f72c9f0ad6053c17f59e7468f7c040692413b59134bbe7b68752294400f38e03752e42ab612edad8609bd1a31914348303d6da
-MISC ChangeLog 688 SHA256 ee7b4db17a553ae6f4c5cc53d05efa8c9852b0be8f6a1dad04af07bdeaa2695d WHIRLPOOL c7565d3e24da5424b9c3fd03ebb801cfe1965fea0961eb21a44ec4192892ec5c96599393a81bd28dbb4a84e4cd3964b205d1077eca8023270e36e95b1a7e59bf
+EBUILD rrdtool-1.4.8.ebuild 4735 SHA256 4a55b3cc4e072e6f5279c4183a0bed16c21481685be29191aa6f63bfd9bd039d WHIRLPOOL 656af757d72bfbc981962610307babbab8d28c6dad7f09f5f391f115d57c788defebdf4d102606eb78feec67aca552089e4ac4cfe21a3b8da59db2398d0135ed
+MISC ChangeLog 981 SHA256 b4541ab7533dc7ee221df62ce014e27c672ad10df7ad09588275575ba05bc713 WHIRLPOOL 37f45e5126ccb99280b86472cf80e2272c04df7c3e7e421a1af6dbc32ea83c6c4fc28c50a376ff742cad861ad0044fa0eac92a5bf34afad0f57662ac9b4af4b8
 MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
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
new file mode 100644
index 00000000..4fad9fb2
--- /dev/null
+++ b/net-analyzer/rrdtool/files/1.4.8-Add-support-for-MINNAN-and-MAXNAN-operators.patch
@@ -0,0 +1,102 @@
+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/rrdtool-1.4.8.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild
index f8f30c65..e6e38f54 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild,v 1.1 2013/08/01 15:14:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8.ebuild,v 1.10 2014/03/24 14:29:15 ago Exp $
 
 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
@@ -14,7 +15,7 @@ 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"
+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 ruby rrdcgi static-libs tcl tcpd"
 
 RDEPEND="
@@ -58,6 +59,7 @@ src_prepare() {
 	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