commit: 1179f84a32cea29db5f2641af6add80361f8a588 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org> AuthorDate: Fri Apr 4 20:10:49 2025 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Fri Apr 4 20:15:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1179f84a
net-analyzer/rrdtool: drop 1.8.0-r4, 1.9.0 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> net-analyzer/rrdtool/Manifest | 3 - .../files/rrdtool-1.8.0-configure-clang16.patch | 34 --- net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild | 256 --------------------- net-analyzer/rrdtool/rrdtool-1.9.0.ebuild | 253 -------------------- 4 files changed, 546 deletions(-) diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index 97c81ab9af4d..3cc77a422414 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1,4 +1 @@ -DIST rrdtool-1.8.0-gcc14.patch.gz 10775 BLAKE2B 9b8eeb829acec097bf06e3cad2fb4ca37a5d351fb3eca5767066d8cfb70c176c9d3b9265a721958b97e02f1c267b8b3a4b61ad35b0ca06199cc45c8c92f7dc09 SHA512 576be3d94a56edbc8738a32b934d30d8e45eb3e801854f73a3a77f5bd22bdd4618f68ea079f37992f38a9b756cac96e6cb48eeb5cceb4ff30139a2d77c9b0afe -DIST rrdtool-1.8.0.tar.gz 2955398 BLAKE2B d821d662af432c53760bc0e9636b84d9209933a810fa71091fc4c2b44518c89c7ad509bde7955d952279ee41464c3bfa4f631662dde61b6fff46699bb382653f SHA512 8ae6f94d119e8d0e1ba7f2d0738f1ba008a4880d1022f1c0c5436f662d961fceec5c42e01c241493ece3d6f55c60fd7d1d264f93e678f3cf1251201dcde027c1 DIST rrdtool-1.9.0.gh.tar.gz 833532 BLAKE2B f2b5ece76d5e229f210781e1cc3756cc350b84b771221cc64a31a8928f047c5caca55d15b237de1cf95d8ca2b80c98d5eb0c3530c8b8caf257238dbf7fcba512 SHA512 82d947f3cb41223437c4548cd30054f0b0b08f5f07438203deadcc2a0f106a6df8ef7b8e04eeac4cd31f8bc0549b5fa098ad1bb4c6b17fcfa20fc1bc40f634db -DIST rrdtool-1.9.0.tar.gz 2972593 BLAKE2B a5633b1bcacf53823f95f7899872e67d9941faec235c56546de8b66faf15a958a7c0d6a86d569c078e11a478dc272b1fbe784c3d3d9d45e8c3de696f0d6e378a SHA512 ebeb1fd9e1eed8e01d4d08a4f07aa22c272cc95ac87852f81a892690e6f446b5398bf64689ea99622779cba490722d97b325bda2d2a6d4dfc0719929b2a4c041 diff --git a/net-analyzer/rrdtool/files/rrdtool-1.8.0-configure-clang16.patch b/net-analyzer/rrdtool/files/rrdtool-1.8.0-configure-clang16.patch deleted file mode 100644 index 355436cb82f2..000000000000 --- a/net-analyzer/rrdtool/files/rrdtool-1.8.0-configure-clang16.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://github.com/oetiker/rrdtool-1.x/commit/f3334fcbde0a77aa48938ba38602bff91c09cf85 - -From f3334fcbde0a77aa48938ba38602bff91c09cf85 Mon Sep 17 00:00:00 2001 -From: Ryan Schmidt <[email protected]> -Date: Sun, 20 Mar 2022 16:29:10 -0500 -Subject: [PATCH] acinclude.m4: Include <stdlib.h> when using exit - -Fixes: - -conftest.c:124:33: error: implicitly declaring library function 'exit' -with type 'void (int) __attribute__((noreturn))' ---- a/m4/acinclude.m4 -+++ b/m4/acinclude.m4 -@@ -582,7 +582,8 @@ AC_DEFUN([GC_TIMEZONE], [ - AC_REQUIRE([AC_STRUCT_TM]) - AC_CACHE_CHECK([tm_gmtoff in struct tm], gq_cv_have_tm_gmtoff, - gq_cv_have_tm_gmtoff=no -- AC_TRY_COMPILE([#include <time.h> -+ AC_TRY_COMPILE([#include <stdlib.h> -+ #include <time.h> - #include <$ac_cv_struct_tm> - ], - [struct tm t; -@@ -595,7 +596,8 @@ AC_DEFUN([GC_TIMEZONE], [ - - AC_CACHE_CHECK([__tm_gmtoff in struct tm], gq_cv_have___tm_gmtoff, - gq_cv_have___tm_gmtoff=no -- AC_TRY_COMPILE([#include <time.h> -+ AC_TRY_COMPILE([#include <stdlib.h> -+ #include <time.h> - #include <$ac_cv_struct_tm> - ], - [struct tm t; - diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild deleted file mode 100644 index b9d2d6cb4fc5..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild +++ /dev/null @@ -1,256 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..12} ) -DISTUTILS_EXT=1 -DISTUTILS_OPTIONAL="true" -DISTUTILS_SINGLE_IMPL="true" -DISTUTILS_USE_PEP517="setuptools" -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 - https://dev.gentoo.org/~conikost/distfiles/patches/${PN}-1.8.0-gcc14.patch.gz -" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-2" -SLOT="0/8.0.0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -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? ( graph 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 - app-alternatives/awk - python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') ) - test? ( - app-alternatives/bc - lua? ( ${LUA_DEPS} ) - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-1.7.0-disable-rrd_graph-cgi.patch - "${FILESDIR}"/${PN}-1.7.1-configure.ac.patch - "${FILESDIR}"/${PN}-1.8.0-configure-clang16.patch - "${WORKDIR}"/${PN}-1.8.0-gcc14.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 - - # Temporarily disable rpn test, will be enabled with > 1.8.0 release. - sed -e 's/rpn2//' -i tests/Makefile.am || die - - 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.9.0.ebuild b/net-analyzer/rrdtool/rrdtool-1.9.0.ebuild deleted file mode 100644 index 1215d92c400b..000000000000 --- a/net-analyzer/rrdtool/rrdtool-1.9.0.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{1..4} luajit ) -PYTHON_COMPAT=( python3_{9..13} ) -DISTUTILS_EXT=1 -DISTUTILS_OPTIONAL="true" -DISTUTILS_SINGLE_IMPL="true" -DISTUTILS_USE_PEP517="setuptools" -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 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -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? ( graph 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 - app-alternatives/awk - python? ( $(python_gen_cond_dep 'dev-python/setuptools[${PYTHON_USEDEP}]') ) - test? ( - app-alternatives/bc - lua? ( ${LUA_DEPS} ) - ) -" - -PATCHES=( - "${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 - - # Temporarily disable rpn test, will be enabled with > 1.8.0 release. - sed -e 's/rpn2//' -i tests/Makefile.am || die - - 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 -}
