6 files changed, 2 insertions, 345 deletions
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index fd74f43533fc..473e1f6dcd11 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -1,13 +1,8 @@
-AUX rrdcached.confd 150 BLAKE2B 7e3e87c632bde99e2c460828157d281ace8a2f34f5310dc1ca5610625cde80170a8e2d973b1464ff5ee7447e28f4e26386140b80bd0d866acd8445733e1eb4e9 SHA512 93d95057e99c98c943060cfc607285e76ac4580e9955e65ceac69b09577dd6a78b1faa9e6213345a7f011beabebce21c9447b6bd39f4091762d9974cd1a358e0
 AUX rrdcached.confd-r1 425 BLAKE2B bd5bd8789f07803304d53aed0ed80685b7b42d9b7d9067d9980564a4b485c4ae474ca88298ea72154945941de00ba6ccea71ae5f3b4fe3be14583fe3e7d4da52 SHA512 d22503eebf3a89fc5e14124716058efef2b78409995a9814cb72e8ab9b9172a89bab5bc0c1f796a1d735d41f20c9c0b8009539da9f9bb96554d71984a64adb72
-AUX rrdcached.init 331 BLAKE2B 835f60bd601591667556610f24002dc9cf7cba547d6cff7b5116c742577d97233a704f65dcc55bee26b8717da547a987a1f4b1511433ec559e86932fad9f52b0 SHA512 383cebcc9ad035660def2e465690f52104eac4ac621faeca3f31822f2f2bbd96f23c60fc5bc6382855e971563d7d545cc7abc31fe351c57a8ea716bcd7c95d88
 AUX rrdcached.init-r1 799 BLAKE2B 2b276a75e1d910fc7931758710507490f1d41398555426d160d0985fa326431018cfaa4ad1f0d54524e8b56e531f4867308fd078d499aa717011f6fe133a46c6 SHA512 789fd4d6e50169e34a1d4d04c9d36ce6a913a6ae0a633e07cbec3a7936ca6b47910b0e8002b8a346824ba5fff048f700e72f819f803b9aa1f18634e85127f66f
 AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 BLAKE2B 80b309cf59260a0f137f6550bf867845df25e6be0ac5677517d062aef8240f34db6f721700331d41d73f7aefbbd17f2c13df7ee1f774ff6bf33b6c1790183153 SHA512 6eb8d8a8193ce5bc22a4645e909dc7eb0a911b1f89f6403afc9cffec705929cf64086f415e53b748254a384b83ff8352be82f735ad403795c17a9058bc3e386c
-AUX rrdtool-1.5.5-rrdrados.pod 1419 BLAKE2B ef1a2438846a60b565c94088d7563480a97e9b77d5ef2173aed3b8f9cd8fba43ff9a553946ca4ee3092512b10dfce6de9a6436cac5aaa62a35c655f7c82520dc SHA512 fd3339862c51c8573dd93079ba70c9b538c4d73d031157fe845bcb59e7233cb5e9fa8cc451e760f8ae30014c975ec9ee04f66d42fc928c621a572b92e9348e4f
 AUX rrdtool-1.7.0-disable-rrd_graph-cgi.patch 1249 BLAKE2B 91dc764b7629ec517ff35362dc31605ab0428be4291afe5bd0a5c9c901bdd85a989cf1dcb33e247a7f79d8b155daf02d512691c38e72b8d2be3691d9733e5dc9 SHA512 5c2d192919e31a91cd600ed0e11346a4cbb1c66f93abbb583f20882d03705972eb4ed3156a9cae9a589aa5d26009037deb280569baf940966887483c6dbefb81
 AUX rrdtool-1.7.1-configure.ac.patch 257 BLAKE2B 9aa11b7b0392cb2427d686b888c29b09d8e50b1b0fbedfe0e144eeb27ab6da5a7526633eb8655f1edb129e6a256b102ba095cd9c1aa501aed5e9492073c93b2b SHA512 7c3d175ce94bce24ab244ca899d62d2537392c360ed3ec211b5be2e41fcb6638343f7357db1d3c00fac15104398f83b236ead713e940385b04d61851a3275683
-DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
 DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
-EBUILD rrdtool-1.7.2-r100.ebuild 5767 BLAKE2B 7568e91cfaa2295ab8ac44736185605626cfb3fd000a3a009f45e6fdfe9011d6c49080d33b4a69717f3d2244ffd53edd1bab6bf889b65d5b437aa4072a591fbc SHA512 817cfe3581b506eac6f4a62441a32d0b7a218cb258e004af2283b23318c43d60d2fa1bdef1aad7968ec51973494209389b436b52a6e3090e37ca3990bf3ef6c6
-EBUILD rrdtool-1.8.0.ebuild 5446 BLAKE2B f74dfd05178853e37ac3fb10f8d14959538db8ff214edfc0af20a5b44bb27551245558afdc791997eac392391e4eb517f3840ad65e6b0260ec4410743e9bcec0 SHA512 a8e815bb3edf42792c286db2aaa759ed075c0c482430e056185456c1d42a178a76746cdd2251361376fdff76c4bb6803177daa69facf2583c02b061faba18a1b
+EBUILD rrdtool-1.8.0.ebuild 5445 BLAKE2B a9759f7ab31b351d7949c0498732c5860fc45514b0b2a786026037bdeab397b837e456578cbfa9b1d07a3d09211d14cd8b179aab7a3bfbd457ff1d42256eafcd SHA512 540f71cf177fe908776686a3cfbf6776d93768140a7353069003fc4ee35eab19a294afbc31c53214da34b4b9ea8a61efa5bca696ae2e96cc2e73e60683e726bb
 MISC metadata.xml 767 BLAKE2B 12dd8f6fc7192dd214acb9b7ab3cb2bdfdd601ad768587ca0133ea132a2ffbc4aace5c7943c933b0b8e13d200ff5129882f9b47931421db9db2c017a398870ff SHA512 afca7f1c6ff9209ee1fe4977f5e9a063e37e3ee00a5a3ecd560e71fdf86df7daed526742bcd592d145df4b26ac206672135845fe67f8d2a64d5ae536113aa22f
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
-
-E<lt>rrdfileE<gt> = B<ceph//E<lt>nameE<gt>>
-
-
-=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<CEPH_ID>
-
-Sets the Ceph Client ID to use when connecting. By default the client ID "admin"
-is used.
-
-=item B<CEPH_POOL>
-
-Sets the name of the Ceph Pool to connect to. By default, the pool "rrd" is
-used.
-
-=back
-
-
-=head1 EXAMPLES
-
-B<Creating an RRD file on Ceph>
-
- 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<Importing an existing RRD into Ceph>
-
- 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<Retrieving RRD data from Ceph>
-
- rrdtool fetch ceph//file.rrd AVERAGE
-
-
-=head1 AUTHOR
-
-Simon Boulet E<lt>simon@nostalgeek.comE<gt>
-
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
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
index 2cd8ee5e9e1e..ad96cbb55058 100644
--- a/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.8.0.ebuild
@@ -20,7 +20,7 @@ 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"
+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 )"