Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app-misc/qcma/qcma-0.4.1-r2.ebuild5
-rw-r--r--app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild5
-rw-r--r--app-misc/qcma/qcma-9999.ebuild5
-rw-r--r--app-office/calligra/calligra-3.2.1-r8.ebuild2
-rw-r--r--dev-python/urllib3/urllib3-2.0.2-r1.ebuild2
-rw-r--r--dev-python/zstandard/zstandard-0.21.0.ebuild2
-rw-r--r--media-sound/moc/moc-2.6_alpha3-r6.ebuild5
-rw-r--r--media-video/transcode/transcode-1.1.7-r6.ebuild5
-rw-r--r--net-mail/mu/mu-1.10.3.ebuild2
-rw-r--r--profiles/package.mask10
10 files changed, 23 insertions, 20 deletions
diff --git a/app-misc/qcma/qcma-0.4.1-r2.ebuild b/app-misc/qcma/qcma-0.4.1-r2.ebuild
index d6c461d3cc9c..7f789808b6f5 100644
--- a/app-misc/qcma/qcma-0.4.1-r2.ebuild
+++ b/app-misc/qcma/qcma-0.4.1-r2.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
@@ -14,6 +14,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+ffmpeg"
+# <ffmpeg-5 for bug #900947
DEPEND="
dev-libs/glib:2
dev-qt/qtcore:5
@@ -22,7 +23,7 @@ DEPEND="
dev-qt/qtsql:5
dev-qt/qtwidgets:5
media-libs/vitamtp:0
- ffmpeg? ( media-video/ffmpeg:= )
+ ffmpeg? ( <media-video/ffmpeg-5:= )
x11-libs/libnotify:0
"
RDEPEND="${DEPEND}"
diff --git a/app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild b/app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild
index bd1e2fe321dc..36824384cb41 100644
--- a/app-misc/qcma/qcma-0.4.2_pre20181227-r2.ebuild
+++ b/app-misc/qcma/qcma-0.4.2_pre20181227-r2.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
@@ -16,6 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
IUSE="+ffmpeg"
+# <ffmpeg-5 for bug #900947
DEPEND="
dev-libs/glib:2
dev-qt/qtcore:5
@@ -24,7 +25,7 @@ DEPEND="
dev-qt/qtsql:5
dev-qt/qtwidgets:5
media-libs/vitamtp:0
- ffmpeg? ( media-video/ffmpeg:= )
+ ffmpeg? ( <media-video/ffmpeg-5:= )
x11-libs/libnotify:0
"
RDEPEND="${DEPEND}"
diff --git a/app-misc/qcma/qcma-9999.ebuild b/app-misc/qcma/qcma-9999.ebuild
index ce4bbebe7511..6a97bf6b94b5 100644
--- a/app-misc/qcma/qcma-9999.ebuild
+++ b/app-misc/qcma/qcma-9999.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
@@ -14,6 +14,7 @@ SLOT="0"
IUSE="+ffmpeg"
+# <ffmpeg-5 for bug #900947
DEPEND="
dev-libs/glib:2
dev-qt/qtcore:5
@@ -22,7 +23,7 @@ DEPEND="
dev-qt/qtsql:5
dev-qt/qtwidgets:5
media-libs/vitamtp:0
- ffmpeg? ( media-video/ffmpeg:= )
+ ffmpeg? ( <media-video/ffmpeg-5:= )
x11-libs/libnotify:0
"
RDEPEND="${DEPEND}"
diff --git a/app-office/calligra/calligra-3.2.1-r8.ebuild b/app-office/calligra/calligra-3.2.1-r8.ebuild
index 0c34bcc17c16..49aba50d91f5 100644
--- a/app-office/calligra/calligra-3.2.1-r8.ebuild
+++ b/app-office/calligra/calligra-3.2.1-r8.ebuild
@@ -18,7 +18,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then
PATCHSET="${P}-patchset-1"
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"
- KEYWORDS="amd64 ~ppc64 ~riscv x86"
+ KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
fi
CAL_FTS=( karbon sheets stage words )
diff --git a/dev-python/urllib3/urllib3-2.0.2-r1.ebuild b/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
index ffda8025ad60..3f5b9f1f683a 100644
--- a/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
+++ b/dev-python/urllib3/urllib3-2.0.2-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris"
IUSE="brotli test zstd"
RESTRICT="!test? ( test )"
diff --git a/dev-python/zstandard/zstandard-0.21.0.ebuild b/dev-python/zstandard/zstandard-0.21.0.ebuild
index 15b585d3ea15..dd22686221a6 100644
--- a/dev-python/zstandard/zstandard-0.21.0.ebuild
+++ b/dev-python/zstandard/zstandard-0.21.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
SLOT="0"
LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
DEPEND="
app-arch/zstd:=
diff --git a/media-sound/moc/moc-2.6_alpha3-r6.ebuild b/media-sound/moc/moc-2.6_alpha3-r6.ebuild
index c6dab66976fe..0a24feba0780 100644
--- a/media-sound/moc/moc-2.6_alpha3-r6.ebuild
+++ b/media-sound/moc/moc-2.6_alpha3-r6.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
@@ -17,6 +17,7 @@ KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 ~riscv sparc x86"
IUSE="aac alsa +cache curl debug ffmpeg flac jack libsamplerate mad +magic modplug musepack
oss sid sndfile sndio speex timidity tremor +unicode vorbis wavpack"
+# <ffmpeg-5 dep for bug #834393
RDEPEND="
>=dev-libs/libltdl-2
dev-libs/popt
@@ -25,7 +26,7 @@ RDEPEND="
alsa? ( >=media-libs/alsa-lib-1.0.11 )
cache? ( >=sys-libs/db-4.1:= )
curl? ( >=net-misc/curl-7.15.1 )
- ffmpeg? ( >=media-video/ffmpeg-1.2.6-r1 )
+ ffmpeg? ( <media-video/ffmpeg-5:= )
flac? ( >=media-libs/flac-1.1.3:= )
jack? ( virtual/jack )
libsamplerate? ( >=media-libs/libsamplerate-0.1.0 )
diff --git a/media-video/transcode/transcode-1.1.7-r6.ebuild b/media-video/transcode/transcode-1.1.7-r6.ebuild
index ba7343990bf2..e3b0d10caf68 100644
--- a/media-video/transcode/transcode-1.1.7-r6.ebuild
+++ b/media-video/transcode/transcode-1.1.7-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2002-2022 Gentoo Authors
+# Copyright 2002-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -23,8 +23,9 @@ REQUIRED_USE="
nuv? ( lzo )
"
+# <ffmpeg-5 dep for bug #831482
RDEPEND="
- >=media-video/ffmpeg-0.10
+ <media-video/ffmpeg-5:=
a52? ( media-libs/a52dec )
aac? ( media-libs/faac )
alsa? ( media-libs/alsa-lib )
diff --git a/net-mail/mu/mu-1.10.3.ebuild b/net-mail/mu/mu-1.10.3.ebuild
index 3b59da786c40..6db9039141c9 100644
--- a/net-mail/mu/mu-1.10.3.ebuild
+++ b/net-mail/mu/mu-1.10.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-3+"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~riscv x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
IUSE="emacs readline"
DEPEND="
diff --git a/profiles/package.mask b/profiles/package.mask
index 3fef0ce202f5..a4a3089a2864 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,10 @@
#--- END OF EXAMPLES ---
+# Sam James <sam@gentoo.org> (2023-05-29)
+# Masked until enough reverse dependencies are fixed, bug #901257.
+=media-video/ffmpeg-6*
+
# Ionen Wolkens <ionen@gentoo.org> (2023-05-28)
# Both versions are affected by notable regressions, i.e. 2.8.5
# leaves 100% cpu processes behind, and 2.8.6 has broken positioning
@@ -448,12 +452,6 @@ dev-qt/qtwebsockets:6
# should update to that. #841437
~sci-physics/bullet-3.22b
-# James Beddek <telans@posteo.de> (2022-01-19)
-# FFmpeg 5.0 ABI/API changes break many packages.
-# Masking for tracker/tinderbox. Bug #831437
->=media-video/ffmpeg-5
->=media-sound/spek-0.8.5
-
# Brian Evans <grknight@gentoo.org> (2022-01-07)
# The main consumer, phpunit, does not initiate the new timer correctly
# This is likely to cause issues in tests; Unmask if using for other purposes