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 EA455158090 for ; Sat, 28 May 2022 17:58:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA2E1E0831; Sat, 28 May 2022 17:58:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 C1904E0831 for ; Sat, 28 May 2022 17:58:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8F7FE341528 for ; Sat, 28 May 2022 17:58:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2175E3B8 for ; Sat, 28 May 2022 17:58:16 +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: <1653760682.8effdbfee3d3431d974d6458d19846a162f7f5df.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/rrdtool/, net-analyzer/rrdtool/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/rrdtool/Manifest net-analyzer/rrdtool/files/rrdcached.confd net-analyzer/rrdtool/files/rrdcached.init net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild X-VCS-Directories: net-analyzer/rrdtool/ net-analyzer/rrdtool/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 8effdbfee3d3431d974d6458d19846a162f7f5df X-VCS-Branch: master Date: Sat, 28 May 2022 17:58:16 +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: 348847c0-c96a-4f97-aa1c-a406631bbc77 X-Archives-Hash: 01fb8c234b325535ac0d50883e55b0af commit: 8effdbfee3d3431d974d6458d19846a162f7f5df Author: Conrad Kostecki gentoo org> AuthorDate: Sat May 28 17:55:31 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sat May 28 17:58:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8effdbfe net-analyzer/rrdtool: drop 1.7.2-r100 Signed-off-by: Conrad Kostecki gentoo.org> net-analyzer/rrdtool/Manifest | 1 - net-analyzer/rrdtool/files/rrdcached.confd | 8 - net-analyzer/rrdtool/files/rrdcached.init | 13 -- .../rrdtool/files/rrdtool-1.5.5-rrdrados.pod | 68 ------ net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild | 249 --------------------- 5 files changed, 339 deletions(-) diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index 2fce6e694e1d..e3ece643a7cd 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,2 +1 @@ -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 b/net-analyzer/rrdtool/files/rrdcached.confd deleted file mode 100644 index 0463a7923461..000000000000 --- a/net-analyzer/rrdtool/files/rrdcached.confd +++ /dev/null @@ -1,8 +0,0 @@ -RRCACHE_ARGS="-l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F -b /var/lib/rrdcached/db/ -B" - -USER="" -GROUP="" - -MODE="" - -MAXWAIT=30 diff --git a/net-analyzer/rrdtool/files/rrdcached.init b/net-analyzer/rrdtool/files/rrdcached.init deleted file mode 100644 index 51c2cbb6e818..000000000000 --- a/net-analyzer/rrdtool/files/rrdcached.init +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -command="/usr/bin/rrdcached" -command_args="${RRCACHE_ARGS} -p /run/rrdcached.pid" -start_stop_daemon_args="--quiet" -description="RRDtool data caching daemon" - -depend() { - need localmount net - use logger -} diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod deleted file mode 100644 index 0c645548a202..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod +++ /dev/null @@ -1,68 +0,0 @@ -=head1 NAME - -rrdrados - Creating, updating and retrieving RRD files from Ceph - -=head1 SYNOPSIS - -ErrdfileE = BnameE> - - -=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 - -Sets the Ceph Client ID to use when connecting. By default the client ID "admin" -is used. - -=item B - -Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is -used. - -=back - - -=head1 EXAMPLES - -B - - 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 - - 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 - - rrdtool fetch ceph//file.rrd AVERAGE - - -=head1 AUTHOR - -Simon Boulet Esimon@nostalgeek.comE - diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild deleted file mode 100644 index 0c1a88cad569..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild +++ /dev/null @@ -1,249 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=true -DISTUTILS_SINGLE_IMPL=true -GENTOO_DEPEND_ON_PERL=no -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{8..10} ) - -inherit autotools lua perl-module distutils-r1 flag-o-matic - -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" -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 graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test" - -RESTRICT="!test? ( test )" -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) - lua? ( - ${LUA_REQUIRED_USE} - test? ( graph ) - ) -" - -RDEPEND=" - >=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? ( ${LUA_DEPS} ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - rados? ( sys-cluster/ceph ) - 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} ) - ) -" - -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 -) - -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::' \ - -e 's|graph1||g' \ - tests/Makefile.am || die - fi - - eautoreconf -} - -src_configure() { - export rd_cv_gcc_flag__Werror=no - export rd_cv_ms_async=ok - - 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 - - # 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. - econf \ - $(use_enable graph rrd_graph) \ - $(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-lua \ - --disable-ruby-site-install \ - --disable-ruby \ - ${myconf[@]} -} - -python_compile() { - cd bindings/python || die - distutils-r1_python_compile -} - -lua_src_compile() { - pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" - - # We do need the cmod-dir path here, otherwise libtool complains. - # Use the real one (i.e. not within ${ED}) just in case. - emake \ - LUA_CFLAGS=$(lua_get_CFLAGS) \ - LUA_INSTALL_CMOD="$(lua_get_cmod_dir)" - - popd -} - -src_compile() { - default - - if use lua; then - # Only copy sources now so that we do not trigger librrd compilation - # multiple times. - 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 "Failed to change to Lua-binding directory for ${ELUA}" - - 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 -} - -python_install() { - cd bindings/python || die - distutils-r1_python_install -} - -lua_src_install() { - pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}" - - # This time we must prefix the cmod-dir path with ${ED} so that make - # does not try to violate the sandbox. - emake \ - LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \ - install - - popd || die -} - -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 rrdcgi ; then - # uses rrdcgi, causes invalid shebang error in Prefix, useless - # without rrdcgi installed - rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi || die - 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 {} + || die - - 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 -}