From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6E9C815803E for ; Fri, 5 Jan 2024 21:48:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2B0F2BC013; Fri, 5 Jan 2024 21:48:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 922A82BC013 for ; Fri, 5 Jan 2024 21:48:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF89B343122 for ; Fri, 5 Jan 2024 21:48:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4677F1300 for ; Fri, 5 Jan 2024 21:48:25 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1704491290.1c0f5f5138d2ee1c140292113db1beb73ed96cd9.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/rrdtool/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/rrdtool/Manifest net-analyzer/rrdtool/rrdtool-1.8.0-r3.ebuild net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild X-VCS-Directories: net-analyzer/rrdtool/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 1c0f5f5138d2ee1c140292113db1beb73ed96cd9 X-VCS-Branch: master Date: Fri, 5 Jan 2024 21:48:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7ba370b6-1751-4963-95f8-9ce3fec9c340 X-Archives-Hash: d7778973adb7c7e72ecbac6054963d65 commit: 1c0f5f5138d2ee1c140292113db1beb73ed96cd9 Author: Conrad Kostecki gentoo org> AuthorDate: Fri Jan 5 21:39:06 2024 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Fri Jan 5 21:48:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c0f5f51 net-analyzer/rrdtool: fix gcc14 build Closes: https://bugs.gentoo.org/919448 Signed-off-by: Conrad Kostecki gentoo.org> net-analyzer/rrdtool/Manifest | 1 + ...{rrdtool-1.8.0-r3.ebuild => rrdtool-1.8.0-r4.ebuild} | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/net-analyzer/rrdtool/Manifest b/net-analyzer/rrdtool/Manifest index e3ece643a7cd..457a1b51cd3a 100644 --- a/net-analyzer/rrdtool/Manifest +++ b/net-analyzer/rrdtool/Manifest @@ -1 +1,2 @@ +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 diff --git a/net-analyzer/rrdtool/rrdtool-1.8.0-r3.ebuild b/net-analyzer/rrdtool/rrdtool-1.8.0-r4.ebuild similarity index 92% rename from net-analyzer/rrdtool/rrdtool-1.8.0-r3.ebuild rename to 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 }