commit: e48cfb03c694ce1dac06d7711dac4e9e4e321f12
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Jan 8 21:37:32 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 00:06:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e48cfb03
sys-apps/portage: fix invalid python bytecompile stage
python software needs to have two postprocessing passes run:
- fix up shebangs of bin scripts
- optimize importable libraries in sitedir
For some reason, both directories get both passes applied, which doesn't
actually do anything useful. Worse, the shebang fixing happens *after*
the optimizing, which means that if any shebang fixing occurs in the
sitedir, it invalidates the bytecode.
Fixes: be37f979f5f838c8a4039aaba379a3e373af0b6f
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/portage/{portage-3.0.57.ebuild => portage-3.0.57-r1.ebuild} | 4 ++--
sys-apps/portage/{portage-3.0.59.ebuild => portage-3.0.59-r1.ebuild} | 4 ++--
sys-apps/portage/{portage-3.0.60.ebuild => portage-3.0.60-r1.ebuild} | 2 +-
sys-apps/portage/portage-9999.ebuild | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sys-apps/portage/portage-3.0.57.ebuild
b/sys-apps/portage/portage-3.0.57-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.57.ebuild
rename to sys-apps/portage/portage-3.0.57-r1.ebuild
index f52331d84170..57f781d85350 100644
--- a/sys-apps/portage/portage-3.0.57.ebuild
+++ b/sys-apps/portage/portage-3.0.57-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -187,8 +187,8 @@ my_src_install() {
)
meson_src_install
- python_optimize "${pydirs[@]}"
python_fix_shebang "${pydirs[@]}"
+ python_optimize "${pydirs[@]}"
}
pkg_preinst() {
diff --git a/sys-apps/portage/portage-3.0.59.ebuild
b/sys-apps/portage/portage-3.0.59-r1.ebuild
similarity index 99%
rename from sys-apps/portage/portage-3.0.59.ebuild
rename to sys-apps/portage/portage-3.0.59-r1.ebuild
index 1ff0ccb90547..2dd0b1031597 100644
--- a/sys-apps/portage/portage-3.0.59.ebuild
+++ b/sys-apps/portage/portage-3.0.59-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -185,8 +185,8 @@ my_src_install() {
)
meson_src_install
- python_optimize "${pydirs[@]}"
python_fix_shebang "${pydirs[@]}"
+ python_optimize "${pydirs[@]}"
}
pkg_preinst() {
diff --git a/sys-apps/portage/portage-3.0.60.ebuild
b/sys-apps/portage/portage-3.0.60-r1.ebuild
similarity index 100%
rename from sys-apps/portage/portage-3.0.60.ebuild
rename to sys-apps/portage/portage-3.0.60-r1.ebuild
index 7d462427195c..36c0d5fdf384 100644
--- a/sys-apps/portage/portage-3.0.60.ebuild
+++ b/sys-apps/portage/portage-3.0.60-r1.ebuild
@@ -185,8 +185,8 @@ my_src_install() {
)
meson_src_install
- python_optimize "${pydirs[@]}"
python_fix_shebang "${pydirs[@]}"
+ python_optimize "${pydirs[@]}"
}
pkg_preinst() {
diff --git a/sys-apps/portage/portage-9999.ebuild
b/sys-apps/portage/portage-9999.ebuild
index 0fa6790375b9..36c0d5fdf384 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -185,8 +185,8 @@ my_src_install() {
)
meson_src_install
- python_optimize "${pydirs[@]}"
python_fix_shebang "${pydirs[@]}"
+ python_optimize "${pydirs[@]}"
}
pkg_preinst() {
