From 1f709ed82b8014b4c156f87c66cee7d0d1d3905d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 4 Nov 2022 03:13:19 +0000
Subject: gentoo auto-resync : 04:11:2022 - 03:13:18

---
 net-analyzer/Manifest.gz                     | Bin 44569 -> 44566 bytes
 net-analyzer/rrdtool/Manifest                |   2 +-
 net-analyzer/rrdtool/rrdtool-1.8.0-r1.ebuild | 247 --------------------------
 net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild | 248 +++++++++++++++++++++++++++
 4 files changed, 249 insertions(+), 248 deletions(-)
 delete mode 100644 net-analyzer/rrdtool/rrdtool-1.8.0-r1.ebuild
 create mode 100644 net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild

(limited to 'net-analyzer')

diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 9ba466cb3cfa..d0bd66e24a6a 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index f32a0cac5b7b..eb10ec6606e2 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -4,5 +4,5 @@ AUX rrdtool-1.4.9-disable-rrd_graph-perl.patch 914 BLAKE2B 80b309cf59260a0f137f6
 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.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1
-EBUILD rrdtool-1.8.0-r1.ebuild 5457 BLAKE2B 3309b424774392e87d9303f7acba215ccea79a0cf9505a4cbc169c730cd3a18dd5c2ccfc6f666b324a1adf6996a9fce27557abf30ceea7084abaf9632d6c681a SHA512 090d82885106fbd241aaa2e84b1a7e72ed142a66dfca3c585405b7fa81d9a90393c721fb0009971e485f34f8049892ae5d33115a1dcc4282cec405333ab90152
+EBUILD rrdtool-1.8.0-r2.ebuild 5509 BLAKE2B c1f428c3d0f0a79f7ca218144ff6114668511efa2d25b72f9640e7e3d6e24f24ac108ba7d38dc24d31c431a25ad1b8fbee88f1d542ac439a2c8527804fddc7c1 SHA512 41360ad73d474ade3efd0a52130f3ba177d70442753d79da3fdb2953f59741e9693e738d89e502cc1d6ce695684f0f87ce61949eb1ce5cbd5611548cf980bb31
 MISC metadata.xml 767 BLAKE2B 12dd8f6fc7192dd214acb9b7ab3cb2bdfdd601ad768587ca0133ea132a2ffbc4aace5c7943c933b0b8e13d200ff5129882f9b47931421db9db2c017a398870ff SHA512 afca7f1c6ff9209ee1fe4977f5e9a063e37e3ee00a5a3ecd560e71fdf86df7daed526742bcd592d145df4b26ac206672135845fe67f8d2a64d5ae536113aa22f
diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0-r1.ebuild
deleted file mode 100644
index e2a100d00954..000000000000
--- a/net-analyzer/rrdtool/rrdtool-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# 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 )
-	)
-	test? ( rrdcached )
-"
-
-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 || die
-}
-
-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
-}
diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild
new file mode 100644
index 000000000000..1cf84bb9c604
--- /dev/null
+++ b/net-analyzer/rrdtool/rrdtool-1.8.0-r2.ebuild
@@ -0,0 +1,248 @@
+# 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..11} )
+DISTUTILS_USE_PEP517="setuptools"
+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 )
+	)
+	test? ( rrdcached )
+"
+
+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="
+	${DISTUTILS_DEPS}
+	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 || die
+}
+
+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
+}
-- 
cgit v1.2.3