commit: f2a6b1d0e3af83399ff1277a6cc2be7951fd1ea6 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> AuthorDate: Sun May 21 22:31:52 2017 +0000 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> CommitDate: Sun May 21 22:34:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a6b1d0
net-analyzer/rrdtool: Version bump. Package-Manager: Portage-2.3.6, Repoman-2.3.2 net-analyzer/rrdtool/Manifest | 1 + .../rrdtool-1.7.0-disable-rrd_graph-cgi.patch | 49 ++++++ net-analyzer/rrdtool/rrdtool-1.7.0.ebuild | 189 +++++++++++++++++++++ 3 files changed, 239 insertions(+) diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index 0a042340d9b..e329884a331 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,3 +1,4 @@ DIST rrdtool-1.4.8.tar.gz 1379482 SHA256 de95b9f5aa488b0683600aad5a07c316f8d98cbe8d00aa0a1c87e2b2ef89f3d6 SHA512 c525978829508e1db393092c948d8db910554f42e1221acc4064a8f546ceac5d68943f603c6f0ef0e6510bbe5f606cfe6862672145ea1b630cd2b7fd07fa805b WHIRLPOOL f3926aed715a80c8d8287b057c39bbe614d81ebf9f24d1e285a9a438594d5c4c66b59934cc7c6be0550f0f729f319b01a46efc32ccf0b412563c43cf74a21564 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 +DIST rrdtool-1.7.0.tar.gz 2849994 SHA256 f97d348935b91780f2cd80399719e20c0b91f0a23537c0a85f9ff306d4c5526b SHA512 36d979561601135d74622eaf183701de15cba5e25118f7a308926a695ba84ecb33c3d16511bf4bc80cff055853e2eb85065bc4ed8aef19fc0277c6430ecd319f WHIRLPOOL afe313254d7ae7ac6a9a9c86f38b2f6873846d0b4419d186d4fbb14b1ff7b5b6f8d1494e6608f40daa0c2a0c24f24f3edb14cea1130c5f89bf38dddbd86c7577 diff --git a/net-analyzer/rrdtool/files/rrdtool-1.7.0-disable-rrd_graph-cgi.patch b/net-analyzer/rrdtool/files/rrdtool-1.7.0-disable-rrd_graph-cgi.patch new file mode 100644 index 00000000000..beb1ba794f2 --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdtool-1.7.0-disable-rrd_graph-cgi.patch @@ -0,0 +1,49 @@ +--- a/src/rrd_cgi.c ++++ b/src/rrd_cgi.c +@@ -51,6 +51,7 @@ + const char **); + + /* call rrd_graph and insert appropriate image tag */ ++#ifdef HAVE_RRD_GRAPH + static char *drawgraph( + long, + const char **); +@@ -59,6 +60,7 @@ + static char *drawprint( + long, + const char **); ++#endif /* HAVE_RRD_GRAPH */ + + /* pretty-print the <last></last> value for some.rrd via strftime() */ + static char *printtimelast( +@@ -510,9 +512,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); +@@ -900,7 +906,7 @@ + } + + +- ++#ifdef HAVE_RRD_GRAPH + static char *drawgraph( + long argc, + const char **args) +@@ -931,6 +937,7 @@ + } + return NULL; + } ++#endif /* HAVE_RRD_GRAPH */ + + static char *drawprint( + long argc, diff --git a/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild new file mode 100644 index 00000000000..ea4b9932cc7 --- /dev/null +++ b/net-analyzer/rrdtool/rrdtool-1.7.0.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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=( python2_7 ) +inherit autotools 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/8.0.0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~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.5.0_rc1-disable-rrd_graph-lua.patch + "${FILESDIR}"/${PN}-1.6.0-configure.ac.patch + "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch + +) + +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() { + 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 + + 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 +}
