7 files changed, 29 insertions, 3 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 27ed5ccebccc..a09b29e688c5 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/no-multilib/package.use b/profiles/arch/amd64/no-multilib/package.use
new file mode 100644
index 000000000000..efa1e3485e8b
--- /dev/null
+++ b/profiles/arch/amd64/no-multilib/package.use
@@ -0,0 +1,8 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Ionen Wolkens <ionen@gentoo.org> (2023-08-10)
+# Multilib profiles (currently) prefer USE=abi_x86_32 over experimental
+# USE=wow64, but experimental is better than no support for no-multilib.
+app-emulation/wine-staging wow64
+app-emulation/wine-vanilla wow64
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 88735e0a784d..918775208b01 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -1,6 +1,16 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2023-08-10)
+# These use 32bit PE libraries (mingw) and are usable on no-multilib.
+# TODO?: this profile hides this USE, as such it is difficult to tell
+# if it is enabled or not outside build logs and may ideally need to
+# be renamed (they are however all enabled by default)
+app-emulation/dxvk -abi_x86_32
+app-emulation/vkd3d-proton -abi_x86_32
+app-emulation/wine-gecko -abi_x86_32
+dev-util/mingw64-toolchain -abi_x86_32
+
 # James Le Cuirot <chewi@gentoo.org> (2022-06-25)
 # This flag concerns a 32-bit x86-specific problem.
 sys-libs/glibc stack-realign
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index e8dcc4177244..752fc6c76f2e 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,6 +1,11 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Ionen Wolkens <ionen@gentoo.org> (2023-08-10)
+# Requires 64bit support.
+app-emulation/wine-staging wow64
+app-emulation/wine-vanilla wow64
+
 # Guilherme Amadio <amadio@gentoo.org> (2023-06-30)
 # sys-cluster/ceph not keyworded on x86
 >=net-libs/xrootd-5.6.0 ceph
diff --git a/profiles/features/wd40/package.mask b/profiles/features/wd40/package.mask
index a2d89b488fa8..a3007690df0a 100644
--- a/profiles/features/wd40/package.mask
+++ b/profiles/features/wd40/package.mask
@@ -34,7 +34,7 @@ dev-python/jsonschema-specifications
 dev-python/jupyterlab-server
 dev-python/jupyterlab
 dev-python/keyring
-dev-python/libcloud
+dev-python/apache-libcloud
 dev-python/moto
 dev-python/mkdocs-redirects
 dev-python/mkdocs-material
diff --git a/profiles/updates/3Q-2023 b/profiles/updates/3Q-2023
index 7ea55bb8b7ee..2470a7d07f6f 100644
--- a/profiles/updates/3Q-2023
+++ b/profiles/updates/3Q-2023
@@ -8,3 +8,4 @@ move dev-python/indexed_gzip dev-python/indexed-gzip
 move dev-python/signature_dispatch dev-python/signature-dispatch
 move dev-python/mdx_gh_links dev-python/mdx-gh-links
 move dev-python/nest_asyncio dev-python/nest-asyncio
+move dev-python/libcloud dev-python/apache-libcloud
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 2b38b03106b1..323d1b1956d8 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -685,6 +685,7 @@ app-emulation/wine-staging:pcap - Support packet capture software (e.g. wireshar
 app-emulation/wine-staging:perl - Install helpers that require perl (winedump/winemaker)
 app-emulation/wine-staging:samba - Pull in net-fs/samba with winbind for NTLM auth support
 app-emulation/wine-staging:sdl - Enable gamepad support using media-libs/libsdl2
+app-emulation/wine-staging:wow64 - Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental, USE=abi_x86_32 is recommended for complete support)
 app-emulation/wine-vanilla:capi - Enable ISDN support using net-libs/libcapi
 app-emulation/wine-vanilla:crossdev-mingw - Use sys-devel/crossdev for the toolchain rather than dev-util/mingw64-toolchain (requires manual setting up)
 app-emulation/wine-vanilla:dos - Pull in games-emulation/dosbox to run DOS applications
@@ -699,6 +700,7 @@ app-emulation/wine-vanilla:perl - Install helpers that require perl (winedump/wi
 app-emulation/wine-vanilla:samba - Pull in net-fs/samba with winbind for NTLM auth support
 app-emulation/wine-vanilla:sdl - Enable gamepad support using media-libs/libsdl2
 app-emulation/wine-vanilla:vkd3d - Enable DirectX 12 support using app-emulation/vkd3d
+app-emulation/wine-vanilla:wow64 - Enable running 32bit applications without 32bit ELF multilib by mapping to 64bit calls (experimental, USE=abi_x86_32 is recommended for complete support)
 app-emulation/winetricks:rar - Pull in app-arch/unrar for extraction of rar-compressed game files
 app-emulation/x48:readline - Enables support for libreadline
 app-emulation/xe-guest-utilities:xenstore - Use xenstore binaries bundled by Citrix instead of building app-emulation/xen-tools
@@ -8781,7 +8783,7 @@ x11-base/xorg-server:xorg - Build the Xorg X server (HIGHLY RECOMMENDED)
 x11-base/xorg-server:xvfb - Build the Xvfb server
 x11-base/xwayland:unwind - Enable libunwind usage for backtraces
 x11-base/xwayland:xcsecurity - Build Security extension
-x11-drivers/nvidia-drivers:kernel-open - Use the open source variant of drivers (Turing/Ampere+ GPUs only, aka GTX 1650+, very experimental)
+x11-drivers/nvidia-drivers:kernel-open - Use the open source variant of drivers (Turing/Ampere+ GPUs only, aka GTX 1650+, experimental)
 x11-drivers/nvidia-drivers:persistenced - Install the persistence daemon for keeping devices state when unused (e.g. for headless)
 x11-drivers/nvidia-drivers:static-libs - Install the XNVCtrl static library for accessing sensors and other features
 x11-drivers/nvidia-drivers:tools - Install additional tools such as nvidia-settings