From 6a8239ecafbd4cd8232019f5e1b0391b7c6f1c1d Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 2 Sep 2024 07:19:07 +0000 Subject: [PATCH] profiles: Sync with Gentoo It's from Gentoo commit ce13d2713acd7c0139e3e3614d4d6e67c5fcc82a. --- .../profiles/arch/amd64/package.use.mask | 2 +- .../arch/amd64/package.use.stable.mask | 4 -- .../profiles/arch/arm64/package.use.mask | 2 +- .../profiles/arch/base/package.use.mask | 2 +- .../profiles/arch/loong/package.use.mask | 5 ++ .../profiles/arch/mips/package.use.mask | 15 ++++- .../profiles/arch/mips/use.mask | 8 +++ .../arch/powerpc/ppc64/package.use.mask | 1 + .../powerpc/ppc64/package.use.stable.mask | 4 ++ .../profiles/arch/riscv/package.use.mask | 16 ++++- .../profiles/arch/riscv/use.mask | 7 ++ .../profiles/arch/s390/package.use.mask | 4 ++ .../profiles/arch/x86/package.use.stable.mask | 8 +-- .../portage-stable/profiles/base/package.use | 7 -- .../profiles/base/package.use.mask | 6 ++ .../profiles/base/package.use.stable.mask | 15 +++-- .../profiles/base/use.stable.mask | 4 -- .../profiles/features/musl/package.mask | 9 ++- .../profiles/features/wd40/package.mask | 6 ++ .../profiles/features/wd40/package.use.mask | 4 ++ .../portage-stable/profiles/package.mask | 64 +++++++++++++------ .../profiles/targets/desktop/make.defaults | 2 +- .../profiles/targets/desktop/package.use | 5 ++ .../targets/desktop/plasma/package.use | 15 ----- .../portage-stable/profiles/updates/1Q-2024 | 1 - .../portage-stable/profiles/updates/3Q-2024 | 1 + 26 files changed, 150 insertions(+), 67 deletions(-) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask index b9ed719989..4309f6e2c9 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.mask @@ -253,7 +253,7 @@ sys-libs/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo sys-libs/compiler-rt-sanitizers -gwp-asan sys-libs/compiler-rt-sanitizers -libfuzzer -memprof -orc -profile -xray -sys-libs/compiler-rt-sanitizers -ctx-profile +sys-libs/compiler-rt-sanitizers -ctx-profile -nsan -rtsan # Sam James (2020-10-24) # asm redc is only available on amd64, diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask index f9fa5971a9..22b18c98f8 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/amd64/package.use.stable.mask @@ -76,10 +76,6 @@ media-video/ffmpeg qsv # needs stabilizing media-video/ffmpeg vmaf -# Adel Kara Slimane (2022-02-17) -# needs stabilizing -media-video/ffmpeg amf - # Joonas Niilola (2021-08-13) # dev-libs/efl is stabilized on amd64. app-crypt/pinentry -efl diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask index d2412f8063..c80e58a8f1 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/arm64/package.use.mask @@ -237,7 +237,7 @@ app-text/enchant voikko sys-libs/compiler-rt-sanitizers -asan -dfsan -lsan -msan -hwasan -tsan sys-libs/compiler-rt-sanitizers -ubsan -safestack -cfi -scudo sys-libs/compiler-rt-sanitizers -gwp-asan -shadowcallstack -sys-libs/compiler-rt-sanitizers -libfuzzer -profile -xray +sys-libs/compiler-rt-sanitizers -libfuzzer -profile -xray -rtsan >=sys-libs/compiler-rt-sanitizers-16 -orc # Roy Bamford (2020-12-07) diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask index 1d3fbfbbc9..9a9ccce5a0 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/base/package.use.mask @@ -252,7 +252,7 @@ sys-libs/compiler-rt-sanitizers asan dfsan lsan msan hwasan tsan sys-libs/compiler-rt-sanitizers ubsan safestack cfi scudo sys-libs/compiler-rt-sanitizers shadowcallstack gwp-asan sys-libs/compiler-rt-sanitizers libfuzzer memprof orc profile xray -sys-libs/compiler-rt-sanitizers ctx-profile +sys-libs/compiler-rt-sanitizers ctx-profile nsan rtsan # Sam James (2020-10-24) # asm redc is only available on amd64, diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask index 72ce670abb..37500a2075 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/loong/package.use.mask @@ -1,6 +1,10 @@ # Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-08-31) +# dnstap USE masked due to missing keywords +net-dns/bind dnstap + # Sam James (2024-08-23) # dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here sys-apps/systemd bpf @@ -305,6 +309,7 @@ media-plugins/gst-plugins-meta libvisual >=sys-libs/compiler-rt-sanitizers-17.0.0_pre20230705 -dfsan >=sys-libs/compiler-rt-sanitizers-17.0.0_pre20230717 -profile -xray >sys-libs/compiler-rt-sanitizers-17.0.0_pre20230717 -libfuzzer +>=sys-libs/compiler-rt-sanitizers-19 -cfi # WANG Xuerui (2022-07-08) # virtual/{jdk,jre} is not available on loong yet. diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask index 16a169bf12..a6d61abcda 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/package.use.mask @@ -1,12 +1,23 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Arthur Zamarin (2024-08-26) +# dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here +sys-apps/systemd bpf + +# Arthur Zamarin (2024-08-26) +# dev-ruby/thor not keyworded here +app-text/htmltidy test + # Arthur Zamarin (2024-08-25) # simplify the dep tree -app-admin/syslog-ng amqp grpc kafka mongodb smtp +app-admin/syslog-ng amqp grpc kafka mongodb smtp test app-crypt/pinentry efl app-text/doxygen gui dev-build/cmake gui +dev-db/mysql cjk +dev-db/percona-server cjk +dev-libs/libisoburn frontend-optional dev-util/glade gjs dev-util/pkgcheck emacs dev-util/ragel doc @@ -112,7 +123,7 @@ net-analyzer/rrdtool rados # matoro (2023-11-22) # Qt 5 is not keyworded here -app-admin/setools X +app-admin/setools X test # matoro (2023-11-22) # Qt 5 is not keyworded here diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask index 6fdd3e3d52..da6c9e7c86 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/mips/use.mask @@ -1,6 +1,14 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Arthur Zamarin (2024-08-26) +# media-libs/libheif is not keyworded here +heif + +# Arthur Zamarin (2024-08-26) +# media-libs/libjxl is not keyworded here +jpegxl + # Unmask the flag which corresponds to ARCH. -mips diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask index 01db7ccd20..1818fc6de3 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.mask @@ -107,6 +107,7 @@ dev-util/diffoscope haskell sys-libs/compiler-rt-sanitizers -asan -lsan -msan -tsan sys-libs/compiler-rt-sanitizers -ubsan -scudo sys-libs/compiler-rt-sanitizers -profile +>=sys-libs/compiler-rt-sanitizers-19 -orc # Georgy Yakovlev (2020-01-25) # fwupd keyworded now on ppc64 diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.stable.mask index dbbd4dfe61..299a152bee 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/powerpc/ppc64/package.use.stable.mask @@ -17,6 +17,10 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2024-06-13) +# Waiting for KF6 stabilisation in bug #934478 +app-crypt/pinentry qt6 + # Sam James (2024-04-30) # sys-block/nbdkit is not yet marked stable here app-emulation/libvirt nbd diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask index 289258c837..d18dd82522 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/package.use.mask @@ -1,6 +1,18 @@ # Copyright 2019-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Michael Orlitzky (2024-09-01) +# Mask the optional plotting backend sci-libs/vtk because it's a beast +# and I don't want to deal with it right now. +sci-mathematics/maxima vtk + +# Michael Orlitzky (2024-08-26) +# There's an unexplained test failure in sci-libs/qd that I've emailed +# the authors about. Until we know what's up with that, USE=qd should +# remain masked for consumers. +sci-libs/fplll qd +sci-mathematics/lcalc double-double quad-double + # Andreas Sturmlechner (2024-07-06) # KDE PIM is not keyworded here kde-apps/libkgapi:5 kf6compat @@ -72,8 +84,10 @@ sys-kernel/installkernel -systemd-boot -ukify -uki sys-block/tgt rbd # jinqiang zhang (2023-03-27) -# Sanitizers supported on this architecture. +# Sanitizers supported on riscv64. sys-libs/compiler-rt-sanitizers -asan -lsan +>=sys-libs/compiler-rt-sanitizers-19 -libfuzzer -hwasan -profile -tsan +>=sys-libs/compiler-rt-sanitizers-19 -ubsan -scudo # Yixun Lan (2023-02-16) # USE=java depend on virtual/jdk:1.8 which is not support on RISC-V diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask index 00ac5effb4..3c39137162 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/riscv/use.mask @@ -4,6 +4,13 @@ # Unmask the flag which corresponds to ARCH. -riscv +# Michael Orlitzky (2024-09-01) +# These lisp implementations have ~riscv keywords. +# This counteracts the mask in arch/base/use.mask. +-clisp +-ecl +-gcl + # Andrew Ammerlaan (2023-07-11) # Unmask secureboot flag on arches where sbsigntools is keyworded -secureboot diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask index 833ceeabf4..ae7ab5ecfa 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/s390/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Hans de Graaff (2024-09-01) +# Requires large parts of dev-ruby/rails to be keyworded +dev-ruby/minitest-hooks test + # Sam James (2024-08-23) # dev-util/bpftool and/or sys-devel/bpf-toolchain not keyworded here sys-apps/systemd bpf diff --git a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask index 754bad0762..21fa3f4fea 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/arch/x86/package.use.stable.mask @@ -17,11 +17,9 @@ #--- END OF EXAMPLES --- -# Andreas Sturmlechner (2024-07-21) -# Need not as yet stable KF6-based counterparts (bug #934361) -kde-apps/libkcddb kf6compat -kde-apps/libksane kf6compat -net-misc/kio-zeroconf kf6compat +# Andreas Sturmlechner (2024-08-30) +# KF6 is not stable here. +>=app-crypt/pinentry-1.3.0 wayland # Matt Turner (2024-07-14) # spirv-llvm-translator < 17 is not stable on x86. diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use b/sdk_container/src/third_party/portage-stable/profiles/base/package.use index b4cc281eb2..cf646b56fb 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use @@ -1,13 +1,6 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -# Andreas Sturmlechner (2024-05-30) -# Only up to python 3.11 supported, bug #929546 - (2024-03-23) # Used by pkgcheck, so let's make it easier for all developers to install it >=dev-libs/tree-sitter-bash-0.21.0 python diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask index 71cf794e08..776d751b57 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.mask @@ -6,6 +6,12 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Andreas Sturmlechner (2024-08-31) +# Prepare for KDE PIM 5 removal and avoid conflicts w/ KDE PIM 6 +app-office/kmymoney:5 addressbook +app-office/kraft:5 pim +media-gfx/digikam:5 addressbook + # Viorel Munteanu (2024-07-26) # Branch 7.1 needs a new BDEPEND for doc >=app-emulation/virtualbox-7.1 doc diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask index 02af998f91..9d9b546ecb 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/package.use.stable.mask @@ -4,10 +4,17 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in package.use.mask -# Andreas Sturmlechner (2024-06-13) -# Building with qt6 requires (masked) kde-frameworks:6 -app-admin/calamares qt6 -app-crypt/pinentry qt6 +# Andreas Sturmlechner (2024-08-29) +# Pin down kf6compat mask to currently stable versions. + (2024-04-14) # Qt6 dependencies are not yet available in stable. Moreover, diff --git a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask index de017f0c28..4c528b5880 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/base/use.stable.mask @@ -4,10 +4,6 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in use.mask -# Andreas Sturmlechner (2024-06-13) -# KF6 is not in stable yet. -kf6compat - # Michał Górny (2024-05-08) # Python implementations without stable keywords. python_targets_python3_13 diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask index cdd861ded1..8f0c620b42 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/musl/package.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Sam James (2024-08-31) +# sys-devel/binutils[gprofng] is masked on musl +dev-debug/gprofng-gui + # Sam James (2024-08-21) # systemtap needs porting to musl. Fails to compile in a few ways. # See bug #925857. @@ -81,7 +85,10 @@ app-arch/lrzip-next # Christopher Fore (2024-01-24) # >=sys-fs/bcachefs-tools-1.4.1 uses functions currently not in Musl # https://github.com/koverstreet/bcachefs-tools/issues/213 ->=sys-fs/bcachefs-tools-1.4.1 +# The above was fixed in musl 1.2.5, which bcachefs-tools 1.11.0 +# will now depend on. +# https://www.openwall.com/lists/musl/2024/03/01/2 + (2024-01-23) # Uses glibc function getsourcefilter(), diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask index c6156b25d7..30e6852a7e 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.mask @@ -44,6 +44,7 @@ net-analyzer/suricata net-analyzer/gvm-tools net-analyzer/gr-fosphor net-analyzer/gvm +net-analyzer/snmpclitools media-sound/beets media-sound/gnome-sound-recorder media-gfx/oxipng @@ -122,6 +123,10 @@ dev-python/dissononce dev-python/consonance dev-python/PyGithub dev-python/adblock +dev-python/pysnmp +dev-python/pysnmp-mibs +dev-python/pysmi +dev-python/pysnmpcrypto dev-java/icedtea-web dev-debug/pwndbg dev-db/mycli @@ -180,6 +185,7 @@ net-wireless/gnuradio net-wireless/gqrx net-wireless/gr-iqbal net-wireless/gr-osmosdr +app-emulation/diskimage-builder # Various packages requiring Rust. app-admin/ansible diff --git a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask index 3520b9ccc3..888aadab1d 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/features/wd40/package.use.mask @@ -1,6 +1,10 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Petr Vaněk (2024-09-01) +# Requires dev-python/cryptography +app-crypt/osslsigncode test + # matoro (2024-07-27) # Additional entries exposed by correcting musl, #936643 x11-wm/xpra crypt oauth diff --git a/sdk_container/src/third_party/portage-stable/profiles/package.mask b/sdk_container/src/third_party/portage-stable/profiles/package.mask index 931028fca3..ad84db5649 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/package.mask +++ b/sdk_container/src/third_party/portage-stable/profiles/package.mask @@ -33,6 +33,51 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner (2024-08-31) +# This is so old that it was only kept alive as KF5-based snapshot of an +# upstream git branch containing a single "Initial port to KF/Qt5 (back in +# 2017). That was never merged to master, project archived for a long time. +# Bug #759772. Removal on 2024-09-31. +media-gfx/kcoloredit + +# Sam James (2024-08-31) +# Please unmask and test. If you have any issues, please file a new bug. +# The mask will be lifted by 2024-09-02. Test it before then please! +=net-dns/bind-9.18.29 +=net-dns/bind-tools-9.18.0 + +# Andreas Sturmlechner (2024-08-29) +# No signs of development upstream (last commit in 2016). If you use this, +# please ping them in order to get it ported over to KF6. +# Removal on 2024-09-29. +kde-misc/ktoshiba + +# Andreas Sturmlechner (2024-08-29) +# This is so old that it was only kept alive as KF5-based version by means +# of a downstream patch porting away from KDElibs4 (back in 2014!). Not +# functional in KIO-6 revdeps. Removal on 2024-09-29. +kde-misc/openofficeorg-thumbnail + +# Andreas Sturmlechner (2024-08-29) +# Long unmaintained Plasma 5-only desktop widget. Removal on 2024-09-29. +kde-misc/plasma-applet-network-monitor + +# Andreas Sturmlechner (2024-08-29) +# This is so old that it was only kept alive as KF5-based version by means +# of a downstream patch porting away from KDElibs4. No reports of it even +# being in a working state (e.g. bug 813031). Removal on 2024-09-29. +kde-misc/kio-locate + +# Andreas Sturmlechner (2024-08-29) +# Depends on kde-apps/konqueror:5 which is close to being obsolete. +# No signs of upstream porting work. Removal on 2024-09-29. +kde-misc/kio-gopher + +# Michał Górny (2024-08-28) +# API removals break gobject-introspection. +>=dev-python/ensurepip-setuptools-74 +>=dev-python/setuptools-74 + # Andreas Sturmlechner (2024-08-25) # Broken with current Plasma 5 version, not ported to Plasma 6. # Removal on 2024-09-24. @@ -158,25 +203,6 @@ media-video/bdsup2sub =dev-python/ensurepip-setuptools-72.0.0 =dev-python/setuptools-72.0.0 -# Volkmar W. Pogatzki (2024-07-27) -# Stable version stuck on EAPI=6. -# Lacks maintainer capacity for dev-lang/scala. -# Removal on 2024-08-26. Bugs #932012, #932737, #933607. -dev-lang/scala -dev-lang/mozart -dev-lang/mozart-stdlib - -# Arthur Zamarin (2024-07-27) -# EAPI=6 package, awaits version bump. -# Removal on 2024-08-26. Bug #936756. -www-apps/rt - -# Arthur Zamarin (2024-07-27) -# EAPI=6, awaits version bump. This is *-macos prefix only package, so -# hard to verify EAPI bump without the maintainer. -# Removal on 2024-08-26. Bug #936755. -dev-debug/gdb-apple - # Alfred Wingate (2024-07-24) # Includes change that breaks firewalld notably. # diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/make.defaults b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/make.defaults index 3cba94431b..72e77543df 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/make.defaults +++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/make.defaults @@ -1,4 +1,4 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg kf6compat lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb vulkan wxwidgets X xcb xft x264 xml xv xvid" +USE="a52 aac acpi alsa bluetooth branding cairo cdda cdr cups dbus dri dts dvd dvdr elogind encode exif flac gif gpm gtk gui icu jpeg kf6compat lcms libnotify mad mng mp3 mp4 mpeg ogg opengl pango pdf png policykit ppds qt6 qt5 sdl sound spell startup-notification svg tiff truetype vorbis udev udisks unicode upower usb vulkan wxwidgets X xcb xft x264 xml xv xvid" diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use index 0822e94248..82330969f0 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/package.use @@ -1,6 +1,11 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +# Andreas Sturmlechner (2024-08-30) +# Resolve conflicting REQUIRED_USE defaults (qt5 vs. qt6) +media-libs/simage -qt5 +net-p2p/transmission -qt5 + # Andreas Sturmlechner (2024-03-07) # Required by kde-frameworks/kio:6 dev-qt/qtbase libproxy diff --git a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use index ae28b8b9cf..b52b0a547b 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use +++ b/sdk_container/src/third_party/portage-stable/profiles/targets/desktop/plasma/package.use @@ -4,21 +4,6 @@ # Resolve conflict between Plasma 6 and KDevelop 24.05 >=dev-util/kdevelop-24.05.1:5 -plasma -# Sam James (2024-06-13) -# Needed by dependencies of KDE Plasma and KDE Gear -app-crypt/gpgme qt6 -app-crypt/pinentry qt6 -app-crypt/qca qt6 -app-text/poppler qt6 -dev-libs/qtkeychain qt6 -media-libs/phonon qt6 -media-libs/phonon-vlc qt6 -net-libs/accounts-qml qt6 -net-libs/accounts-qt qt6 -net-libs/signond qt6 -net-libs/signon-oauth2 qt6 -sys-auth/polkit-qt qt6 - # Alfred Wingate (2023-12-25) # Prefer wayland over X with REQUIRED_USE: ^^ ( gbm wayland X ) >=media-tv/kodi-20.2 wayland -X diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2024 b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2024 index 761222bbaf..05eb97ac02 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2024 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/1Q-2024 @@ -7,7 +7,6 @@ move app-doc/psmark app-text/psmark move app-doc/xmltoman app-text/xmltoman move app-doc/zeal app-text/zeal move sys-devel/gdb dev-debug/gdb -move sys-devel/gdb-apple dev-debug/gdb-apple move dev-util/lldb dev-debug/lldb move dev-util/cgdb dev-debug/cgdb move dev-util/ninja dev-build/ninja diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2024 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2024 index 109dd8d735..6f716a6561 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2024 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2024 @@ -2,3 +2,4 @@ move sci-libs/rtree dev-python/rtree move dev-python/mapbox_earcut dev-python/mapbox-earcut move dev-qt/kdsingleapplication dev-libs/kdsingleapplication slotmove dev-util/kdevelop-pg-qt 5 0 +move dev-python/parse_type dev-python/parse-type