net-analyzer/rrdtool: Remove old

Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
2020-09-19 12:44:26 +02:00
parent df334212bd
commit 3ebd2c514e
8 changed files with 0 additions and 524 deletions

View File

@@ -1,3 +1 @@
DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29

View File

@@ -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,

View File

@@ -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}
};

View File

@@ -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}
};

View File

@@ -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

View File

@@ -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

View File

@@ -1,185 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
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
MY_P=${P/_/-}
DESCRIPTION="A system to store and display time-series data"
HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0.0"
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-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}/${MY_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}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod || die
epatch \
"${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 \
"${FILESDIR}"/${PN}-1.6.0-configure.ac.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
if ! use graph; then
sed -i \
-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
tests/Makefile.am || die
fi
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_test() {
export LC_ALL=C
default
}
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
}

View File

@@ -1,188 +0,0 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DISTUTILS_OPTIONAL=true
DISTUTILS_SINGLE_IMPL=true
GENTOO_DEPEND_ON_PERL=no
PYTHON_COMPAT=( python3_6 )
inherit autotools perl-module distutils-r1 flag-o-matic multilib
MY_P=${P/_/-}
DESCRIPTION="A system to store and display time-series data"
HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/8.0.0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-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} )
"
PATCHES=(
"${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
"${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
"${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
"${FILESDIR}"/${PN}-1.7.1-rrdcached.socket.patch
)
S=${WORKDIR}/${MY_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() {
default
# At the next version bump, please see if you actually still need this
# before adding versions
if ! [ -f doc/rrdrados.pod ]; then
cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
else
die "File already exists: doc/rrdrados.pod. Remove this code!"
fi
# 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
if ! use graph; then
sed -i \
-e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
-e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
tests/Makefile.am || die
fi
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_test() {
export LC_ALL=C
default
}
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
}