diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2021-12-01 16:51:29 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2021-12-01 16:51:29 +0000 |
| commit | a52522679dd116c940475b32e8451a019e73220c (patch) | |
| tree | 52d65be349b5a5c272411baced2a5cf18f10500c /profiles | |
| parent | 2021-12-01 16:36:47 UTC (diff) | |
| parent | dev-libs/libixion: fix build with Clang (diff) | |
| download | gentoo-a52522679dd116c940475b32e8451a019e73220c.tar.gz gentoo-a52522679dd116c940475b32e8451a019e73220c.tar.bz2 gentoo-a52522679dd116c940475b32e8451a019e73220c.zip | |
Merge updates from master
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/arch/powerpc/ppc64/64le/package.mask | 1 | ||||
| -rw-r--r-- | profiles/arch/powerpc/ppc64/package.mask | 1 | ||||
| -rw-r--r-- | profiles/base/package.mask | 1 | ||||
| -rw-r--r-- | profiles/package.mask | 6 |
4 files changed, 9 insertions, 0 deletions
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask b/profiles/arch/powerpc/ppc64/64le/package.mask index 29cc18c63a1b..5a33b5659e8f 100644 --- a/profiles/arch/powerpc/ppc64/64le/package.mask +++ b/profiles/arch/powerpc/ppc64/64le/package.mask @@ -44,6 +44,7 @@ sci-mathematics/geogebra-bin # Georgy Yakovlev <gyakovlev@gentoo.org> (2020-08-27) # little-endian power8 ppc64 configs are provided -sys-kernel/gentoo-kernel +-sys-kernel/gentoo-kernel-bin -sys-kernel/vanilla-kernel -virtual/dist-kernel diff --git a/profiles/arch/powerpc/ppc64/package.mask b/profiles/arch/powerpc/ppc64/package.mask index 36a972da57c5..7b32acd5c13c 100644 --- a/profiles/arch/powerpc/ppc64/package.mask +++ b/profiles/arch/powerpc/ppc64/package.mask @@ -42,6 +42,7 @@ dev-java/openjfx:11 # big-endian ppc64 configs are not provided # however users can unmask and use savedconfig feature sys-kernel/gentoo-kernel +sys-kernel/gentoo-kernel-bin sys-kernel/vanilla-kernel virtual/dist-kernel diff --git a/profiles/base/package.mask b/profiles/base/package.mask index 596abf9f4086..58f5f5ac5739 100644 --- a/profiles/base/package.mask +++ b/profiles/base/package.mask @@ -5,6 +5,7 @@ # Mask the older libcrypt virtual (which accepted glibc[crypt]) to ease # dependency resolution. In a fair number of cases, this has helped # upgrades go through cleanly. +# Read the news item if you need help! # (This mask is undone in musl profiles where the transition is not yet being # made.) # bug #699422. diff --git a/profiles/package.mask b/profiles/package.mask index caf0ab95a465..89cad9371325 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,6 +33,12 @@ #--- END OF EXAMPLES --- +# 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* + # William Hubbs <williamh@gentoo.org> (2021-11-30) # Dead upstream, no releases since 2015 # Bug #770619; masked for removal on 2021-12-30. |