From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1625780-garchives=archives.gentoo.org@lists.gentoo.org>
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 13FE41581E7
	for <garchives@archives.gentoo.org>; Sun, 28 Apr 2024 06:55:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id DC729E29FE;
	Sun, 28 Apr 2024 06:55:06 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 99064E29B5
	for <gentoo-commits@lists.gentoo.org>; Sun, 28 Apr 2024 06:55:06 +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))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 97E9D335C11
	for <gentoo-commits@lists.gentoo.org>; Sun, 28 Apr 2024 06:55:05 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 2D38F16F9
	for <gentoo-commits@lists.gentoo.org>; Sun, 28 Apr 2024 06:55:04 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1714287265.84e655a1f462a58154b701b9b8077ebf3071e82f.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/squashfs-tools-ng/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.2.0.ebuild sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
X-VCS-Directories: sys-fs/squashfs-tools-ng/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 84e655a1f462a58154b701b9b8077ebf3071e82f
X-VCS-Branch: master
Date: Sun, 28 Apr 2024 06:55:04 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 53a4195e-1f24-4001-8186-9dc315c066c9
X-Archives-Hash: 937db05a5b6d4978c3b8e6e9cd2955d7

commit:     84e655a1f462a58154b701b9b8077ebf3071e82f
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Apr 28 04:42:54 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 06:54:25 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e655a1

sys-fs/squashfs-tools-ng: run elibtoolize in non-live ebuild

When building live, we always run eautoreconf. However, even in release
mode we should still run elibtoolize to get important fixes -- such as
the ones that pass through LTO sanity flags to the link phase.

Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.2.0.ebuild | 9 +++++++--
 sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild | 9 +++++++--
 sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild  | 7 ++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.2.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.2.0.ebuild
index dc4fd0581812..a4168be5e3b8 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.2.0.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2023 Gentoo Authors
+# Copyright 2019-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,6 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
 else
+	inherit libtool
 	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
 fi
@@ -30,7 +31,11 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-	[[ ${PV} == "9999" ]] && eautoreconf
+	if [[ ${PV} = "9999" ]]; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 src_configure() {

diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild
index c143cfb54ab2..f936c78e267e 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.3.0.ebuild
@@ -9,7 +9,8 @@ if [[ ${PV} = 9999* ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
 else
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	inherit libtool
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
 fi
 
@@ -30,7 +31,11 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-	[[ ${PV} == "9999" ]] && eautoreconf
+	if [[ ${PV} = "9999" ]]; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 src_configure() {

diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
index 161eca8ce48e..f936c78e267e 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -9,6 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
 else
+	inherit libtool
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
 fi
@@ -30,7 +31,11 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
-	[[ ${PV} == "9999" ]] && eautoreconf
+	if [[ ${PV} = "9999" ]]; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 src_configure() {