From 3c80dad35d7ad930fd7a07a40cd8f5d28d5dcbb0 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 23 Sep 2026 09:10:25 -0400 Subject: [PATCH 1/9] profile: update scons to fix gpsd --- profiles/pentoo/base/package.keywords/dev-build | 3 +++ profiles/pentoo/base/package.mask | 3 +++ profiles/pentoo/overlay/package.keywords/dev-build | 1 + 3 files changed, 7 insertions(+) create mode 100644 profiles/pentoo/base/package.keywords/dev-build create mode 120000 profiles/pentoo/overlay/package.keywords/dev-build diff --git a/profiles/pentoo/base/package.keywords/dev-build b/profiles/pentoo/base/package.keywords/dev-build new file mode 100644 index 0000000000..de8d715648 --- /dev/null +++ b/profiles/pentoo/base/package.keywords/dev-build @@ -0,0 +1,3 @@ +#https://bugs.gentoo.org/982332 +#https://bugs.gentoo.org/980766 +~dev-build/scons-4.11.1 amd64 arm arm64 diff --git a/profiles/pentoo/base/package.mask b/profiles/pentoo/base/package.mask index d59919fb0b..cbfbef4363 100644 --- a/profiles/pentoo/base/package.mask +++ b/profiles/pentoo/base/package.mask @@ -75,3 +75,6 @@ sci-libs/mkl #force sticky upgrade Date: Wed, 23 Sep 2026 10:00:27 -0400 Subject: [PATCH 2/9] test-build: no verify-sig due to circular deps --- scripts/qa/test-build | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/scripts/qa/test-build b/scripts/qa/test-build index aeeec8b481..7631d84432 100755 --- a/scripts/qa/test-build +++ b/scripts/qa/test-build @@ -1,4 +1,5 @@ #!/bin/bash +set -x WARNED='0' FAILED='0' FEATURES='-ipc-sandbox -network-sandbox -pid-sandbox' @@ -6,20 +7,21 @@ export FEATURES [ -d '/etc/portage/env' ] || mkdir -p /etc/portage/env/ printf 'FEATURES="%s test"' "${FEATURES}" >> /etc/portage/env/features-test +# Verify-sig is causing circular deps. Allow verify-sig after testing is moved to a bigger docker container which includes bdeps pretend_build() { - emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --pretend "${1}" + USE="-verify-sig" emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --pretend "${1}" } dep_build() { - emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --onlydeps "${1}" + USE="-verify-sig" emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --onlydeps "${1}" } binpkg_build() { - emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" + USE="-verify-sig" emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" } build() { - FEATURES="${FEATURES} -getbinpkg" emerge --getbinpkg=n --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" + FEATURES="${FEATURES} -getbinpkg" USE="-verify-sig" emerge --getbinpkg=n --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" } print_build_log() { From 1185ee73019b9163aa9da439265efbd93b923e9e Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 23 Sep 2026 11:26:09 -0400 Subject: [PATCH 3/9] test-build: try just adding bdeps early --- scripts/qa/test-build | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/qa/test-build b/scripts/qa/test-build index 7631d84432..a4d25b1139 100755 --- a/scripts/qa/test-build +++ b/scripts/qa/test-build @@ -7,21 +7,20 @@ export FEATURES [ -d '/etc/portage/env' ] || mkdir -p /etc/portage/env/ printf 'FEATURES="%s test"' "${FEATURES}" >> /etc/portage/env/features-test -# Verify-sig is causing circular deps. Allow verify-sig after testing is moved to a bigger docker container which includes bdeps pretend_build() { - USE="-verify-sig" emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --pretend "${1}" + emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --pretend "${1}" } dep_build() { - USE="-verify-sig" emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --onlydeps "${1}" + emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose --onlydeps "${1}" } binpkg_build() { - USE="-verify-sig" emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" + emerge --getbinpkg=y --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" } build() { - FEATURES="${FEATURES} -getbinpkg" USE="-verify-sig" emerge --getbinpkg=n --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" + FEATURES="${FEATURES} -getbinpkg" emerge --getbinpkg=n --buildpkg=n --jobs="$(nproc)" --load-average="$(nproc)" --verbose "${1}" } print_build_log() { @@ -34,6 +33,9 @@ print_build_log() { fi } +# Until we have a pentoo-ci to build from, add in the bdeps in the first step to avoid circular breakage +emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose @world + for i in $(git --no-pager diff --name-only "$(git rev-parse --verify origin/master 2> /dev/null)" HEAD); do if [ "${i%.ebuild}" != "${i}" ]; then test_ebuild="$(printf '%s' "${i%.ebuild}" | awk -F'/' '{print "="$1"/"$3}')" From 2bf273180bb9af8863040235b1f31b1da1cf3b67 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 23 Sep 2026 11:51:50 -0400 Subject: [PATCH 4/9] fix visibility --- scripts/qa/Dockerfile.visibility | 5 +++-- scripts/qa/test-build | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/qa/Dockerfile.visibility b/scripts/qa/Dockerfile.visibility index e6c3f5ceba..4bf29a7c0e 100644 --- a/scripts/qa/Dockerfile.visibility +++ b/scripts/qa/Dockerfile.visibility @@ -20,9 +20,10 @@ RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf RUN goornogo="$(portageq match / 'dev-lang/go')" RUN if [ -z "${goornogo}" ]; then \ - emerge -1 -kb dev-lang/go-bootstrap; \ - emerge -1 -kb dev-lang/go; \ + FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge -1 -kb dev-lang/go-bootstrap --jobs="$(nproc)" --load-average="$(nproc)" --quiet; \ + FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge -1 -kb dev-lang/go --jobs="$(nproc)" --load-average="$(nproc)" --quiet; \ fi +RUN FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose --quiet @world # Check consistency of all metadata in the repo RUN time FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --regen --jobs="$(nproc)" --quiet diff --git a/scripts/qa/test-build b/scripts/qa/test-build index a4d25b1139..cb55f2eebd 100755 --- a/scripts/qa/test-build +++ b/scripts/qa/test-build @@ -34,7 +34,7 @@ print_build_log() { } # Until we have a pentoo-ci to build from, add in the bdeps in the first step to avoid circular breakage -emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose @world +#emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose @world for i in $(git --no-pager diff --name-only "$(git rev-parse --verify origin/master 2> /dev/null)" HEAD); do if [ "${i%.ebuild}" != "${i}" ]; then From 06fa74e9795e0af838de80cb8bf6ee122757c526 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Wed, 23 Sep 2026 12:01:48 -0400 Subject: [PATCH 5/9] bootstrap visiblity harder --- scripts/qa/Dockerfile.visibility | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/qa/Dockerfile.visibility b/scripts/qa/Dockerfile.visibility index 4bf29a7c0e..cef3374779 100644 --- a/scripts/qa/Dockerfile.visibility +++ b/scripts/qa/Dockerfile.visibility @@ -18,11 +18,14 @@ WORKDIR /home # disable minimal (pentoo-core is default minimal) RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf +# Until we have a pentoo-ci to build from, add in the bdeps in the first step to avoid circular breakage RUN goornogo="$(portageq match / 'dev-lang/go')" RUN if [ -z "${goornogo}" ]; then \ FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge -1 -kb dev-lang/go-bootstrap --jobs="$(nproc)" --load-average="$(nproc)" --quiet; \ FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge -1 -kb dev-lang/go --jobs="$(nproc)" --load-average="$(nproc)" --quiet; \ fi +RUN USE="-natspec" FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose --quiet app-arch/unzip +RUN USE="-verify-sig" FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose --quiet dev-build/automake RUN FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose --quiet @world # Check consistency of all metadata in the repo From 14206bbe444f1df93d2ce8df6d3ac60251b21711 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 24 Sep 2026 09:16:18 -0400 Subject: [PATCH 6/9] qa: add pentoo-core-ci for pentoo-visibility check --- scripts/qa/Dockerfile.visibility | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/scripts/qa/Dockerfile.visibility b/scripts/qa/Dockerfile.visibility index cef3374779..2e89bfa4ec 100644 --- a/scripts/qa/Dockerfile.visibility +++ b/scripts/qa/Dockerfile.visibility @@ -1,4 +1,4 @@ -FROM pentoolinux/pentoo-core +FROM pentoolinux/pentoo-core-ci # Setup repos WORKDIR /var/db/repos/ @@ -15,19 +15,6 @@ COPY . pentoo WORKDIR /home -# disable minimal (pentoo-core is default minimal) -RUN sed -i 's# pentoo-minimal##' /etc/portage/make.conf - -# Until we have a pentoo-ci to build from, add in the bdeps in the first step to avoid circular breakage -RUN goornogo="$(portageq match / 'dev-lang/go')" -RUN if [ -z "${goornogo}" ]; then \ - FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge -1 -kb dev-lang/go-bootstrap --jobs="$(nproc)" --load-average="$(nproc)" --quiet; \ - FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge -1 -kb dev-lang/go --jobs="$(nproc)" --load-average="$(nproc)" --quiet; \ - fi -RUN USE="-natspec" FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose --quiet app-arch/unzip -RUN USE="-verify-sig" FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose --quiet dev-build/automake -RUN FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --with-bdeps=y --jobs="$(nproc)" --load-average="$(nproc)" --verbose --quiet @world - # Check consistency of all metadata in the repo RUN time FEATURES="-getbinpkg -ipc-sandbox -network-sandbox -pid-sandbox" emerge --regen --jobs="$(nproc)" --quiet # test install pentoo/pentoo From 5a590dd90dda2404398312dcbb744ba449989740 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 24 Sep 2026 16:11:22 -0400 Subject: [PATCH 7/9] pentoo-desktop: default is chromium we do have binpkgs for a reason --- ...oo-desktop-2026.2.ebuild => pentoo-desktop-2026.2-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename pentoo/pentoo-desktop/{pentoo-desktop-2026.2.ebuild => pentoo-desktop-2026.2-r1.ebuild} (98%) diff --git a/pentoo/pentoo-desktop/pentoo-desktop-2026.2.ebuild b/pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild similarity index 98% rename from pentoo/pentoo-desktop/pentoo-desktop-2026.2.ebuild rename to pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild index e7e86b28fd..e0228c802a 100644 --- a/pentoo/pentoo-desktop/pentoo-desktop-2026.2.ebuild +++ b/pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild @@ -20,7 +20,7 @@ PDEPEND="X? ( amd64? ( sys-firmware/sof-firmware chrome? ( - || ( www-client/google-chrome www-client/chromium:stable www-client/google-chrome-beta www-client/google-chrome-unstable ) + || ( www-client/chromium:stable www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable ) ) ) From 547a69b77d931eda2d3eab690edc6a727553be86 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 24 Sep 2026 16:31:40 -0400 Subject: [PATCH 8/9] I guess chromium is going bye bye --- pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild | 2 +- ...ero-system-2026.2-r4.ebuild => zero-system-2026.2-r5.ebuild} | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) rename pentoo/zero-system/{zero-system-2026.2-r4.ebuild => zero-system-2026.2-r5.ebuild} (99%) diff --git a/pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild b/pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild index e0228c802a..bb2af0533f 100644 --- a/pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild +++ b/pentoo/pentoo-desktop/pentoo-desktop-2026.2-r1.ebuild @@ -20,7 +20,7 @@ PDEPEND="X? ( amd64? ( sys-firmware/sof-firmware chrome? ( - || ( www-client/chromium:stable www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable ) + || ( www-client/google-chrome www-client/google-chrome-beta www-client/google-chrome-unstable ) ) ) diff --git a/pentoo/zero-system/zero-system-2026.2-r4.ebuild b/pentoo/zero-system/zero-system-2026.2-r5.ebuild similarity index 99% rename from pentoo/zero-system/zero-system-2026.2-r4.ebuild rename to pentoo/zero-system/zero-system-2026.2-r5.ebuild index a033ca3bb0..3483fda649 100644 --- a/pentoo/zero-system/zero-system-2026.2-r4.ebuild +++ b/pentoo/zero-system/zero-system-2026.2-r5.ebuild @@ -54,7 +54,6 @@ RDEPEND=" x11-misc/slim x11-misc/xdotool xfce-extra/xfce4-genmon-plugin - amd64? ( www-client/chromium:stable ) arm? ( www-client/firefox ) !arm? ( www-client/firefox-bin www-client/google-chrome From 1d74ce750d00ba27fe9e6a93eb52ae3861944628 Mon Sep 17 00:00:00 2001 From: "Rick Farina (Zero_Chaos)" Date: Thu, 24 Sep 2026 16:32:41 -0400 Subject: [PATCH 9/9] profile: accept license for google-chrome --- profiles/pentoo/base/make.defaults | 2 ++ 1 file changed, 2 insertions(+) diff --git a/profiles/pentoo/base/make.defaults b/profiles/pentoo/base/make.defaults index 24dd0b175b..e8b3872737 100644 --- a/profiles/pentoo/base/make.defaults +++ b/profiles/pentoo/base/make.defaults @@ -84,3 +84,5 @@ BRANDING_OS_HOME_URL='https://pentoo.org/' BRANDING_OS_SUPPORT_URL='https://pentoo.org/' BRANDING_OS_BUG_REPORT_URL='https://github.com/pentoo/pentoo-overlay/issues' BRANDING_OS_PRETTY_NAME='Pentoo Linux' + +ACCEPT_LICENSE="${ACCEPT_LICENSE} google-chrome"