Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/rrdtool/, net-analyzer/rrdtool/files/
Date: Sat, 28 May 2022 17:58:21
Message-Id: 1653760682.8effdbfee3d3431d974d6458d19846a162f7f5df.conikost@gentoo
1 commit: 8effdbfee3d3431d974d6458d19846a162f7f5df
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 28 17:55:31 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Sat May 28 17:58:02 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8effdbfe
7
8 net-analyzer/rrdtool: drop 1.7.2-r100
9
10 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
11
12 net-analyzer/rrdtool/Manifest | 1 -
13 net-analyzer/rrdtool/files/rrdcached.confd | 8 -
14 net-analyzer/rrdtool/files/rrdcached.init | 13 --
15 .../rrdtool/files/rrdtool-1.5.5-rrdrados.pod | 68 ------
16 net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild | 249 ---------------------
17 5 files changed, 339 deletions(-)
18
19 diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
20 index 2fce6e694e1d..e3ece643a7cd 100644
21 --- a/net-analyzer/rrdtool/Manifest
22 +++ b/net-analyzer/rrdtool/Manifest
23 @@ -1,2 +1 @@
24 -DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
25 DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
26
27 diff --git a/net-analyzer/rrdtool/files/rrdcached.confd b/net-analyzer/rrdtool/files/rrdcached.confd
28 deleted file mode 100644
29 index 0463a7923461..000000000000
30 --- a/net-analyzer/rrdtool/files/rrdcached.confd
31 +++ /dev/null
32 @@ -1,8 +0,0 @@
33 -RRCACHE_ARGS="-l unix:/var/run/rrdcached.sock -j /var/lib/rrdcached/journal/ -F -b /var/lib/rrdcached/db/ -B"
34 -
35 -USER=""
36 -GROUP=""
37 -
38 -MODE=""
39 -
40 -MAXWAIT=30
41
42 diff --git a/net-analyzer/rrdtool/files/rrdcached.init b/net-analyzer/rrdtool/files/rrdcached.init
43 deleted file mode 100644
44 index 51c2cbb6e818..000000000000
45 --- a/net-analyzer/rrdtool/files/rrdcached.init
46 +++ /dev/null
47 @@ -1,13 +0,0 @@
48 -#!/sbin/openrc-run
49 -# Copyright 1999-2012 Gentoo Foundation
50 -# Distributed under the terms of the GNU General Public License v2
51 -
52 -command="/usr/bin/rrdcached"
53 -command_args="${RRCACHE_ARGS} -p /run/rrdcached.pid"
54 -start_stop_daemon_args="--quiet"
55 -description="RRDtool data caching daemon"
56 -
57 -depend() {
58 - need localmount net
59 - use logger
60 -}
61
62 diff --git a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod b/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
63 deleted file mode 100644
64 index 0c645548a202..000000000000
65 --- a/net-analyzer/rrdtool/files/rrdtool-1.5.5-rrdrados.pod
66 +++ /dev/null
67 @@ -1,68 +0,0 @@
68 -=head1 NAME
69 -
70 -rrdrados - Creating, updating and retrieving RRD files from Ceph
71 -
72 -=head1 SYNOPSIS
73 -
74 -E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
75 -
76 -
77 -=head1 DESCRIPTION
78 -
79 -This module adds support for creating, updating and retrieving RRD files
80 -directly from a Ceph cluster using librados.
81 -
82 -It adds a ceph// prefix to RRD file name which is used to instruct rrdtool to
83 -operate on a file that is stored in Ceph.
84 -
85 -Currently the module expects to find the Ceph configuration file in the default
86 -location at /etc/ceph/ceph.conf. By default it uses Ceph client ID "admin" and a
87 -Ceph pool named "rrd".
88 -
89 -
90 -=head1 ENVIRONMENT VARIABLES
91 -
92 -=over 4
93 -
94 -=item B<CEPH_ID>
95 -
96 -Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
97 -is used.
98 -
99 -=item B<CEPH_POOL>
100 -
101 -Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
102 -used.
103 -
104 -=back
105 -
106 -
107 -=head1 EXAMPLES
108 -
109 -B<Creating an RRD file on Ceph>
110 -
111 - rrdtool create ceph//temperature.rrd --step 300 \
112 - DS:temp:GAUGE:600:-273:5000 \
113 - RRA:AVERAGE:0.5:1:1200 \
114 - RRA:MIN:0.5:12:2400 \
115 - RRA:MAX:0.5:12:2400 \
116 - RRA:AVERAGE:0.5:12:2400
117 -
118 -
119 -B<Importing an existing RRD into Ceph>
120 -
121 - rrdtool dump existing.rrd | rrdtool restore - ceph//new.rrd
122 -
123 -Or you could also copy the RRD file directly into Ceph using the rados command
124 -line utility.
125 -
126 -
127 -B<Retrieving RRD data from Ceph>
128 -
129 - rrdtool fetch ceph//file.rrd AVERAGE
130 -
131 -
132 -=head1 AUTHOR
133 -
134 -Simon Boulet E<lt>simon@××××××××××.comE<gt>
135 -
136
137 diff --git a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild b/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
138 deleted file mode 100644
139 index 0c1a88cad569..000000000000
140 --- a/net-analyzer/rrdtool/rrdtool-1.7.2-r100.ebuild
141 +++ /dev/null
142 @@ -1,249 +0,0 @@
143 -# Copyright 1999-2021 Gentoo Authors
144 -# Distributed under the terms of the GNU General Public License v2
145 -
146 -EAPI=7
147 -
148 -DISTUTILS_OPTIONAL=true
149 -DISTUTILS_SINGLE_IMPL=true
150 -GENTOO_DEPEND_ON_PERL=no
151 -LUA_COMPAT=( lua5-{1..4} luajit )
152 -PYTHON_COMPAT=( python3_{8..10} )
153 -
154 -inherit autotools lua perl-module distutils-r1 flag-o-matic
155 -
156 -MY_P=${P/_/-}
157 -
158 -DESCRIPTION="A system to store and display time-series data"
159 -HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
160 -SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
161 -S="${WORKDIR}/${MY_P}"
162 -
163 -LICENSE="GPL-2"
164 -SLOT="0/8.0.0"
165 -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
166 -IUSE="dbi doc graph lua perl python rados rrdcgi ruby static-libs tcl tcpd test"
167 -
168 -RESTRICT="!test? ( test )"
169 -REQUIRED_USE="
170 - python? ( ${PYTHON_REQUIRED_USE} )
171 - lua? (
172 - ${LUA_REQUIRED_USE}
173 - test? ( graph )
174 - )
175 -"
176 -
177 -RDEPEND="
178 - >=dev-libs/glib-2.28.7:2[static-libs(+)?]
179 - >=dev-libs/libxml2-2.7.8:2[static-libs(+)?]
180 - dbi? ( dev-db/libdbi[static-libs(+)?] )
181 - graph? (
182 - >=media-libs/libpng-1.5.10:0=[static-libs(+)?]
183 - >=x11-libs/cairo-1.10.2[svg,static-libs(+)?]
184 - >=x11-libs/pango-1.28
185 - )
186 - lua? ( ${LUA_DEPS} )
187 - perl? ( dev-lang/perl:= )
188 - python? ( ${PYTHON_DEPS} )
189 - rados? ( sys-cluster/ceph )
190 - tcl? ( dev-lang/tcl:0= )
191 - tcpd? ( sys-apps/tcp-wrappers )
192 -"
193 -DEPEND="${RDEPEND}"
194 -BDEPEND="
195 - sys-apps/groff
196 - virtual/pkgconfig
197 - virtual/awk
198 - python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') )
199 - test? (
200 - sys-devel/bc
201 - lua? ( ${LUA_DEPS} )
202 - )
203 -"
204 -
205 -PDEPEND="ruby? ( ~dev-ruby/rrdtool-bindings-${PV} )"
206 -
207 -PATCHES=(
208 - "${FILESDIR}"/${PN}-1.4.9-disable-rrd_graph-perl.patch
209 - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch
210 - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch
211 -)
212 -
213 -pkg_setup() {
214 - use python && python-single-r1_pkg_setup
215 -}
216 -
217 -src_prepare() {
218 - default
219 - # At the next version bump, please see if you actually still need this
220 - # before adding versions
221 - if ! [[ -f doc/rrdrados.pod ]] ; then
222 - cp "${FILESDIR}"/${PN}-1.5.5-rrdrados.pod doc/rrdrados.pod
223 - else
224 - die "File already exists: doc/rrdrados.pod. Remove this code!"
225 - fi
226 -
227 - # bug 456810
228 - # no time to sleep
229 - sed -i \
230 - -e 's|$LUA_CFLAGS|IGNORE_THIS_BAD_TEST|g' \
231 - -e 's|^sleep 1$||g' \
232 - -e '/^dnl.*png/s|^dnl||g' \
233 - configure.ac || die
234 -
235 - # Python bindings are built/installed manually
236 - sed -i \
237 - -e '/^all-local:/s| @COMP_PYTHON@||' \
238 - bindings/Makefile.am || die
239 -
240 - if ! use graph ; then
241 - sed -i \
242 - -e '2s:rpn1::; 2s:rpn2::; 6s:create-with-source-4::;' \
243 - -e '7s:xport1::; 7s:dcounter1::; 7s:vformatter1::' \
244 - -e 's|graph1||g' \
245 - tests/Makefile.am || die
246 - fi
247 -
248 - eautoreconf
249 -}
250 -
251 -src_configure() {
252 - export rd_cv_gcc_flag__Werror=no
253 - export rd_cv_ms_async=ok
254 -
255 - filter-flags -ffast-math
256 -
257 - export RRDDOCDIR="${EPREFIX}"/usr/share/doc/${PF}
258 -
259 - # to solve bug #260380
260 - [[ ${CHOST} == *-solaris* ]] && append-flags -D__EXTENSIONS__
261 -
262 - # Stub configure.ac
263 - local myconf=()
264 - if ! use tcpd ; then
265 - myconf+=( "--disable-libwrap" )
266 - fi
267 - if ! use dbi ; then
268 - myconf+=( "--disable-libdbi" )
269 - fi
270 - if ! use rados ; then
271 - myconf+=( "--disable-librados" )
272 - fi
273 -
274 - # We will handle Lua bindings ourselves, upstream is not multi-impl-ready
275 - # and their Lua-detection logic depends on having the right version of the Lua
276 - # interpreter available at build time.
277 - econf \
278 - $(use_enable graph rrd_graph) \
279 - $(use_enable perl perl-site-install) \
280 - $(use_enable perl) \
281 - $(use_enable python) \
282 - $(use_enable rrdcgi) \
283 - $(use_enable static-libs static) \
284 - $(use_enable tcl) \
285 - $(use_with tcl tcllib "${EPREFIX}"/usr/$(get_libdir)) \
286 - --with-perl-options=INSTALLDIRS=vendor \
287 - --disable-lua \
288 - --disable-ruby-site-install \
289 - --disable-ruby \
290 - ${myconf[@]}
291 -}
292 -
293 -python_compile() {
294 - cd bindings/python || die
295 - distutils-r1_python_compile
296 -}
297 -
298 -lua_src_compile() {
299 - pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
300 -
301 - # We do need the cmod-dir path here, otherwise libtool complains.
302 - # Use the real one (i.e. not within ${ED}) just in case.
303 - emake \
304 - LUA_CFLAGS=$(lua_get_CFLAGS) \
305 - LUA_INSTALL_CMOD="$(lua_get_cmod_dir)"
306 -
307 - popd
308 -}
309 -
310 -src_compile() {
311 - default
312 -
313 - if use lua; then
314 - # Only copy sources now so that we do not trigger librrd compilation
315 - # multiple times.
316 - lua_copy_sources
317 -
318 - lua_foreach_impl lua_src_compile
319 - fi
320 -
321 - use python && distutils-r1_src_compile
322 -}
323 -
324 -lua_src_test() {
325 - pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
326 -
327 - LUA_CPATH="${PWD}/.libs/?.so" emake LUA="${LUA}" test
328 -
329 - popd || die
330 -}
331 -
332 -src_test() {
333 - export LC_ALL=C
334 -
335 - default
336 - if use lua ; then
337 - lua_foreach_impl lua_src_test
338 - fi
339 -}
340 -
341 -python_install() {
342 - cd bindings/python || die
343 - distutils-r1_python_install
344 -}
345 -
346 -lua_src_install() {
347 - pushd "${BUILD_DIR}"/bindings/lua || die "Failed to change to Lua-binding directory for ${ELUA}"
348 -
349 - # This time we must prefix the cmod-dir path with ${ED} so that make
350 - # does not try to violate the sandbox.
351 - emake \
352 - LUA_INSTALL_CMOD="${ED}/$(lua_get_cmod_dir)" \
353 - install
354 -
355 - popd || die
356 -}
357 -
358 -src_install() {
359 - default
360 -
361 - if ! use doc ; then
362 - rm -rf "${ED}"/usr/share/doc/${PF}/{html,txt} || die
363 - fi
364 -
365 - if use lua ; then
366 - lua_foreach_impl lua_src_install
367 - fi
368 -
369 - if ! use rrdcgi ; then
370 - # uses rrdcgi, causes invalid shebang error in Prefix, useless
371 - # without rrdcgi installed
372 - rm -f "${ED}"/usr/share/${PN}/examples/cgi-demo.cgi || die
373 - fi
374 -
375 - if use perl ; then
376 - perl_delete_localpod
377 - perl_delete_packlist
378 - fi
379 -
380 - dodoc CHANGES CONTRIBUTORS NEWS THREADS TODO
381 -
382 - find "${ED}"/usr -name '*.la' -exec rm -f {} + || die
383 -
384 - keepdir /var/lib/rrdcached/journal/
385 - keepdir /var/lib/rrdcached/db/
386 -
387 - newconfd "${FILESDIR}"/rrdcached.confd rrdcached
388 - newinitd "${FILESDIR}"/rrdcached.init rrdcached
389 -
390 - use python && distutils-r1_src_install
391 -}