gentoo auto-resync : 01:06:2023 - 09:25:35

5 files changed, 12 insertions, 169 deletions

diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index a82b77625e6f..19475a41bf80 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index ba9ba296d7b9..dd7159de4051 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,5 +1,3 @@
 DIST audacious-plugins-4.3.1.tar.bz2 1786114 BLAKE2B 7d0a88411dc389e9f250ac126c02eff217ab4feb581527789cfe190f0fd997671fe06664d574d531296d884b2ae4f85f31a25f79ef09bd9db39640f17a0a97cf SHA512 ca065b4558406702e4f2aa2ac085ea02d3215e689e09e9c0b6a740970a469297910df52cd222997e8a4206a68d3a064ac3f6d94c6412830ce8bd34a5b42c30da
-DIST audacious-plugins-4.3.tar.bz2 1932184 BLAKE2B a62e7e3600b21a8af9248cd1b244dd736693e29f3d5374d68417bd46eb37263109b926beb9aa587ebb98bcea8d444403c6d8fdd96f0dcb7e6665199b0b34c9fe SHA512 51ffb38917bc9cf13d433c39843b37cbad6ef2a0db8b5da65ba18f8e547c94cfb979f0c8f4413080c56bc33d4f2ae47f92679ee5c11225aa47d85abfd27c0810
-EBUILD audacious-plugins-4.3-r1.ebuild 4095 BLAKE2B 1cba5bbe8b716d2a428ef030fbabc50f4c1e1c14b1a988bccb896da0b5421adb147c27d33a3f24bbfeb3882d31fdd72c1bf7d78c38d1badb2627dbe811fb621c SHA512 42f6e870a01ef6e857898bdc25ec8f84b51eb6a71ceb69349c689c5e0c0a776846b7b2f203e3e9e0042a2f18b3ac2d59613583b7c5e892d199fe0322ca1e3471
 EBUILD audacious-plugins-4.3.1-r2.ebuild 4084 BLAKE2B 0fe099976811e24612c0c53f11f5dacc8dccc9469f796bc5402f9163e06e3711ad04783364c0a76a695dd126850ee946660bd541f1d21a2266bd2e4c1e3e5c2d SHA512 572e284607bb20d2c4ec9e969b9a1f36fec2ec49415b6f7823bf1afaba4ec8c04d4f6b48302297d9f4c9ecee0862e98d7e3ee5f37616d5355e9dce87ddd68544
 MISC metadata.xml 1155 BLAKE2B fbd2f8cb2bae9dedf92c13907010dda578bc963e32807259be40b656d0360857b7e71e0102ad5aaf0121d4f7488fa138b3fc61be15fdfda630d6ca963ad3f8e1 SHA512 20ac2780a6ff28629dd478a0cca8a4dc9d09a0883c9ceef401639da84c0a01821077e0412e0c6a414548df0ffe13d33dae893229bc797c9507f13a8e8c222d33
diff --git a/media-plugins/audacious-plugins/audacious-plugins-4.3-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.3-r1.ebuild
deleted file mode 100644
index 32c24d60ff71..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-4.3-r1.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-
-KEYWORDS="amd64 ~riscv x86"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="
-	aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
-	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl openmpt
-	opus pipewire pulseaudio scrobbler sdl sid sndfile soxr speedpitch
-	streamtuner vorbis wavpack
-"
-
-REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
-
-# The following plugins REQUIRE a GUI build of audacious, because non-GUI
-# builds do NOT install the libaudgui library & headers.
-# Plugins without a configure option:
-#   alarm
-#   albumart
-#   delete-files
-#   ladspa
-#   playlist-manager
-#   search-tool
-#   skins
-#   vtx
-# Plugins with a configure option:
-#   glspectrum
-#   gtkui
-#   hotkey
-#   notify
-#   statusicon
-BDEPEND="
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	app-arch/unzip
-	dev-libs/glib:2
-	dev-libs/libxml2:2
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtwidgets:5
-	~media-sound/audacious-${PV}
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	aac? ( >=media-libs/faad2-2.7 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	ampache? ( =media-libs/ampache_browser-1*:= )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia:=
-		>=media-libs/libcddb-1.2.1
-	)
-	cue? ( media-libs/libcue:= )
-	ffmpeg? ( >=media-video/ffmpeg-0.7.3:= )
-	flac? (
-		>=media-libs/flac-1.2.1-r1:=
-		>=media-libs/libvorbis-1.0
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	http? ( >=net-libs/neon-0.26.4 )
-	jack? (
-		>=media-libs/bio2jack-0.4
-		virtual/jack
-	)
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	opengl? ( dev-qt/qtopengl:5 )
-	openmpt? ( media-libs/libopenmpt )
-	opus? ( media-libs/opusfile )
-	pipewire? ( media-video/pipewire:= )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl2[sound] )
-	sid? ( >=media-libs/libsidplayfp-1.0.0 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	soxr? ( media-libs/soxr )
-	speedpitch? ( media-libs/libsamplerate:= )
-	streamtuner? ( dev-qt/qtnetwork:5 )
-	vorbis? (
-		>=media-libs/libogg-1.1.3
-		>=media-libs/libvorbis-1.2.0
-	)
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-}
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "Failed to sed" # bug #512698
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-mpris2
-		--enable-qt
-		--enable-qtaudio
-		--enable-songchange
-		--disable-adplug # not packaged
-		--disable-gtk
-		--disable-oss4
-		--disable-coreaudio
-		--disable-sndio
-		$(use_enable aac)
-		$(use_enable alsa)
-		$(use_enable ampache)
-		$(use_enable bs2b)
-		$(use_enable cdda cdaudio)
-		$(use_enable cue)
-		$(use_enable ffmpeg ffaudio)
-		$(use_enable flac)
-		$(use_enable flac filewriter)
-		$(use_enable fluidsynth amidiplug)
-		$(use_enable gme console)
-		$(use_enable http neon)
-		$(use_enable jack)
-		$(use_enable lame filewriter_mp3)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate resample)
-		$(use_enable lirc)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable mp3 mpg123)
-		$(use_enable nls)
-		$(use_enable opengl qtglspectrum)
-		$(use_enable openmpt)
-		$(use_enable opus)
-		$(use_enable pipewire)
-		$(use_enable pulseaudio pulse)
-		$(use_enable scrobbler scrobbler2)
-		$(use_enable sdl sdlout)
-		$(use_enable sid)
-		$(use_enable sndfile)
-		$(use_enable soxr)
-		$(use_enable speedpitch)
-		$(use_enable streamtuner)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-plugins/gst-plugins-opencv/Manifest b/media-plugins/gst-plugins-opencv/Manifest
index aaa2c18c5c80..40b385bf07ca 100644
--- a/media-plugins/gst-plugins-opencv/Manifest
+++ b/media-plugins/gst-plugins-opencv/Manifest
@@ -9,5 +9,5 @@ EBUILD gst-plugins-opencv-1.20.3.ebuild 720 BLAKE2B 9a678748ad38136b07b0d300def0
 EBUILD gst-plugins-opencv-1.20.4.ebuild 723 BLAKE2B eaa32051977543a70f4d043d23fd5cd10178e625f2e499bb897213a6f8de2d32335f068afc078661d17903577d150808b40af8d2f742dd2ba89d7e1276f548c9 SHA512 94fcd8f2dfb90c13ec7e4fbee6032ed268344e5aded5cc8597012d758bfb5a79200992241c5764a0544cf00743f176f2323c601e68de9a3f3399aead9c0fc26a
 EBUILD gst-plugins-opencv-1.20.5.ebuild 725 BLAKE2B 9876f5334e548e4a1e9c26559270d9a5ddc831d70a7e5c491bfa4e26ee5642ce29d5c50064d4a7cbb2d7bd8ad7d2fbf3bb221502e4849adca7a550de0d2212af SHA512 46341cf450595504fa56f230d768e882998373e00959a998efab3eec8c140ee12e27723690112b340367e2d45ccb470b49e8c01aa27e44734b72ec339f8a5d39
 EBUILD gst-plugins-opencv-1.20.6.ebuild 725 BLAKE2B 9876f5334e548e4a1e9c26559270d9a5ddc831d70a7e5c491bfa4e26ee5642ce29d5c50064d4a7cbb2d7bd8ad7d2fbf3bb221502e4849adca7a550de0d2212af SHA512 46341cf450595504fa56f230d768e882998373e00959a998efab3eec8c140ee12e27723690112b340367e2d45ccb470b49e8c01aa27e44734b72ec339f8a5d39
-EBUILD gst-plugins-opencv-1.22.3-r1.ebuild 696 BLAKE2B 3996404e3eb653f6cfefc148e3463a9e1a8f88bca78615e4b62dd633c4acb86aa827777fbede0935b76c031a94df0e495c92c63347626579ad5d3270d0f0ca5b SHA512 173907c0def07fd939710c63d5f23b6d7865c7e8235b137d4d0179d74b9e01834fcde21b97272d7c7299e7d59bc5d89d02c559f793ff3fb2f400a29f93385df9
+EBUILD gst-plugins-opencv-1.22.3-r2.ebuild 991 BLAKE2B dd47c38af9a2d70dc324ac97c3448210ec35c3792fe16067327a9cfdaae7c0d57b351065b0af0ae676ebeb80ce176b013a49460fe06334087679024632765e9c SHA512 9e96838d185b7a79dfa6aac32a3d1895f8b285046b0b516244b3584c026d4b31f314f956c3117b1e77200cfab94c0f30977b54bdfb8bffaeb83cd5ff7b6271b5
 MISC metadata.xml 263 BLAKE2B dd46173106e3b1509b54acb2e1688a98d89f8f1fe255db2f2db9fc82021410df1139ebb7fe913acf44e64bb8ca4b00e8f71801b92f0adf3d4110f4a7f9226900 SHA512 53d4401737d15aac01f0b0cf65fb159908ccf3611604b38c28baaf5a5f4a290931a6cbfd735421dadd8f1114367cf2d79bf3f4b5473ba958bd46e0c1ee666454
diff --git a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r2.ebuild
index dd4e9c41a067..979c21297c73 100644
--- a/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r1.ebuild
+++ b/media-plugins/gst-plugins-opencv/gst-plugins-opencv-1.22.3-r2.ebuild
@@ -25,6 +25,17 @@ src_prepare() {
 	gstreamer_system_package video_dep:gstreamer-video
 }
 
+multilib_src_configure() {
+	local emesonargs=(
+		# We need to disable here to avoid colliding w/ gst-plugins-bad
+		# on translations, because we currently do a "full" install in
+		# multilib_src_install in this package. See bug #907480.
+		-Dnls=disabled
+	)
+
+	gstreamer_multilib_src_configure
+}
+
 multilib_src_install() {
 	DESTDIR="${D}" eninja install
 }