summaryrefslogtreecommitdiff
path: root/net-analyzer/rrdtool
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-01-06 00:53:39 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-01-06 00:53:39 +0000
commit5f153476311b368e80c57c4d1051c8106a724118 (patch)
tree830e9a7198df466eb4568e5a790d99b4cd1a6143 /net-analyzer/rrdtool
parent17ad5d72e60411f0ed843a9dbeb450d89f63d62c (diff)
gentoo auto-resync : 06:01:2024 - 00:53:38
Diffstat (limited to 'net-analyzer/rrdtool')
-rw-r--r--net-analyzer/rrdtool/Manifest3
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild (renamed from net-analyzer/rrdtool/rrdtool-1.8.0-r3.ebuild)17
2 files changed, 14 insertions, 6 deletions
diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest
index 555ef464c3dc..fa00638db411 100644
--- a/net-analyzer/rrdtool/Manifest
+++ b/net-analyzer/rrdtool/Manifest
@@ -4,6 +4,7 @@ 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
AUX rrdtool-1.8.0-configure-clang16.patch 1435 BLAKE2B 15d1788f77b7aa5a52a7306ffacf865afa01fc58fdcb8e836980fb00a688d83b93398f3d1b1385f3f30b42adf8378fc222dad6c44712bfb2695ae7949ecb704d SHA512 8a60fdf7843ef294a933bfb268e976ad0bab09a9c7c9101b608998f968b2d2e9f081256498526e11bcc8c28bdcb446179c4ec8dc6790c83ca27f946e20ba5fa1
+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
-EBUILD rrdtool-1.8.0-r3.ebuild 5562 BLAKE2B fe8862527b333aaafa6ad6a25a25862994dd9ac71e822b4059bcb9533e6a4b40000e2555ed75983c56b0e7b461baec99d8f55caf10b7654cc9c9baa4fa54e6e0 SHA512 ca1e61ff6537f01b4cd0e3ea632b47438f81fc4029f8877cfd7bb7f2dcee54f1220a86fa6023e18eaf89cc5deb6787ac4f5ad74abc6745e9ffd1b5c6e459bbd7
+EBUILD rrdtool-1.8.0-r4.ebuild 5768 BLAKE2B 44add8e748f3fe2f72843e95329629282120f799cbaa50d825471c3a0cb927bcbab717882befb27389ae1c009af5731cf6def5fb72d6ad1404e96d2ec6ee2462 SHA512 df2caf24d2237d859e358128fae7e56d83d6c9a59e143705ab7ba8b78b00190de9735d51b9cdfdf3295d4d4c479fcdcdfb29664d6bd8d6c1692ef34cc7133449
MISC metadata.xml 767 BLAKE2B 12dd8f6fc7192dd214acb9b7ab3cb2bdfdd601ad768587ca0133ea132a2ffbc4aace5c7943c933b0b8e13d200ff5129882f9b47931421db9db2c017a398870ff SHA512 afca7f1c6ff9209ee1fe4977f5e9a063e37e3ee00a5a3ecd560e71fdf86df7daed526742bcd592d145df4b26ac206672135845fe67f8d2a64d5ae536113aa22f
diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0-r3.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild
index 3808ba2d4164..46d30cce0ce6 100644
--- a/net-analyzer/rrdtool/rrdtool-1.8.0-r3.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild
@@ -4,10 +4,11 @@
EAPI=8
LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_PEP517="setuptools"
+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/_/-}"
@@ -15,7 +16,10 @@ 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"
+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"
@@ -71,10 +75,10 @@ BDEPEND="
"
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
- "${FILESDIR}"/${P}-configure-clang16.patch
+ "${FILESDIR}"/${PN}-1.8.0-configure-clang16.patch
+ "${WORKDIR}"/${PN}-1.8.0-gcc14.patch
)
pkg_setup() {
@@ -114,6 +118,9 @@ src_prepare() {
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
}