commit:     958ff90ac2223dfc4b443b02be45ade180932b0f
Author:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Sun May  4 22:03:27 2025 +0000
Commit:     Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Sun May  4 22:03:27 2025 +0000
URL:        https://gitweb.gentoo.org/proj/binhost.git/commit/?id=958ff90a

variants: python3both: also build USE=-python without any USE

The resulting packages don't need to be repetitively reinstalled when
switching python versions.

This could also be solved by bug 790422 (USE-dependent USE-flag
masking).

Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>

 builders/dola/gnome-23/portage/variants/python3both/buildpkgonly      | 2 ++
 builders/dola/kde-23/portage/variants/python3both/buildpkgonly        | 2 ++
 builders/dola/server-23/portage/variants/python3both/buildpkgonly     | 2 ++
 builders/milou/gnome-23/portage/variants/python3both/buildpkgonly     | 2 ++
 builders/milou/gnome-v3-23/portage/variants/python3both/buildpkgonly  | 2 ++
 builders/milou/kde-23/portage/variants/python3both/buildpkgonly       | 2 ++
 builders/milou/kde-v3-23/portage/variants/python3both/buildpkgonly    | 2 ++
 builders/milou/server-23/portage/variants/python3both/buildpkgonly    | 2 ++
 builders/milou/server-v3-23/portage/variants/python3both/buildpkgonly | 2 ++
 9 files changed, 18 insertions(+)

diff --git a/builders/dola/gnome-23/portage/variants/python3both/buildpkgonly 
b/builders/dola/gnome-23/portage/variants/python3both/buildpkgonly
index 6f396d8..920d751 100755
--- a/builders/dola/gnome-23/portage/variants/python3both/buildpkgonly
+++ b/builders/dola/gnome-23/portage/variants/python3both/buildpkgonly
@@ -11,3 +11,5 @@ cat >> ../../make.conf <<- __EOF__
 __EOF__
 
 EPYTHON=python3.12 emerge -uDN --backtrack=100 @world
+
+PYTHON_TARGETS= PYTHON_SINGLE_TARGET= emerge -1 $(pquery -I --has-use python 
--attr use| awk '/-python[ $]/{print "="$1}'

diff --git a/builders/dola/kde-23/portage/variants/python3both/buildpkgonly 
b/builders/dola/kde-23/portage/variants/python3both/buildpkgonly
index 6f396d8..920d751 100755
--- a/builders/dola/kde-23/portage/variants/python3both/buildpkgonly
+++ b/builders/dola/kde-23/portage/variants/python3both/buildpkgonly
@@ -11,3 +11,5 @@ cat >> ../../make.conf <<- __EOF__
 __EOF__
 
 EPYTHON=python3.12 emerge -uDN --backtrack=100 @world
+
+PYTHON_TARGETS= PYTHON_SINGLE_TARGET= emerge -1 $(pquery -I --has-use python 
--attr use| awk '/-python[ $]/{print "="$1}'

diff --git a/builders/dola/server-23/portage/variants/python3both/buildpkgonly 
b/builders/dola/server-23/portage/variants/python3both/buildpkgonly
index 6f396d8..f6f87f0 100755
--- a/builders/dola/server-23/portage/variants/python3both/buildpkgonly
+++ b/builders/dola/server-23/portage/variants/python3both/buildpkgonly
@@ -11,3 +11,5 @@ cat >> ../../make.conf <<- __EOF__
 __EOF__
 
 EPYTHON=python3.12 emerge -uDN --backtrack=100 @world
+
+PYTHON_TARGETS= PYTHON_SINGLE_TARGET= emerge -1 $(pquery -I --has-use python 
--attr use| awk '/-python[ $]/{print "="$1}' | sed '/z3/d')

diff --git a/builders/milou/gnome-23/portage/variants/python3both/buildpkgonly 
b/builders/milou/gnome-23/portage/variants/python3both/buildpkgonly
index 6f396d8..920d751 100755
--- a/builders/milou/gnome-23/portage/variants/python3both/buildpkgonly
+++ b/builders/milou/gnome-23/portage/variants/python3both/buildpkgonly
@@ -11,3 +11,5 @@ cat >> ../../make.conf <<- __EOF__
 __EOF__
 
 EPYTHON=python3.12 emerge -uDN --backtrack=100 @world
+
+PYTHON_TARGETS= PYTHON_SINGLE_TARGET= emerge -1 $(pquery -I --has-use python 
--attr use| awk '/-python[ $]/{print "="$1}'

diff --git 
a/builders/milou/gnome-v3-23/portage/variants/python3both/buildpkgonly 
b/builders/milou/gnome-v3-23/portage/variants/python3both/buildpkgonly
index 6f396d8..eb92c16 100755
--- a/builders/milou/gnome-v3-23/portage/variants/python3both/buildpkgonly
+++ b/builders/milou/gnome-v3-23/portage/variants/python3both/buildpkgonly
@@ -11,3 +11,5 @@ cat >> ../../make.conf <<- __EOF__
 __EOF__
 
 EPYTHON=python3.12 emerge -uDN --backtrack=100 @world
+
+PYTHON_TARGETS= PYTHON_SINGLE_TARGET= emerge -1 $(pquery -I --has-use python 
--attr use| awk '/-python[ $]/{print "="$1}' | sed 
'/samba/d;/ldb/d;/tdb/d;/tevent/d')

diff --git a/builders/milou/kde-23/portage/variants/python3both/buildpkgonly 
b/builders/milou/kde-23/portage/variants/python3both/buildpkgonly
index 6f396d8..920d751 100755
--- a/builders/milou/kde-23/portage/variants/python3both/buildpkgonly
+++ b/builders/milou/kde-23/portage/variants/python3both/buildpkgonly
@@ -11,3 +11,5 @@ cat >> ../../make.conf <<- __EOF__
 __EOF__
 
 EPYTHON=python3.12 emerge -uDN --backtrack=100 @world
+
+PYTHON_TARGETS= PYTHON_SINGLE_TARGET= emerge -1 $(pquery -I --has-use python 
--attr use| awk '/-python[ $]/{print "="$1}'

diff --git a/builders/milou/kde-v3-23/portage/variants/python3both/buildpkgonly 
b/builders/milou/kde-v3-23/portage/variants/python3both/buildpkgonly
index 6f396d8..920d751 100755
--- a/builders/milou/kde-v3-23/portage/variants/python3both/buildpkgonly
+++ b/builders/milou/kde-v3-23/portage/variants/python3both/buildpkgonly
@@ -11,3 +11,5 @@ cat >> ../../make.conf <<- __EOF__
 __EOF__
 
 EPYTHON=python3.12 emerge -uDN --backtrack=100 @world
+
+PYTHON_TARGETS= PYTHON_SINGLE_TARGET= emerge -1 $(pquery -I --has-use python 
--attr use| awk '/-python[ $]/{print "="$1}'

diff --git a/builders/milou/server-23/portage/variants/python3both/buildpkgonly 
b/builders/milou/server-23/portage/variants/python3both/buildpkgonly
index 6f396d8..f6f87f0 100755
--- a/builders/milou/server-23/portage/variants/python3both/buildpkgonly
+++ b/builders/milou/server-23/portage/variants/python3both/buildpkgonly
@@ -11,3 +11,5 @@ cat >> ../../make.conf <<- __EOF__
 __EOF__
 
 EPYTHON=python3.12 emerge -uDN --backtrack=100 @world
+
+PYTHON_TARGETS= PYTHON_SINGLE_TARGET= emerge -1 $(pquery -I --has-use python 
--attr use| awk '/-python[ $]/{print "="$1}' | sed '/z3/d')

diff --git 
a/builders/milou/server-v3-23/portage/variants/python3both/buildpkgonly 
b/builders/milou/server-v3-23/portage/variants/python3both/buildpkgonly
index 6f396d8..f6f87f0 100755
--- a/builders/milou/server-v3-23/portage/variants/python3both/buildpkgonly
+++ b/builders/milou/server-v3-23/portage/variants/python3both/buildpkgonly
@@ -11,3 +11,5 @@ cat >> ../../make.conf <<- __EOF__
 __EOF__
 
 EPYTHON=python3.12 emerge -uDN --backtrack=100 @world
+
+PYTHON_TARGETS= PYTHON_SINGLE_TARGET= emerge -1 $(pquery -I --has-use python 
--attr use| awk '/-python[ $]/{print "="$1}' | sed '/z3/d')

Reply via email to