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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/
Date: Tue, 21 Mar 2023 12:44:03 +0000 (UTC)	[thread overview]
Message-ID: <1679402638.54590fb2caabe3e8901c5427b4c31e66cb6c5d87.mgorny@gentoo> (raw)

commit:     54590fb2caabe3e8901c5427b4c31e66cb6c5d87
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 12:26:50 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 12:43:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54590fb2

dev-util/scons: Fix merging sdist with GitHub archive

The ebuild originally unpacked the sdist tarball inside the GitHub
archive.  However, this stopped working correctly once upstream moved
the source code from "src" subdirectory to the top directory.  Update
the ebuild to merge sources again.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 .../{scons-4.5.1.ebuild => scons-4.5.1-r2.ebuild}  | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/dev-util/scons/scons-4.5.1.ebuild b/dev-util/scons/scons-4.5.1-r2.ebuild
similarity index 85%
rename from dev-util/scons/scons-4.5.1.ebuild
rename to dev-util/scons/scons-4.5.1-r2.ebuild
index 87c03687ce2a..a266b560941a 100644
--- a/dev-util/scons/scons-4.5.1.ebuild
+++ b/dev-util/scons/scons-4.5.1-r2.ebuild
@@ -29,7 +29,6 @@ SRC_URI="
 			-> ${P}.gh.tar.gz
 	)
 "
-S="${WORKDIR}/${P}/src"
 
 LICENSE="MIT"
 SLOT="0"
@@ -44,30 +43,27 @@ BDEPEND="
 	)
 "
 
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-4.1.0-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
-)
-
 src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
+	# use the git directory structure, then unpack the pypi tarball
+	# on top of it to make our life easier
 	if use test; then
 		unpack "${P}.gh.tar.gz"
 	else
-		mkdir -p "${P}"/src || die
+		mkdir -p "${P}" || die
 	fi
 
-	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die
+	tar -C "${P}" --strip-components=1 -xzf "${DISTDIR}/${MY_P}.tar.gz" || die
 }
 
 src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
 	distutils-r1_src_prepare
 
+	# TODO: rebase the patches <4.5.1-r2 is gone
+	# support env passthrough for Gentoo ebuilds
+	eapply -p2 "${FILESDIR}"/scons-4.1.0-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	eapply -p2 "${FILESDIR}"/scons-4.2.0-respect-cc-etc.patch
+
 	if use test; then
 		local remove_tests=(
 			# TODO: does not respect PATH?
@@ -90,6 +86,11 @@ src_prepare() {
 			test/Fortran/F77PATH.py
 			test/Fortran/FORTRANPATH.py
 			test/Fortran/gfortran.py
+			# TODO, these seem to be caused by our patches
+			test/Repository/include.py
+			test/Repository/multi-dir.py
+			test/Repository/variants.py
+			test/virtualenv/activated/option/ignore-virtualenv.py
 		)
 
 		if ! use amd64 && ! use x86 ; then

next             reply	other threads:[~2023-03-21 12:44 UTC|newest]

Thread overview: 170+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-03-21 12:44 Michał Górny [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-09 18:43 [gentoo-commits] repo/gentoo:master commit in: dev-util/scons/ Michał Górny
2023-12-26 16:37 Sam James
2023-12-21  8:05 Arthur Zamarin
2023-12-21  6:52 Sam James
2023-12-21  6:52 Sam James
2023-12-21  6:52 Sam James
2023-12-19  6:14 Michał Górny
2023-12-19  5:19 Sam James
2023-12-10 16:12 Michał Górny
2023-12-10 15:16 Michał Górny
2023-12-10  1:38 Ionen Wolkens
2023-11-20  6:56 Michał Górny
2023-10-06 12:29 Michał Górny
2023-08-20 13:21 Sam James
2023-08-20 13:11 Sam James
2023-08-20 10:57 Sam James
2023-08-20 10:42 Sam James
2023-08-20  8:50 Michał Górny
2023-08-20  8:50 Michał Górny
2023-03-21 16:45 Michał Górny
2023-03-21 12:44 Michał Górny
2023-03-21  5:31 Michał Górny
2023-03-20 19:29 Michał Górny
2023-03-07  8:11 Michał Górny
2023-01-15  7:32 Michał Górny
2023-01-06 15:27 Michał Górny
2022-12-19 18:37 Michał Górny
2022-12-19 16:46 Michał Górny
2022-12-19 15:12 Michał Górny
2022-09-08 11:24 Agostino Sarubbo
2022-09-06  9:00 Jakov Smolić
2022-09-05 14:03 Agostino Sarubbo
2022-09-05 14:02 Agostino Sarubbo
2022-09-05 14:02 Agostino Sarubbo
2022-09-05 14:01 Agostino Sarubbo
2022-09-04 17:48 Sam James
2022-08-01 17:32 Michał Górny
2022-05-14  5:32 WANG Xuerui
2022-02-25 23:41 Michał Górny
2022-02-25 21:50 Sam James
2022-02-11 21:10 Arthur Zamarin
2022-02-10 13:58 Sam James
2022-02-10 11:43 Sam James
2022-02-10 11:43 Sam James
2022-02-10 11:43 Sam James
2022-02-10 10:45 Jakov Smolić
2021-12-25 21:52 Michał Górny
2021-10-13  2:38 Sam James
2021-10-04 19:16 Sam James
2021-10-03 17:50 Agostino Sarubbo
2021-10-02 23:51 Sam James
2021-10-02 23:50 Sam James
2021-09-27 18:13 Sam James
2021-09-27  6:57 Agostino Sarubbo
2021-09-27  6:55 Agostino Sarubbo
2021-08-01  8:17 Michał Górny
2021-07-27 11:00 Marek Szuba
2021-03-28 11:51 Sam James
2021-03-06 10:25 Sergei Trofimovich
2021-03-05 21:41 Sam James
2021-03-05 18:50 Sam James
2021-03-05 18:50 Sam James
2021-03-05 15:02 Agostino Sarubbo
2021-03-05 14:19 Agostino Sarubbo
2021-02-05 21:47 Sam James
2021-02-05 21:46 Sam James
2021-01-06 22:55 Fabian Groffen
2020-12-13 23:35 Sam James
2020-11-09 15:15 Michał Górny
2020-10-06 19:43 Sam James
2020-09-26 16:21 Michał Górny
2020-09-26 12:51 Michał Górny
2020-09-24  6:46 Agostino Sarubbo
2020-09-20 21:52 Thomas Deutschmann
2020-09-19  2:10 Sam James
2020-09-18 16:56 Michał Górny
2020-09-18 11:02 Michał Górny
2020-09-18  9:38 Michał Górny
2020-09-16 17:48 Sergei Trofimovich
2020-09-14 16:34 Sergei Trofimovich
2020-07-21 12:39 Michał Górny
2020-07-11 13:59 Michał Górny
2020-04-08 20:53 Sergei Trofimovich
2020-04-06 17:45 Mike Gilbert
2020-02-24 11:31 Agostino Sarubbo
2020-02-21 15:57 Agostino Sarubbo
2020-02-17 12:21 Agostino Sarubbo
2020-02-17 12:17 Agostino Sarubbo
2020-02-17 12:09 Agostino Sarubbo
2020-02-17 11:53 Agostino Sarubbo
2020-02-17 11:45 Agostino Sarubbo
2020-02-16 20:51 Sergei Trofimovich
2019-12-24 20:02 Mikle Kolyada
2019-12-17  7:35 Michał Górny
2019-12-17  7:35 Michał Górny
2019-11-11 19:39 Sergei Trofimovich
2019-09-13 18:51 Mikle Kolyada
2019-09-09 17:21 Aaron Bauman
2019-09-09  6:02 Agostino Sarubbo
2019-09-09  6:00 Agostino Sarubbo
2019-09-09  5:54 Agostino Sarubbo
2019-09-09  5:50 Agostino Sarubbo
2019-09-09  5:49 Agostino Sarubbo
2019-09-08 19:15 Thomas Deutschmann
2019-09-08  6:43 Michał Górny
2019-08-08 21:48 Michał Górny
2019-07-28 19:53 Mikle Kolyada
2019-07-23 23:49 Aaron Bauman
2019-07-21  6:44 Michał Górny
2019-06-15 14:19 Michał Górny
2019-06-15 14:19 Michał Górny
2019-06-15 14:19 Michał Górny
2019-06-15 14:19 Michał Górny
2019-06-15 14:19 Michał Górny
2019-06-15 14:19 Michał Górny
2019-06-06  6:46 Agostino Sarubbo
2019-05-30 20:33 Sergei Trofimovich
2019-05-30 20:30 Sergei Trofimovich
2019-05-30 20:08 Sergei Trofimovich
2019-05-30 20:05 Sergei Trofimovich
2019-05-26 22:27 Thomas Deutschmann
2019-05-26 11:35 Mikle Kolyada
2019-05-26  8:27 Sergei Trofimovich
2019-05-24 21:43 Michał Górny
2019-04-28 13:03 Sergei Trofimovich
2019-04-28  7:42 Sergei Trofimovich
2019-04-22 12:07 Michał Górny
2019-04-20 17:57 Mikle Kolyada
2019-03-27 13:12 Michał Górny
2019-03-16 14:06 Mikle Kolyada
2019-03-15  8:11 Mikle Kolyada
2019-03-14 21:53 Sergei Trofimovich
2019-03-14 19:41 Sergei Trofimovich
2019-01-24  7:50 Michał Górny
2018-09-06 21:22 Michał Górny
2018-06-13  7:31 Michał Górny
2018-05-26  9:21 Mikle Kolyada
2018-05-10 11:48 Fabian Groffen
2018-05-09 15:26 Michał Górny
2018-05-09 14:30 Michał Górny
2018-05-09 14:30 Michał Górny
2018-04-25 12:26 Mart Raudsepp
2018-04-19 22:14 Sergei Trofimovich
2018-04-18 20:56 Mikle Kolyada
2018-04-05 23:19 Thomas Deutschmann
2018-04-01 11:09 Tobias Klausmann
2018-03-30 13:32 Aaron Bauman
2018-03-27 22:32 Sergei Trofimovich
2018-03-27 19:07 Sergei Trofimovich
2017-10-29 21:51 Matt Thode
2017-04-23 20:48 Michał Górny
2017-03-01  0:35 Michael Weber
2017-01-15 19:37 Jeroen Roovers
2017-01-04 17:09 Agostino Sarubbo
2016-12-17 12:24 Aaron Bauman
2016-11-26 10:02 Markus Meier
2016-11-15 14:53 Tobias Klausmann
2016-11-06  9:38 Michał Górny
2016-11-04  8:21 Lars Wendler
2016-04-20  6:35 Lars Wendler
2016-04-20  6:35 Lars Wendler
2016-02-08  8:15 Fabian Groffen
2015-11-11 10:37 Lars Wendler
2015-09-23  0:16 Mike Gilbert
2015-09-22  8:54 Lars Wendler
2015-09-22  8:54 Lars Wendler
2015-09-17 22:36 Patrice Clement
2015-09-14 13:49 Tobias Klausmann
2015-09-14  3:24 Jeroen Roovers

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:87c03687ce2 dfblob:a266b560941 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: dev-util/scons/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1679402638.54590fb2caabe3e8901c5427b4c31e66cb6c5d87.mgorny@gentoo \
    --to=mgorny@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox