4 files changed, 55 insertions, 11 deletions
diff --git a/net-analyzer/rrdtool/ChangeLog b/net-analyzer/rrdtool/ChangeLog
index d44a97849684..13240727b1ec 100644
--- a/net-analyzer/rrdtool/ChangeLog
+++ b/net-analyzer/rrdtool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/rrdtool
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.266 2014/07/16 11:51:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/ChangeLog,v 1.267 2014/07/16 13:05:12 jer Exp $
+
+*rrdtool-1.4.8-r3 (16 Jul 2014)
+
+  16 Jul 2014; Jeroen Roovers <jer@gentoo.org> -rrdtool-1.4.8-r2.ebuild,
+  +rrdtool-1.4.8-r3.ebuild, files/rrdtool-1.4.8-disable-rrd_graph.patch:
+  Disable rdd_xport when rrd_graph is not available.
 
   16 Jul 2014; Jeroen Roovers <jer@gentoo.org> rrdtool-1.4.8-r1.ebuild,
   rrdtool-1.4.8-r2.ebuild:
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 29322c569776..3588b7cbcde4 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -4,17 +4,17 @@ Hash: SHA256
 AUX rrdcached.confd 150 SHA256 f544145d142ab85f5efa578c24ab6b813c4a236af2b3ddc51d5fb2cd847cf976 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0 WHIRLPOOL af0317711dfd276e8047dbf285125104931a9ea696d8b73e54d41bbce7d1d7c08da0d71564346a95b485171d4990005b2f944be227962aed44b332807f300838
 AUX rrdcached.init 449 SHA256 cc1b0d349ebdbaa224d51bd271b2b299b89d10f87e75537e3618d9ea6d4dcbb4 SHA512 770000e8541b0cb2c5e70fe8b105901f5362633bcacb1d75684163ec78dda59e04adacfde3a3cc03b1cff1c44a5933146a4b1beeacd2c9fb6206de47c5af7156 WHIRLPOOL dd1936b9491ca91a1851db8252b750fa14072584b8d71c3f0f316d7a93cd34687c5c7221d1fd09bc28f4d2c0aea3065fd5d93f50668193c08e5f5cd7b0da7e42
 AUX rrdtool-1.4.7-configure.ac.patch 492 SHA256 00ac12cee29a579532cfa82d3bba88588f4cc938667801743c40097dd38f73e5 SHA512 c91bb2ac81de4ca3002eb4526582d24067da71597218afd94c6c198686f70709afbc9d1058bab090a56cb2d8290b52809bcafdffe83aaeb54e7510040851a74c WHIRLPOOL f453a9ae54853a9d2546edc6394e71eae2c28ca77c9751b8d5add5495360c20cd5d70046d5a9a9122ec5979cfba238fe799a965814399f51588758ed5fe37b6b
-AUX rrdtool-1.4.8-disable-rrd_graph.patch 4562 SHA256 3d5e1f04208e95a68241b0c8dc89fccf5468851887b55e6613ca017302e5f22f SHA512 5d3d3dce6cba1e3a7a6b4ecdd80f5d436ccea5677ac9af944a6b3028a59efca66ffc117acde897d391de2fd16a451c6d2a669939a333b39b496700bee26c25c6 WHIRLPOOL 846b3c7d0d3a04ba8d3022c6af8839611248bfc9e2715cb32615c8d3d3164aa535b40268ddfb0b53673db0490cbee1617c90752911688a3f9391c95536f76e14
+AUX rrdtool-1.4.8-disable-rrd_graph.patch 5453 SHA256 c81ac70ac9ce961561df7ebc5a4804848113765e4655e344287449b91d791c57 SHA512 11a483d40bd693629994a80a3e804a6c4eb984a2bba366a358c48b6d76b05d2dff275645591bb5406442280b60b6548ec265f82685be117cc65c80bf962b08a2 WHIRLPOOL 24b16e00b1d989b065a8962a4f444f3fec2cb609368dcdfc960f8da8d8521006bcbc6fb0476507bc04b3c7028f3baa67f97ce4e670147a077eb91a9872baebfd
 DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
 EBUILD rrdtool-1.4.8-r1.ebuild 4123 SHA256 e4d4e50c2f6f7df6e3abbdd401bf36be11b167689ab0acdc6c52dfd364d3ea3e SHA512 d2065660c2e239adb62f1d90df39467be67cea62d57801ed579fe5fcecde5af3a32237ae39deca8e73447d294a4e7044b0d19fde4851db9a0edf0f9c5e5d7c02 WHIRLPOOL fe87357c54399cbecf9a9701be2bf43ac9f218ce5bbcf588787232964af367b009e22d858c7cb9f8394fc58648d9a28a1776f06be0de854b5b8d7f5fd9c32140
-EBUILD rrdtool-1.4.8-r2.ebuild 4173 SHA256 527762f273c074245d5783357b098fe211fcd39666551ab7318cfbf76ac6bf21 SHA512 18019f55f18600e6218cdce7383621ba788d42f2730fa157d9c83926e522913a6eba888d44b616f485932f62e862363a30fc38582d38c4d6fa0b0efefca96aa1 WHIRLPOOL 36853d51502cc57786339fb47ea3708e128da302ee28052e5bf7290db96a9e834937057f6fd7f062cf7063e00a6f0ee12a3269937f2d2314d4504a63d46c0b4c
+EBUILD rrdtool-1.4.8-r3.ebuild 4173 SHA256 ccd814d1ac7322090abea1b16b802121a2a9cf1b139f8b6fde4742aadd9cc65c SHA512 77eb25dcb34fa464aff43b3c0dfb84885d148e8219bf95dcce45bbec34c00dea611952d24cd301bed9e870b286b3b454f7b3816b754d88d60cd10d49798af5ac WHIRLPOOL 2297efeb956bfd67ff370d550795ec3c19926f27e0435e82dafa2a4e1e6b31e337db6be6b98f990cc169933dae78f8916100193f5beb0d2d48bbadb273ad0dac
 EBUILD rrdtool-1.4.8.ebuild 4172 SHA256 5fac5d8fb9d5dedb53dc1c7f7311fa13b7c4ada26fb3cb1880a3c2a128d0dca5 SHA512 07ca0440306002f8223e6c92e6a5dbd7a7caae3df048f2c077b62f73a408a0361d5d5c8a39493120320f1782fcd4cca76e028b697fc4ac78deb38fcbd8fb0e70 WHIRLPOOL d892e7db2fe6fddac534964c3d4ae6af66e80f74ce588285d328a97e5697ef5c9772b63941137c1a1313f5eae06350bea9543b63302d705935cee28798ac0a3e
-MISC ChangeLog 39578 SHA256 cc3dda9d437d68b75c8113aa2f3f3042d3ae61263d691b4552cabf8a218df426 SHA512 7f76c9085cacde595962fc092c4b6ed12a3f377ac83a994a1139c16b13a1008b58b641fdd7b872e769294e1c203eba43fc0bcc28d67f37c0ac269877500ab749 WHIRLPOOL e16490e449fffbe637f6115921d21f5eced8685bfd2182723e3e43587437a53c871737fede402929391278c7a95af47b55952fee939c2d98d2e36a9cedbd87ba
+MISC ChangeLog 39811 SHA256 2dacb8beea8b31f398765610e602dfdcd7d684226263d64a6705eeaf537c0626 SHA512 ebaa8b2e1961d74014b6332e4b4700062caf4c17f5bce5316cc5dffce86fc6bbe99fefa9dc5b53532e0911d5ebb4cf7126966014c3f98da93d9053d2bace6037 WHIRLPOOL 2f07a1ad4f4761b1544c3f14b76c2d0f8caf02c3075488a7c7a333fad0dea0456414f1a7d82140d57bf2296f4ab10d6a5ca64cb22d0d98d852fcd55edf6322f7
 MISC metadata.xml 382 SHA256 61ecf5c79b1a7801d054184a5b79c9ecfbe89d3633b8eb8f29e2297ef4f201ab SHA512 f30109bc3a89232a2b4f55afebaf6322ab70b0bd38b53e2650259192cca547bf69cdbe5640d43576a9ac0fb637eb447053ad8a6cb4f3fc1bf49746eb821bf905 WHIRLPOOL b34ad3e79ae530ac2ef811e561cdb5a0666eb873a575c4aed970daf330be5ab6490aa12cc15dc13c53387c6c3530ccd572e1abb4a7a0cf351c5c77136dc38f8d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPGZ04ACgkQVWmRsqeSphPimQCfXm4XW9X4vq1AQzC5CXOj4eBF
-weEAn3jpdVWbeokJ3Ex9TZJ74Kd5Uq9Q
-=nDDG
+iEYEAREIAAYFAlPGeIoACgkQVWmRsqeSphOawACeKXe+1YSglOYIT0krtUmOVC/d
+8pQAn2ZOW1M81sVlYWPaWwb3lzGudr+0
+=wpqY
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch
index 1af3d848147a..24c264e920d3 100644
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch
+++ b/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch
@@ -17,7 +17,24 @@
  SV *
  rrd_fetch(...)
  	PROTOTYPE: @	
-@@ -397,6 +400,7 @@
+@@ -313,6 +316,7 @@
+ 		PUSHs(sv_2mortal(newSVuv(start_tmp)));
+ 		PUSHs(sv_2mortal(newSVuv(end_tmp)));
+ 
++#ifdef HAVE_RRD_GRAPH
+ int
+ rrd_xport(...)
+ 	PROTOTYPE: @	
+@@ -371,6 +375,8 @@
+ 		PUSHs(sv_2mortal(newRV_noinc((SV*)names)));
+ 		PUSHs(sv_2mortal(newRV_noinc((SV*)retar)));
+ 
++#endif /* HAVE_RRD_GRAPH */
++
+ SV*
+ rrd_info(...)
+ 	PROTOTYPE: @	
+@@ -397,6 +403,7 @@
      OUTPUT:
  	   RETVAL
  
@@ -25,7 +42,7 @@
  SV*
  rrd_graphv(...)
  	PROTOTYPE: @	
-@@ -410,6 +414,8 @@
+@@ -410,6 +417,8 @@
      OUTPUT:
  	   RETVAL
  
@@ -120,7 +137,23 @@
  
  static char PyRRD_updatev__doc__[] =
      "updatev is called in the same manner as update";
-@@ -672,13 +676,17 @@
+@@ -587,6 +591,7 @@
+     return r;
+ }
+ 
++#ifdef HAVE_RRD_GRAPH
+ static char PyRRD_xport__doc__[] =
+     "xport(args..): dictionary representation of data stored in RRDs\n"
+     "    [-s|--start seconds] [-e|--end seconds] [-m|--maxrows rows]"
+@@ -664,6 +669,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}
+@@ -672,16 +678,22 @@
      meth("create", PyRRD_create, PyRRD_create__doc__),
      meth("update", PyRRD_update, PyRRD_update__doc__),
      meth("fetch", PyRRD_fetch, PyRRD_fetch__doc__),
@@ -137,7 +170,12 @@
 +#endif /* HAVE_RRD_GRAPH */
      meth("updatev", PyRRD_updatev, PyRRD_updatev__doc__),
      meth("flushcached", PyRRD_flushcached, PyRRD_flushcached__doc__),
++#ifdef HAVE_RRD_GRAPH
      meth("xport", PyRRD_xport, PyRRD_xport__doc__),
++#endif /* HAVE_RRD_GRAPH */
+     {NULL, NULL, 0, NULL}
+ };
+ 
 --- a/src/rrd_cgi.c
 +++ b/src/rrd_cgi.c
 @@ -56,6 +56,7 @@
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
index 54fae5f7831f..e5f007eac5ba 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
@@ -1,6 +1,6 @@
 # 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-r2.ebuild,v 1.3 2014/07/16 11:51:40 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild,v 1.1 2014/07/16 13:05:12 jer Exp $
 
 EAPI="5"