From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C05E215808B for ; Tue, 5 Apr 2022 19:34:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B15DEE0A00; Tue, 5 Apr 2022 19:34:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E5A5E09FE for ; Tue, 5 Apr 2022 19:34:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCB823412C8 for ; Tue, 5 Apr 2022 19:34:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11E0B38D for ; Tue, 5 Apr 2022 19:34:41 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1649187104.a57c5e54c6b898a2075ebf22a622e7f9a04fc8ce.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/rrdtool/files/, net-analyzer/rrdtool/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/rrdtool/Manifest net-analyzer/rrdtool/files/rrdcached.confd-r1 net-analyzer/rrdtool/files/rrdcached.init-r1 net-analyzer/rrdtool/metadata.xml net-analyzer/rrdtool/rrdtool-1.8.0.ebuild X-VCS-Directories: net-analyzer/rrdtool/ net-analyzer/rrdtool/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: a57c5e54c6b898a2075ebf22a622e7f9a04fc8ce X-VCS-Branch: master Date: Tue, 5 Apr 2022 19:34:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: da07dba9-7719-40a8-a4c9-e7d87d835d55 X-Archives-Hash: 09739187099c4016aaee96461d89a5e6 commit: a57c5e54c6b898a2075ebf22a622e7f9a04fc8ce Author: Conrad Kostecki gentoo org> AuthorDate: Tue Apr 5 19:31:30 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Tue Apr 5 19:31:44 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57c5e54 net-analyzer/rrdtool: add 1.8.0 Closes: https://bugs.gentoo.org/439652 Closes: https://bugs.gentoo.org/450674 Closes: https://bugs.gentoo.org/836576 Signed-off-by: Conrad Kostecki gentoo.org> net-analyzer/rrdtool/Manifest | 1 + net-analyzer/rrdtool/files/rrdcached.confd-r1 | 13 ++ net-analyzer/rrdtool/files/rrdcached.init-r1 | 23 +++ net-analyzer/rrdtool/metadata.xml | 1 + net-analyzer/rrdtool/rrdtool-1.8.0.ebuild | 246 ++++++++++++++++++++++++++ 5 files changed, 284 insertions(+) diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index d0902d1b33b9..2fce6e694e1d 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1 +1,2 @@ DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29 +DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1 diff --git a/net-analyzer/rrdtool/files/rrdcached.confd-r1 b/net-analyzer/rrdtool/files/rrdcached.confd-r1 new file mode 100644 index 000000000000..99213acd1e1b --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdcached.confd-r1 @@ -0,0 +1,13 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Default user and group for the rrdcached daemon +GROUP="rrdcached" +USER="root" + +# Default options for the rrdcached daemon +RRCACHE_ARGS="-B -F -m 770 -s rrdcached -l unix:/run/rrdcached.sock" + +# Default path for database and journal +RRCACHE_DATABASE="/var/lib/rrdcached/db" +RRCACHE_JOURNAL="/var/lib/rrdcached/journal" diff --git a/net-analyzer/rrdtool/files/rrdcached.init-r1 b/net-analyzer/rrdtool/files/rrdcached.init-r1 new file mode 100644 index 000000000000..44ee3c5f19df --- /dev/null +++ b/net-analyzer/rrdtool/files/rrdcached.init-r1 @@ -0,0 +1,23 @@ +#!/sbin/openrc-run +# Copyright 1999-2022 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +description="Data caching daemon for RRDTool" +rrdcached_database="${RRCACHE_DATABASE:-/var/lib/rrdcached/db}" +rrdcached_group="${GROUP:-rrdcached}" +rrdcached_journal="${RRCACHE_JOURNAL:-/var/lib/rrdcached/journal}" +rrdcached_user="${USER:-rrdcached}" +pidfile="/run/rrdcached.pid" + +command="/usr/bin/rrdcached" +command_args="${RRCACHE_ARGS} -b ${rrdcached_database} -G ${rrdcached_group} -j ${rrdcached_journal} -p ${pidfile} -U ${rrdcached_user}" + +depend() { + need localmount + use logger +} + +start_pre() { + checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_database}" + checkpath -d -o "${rrdcached_user}:${rrdcached_group}" -q "${rrdcached_journal}" +} diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml index cdb31d558f75..0192500278b1 100644 --- a/net-analyzer/rrdtool/metadata.xml +++ b/net-analyzer/rrdtool/metadata.xml @@ -8,6 +8,7 @@ Enable support for graphing functions Enable support for librados from sys-cluster/ceph + Build support for write-caching daemon Build rrdcgi support diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild new file mode 100644 index 000000000000..10082283a10c --- /dev/null +++ b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild @@ -0,0 +1,246 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{1..4} luajit ) +PYTHON_COMPAT=( python3_{8..10} ) + +DISTUTILS_OPTIONAL="true" +DISTUTILS_SINGLE_IMPL="true" +GENTOO_DEPEND_ON_PERL="no" +MY_P="${P/_/-}" + +inherit autotools lua perl-module distutils-r1 flag-o-matic + +DESCRIPTION="A data logging and graphing system for time series data" +HOMEPAGE="https://oss.oetiker.ch/rrdtool/" +SRC_URI="https://github.com/oetiker/${PN}-1.x/releases/download/v${PV}/${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0/8.0.0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris" +IUSE="dbi doc examples graph lua perl python rados rrdcached rrdcgi ruby static-libs tcl tcpd test" + +RESTRICT="!test? ( test )" +REQUIRED_USE=" + python? ( ${PYTHON_REQUIRED_USE} ) + lua? ( + ${LUA_REQUIRED_USE} + test? ( graph ) + ) +" + +PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )" + +RDEPEND=" + dev-libs/glib:2[static-libs(+)?] + dev-libs/libxml2:2[static-libs(+)?] + dbi? ( dev-db/libdbi[static-libs(+)?] ) + graph? ( + media-libs/libpng:0=[static-libs(+)?] + x11-libs/cairo[svg,static-libs(+)?] + x11-libs/pango + ) + lua? ( ${LUA_DEPS} ) + perl? ( dev-lang/perl:= ) + python? ( ${PYTHON_DEPS} ) + rados? ( sys-cluster/ceph ) + rrdcached? ( + acct-group/rrdcached + acct-user/rrdcached + ) + tcl? ( dev-lang/tcl:0= ) + tcpd? ( sys-apps/tcp-wrappers ) +" + +DEPEND="${RDEPEND}" + +BDEPEND=" + sys-apps/groff + virtual/pkgconfig + virtual/awk + python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') ) + test? ( + sys-devel/bc + lua? ( ${LUA_DEPS} ) + ) +" + +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 +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + default + + # Bug #456810 + local mysedargs=( + -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' + -e 's|^sleep 1$||g' + -e '/^dnl.*png/s|^dnl||g' + -i configure.ac + ) + + sed "${mysedargs[@]}" || die + + # Python bindings are built and installed manually + local mysedargs=( + -e '/^all-local:/s| @COMP_PYTHON@||' + -i bindings/Makefile.am + ) + + sed "${mysedargs[@]}" || die + + # Makefile needs to be adjusted for disabling 'graph' feature + if ! use graph ; then + local mysedargs=( + -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' + -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' + -e 's|graph1||g' + -i tests/Makefile.am + ) + + sed "${mysedargs[@]}" || die + fi + + eautoreconf +} + +src_configure() { + export rd_cv_gcc_flag__Werror=no + export rd_cv_ms_async=ok + export RRDDOCDIR="${EPREFIX}/usr/share/doc/${PF}" + + # Bug #260380 + [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__ + + # Enabling '-ffast-math' is known to cause problems. + filter-flags -ffast-math + + # We will handle Lua bindings ourselves, upstream is not multi-impl-ready + # and their Lua-detection logic depends on having the right version of the Lua + # interpreter available at build time. + local myeconfargs=( + --disable-lua + --disable-ruby + --disable-ruby-site-install + $(usex !dbi '--disable-libdbi' '') + $(usex !examples '--disable-examples' '') + $(use_enable graph rrd_graph) + $(use_enable perl perl-site-install) + $(use_enable perl) + $(use_enable python) + $(usex !rados '--disable-librados' '') + $(usex !rrdcached '--disable-rrdcached' '') + $(use_enable rrdcgi) + $(use_enable static-libs static) + $(usex !tcpd '--disable-libwrap' '') + $(use_enable tcl) + $(use_enable tcl tcl-site) + $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) + --with-perl-options="INSTALLDIRS=vendor" + ) + + econf "${myeconfargs[@]}" +} + +lua_src_compile() { + pushd "${BUILD_DIR}"/bindings/lua || die + + # We do need the CMOD-dir path here, otherwise libtool complains. + # Use the real one (i.e. not within ${ED}) just in case. + local myemakeargs=( + LUA_CFLAGS=$(lua_get_CFLAGS) + LUA_INSTALL_CMOD="$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" + + popd +} + +python_compile() { + cd bindings/python || die + distutils-r1_python_compile +} + +src_compile() { + default + + # Only copy sources now so that we do not + # trigger librrd compilation multiple times. + if use lua; then + lua_copy_sources + lua_foreach_impl lua_src_compile + fi + + use python && distutils-r1_src_compile +} + +lua_src_test() { + pushd "${BUILD_DIR}"/bindings/lua || die + LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test + popd || die +} + +src_test() { + export LC_ALL=C + default + + if use lua; then + lua_foreach_impl lua_src_test + fi +} + +lua_src_install() { + pushd "${BUILD_DIR}"/bindings/lua || die + + # This time we must prefix the CMOD-dir path with ${ED}, + # so that make does not try to violate the sandbox. + local myemakeargs=( + LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" + ) + + emake "${myemakeargs[@]}" install + + popd || die +} + +python_install() { + cd bindings/python || die + distutils-r1_python_install +} + +src_install() { + default + + if ! use doc; then + rm -rf "${ED}"/usr/share/doc/"${PF}"/{html,txt} || die + fi + + if use lua; then + lua_foreach_impl lua_src_install + fi + + if use perl; then + perl_delete_localpod + perl_delete_packlist + fi + + use python && distutils-r1_src_install + + if use rrdcached; then + newconfd "${FILESDIR}"/rrdcached.confd-r1 rrdcached + newinitd "${FILESDIR}"/rrdcached.init-r1 rrdcached + fi + + find "${ED}" -name '*.la' -delete || die +}