summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/Manifest.gzbin147145 -> 147151 bytes
-rw-r--r--profiles/base/package.use.mask7
-rw-r--r--profiles/package.mask7
-rw-r--r--profiles/use.local.desc3
4 files changed, 11 insertions, 6 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 737ee681ed3f..bd8aa6ccbf0f 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index fbcf23d6eee7..f56d328b23a3 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,13 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# Sam James <sam@gentoo.org> (2022-10-02)
+# USE=compat / possibly allowing sys-libs/zlib needs to be figured out,
+# but packages want to use the actual zlib-ng library, so we need to
+# mask it and can't hold the whole thing up on the compat effort.
+sys-libs/zlib-ng compat
+sys-libs/minizip-ng compat
+
# Matt Turner <mattst88@gentoo.org> (2022-09-26)
# Requires nautilus-43.0 which is not in tree yet.
>=x11-terms/gnome-terminal-3.46 nautilus
diff --git a/profiles/package.mask b/profiles/package.mask
index 4ea2ad75db93..5b103b7dc310 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -392,12 +392,6 @@ sys-devel/automake:1.15
# This is likely to cause issues in tests; Unmask if using for other purposes
>=dev-php/PHP_Timer-5.0
-# Sam James <sam@gentoo.org> (2021-12-01)
-# OSL 12 is a development release (for now).
-# Doesn't work with LLVM 13 yet; mask to help
-# Blender compatibility (no mixed LLVM versions).
-=media-libs/osl-1.12*
-
# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-23)
# Does not support updated dev-java/pdfbox-2.0.24, Bug #803488
# Blocks (CVE-2018-11797, CVE-2021-{27807,27906,31811,31812})
@@ -436,6 +430,7 @@ sys-devel/automake:1.11
>=gnome-extra/gnome-calculator-43
>=gnome-extra/gnome-shell-extensions-43
>=mail-client/evolution-3.46
+>=mail-client/geary-43
media-libs/libshumate
net-libs/libsoup:3.0
net-libs/rest:1.0
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 193003b70e65..abd8f9a27c20 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -8472,6 +8472,9 @@ sys-libs/libunwind:libatomic - Use libatomic instead of builtin atomic operation
sys-libs/libxcrypt:compat - Build with compatibility interfaces for other crypt implementations
sys-libs/libxcrypt:system - Install as system libcrypt.so rather than to an alternate directory (will collide with sys-libs/glibc's version)
sys-libs/llvm-libunwind:clang - Force building using installed clang (rather than the default CC/CXX; required for testing).
+sys-libs/minizip-ng:compat - Enable compatibility with sys-libs/zlib's USE=minizip
+sys-libs/minizip-ng:openssl - Use dev-libs/openssl for further encryption capabilities
+sys-libs/minizip-ng:zstd - Add Zstandard compression support via app-arch/zstd
sys-libs/musl-nscd:minimal - Only installs the header files
sys-libs/ncurses:ada - Add bindings for the ADA programming language
sys-libs/ncurses:stack-realign - Realign the stack in the 32-bit build for compatibility with older binaries at some performance cost. Avoids crashes in older 32-bit binaries. Only affects x86/32-bit multilib builds on amd64.