From b7819d03d7312d3d8d12b49738aa417f35f6e18a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 22 Nov 2022 01:05:27 +0000 Subject: gentoo auto-resync : 22:11:2022 - 01:05:27 --- profiles/Manifest.gz | Bin 149339 -> 149359 bytes profiles/arch/powerpc/ppc64/64ul/package.use.mask | 4 -- profiles/base/package.use.mask | 24 ++++---- profiles/base/package.use.stable.mask | 4 ++ .../linux/amd64/17.1/systemd/clang/merged-usr/eapi | 1 + .../amd64/17.1/systemd/clang/merged-usr/parent | 2 + .../linux/arm64/17.0/systemd/llvm/merged-usr/eapi | 1 + .../arm64/17.0/systemd/llvm/merged-usr/parent | 2 + profiles/package.mask | 66 +++------------------ profiles/profiles.desc | 2 + profiles/releases/23.0/make.defaults | 4 +- 11 files changed, 33 insertions(+), 77 deletions(-) create mode 100644 profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/eapi create mode 100644 profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/parent create mode 100644 profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/eapi create mode 100644 profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/parent (limited to 'profiles') diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz index 6d7b8207b321..e5ea512e015d 100644 Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask index acf4a8ba1a10..cfeff90485ae 100644 --- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask +++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask @@ -10,10 +10,6 @@ app-portage/nattka -depgraph-order # impl there anyway. Please keep this in sync with use.stable.mask. dev-lang/python-exec -python_targets_pypy3 -# Georgy Yakovlev (2021-07-27) -# deps are keyworded -gnome-base/gnome-extra-apps -tracker - # Georgy Yakovlev (2021-07-27) # deps not keyworded media-gfx/gnome-photos flickr upnp-av diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 19ccff06c446..86c730432612 100644 --- a/profiles/base/package.use.mask +++ b/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. +# Matt Turner (2022-09-26) +# Requires nautilus-43.0 which is keyworded everywhere +>=app-arch/file-roller-43.0 nautilus +>=app-text/evince-43.0 nautilus +>=x11-terms/gnome-terminal-3.46 nautilus + # Sam James (2022-11-19) # Needs long-EOL dev-lang/spidermonkey:60 (which also needs python:2.7). media-libs/coin javascript @@ -30,6 +36,11 @@ www-servers/uwsgi python-gevent # Requires net-misc/pyhoca-cli that is masked for removal. net-misc/remmina x2go +# Matt Turner (2022-11-16) +# gnome-music and gnome-photos have not been ported to libsoup:3.0, while +# other non-slotted dependencies have been. +gnome-base/gnome-extra-apps tracker + # Matt Turner (2022-11-16) # tracker-miners depends on libsoup:3.0 but USE=rss depends on net-libs/libgrss # which has not been ported to libsoup:3.0. @@ -65,15 +76,6 @@ app-emulation/virtualbox-modules pax-kernel sys-libs/zlib-ng compat sys-libs/minizip-ng compat -# Matt Turner (2022-09-26) -# Requires nautilus-43.0 which is not in tree yet. ->=x11-terms/gnome-terminal-3.46 nautilus - -# Pascal Jaeger (2022-09-21) -# Versions >=43.0 of evince only work with =43.0 would stop users from updating nautilus ->=app-text/evince-43.0 nautilus - # Yiyang Wu (2022-09-21) # Intolerable mathematical errors found on AMD Radeon VII GPU during src_test, # may lead to incorrect results in computation. @@ -183,10 +185,6 @@ dev-python/jupyter_server doc # https://github.com/aria2/aria2/issues/1636 net-misc/aria2 gnutls -# Matt Turner (2022-03-25) -# Depends on libsoup:3.0 ->=gnome-base/gvfs-1.50 http - # Craig Andrews (2022-03-25) # Requires as of yet unreleased QUIC support in OpenSSL net-libs/ngtcp2 openssl diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 07276f167a74..d1763f389d74 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -4,6 +4,10 @@ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in package.use.mask +# Matt Turner (2022-11-16) +# Depends on libsoup:3.0 +>=gnome-base/gvfs-1.50 http + # Michał Górny (2022-11-06) # Unmask the target on python-exec while it's masked elsewhere. dev-lang/python-exec -python_targets_python3_11 diff --git a/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/eapi b/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/parent b/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/parent new file mode 100644 index 000000000000..c8b1675247c9 --- /dev/null +++ b/profiles/default/linux/amd64/17.1/systemd/clang/merged-usr/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../features/merged-usr diff --git a/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/eapi b/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/eapi new file mode 100644 index 000000000000..7ed6ff82de6b --- /dev/null +++ b/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/eapi @@ -0,0 +1 @@ +5 diff --git a/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/parent b/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/parent new file mode 100644 index 000000000000..c8b1675247c9 --- /dev/null +++ b/profiles/default/linux/arm64/17.0/systemd/llvm/merged-usr/parent @@ -0,0 +1,2 @@ +.. +../../../../../../../features/merged-usr diff --git a/profiles/package.mask b/profiles/package.mask index 95a511b6dd1b..12015111be8d 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,14 @@ #--- END OF EXAMPLES --- +# Matt Turner (2022-11-16) +# Packages or their dependencies have not been ported to libsoup:3.0, while +# other non-slotted dependencies have been. +media-gfx/gnome-photos +media-sound/gnome-music +net-libs/libzapojit +net-misc/gnome-online-miners + # Ionen Wolkens (2022-11-21) # Was added only for dev-python/pytest-bdd which no longer needs it. # If using, migrate to stdlib glob which supports `**` since python-3.5. @@ -673,64 +681,6 @@ media-libs/webrtc-audio-processing:1 # old de-ANSI-fication/ansi2knr/AM_C_PROTOTYPES code. Please uninstall. sys-devel/automake:1.11 -# Mart Raudsepp (2021-09-15) -# New major parallel-installable release which needs special care to not -# end up loaded into the same process together with the earlier libsoup ABI. -# Migration to it is expected for GNOME 42, NOT to be unmasked with GNOME 41. ->=app-arch/file-roller-43 ->=app-backup/deja-dup-43 ->=app-crypt/seahorse-43 ->=app-misc/bijiben-40.1-r1 ->=app-misc/tracker-3.4.0-r1 ->=app-misc/tracker-miners-3.4.0-r1 ->=app-text/gtranslator-42 ->=app-text/libgepub-0.7.0 ->=dev-libs/gjs-1.74 ->=dev-libs/libgweather-4.2.0 ->=dev-python/nautilus-python-4.0 ->=dev-util/devhelp-43 ->=dev-util/gnome-builder-43 ->=gnome-base/gnome-applets-3.46 ->=gnome-base/gnome-desktop-43 ->=gnome-base/gnome-flashback-3.46 ->=gnome-base/gnome-panel-3.46 ->=gnome-base/gnome-settings-daemon-43 ->=gnome-base/gnome-shell-43 ->=gnome-base/nautilus-43 ->=gnome-extra/evolution-data-server-3.46 ->=gnome-extra/evolution-ews-3.46 ->=gnome-extra/gnome-boxes-43 ->=gnome-extra/gnome-calculator-43 ->=gnome-extra/gnome-calendar-43 ->=gnome-extra/gnome-clocks-43 ->=gnome-extra/gnome-shell-extensions-43 ->=gnome-extra/gnome-shell-frippery-43 ->=gnome-extra/gnome-software-43 ->=gnome-extra/sushi-43 ->=mail-client/balsa-2.6.4 ->=mail-client/evolution-3.46 ->=mail-client/geary-43 ->=media-gfx/gnome-photos-43 ->=net-irc/polari-43 -net-libs/dleyna ->=net-libs/gnome-online-accounts-3.46 ->=net-libs/gssdp-1.6 ->=net-libs/gupnp-1.6 -net-libs/phodav:3.0 -net-libs/uhttpmock:1.0 -net-libs/webkit-gtk:4.1 -net-libs/webkit-gtk:5 ->=net-misc/gupnp-tools-0.12 ->=net-misc/rygel-0.42 ->=net-misc/spice-gtk-0.41-r1 -sci-geosciences/geocode-glib:2 ->=sci-geosciences/geocode-glib-3.26.4-r1:0 ->=sci-geosciences/gnome-maps-43 ->=sys-apps/osinfo-db-tools-1.10.0-r1 ->=sys-libs/libosinfo-1.10.0-r1 ->=www-client/epiphany-43 ->=x11-wm/mutter-43 - # Thomas Deutschmann (2021-09-07) # Masked while being tested and reverse deps aren't fully compatible # bug #797325. diff --git a/profiles/profiles.desc b/profiles/profiles.desc index 725a7432ddd0..610a2d5937b5 100644 --- a/profiles/profiles.desc +++ b/profiles/profiles.desc @@ -48,6 +48,7 @@ amd64 default/linux/amd64/17.1/systemd/merged-usr stable amd64 default/linux/amd64/17.1/systemd/selinux exp amd64 default/linux/amd64/17.1/clang exp amd64 default/linux/amd64/17.1/systemd/clang exp +amd64 default/linux/amd64/17.1/systemd/clang/merged-usr exp # AMD64 Profiles # @MAINTAINER: amd64@gentoo.org @@ -142,6 +143,7 @@ arm64 default/linux/arm64/17.0/systemd/merged-usr stable arm64 default/linux/arm64/17.0/systemd/selinux exp arm64 default/linux/arm64/17.0/llvm exp arm64 default/linux/arm64/17.0/systemd/llvm exp +arm64 default/linux/arm64/17.0/systemd/llvm/merged-usr exp # ARM64 Profiles (big-endian) diff --git a/profiles/releases/23.0/make.defaults b/profiles/releases/23.0/make.defaults index b6e766a3483b..7cd1e30dc0a3 100644 --- a/profiles/releases/23.0/make.defaults +++ b/profiles/releases/23.0/make.defaults @@ -1,8 +1,8 @@ -# Copyright 1999-2022 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # This just makes sense nowadays, if only for distfiles... -USE="xz zstd" +USE="lzma zstd" # bug 831045 USE="${USE} -cli" -- cgit v1.2.3