net-analyzer/rrdtool: Old.

Package-Manager: portage-2.2.28

12 files changed, 0 insertions, 1371 deletions

diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 03670478aece..0a042340d9b0 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,6 +1,3 @@
 DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564
-DIST rrdtool-1.4.9.tar.gz 1385640 SHA256 3e2826e0d60aaf85313da35b3c0d3a926748fe482b4ada766a325a83b60125cc SHA512 938d6a10c750cbc1e368020fc2408644bc10f6e1d9316f3117df406beef16d7d5fca2fc6fa2bdb6b1ed3e49aa872d58f1f66d1ccee9fe73483c6a5e483c33d4a WHIRLPOOL bc5fb01aef18feb89bb801a2f7fa8c2002b8f8a40e8038355e7edda8a729f354a639c864c01a1ddc7a66d19c8911d75f4f202008bec994d521a209dc6579fe10
-DIST rrdtool-1.5.3.tar.gz 2158011 SHA256 79e7b2f5cf74843e89fe4d08925f955268fd21736cbea03e54ae83320fc6129f SHA512 51e0dbca582acde1a0e77a8fcc4ffa2389b5467b5eb2443a6c9e38851459b7aa9bc08a8d5fd44f69c72e3cdb46be64a2baa66c69ca86a4cda8a061120fa14afb WHIRLPOOL 8738a499699423bd7c2536ca8d8b57db386b190fdeea47328c126aa70fae8d604ab1ab18253567a8426fe73e3fb9ab17ba8c40563841015da96451dcb4435dd7
-DIST rrdtool-1.5.4.tar.gz 2181438 SHA256 3feea3da87c02128a27083f1c7b2cb797ef673e946564c0ce008c1c25a5c3f99 SHA512 1b28db23d138677210e396c2eea48f88839847d0e08a7048b6ffa83384de612c1e71cfd10da0ef59ebc87a2707a72b226153f0d73c78c74f68bb9f721b7ad665 WHIRLPOOL 00346df3e9c5e07d4a23347f486a32c697f25bebc257e780dedebd28ef4a60b8d8d447bd431629eaf8f19d3155d03a5cbabf3df1565089a6eefde79a502f8e0e
 DIST rrdtool-1.5.5.tar.gz 2187685 SHA256 3a286d449c05d657e3fc3adcaa5cb4f0cfac8f465324b14f364a45d4ff8ca6f6 SHA512 07fb0edb5fbc0b491f8a40844d4a914f26c6269b2d07ab91f4d54fdcfeb7899348362044ac632223341f30fc10e6748a59863977496801530f5cdd2d61f0e88c WHIRLPOOL 527093b99044826b5faf5ab0a47d8a141defef3589173fb3b8bf72ed6f52032184e50f6054e0b82bf84cb73aa962ee50f8f1b319fbee519c8916c0d3a1852c26
 DIST rrdtool-1.6.0.tar.gz 2186538 SHA256 cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd WHIRLPOOL ae831bfd6b397ca77d2a7b2e393d2dc542e740f1bfb9b45eada44781a7c9dd93b80279683cca1590477191bc3972f859097802387a12c8e3b40c97f1524428d6
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
deleted file mode 100644
index 24c264e920d3..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.8-disable-rrd_graph.patch
+++ /dev/null
@@ -1,227 +0,0 @@
---- a/bindings/perl-shared/RRDs.xs
-+++ b/bindings/perl-shared/RRDs.xs
-@@ -189,6 +189,7 @@
- 	OUTPUT:
- 		RETVAL
- 
-+#ifdef HAVE_RRD_GRAPH
- SV *
- rrd_graph(...)
- 	PROTOTYPE: @	
-@@ -235,6 +236,8 @@
- 		PUSHs(sv_2mortal(newSViv(xsize)));
- 		PUSHs(sv_2mortal(newSViv(ysize)));
- 
-+#endif /* HAVE_RRD_GRAPH */
-+
- SV *
- rrd_fetch(...)
- 	PROTOTYPE: @	
-@@ -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
- 
-+#ifdef HAVE_RRD_GRAPH
- SV*
- rrd_graphv(...)
- 	PROTOTYPE: @	
-@@ -410,6 +417,8 @@
-     OUTPUT:
- 	   RETVAL
- 
-+#endif /* HAVE_RRD_GRAPH */
-+
- int
- rrd_dump(...)
-        PROTOTYPE: @
---- a/bindings/lua/rrdlua.c
-+++ b/bindings/lua/rrdlua.c
-@@ -267,6 +267,7 @@
-   return 1;
- }
- 
-+#ifdef HAVE_RRD_GRAPH
- static int
- lua_rrd_graph (lua_State * L)
- {
-@@ -291,6 +292,7 @@
-   rrd_freemem(calcpr);
-   return 3;
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- static int
- lua_rrd_flushcached(lua_State *L)
-@@ -305,11 +307,13 @@
-   return lua_rrd_infocall(L, "info", rrd_info);
- }
- 
-+#ifdef HAVE_RRD_GRAPH
- static int
- lua_rrd_graphv (lua_State * L)
- {
-   return lua_rrd_infocall(L, "graphv", rrd_graph_v);
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- static int
- lua_rrd_updatev (lua_State * L)
-@@ -347,7 +351,9 @@
-   {"dump", lua_rrd_dump},
-   {"fetch", lua_rrd_fetch},
-   {"first", lua_rrd_first},
-+#ifdef HAVE_RRD_GRAPH
-   {"graph", lua_rrd_graph},
-+#endif /* HAVE_RRD_GRAPH */
-   {"last", lua_rrd_last},
-   {"resize", lua_rrd_resize},
-   {"restore", lua_rrd_restore},
-@@ -357,7 +363,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}
- };
---- a/bindings/python/rrdtoolmodule.c
-+++ b/bindings/python/rrdtoolmodule.c
-@@ -261,6 +261,7 @@
-     return r;
- }
- 
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_graph__doc__[] =
-     "graph(args..): Create a graph based on data from one or several RRD\n"
-     "    graph filename [-s|--start seconds] "
-@@ -327,6 +328,7 @@
-     destroy_args(&argv);
-     return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- static char PyRRD_tune__doc__[] =
-     "tune(args...): Modify some basic properties of a Round Robin Database\n"
-@@ -503,6 +505,7 @@
-     return r;
- }
- 
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_graphv__doc__[] =
-     "graphv is called in the same manner as graph";
- 
-@@ -530,6 +533,7 @@
-     destroy_args(&argv);
-     return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- static char PyRRD_updatev__doc__[] =
-     "updatev is called in the same manner as update";
-@@ -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__),
-+#ifdef HAVE_RRD_GRAPH
-     meth("graph", PyRRD_graph, PyRRD_graph__doc__),
-+#endif /* HAVE_RRD_GRAPH */
-     meth("tune", PyRRD_tune, PyRRD_tune__doc__),
-     meth("first", PyRRD_first, PyRRD_first__doc__),
-     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
-     meth("graphv", PyRRD_graphv, PyRRD_graphv__doc__),
-+#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 @@
-     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.4.9-disable-rrd_graph-lua.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-lua.patch
deleted file mode 100644
index be8095c438b4..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-lua.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/bindings/lua/rrdlua.c
-+++ b/bindings/lua/rrdlua.c
-@@ -267,6 +267,7 @@
-   return 1;
- }
- 
-+#ifdef HAVE_RRD_GRAPH
- static int
- lua_rrd_graph (lua_State * L)
- {
-@@ -291,6 +292,7 @@
-   rrd_freemem(calcpr);
-   return 3;
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- static int
- lua_rrd_flushcached(lua_State *L)
-@@ -305,11 +307,13 @@
-   return lua_rrd_infocall(L, "info", rrd_info);
- }
- 
-+#ifdef HAVE_RRD_GRAPH
- static int
- lua_rrd_graphv (lua_State * L)
- {
-   return lua_rrd_infocall(L, "graphv", rrd_graph_v);
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- static int
- lua_rrd_updatev (lua_State * L)
-@@ -347,7 +351,9 @@
-   {"dump", lua_rrd_dump},
-   {"fetch", lua_rrd_fetch},
-   {"first", lua_rrd_first},
-+#ifdef HAVE_RRD_GRAPH
-   {"graph", lua_rrd_graph},
-+#endif /* HAVE_RRD_GRAPH */
-   {"last", lua_rrd_last},
-   {"resize", lua_rrd_resize},
-   {"restore", lua_rrd_restore},
-@@ -357,7 +363,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.4.9-disable-rrd_graph-python.patch b/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-python.patch
deleted file mode 100644
index 72be8163330f..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.4.9-disable-rrd_graph-python.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/bindings/python/rrdtoolmodule.c
-+++ b/bindings/python/rrdtoolmodule.c
-@@ -261,6 +261,7 @@
-     return r;
- }
- 
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_graph__doc__[] =
-     "graph(args..): Create a graph based on data from one or several RRD\n"
-     "    graph filename [-s|--start seconds] "
-@@ -327,6 +328,7 @@
-     destroy_args(&argv);
-     return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- static char PyRRD_tune__doc__[] =
-     "tune(args...): Modify some basic properties of a Round Robin Database\n"
-@@ -503,6 +505,7 @@
-     return r;
- }
- 
-+#ifdef HAVE_RRD_GRAPH
- static char PyRRD_graphv__doc__[] =
-     "graphv is called in the same manner as graph";
- 
-@@ -530,6 +533,7 @@
-     destroy_args(&argv);
-     return r;
- }
-+#endif /* HAVE_RRD_GRAPH */
- 
- static char PyRRD_updatev__doc__[] =
-     "updatev is called in the same manner as update";
-@@ -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}
-@@ -677,11 +683,11 @@
-     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__),
-     {NULL, NULL, 0, NULL}
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrd_rados.h b/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrd_rados.h
deleted file mode 100644
index 135536af1c72..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrd_rados.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef RRD_RADOS_H
-#define RRD_RADOS_H
-
-#include <rados/librados.h>
-
-#include "rrd_tool.h"
-
-typedef struct rrd_rados_t {
-    rados_t cluster;
-    rados_ioctx_t ioctx;
-    const char *oid;
-    rados_write_op_t write_op;
-    int lock;
-} rrd_rados_t;
-
-rrd_rados_t* rrd_rados_open(const char *oid);
-int rrd_rados_close(rrd_rados_t *rrd_rados);
-int rrd_rados_create(const char *oid, rrd_t *rrd);
-size_t rrd_rados_read(rrd_rados_t *rrd_rados, void *data, size_t len, uint64_t offset);
-size_t rrd_rados_write(rrd_rados_t *rrd_rados, const void *data, size_t len, uint64_t offset);
-int rrd_rados_flush(rrd_rados_t *rrd_rados);
-int rrd_rados_lock(rrd_rados_t *rrd_rados);
-
-#endif
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod
deleted file mode 100644
index 0c645548a202..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.3-rrdrados.pod
+++ /dev/null
@@ -1,68 +0,0 @@
-=head1 NAME
-
-rrdrados - Creating, updating and retrieving RRD files from Ceph
-
-=head1 SYNOPSIS
-
-E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
-
-
-=head1 DESCRIPTION
-
-This module adds support for creating, updating and retrieving RRD files
-directly from a Ceph cluster using librados.
-
-It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
-operate on a file that is stored in Ceph.
-
-Currently the module expects to find the Ceph configuration file in the default
-location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
-Ceph pool named "rrd".
-
-
-=head1 ENVIRONMENT VARIABLES
-
-=over 4
-
-=item B<CEPH_ID>
-
-Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
-is used.
-
-=item B<CEPH_POOL>
-
-Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
-used.
-
-=back
-
-
-=head1 EXAMPLES
-
-B<Creating an RRD file on Ceph>
-
- rrdtool create ceph//temperature.rrd --step 300 \
-   DS:temp:GAUGE:600:-273:5000 \
-   RRA:AVERAGE:0.5:1:1200 \
-   RRA:MIN:0.5:12:2400 \
-   RRA:MAX:0.5:12:2400 \
-   RRA:AVERAGE:0.5:12:2400
-
-
-B<Importing an existing RRD into Ceph>
-
- rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
-
-Or you could also copy the RRD file directly into Ceph using the rados command
-line utility.
-
-
-B<Retrieving RRD data from Ceph>
-
- rrdtool fetch ceph//file.rrd AVERAGE
-
-
-=head1 AUTHOR
-
-Simon Boulet E<lt>simon@nostalgeek.comE<gt>
-
diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.4-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.4-rrdrados.pod
deleted file mode 100644
index 0c645548a202..000000000000
--- a/net-analyzer/rrdtool/files/rrdtool-1.5.4-rrdrados.pod
+++ /dev/null
@@ -1,68 +0,0 @@
-=head1 NAME
-
-rrdrados - Creating, updating and retrieving RRD files from Ceph
-
-=head1 SYNOPSIS
-
-E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
-
-
-=head1 DESCRIPTION
-
-This module adds support for creating, updating and retrieving RRD files
-directly from a Ceph cluster using librados.
-
-It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
-operate on a file that is stored in Ceph.
-
-Currently the module expects to find the Ceph configuration file in the default
-location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
-Ceph pool named "rrd".
-
-
-=head1 ENVIRONMENT VARIABLES
-
-=over 4
-
-=item B<CEPH_ID>
-
-Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
-is used.
-
-=item B<CEPH_POOL>
-
-Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
-used.
-
-=back
-
-
-=head1 EXAMPLES
-
-B<Creating an RRD file on Ceph>
-
- rrdtool create ceph//temperature.rrd --step 300 \
-   DS:temp:GAUGE:600:-273:5000 \
-   RRA:AVERAGE:0.5:1:1200 \
-   RRA:MIN:0.5:12:2400 \
-   RRA:MAX:0.5:12:2400 \
-   RRA:AVERAGE:0.5:12:2400
-
-
-B<Importing an existing RRD into Ceph>
-
- rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
-
-Or you could also copy the RRD file directly into Ceph using the rados command
-line utility.
-
-
-B<Retrieving RRD data from Ceph>
-
- rrdtool fetch ceph//file.rrd AVERAGE
-
-
-=head1 AUTHOR
-
-Simon Boulet E<lt>simon@nostalgeek.comE<gt>
-
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
deleted file mode 100644
index e12968e8ee8d..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r3.ebuild
+++ /dev/null
@@ -1,163 +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 \
-		"${FILESDIR}"/${P}-disable-rrd_graph.patch
-
-	# 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/net-analyzer/rrdtool/rrdtool-1.4.9.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.9.ebuild
deleted file mode 100644
index 057615f37d1f..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.4.9.ebuild
+++ /dev/null
@@ -1,166 +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-${PV} )
-"
-
-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 \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-lua.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-python.patch
-
-	# 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/net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild
deleted file mode 100644
index 3e6efe53d62d..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.5.3-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
-
-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="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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} )
-	rados? ( sys-cluster/ceph )
-	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-${PV} )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# At the next version bump, please see if you actually still need these
-	# before adding versions
-	cp "${FILESDIR}"/${P}-rrd_rados.h src/rrd_rados.h || die
-	cp "${FILESDIR}"/${P}-rrdrados.pod doc/rrdrados.pod || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	echo ${PV/_rc*/} >> VERSION || die
-
-	export rd_cv_gcc_flag__Werror=no
-
-	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
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	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 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/net-analyzer/rrdtool/rrdtool-1.5.3.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.3.ebuild
deleted file mode 100644
index 67a517eb68e9..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.5.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
-
-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-${PV} )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-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 \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	echo ${PV/_rc*/} >> VERSION || die
-
-	export rd_cv_gcc_flag__Werror=no
-
-	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-librados \
-		--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 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/net-analyzer/rrdtool/rrdtool-1.5.4.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.4.ebuild
deleted file mode 100644
index 8ccb190b32ac..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.5.4.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-DISTUTILS_OPTIONAL=true
-DISTUTILS_SINGLE_IMPL=true
-GENTOO_DEPEND_ON_PERL=no
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils perl-module distutils-r1 flag-o-matic multilib
-
-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="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-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} )
-	rados? ( sys-cluster/ceph )
-	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-${PV} )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-python_compile() {
-	cd bindings/python || die
-	distutils-r1_python_compile
-}
-
-python_install() {
-	cd bindings/python || die
-	distutils-r1_python_install
-}
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# At the next version bump, please see if you actually still need this
-	# before adding versions
-	cp "${FILESDIR}"/${P}-rrdrados.pod doc/rrdrados.pod || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.7-configure.ac.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-cgi.patch \
-		"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-lua.patch \
-		"${FILESDIR}"/${PN}-1.5.0_rc1-disable-rrd_graph-python.patch
-
-	# bug 456810
-	# no time to sleep
-	sed -i \
-		-e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
-		-e 's|^sleep 1$||g' \
-		-e '/^dnl.*png/s|^dnl||g' \
-		configure.ac || die
-
-	# Python bindings are built/installed manually
-	sed -i \
-		-e '/^all-local:/s| @COMP_PYTHON@||' \
-		bindings/Makefile.am || die
-
-	echo ${PV/_rc*/} >> VERSION || die
-
-	export rd_cv_gcc_flag__Werror=no
-
-	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
-	if ! use rados; then
-		myconf+=( "--disable-librados" )
-	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 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
-}