commit: 7fba9f84df6a617d2d415aeae6d1ff962b73bec5
Author: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 9 00:51:03 2025 +0000
Commit: Eli Schwartz <eschwartz <AT> gentoo <DOT> org>
CommitDate: Thu Jan 9 00:51:03 2025 +0000
URL: https://gitweb.gentoo.org/proj/binhost.git/commit/?id=7fba9f84
dola: add variants for slimmed packages / python3both / advance gcc
Signed-off-by: Eli Schwartz <eschwartz <AT> gentoo.org>
.../portage/variants/gccfrontends/package.use/gcc-frontends | 2 ++
builders/dola/gnome-23/portage/variants/gccfrontends/world | 3 +++
.../portage/variants/nobluetooth/package.use/nobluetooth | 1 +
.../dola/gnome-23/portage/variants/nopulse/package.use/nopulse | 1 +
.../gnome-23/portage/variants/nowayland/package.use/nowayland | 1 +
.../dola/gnome-23/portage/variants/python3both/make.conf.footer | 2 ++
.../portage/variants/python3both/package.use/python3both | 1 +
.../portage/variants/python3both/profile/use.stable.mask | 2 ++
builders/dola/gnome-23/portage/variants/slim/package.use/slim2 | 2 ++
builders/dola/gnome-23/portage/variants/unstable/buildpkgonly | 9 +++++++++
.../portage/variants/unstable/package.accept_keywords/gcc | 2 ++
.../dola/server-23/portage/variants/python3both/make.conf.footer | 2 ++
.../portage/variants/python3both/package.use/python3both | 4 ++++
.../portage/variants/python3both/profile/use.stable.mask | 2 ++
14 files changed, 34 insertions(+)
diff --git
a/builders/dola/gnome-23/portage/variants/gccfrontends/package.use/gcc-frontends
b/builders/dola/gnome-23/portage/variants/gccfrontends/package.use/gcc-frontends
new file mode 100644
index 0000000..0456781
--- /dev/null
+++
b/builders/dola/gnome-23/portage/variants/gccfrontends/package.use/gcc-frontends
@@ -0,0 +1,2 @@
+sys-devel/gcc ada d
+>=sys-devel/gcc-13 ada objc objc++
diff --git a/builders/dola/gnome-23/portage/variants/gccfrontends/world
b/builders/dola/gnome-23/portage/variants/gccfrontends/world
new file mode 100644
index 0000000..7193386
--- /dev/null
+++ b/builders/dola/gnome-23/portage/variants/gccfrontends/world
@@ -0,0 +1,3 @@
+sys-devel/gcc:12
+sys-devel/gcc:13
+sys-devel/gcc:14
diff --git
a/builders/dola/gnome-23/portage/variants/nobluetooth/package.use/nobluetooth
b/builders/dola/gnome-23/portage/variants/nobluetooth/package.use/nobluetooth
new file mode 100644
index 0000000..75f37fd
--- /dev/null
+++
b/builders/dola/gnome-23/portage/variants/nobluetooth/package.use/nobluetooth
@@ -0,0 +1 @@
+*/* -bluetooth
diff --git
a/builders/dola/gnome-23/portage/variants/nopulse/package.use/nopulse
b/builders/dola/gnome-23/portage/variants/nopulse/package.use/nopulse
new file mode 100644
index 0000000..3f33baa
--- /dev/null
+++ b/builders/dola/gnome-23/portage/variants/nopulse/package.use/nopulse
@@ -0,0 +1 @@
+*/* -pulseaudio -screencast
diff --git
a/builders/dola/gnome-23/portage/variants/nowayland/package.use/nowayland
b/builders/dola/gnome-23/portage/variants/nowayland/package.use/nowayland
new file mode 100644
index 0000000..3a4762c
--- /dev/null
+++ b/builders/dola/gnome-23/portage/variants/nowayland/package.use/nowayland
@@ -0,0 +1 @@
+*/* -wayland
diff --git
a/builders/dola/gnome-23/portage/variants/python3both/make.conf.footer
b/builders/dola/gnome-23/portage/variants/python3both/make.conf.footer
new file mode 100644
index 0000000..e0fb0ac
--- /dev/null
+++ b/builders/dola/gnome-23/portage/variants/python3both/make.conf.footer
@@ -0,0 +1,2 @@
+PYTHON_TARGETS="python3_12 python3_13"
+PYTHON_SINGLE_TARGET="python3_13"
diff --git
a/builders/dola/gnome-23/portage/variants/python3both/package.use/python3both
b/builders/dola/gnome-23/portage/variants/python3both/package.use/python3both
new file mode 100644
index 0000000..a092cf1
--- /dev/null
+++
b/builders/dola/gnome-23/portage/variants/python3both/package.use/python3both
@@ -0,0 +1 @@
+# unavailable for 3.13
diff --git
a/builders/dola/gnome-23/portage/variants/python3both/profile/use.stable.mask
b/builders/dola/gnome-23/portage/variants/python3both/profile/use.stable.mask
new file mode 100644
index 0000000..d58f7bb
--- /dev/null
+++
b/builders/dola/gnome-23/portage/variants/python3both/profile/use.stable.mask
@@ -0,0 +1,2 @@
+-python_targets_python3_13
+-python_single_target_python3_13
diff --git a/builders/dola/gnome-23/portage/variants/slim/package.use/slim2
b/builders/dola/gnome-23/portage/variants/slim/package.use/slim2
new file mode 100644
index 0000000..28b32db
--- /dev/null
+++ b/builders/dola/gnome-23/portage/variants/slim/package.use/slim2
@@ -0,0 +1,2 @@
+*/* -bluetooth -gnome-online-accounts -pulseaudio -wayland
+app-office/libreoffice -eds -gstreamer
diff --git a/builders/dola/gnome-23/portage/variants/unstable/buildpkgonly
b/builders/dola/gnome-23/portage/variants/unstable/buildpkgonly
new file mode 100755
index 0000000..8c894b0
--- /dev/null
+++ b/builders/dola/gnome-23/portage/variants/unstable/buildpkgonly
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+# We must use buildpkgonly here since we do not want to actually install
+# unstable packages. buildpkgonly will fatally error if any dependencies aren't
+# installed.
+emerge --buildpkgonly sys-devel/gcc:{15,14,13,12}
+# ... and clean it up
+rm /etc/portage/package.accept_keywords/gcc
diff --git
a/builders/dola/gnome-23/portage/variants/unstable/package.accept_keywords/gcc
b/builders/dola/gnome-23/portage/variants/unstable/package.accept_keywords/gcc
new file mode 100644
index 0000000..8b9d7eb
--- /dev/null
+++
b/builders/dola/gnome-23/portage/variants/unstable/package.accept_keywords/gcc
@@ -0,0 +1,2 @@
+sys-devel/gcc ~amd64
+<sys-devel/gcc-15.0.9999:15 **
diff --git
a/builders/dola/server-23/portage/variants/python3both/make.conf.footer
b/builders/dola/server-23/portage/variants/python3both/make.conf.footer
new file mode 100644
index 0000000..e0fb0ac
--- /dev/null
+++ b/builders/dola/server-23/portage/variants/python3both/make.conf.footer
@@ -0,0 +1,2 @@
+PYTHON_TARGETS="python3_12 python3_13"
+PYTHON_SINGLE_TARGET="python3_13"
diff --git
a/builders/dola/server-23/portage/variants/python3both/package.use/python3both
b/builders/dola/server-23/portage/variants/python3both/package.use/python3both
new file mode 100644
index 0000000..3c8a9f7
--- /dev/null
+++
b/builders/dola/server-23/portage/variants/python3both/package.use/python3both
@@ -0,0 +1,4 @@
+# unavailable for 3.13
+llvm-core/clang:16 PYTHON_SINGLE_TARGET: python3_12
+llvm-core/clang:17 PYTHON_SINGLE_TARGET: python3_12
+sys-apps/systemd-utils PYTHON_SINGLE_TARGET: python3_12
diff --git
a/builders/dola/server-23/portage/variants/python3both/profile/use.stable.mask
b/builders/dola/server-23/portage/variants/python3both/profile/use.stable.mask
new file mode 100644
index 0000000..d58f7bb
--- /dev/null
+++
b/builders/dola/server-23/portage/variants/python3both/profile/use.stable.mask
@@ -0,0 +1,2 @@
+-python_targets_python3_13
+-python_single_target_python3_13
