[gentoo-commits] repo/gentoo:master commit in: dev-util/scons/

["Michał Górny" <mgorny@gentoo.org>]

commit:     0e52f021220e829b020786e14e15eb07fa9bc2ab
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 20 19:04:52 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 20 19:29:21 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e52f021

dev-util/scons: Backport MergeFlags fix to 4.5.1

Closes: https://bugs.gentoo.org/900971
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-util/scons/Manifest                                |  1 +
 .../{scons-4.5.1.ebuild => scons-4.5.1-r1.ebuild}      | 18 ++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index b4cb22f2c203..e5ddc6240844 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -3,6 +3,7 @@ DIST SCons-4.5.1.tar.gz 3194371 BLAKE2B 830e3365be99e38aec0f3b99d406bb7547d3d8b7
 DIST scons-4.4.0-user.html 1608381 BLAKE2B ff4eb1e0f9c5e8ea7ca44cc00dc37e3e2dd38c24cb09a857c691e6a48f11e5fc86a55740037cc295e6b23df2a1c1b600adf0462320ec87cc26d4bcf919b07342 SHA512 8c1d6578270054efba34c56ddc07b4314bf62630f6a445f5b9f865cc48d593f6c92101a8d216dece201b8d6cb5bce59ff4adb51caaa40128e96b6235087f748c
 DIST scons-4.4.0-user.pdf 2964111 BLAKE2B 45b37c99c3f3d0e9969a16506e27aeabfd562155405f5a59ba79c24404b14e5588fbd0673d86e2266adbd25eca140c9e1cf86e271228658591c0d9285474f078 SHA512 57330f685e7c775cb1c782e40f711c2b2322fad19212a22a920aff92db974610cc78f276e1606fb827660bb488ce803e2458bb9d93c452fa0600df4478f03d06
 DIST scons-4.4.0.gh.tar.gz 5808265 BLAKE2B f6ce757f2edc40551b05285098626bb62def6abda2380d4885ee4443868e715e53aaa34f26c09dc689bb6ade26d1b0e276046fe3b1d2ddf8eb40400bca9ea164 SHA512 01fcd40bf818ca22a278973af1cda3024efb74cf877f15d46607fda860448fbd577fc96ba33fef2bed3d145e662a0371f55e8c927e7ac44feea7f3081791ce11
+DIST scons-4.5.1-mergeflags.patch 10518 BLAKE2B ea059c4347cfa8dcd99353c1f6b6c1d3aae1c6225b4683e421f3f3ea9181d5597862603c2491abff40dd1599094638239f34bf88458e7c44a8f28908eb91934c SHA512 11771c99d64cee413311f595faec8d2025152a7871ef53bdf0b22be45ffefc0d0c4bf49d185a10c1d3d2fb76ac94b04d992990375dc144587b101761a5d985a4
 DIST scons-4.5.1-user.html 1655168 BLAKE2B 644c808f129d2d83f40b1ef2c8c12781b697a0120dfc00f5f0425e88e23c609290ecf2c8b6daad556c876ae3a86e8b262c53915b05d69c6e3c79f58395789362 SHA512 171d9330df520a75fbc124bf646c55c5868b24343ff46755a6283fe444ad4e090f5658dafa7239e708b4ff8b910e81201c27655674bdaffd20e8cc6ffb81d633
 DIST scons-4.5.1-user.pdf 3023817 BLAKE2B caa782f77fac668eee0ccd76f3e96168ae3d61c9c3e80123c34bc45625182f77973fbab24170c5f67f133c6124412eadbf02c3497373211560c58a348d6b00ab SHA512 41fddff58032b6364ff3935259d4bf81a0d69398cd52158c42be71e4ff6efaebd2faaf1354781f7336ba1aa4f0cf99f0f37edcd72baf325f9ced7ec88b76ce88
 DIST scons-4.5.1.gh.tar.gz 5844118 BLAKE2B 88a82e12a034f6d0748555d0d33716e5af6ff957a9345d5b0ba87c2a36544bae0965ea0a29e3cc80d6d2493f3f8bf0bd314bed5824dc609123972f640b19a53a SHA512 160089342b93197237b9f0c5f0ada42126f3e5c83e0026f6dc121aaae85c94774b01ea3b0b0fc56edf3effd87d91612b2167d004abe7a00bd8d107d5415f5d4a

diff --git a/dev-util/scons/scons-4.5.1.ebuild b/dev-util/scons/scons-4.5.1-r1.ebuild
similarity index 93%
rename from dev-util/scons/scons-4.5.1.ebuild
rename to dev-util/scons/scons-4.5.1-r1.ebuild
index 87c03687ce2a..d12cdf7c1bd8 100644
--- a/dev-util/scons/scons-4.5.1.ebuild
+++ b/dev-util/scons/scons-4.5.1-r1.ebuild
@@ -18,16 +18,16 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${MY_P}.tar.gz
+	https://github.com/SCons/scons/pull/4322.patch
+		-> ${P}-mergeflags.patch
+	https://github.com/SCons/scons/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
 	doc? (
 		https://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf
 			-> ${P}-user.pdf
 		https://www.scons.org/doc/${PV}/HTML/${PN}-user.html
 			-> ${P}-user.html
 	)
-	test? (
-		https://github.com/SCons/scons/archive/${PV}.tar.gz
-			-> ${P}.gh.tar.gz
-	)
 "
 S="${WORKDIR}/${P}/src"
 
@@ -45,6 +45,9 @@ BDEPEND="
 "
 
 PATCHES=(
+	# https://bugs.gentoo.org/900971
+	"${DISTDIR}/${P}-mergeflags.patch"
+
 	# support env passthrough for Gentoo ebuilds
 	"${FILESDIR}"/scons-4.1.0-env-passthrough.patch
 	# respect CC, CXX, C*FLAGS, LDFLAGS by default
@@ -54,12 +57,7 @@ PATCHES=(
 src_unpack() {
 	# use the git directory structure, but put pregenerated release
 	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-	else
-		mkdir -p "${P}"/src || die
-	fi
-
+	unpack "${P}.gh.tar.gz"
 	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die
 }