diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-01-13 00:17:02 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-01-13 00:17:02 +0000 |
| commit | 82180237c3af73b4c691a7887b258378ee1f4d06 (patch) | |
| tree | 9cb79537407b7c6f753c59f1316d52f432931b81 | |
| parent | 2023-01-12 23:47:05 UTC (diff) | |
| parent | profiles/base: Mask net-im/discord-bin[system-ffmpeg] (diff) | |
| download | gentoo-82180237c3af73b4c691a7887b258378ee1f4d06.tar.gz gentoo-82180237c3af73b4c691a7887b258378ee1f4d06.tar.bz2 gentoo-82180237c3af73b4c691a7887b258378ee1f4d06.zip | |
Merge updates from master
| -rw-r--r-- | media-libs/openexr/openexr-3.1.5-r1.ebuild | 2 | ||||
| -rw-r--r-- | net-im/discord-bin/Manifest | 2 | ||||
| -rw-r--r-- | net-im/discord-bin/discord-bin-0.0.23.ebuild (renamed from net-im/discord-bin/discord-bin-0.0.22.ebuild) | 4 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/media-libs/openexr/openexr-3.1.5-r1.ebuild b/media-libs/openexr/openexr-3.1.5-r1.ebuild index 80f5ea2cb0f2..545e236dc104 100644 --- a/media-libs/openexr/openexr-3.1.5-r1.ebuild +++ b/media-libs/openexr/openexr-3.1.5-r1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/ LICENSE="BSD" SLOT="0/30" # based on SONAME # -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads" RESTRICT="!test? ( test )" diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest index 71bb7d4ad904..9ced3ea31507 100644 --- a/net-im/discord-bin/Manifest +++ b/net-im/discord-bin/Manifest @@ -1 +1 @@ -DIST discord-0.0.22.tar.gz 77553233 BLAKE2B c0c9a5a9b088a3f619f498c345f46f5e43712c353f723427a1ffd95a2a66817e8d5e5298a8290d88df807251cc156db0e26ec1403ed4b3cba241b624d436346b SHA512 96c8486577bee7ae165bf96aab50c0733d83a2d9435357d9a4d9a3e9f3225ae6a7bf46e1a7d8b419ecc7ab4e270755332621a4f786ddb89a842379f5da40b271 +DIST discord-0.0.23.tar.gz 82116322 BLAKE2B 5ed0d4d20d20a5bdb2e5bfc31b0a9c47baeaca976ee0f0861fdb436d89eccd4f5d50df9bd366f996cdbc767ce6d06bddf5992574329c7b5c01b47a9c154a37c4 SHA512 d03b27180c95ca74c93323090ce5c1e4351577d27184cfbf5525439052505ba198fafbd4b1489f97ce4c103bc35d1cfb4cdb1c32fc9c80bc55e2373b7a894a39 diff --git a/net-im/discord-bin/discord-bin-0.0.22.ebuild b/net-im/discord-bin/discord-bin-0.0.23.ebuild index e006e6ca8030..67ec3a05d7a0 100644 --- a/net-im/discord-bin/discord-bin-0.0.22.ebuild +++ b/net-im/discord-bin/discord-bin-0.0.23.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -121,7 +121,7 @@ src_install() { exeinto "${DESTDIR}" - doexe "${MY_PN^}" chrome-sandbox libEGL.so libGLESv2.so libvk_swiftshader.so + doexe "${MY_PN^}" chrome_crashpad_handler chrome-sandbox libEGL.so libGLESv2.so libvk_swiftshader.so if use system-ffmpeg; then dosym "../../usr/$(get_libdir)/chromium/libffmpeg.so" "${DESTDIR}/libffmpeg.so" || die diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 7d5d49cb1607..a15d1c319aca 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -6,6 +6,10 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Nick Sarnie <sarnex@gentoo.org> (2023-01-12) +# Fails with in-tree media-video/ffmpeg +net-im/discord-bin system-ffmpeg + # Sam James <sam@gentoo.org> (2023-01-10) # Needs last-rited www-client/dillo, bug #890244 mail-client/claws-mail dillo |