From 02b5e1bc60e28328f8b057cb3dd6764753151185 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 26 Aug 2026 17:01:53 -0400 Subject: [PATCH] net-libs/ngtcp2: re-fix broken elibtoolize handling Broadly, elibtoolize is "probably needed" for any autotools project which also produces libraries. Several patches apply even for freshly eautoreconf'ed builds. In commit 0d76d965790952dbd50e1f4cd71e55beda33360b, an existing elibtoolize was mysteriously: - added to 1.24 (it was missing?), but without required inherit - *omitted* from 1.25 - inherit removed from 9999, thus breaking "copy + single source live/stable ebuilds". elibtoolize unconditionally runs, and gets indirectly inherited via autotools in live only. Revert all ebuilds to the same consistent behavior. Fixes: ``` * Messages for package net-libs/ngtcp2-1.24.0: * Log file: /var/log/portage/build/net-libs/ngtcp2-1.24.0:20260826-035628.log * QA Notice: command not found: * * /var/tmp/portage/net-libs/ngtcp2-1.24.0/temp/environment: line 1315: elibtoolize: command not found ``` and also pkgcheck: ``` MissingInherits: version 1.24.0: libtool: missing inherit usage: 'elibtoolize', line 52 IndirectInherits: version 9999: libtool: indirect inherit usage: 'elibtoolize', line 52 ``` For 1.25 we now go back to applying: ``` * Running elibtoolize in: ngtcp2-1.25.0/ * Applying portage/1.2.0 patch ... * Applying sed/1.5.6 patch ... * Applying as-needed/2.5.0 patch ... * Applying werror/2.4.7-debian patch ... * Applying cxx-pthread/2.4.6 patch ... * Applying color-record/2.4.7-debian patch ... * Applying openmp/2.4.7 patch ... * Applying verbose-pic/2.4.7 patch ... * Applying clang-runtime-ltmain/2.4.7 patch ... * Applying ppc64le/2.4.4 patch ... * Applying fix-file-check/2.5.0 patch ... * Applying clang-runtime/2.4.7 patch ... ``` Fixes: 0d76d965790952dbd50e1f4cd71e55beda33360b Bug: https://bugs.gentoo.org/978993 Signed-off-by: Eli Schwartz --- net-libs/ngtcp2/ngtcp2-1.24.0.ebuild | 2 +- net-libs/ngtcp2/ngtcp2-1.25.0.ebuild | 3 ++- net-libs/ngtcp2/ngtcp2-9999.ebuild | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/net-libs/ngtcp2/ngtcp2-1.24.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.24.0.ebuild index 72ff03c29b44c..2c15013002024 100644 --- a/net-libs/ngtcp2/ngtcp2-1.24.0.ebuild +++ b/net-libs/ngtcp2/ngtcp2-1.24.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Built with autotools rather than cmake to avoid circular dep (bug #951524 -inherit multilib-minimal +inherit libtool multilib-minimal if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git" diff --git a/net-libs/ngtcp2/ngtcp2-1.25.0.ebuild b/net-libs/ngtcp2/ngtcp2-1.25.0.ebuild index b9e77d7facd82..ce9290bbc3184 100644 --- a/net-libs/ngtcp2/ngtcp2-1.25.0.ebuild +++ b/net-libs/ngtcp2/ngtcp2-1.25.0.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Built with autotools rather than cmake to avoid circular dep (bug #951524 -inherit multilib-minimal +inherit libtool multilib-minimal if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git" @@ -49,6 +49,7 @@ QA_CONFIG_IMPL_DECL_SKIP=( src_prepare() { default + elibtoolize # bug #978993 [[ ${PV} == 9999 ]] && eautoreconf } diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild index 9fbc5b215966b..ce9290bbc3184 100644 --- a/net-libs/ngtcp2/ngtcp2-9999.ebuild +++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild @@ -5,7 +5,7 @@ EAPI=8 # Built with autotools rather than cmake to avoid circular dep (bug #951524 -inherit multilib-minimal +inherit libtool multilib-minimal if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"