gentoo resync : 12.05.2022

3 files changed, 29 insertions, 24 deletions

diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index f43edba141b6..1b018d767dae 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,6 +1,6 @@
-DIST QMPlay2-src-21.06.07.tar.xz 1579640 BLAKE2B f687cf19ce8d4a606b5271c2e5789d5194233bd300f29d165354cc8784808a148e02536ea8a593c036cd75d1e40a335177f1b9db33016008bbb2f9516daf7e61 SHA512 41558e2df09a188cef05c2a24393e67ce4d1ef1268ff1bdd1ac97ec666d9f8f849817b0c64e384624403a8f6f60cb985dde188cb3c75afd731e42f776076d282
 DIST QMPlay2-src-21.12.24.tar.xz 1609604 BLAKE2B 0b2e1ddc0a089ee0d8d37d3d14f2273b53b4df078c6f1571a5ed44c1234133c3eb21461287eb12027ccb686d844f28939b8dfe236c11fd6cb5831dc825708301 SHA512 fddd1d28a0c7f8ad7fa8ef02bb1181ee2fe4babfd8b9c026d2b1d518c1cf28528c64d296b0050d7c51b1ae558baf2d04fe808b276816d98e839a85dbc67ac136
-EBUILD qmplay2-21.06.07-r2.ebuild 3332 BLAKE2B 28e7d5b00a174fe3bd56e9e36376ff2ed57c271c9e182bfbce2994f33eaa4277d837ba64dbfe37851b320cab5cc1ac8ab1598e78a08a9d533ada64d4065ba448 SHA512 08ea23ec11101dee122d4ea0b7c541c322bc4b037a232dd37270381ba2221f6354005ebf5c9457af8aaf316fbf8963af1d47f1cbadb68e22d66f369295d64aff
+DIST QMPlay2-src-22.03.19.tar.xz 1612136 BLAKE2B 5b5ff6d4b37c3d1c46e28839e078e3f7bfa4d2d9d88f552a574cc6560ee18996dda8649f47973f2af97224e2ebebbffadf3c6f52b8064fc30ff63c72d7f578e2 SHA512 687fa0b8bc7d3b99432419aeeaedc83773dc3b12d8133872f663419db7123e7093895bc8ac5b64f03acefd1c4e5cf916210ebbef6b6494284e15487763f0d571
 EBUILD qmplay2-21.12.24.ebuild 3336 BLAKE2B 3d8976098e21861788cd780ff3f3e305dd87f9ede70210b121500f4acb1d9c23ca06558056f9df5107d632ba090f6548720b750e9b3306be08caf60518566ff1 SHA512 ccd37998da35fcb75b16d8b3387d4234b5990a25f52d552f83f64123275af069077a09179d0817495825d22d3312dce4bf5c75f6c8685044513e74998063f048
-EBUILD qmplay2-9999.ebuild 3336 BLAKE2B 3d8976098e21861788cd780ff3f3e305dd87f9ede70210b121500f4acb1d9c23ca06558056f9df5107d632ba090f6548720b750e9b3306be08caf60518566ff1 SHA512 ccd37998da35fcb75b16d8b3387d4234b5990a25f52d552f83f64123275af069077a09179d0817495825d22d3312dce4bf5c75f6c8685044513e74998063f048
+EBUILD qmplay2-22.03.19.ebuild 3324 BLAKE2B 9c4ce7611259460080fbdfb72266426f5b3cd7e71942b87df7cb043f3bb22518a951154bab2bd9ecf2adb424222bff19d3703a015465107c7f17e95f0b541179 SHA512 e4d324867eb01f01f874acd717fe76e30bccc24e8d19d3a2939d977cad168ee4fe6e7ee101c93eff58dc34506e99852f5e08cf53d5a03b1ce65473ab090973a8
+EBUILD qmplay2-9999.ebuild 3324 BLAKE2B 9c4ce7611259460080fbdfb72266426f5b3cd7e71942b87df7cb043f3bb22518a951154bab2bd9ecf2adb424222bff19d3703a015465107c7f17e95f0b541179 SHA512 e4d324867eb01f01f874acd717fe76e30bccc24e8d19d3a2939d977cad168ee4fe6e7ee101c93eff58dc34506e99852f5e08cf53d5a03b1ce65473ab090973a8
 MISC metadata.xml 1342 BLAKE2B c3e3b0477c49c00aec65e05ec5d940f8fc126efe074460a1f67c39b98654ccc3819669e47ad5ba83ed977a72f9ee41606d9409ef3a377cfb511bdc01aff0ce70 SHA512 2eb6b7c2b72abf37a2165f35ed7cab51653a425d294f4ec866d0c6b4dd53ffbf8b30306a987bb4bba1e952ea246815dc59e22a6e9141151a844ae1b7cbd36bde
diff --git a/media-video/qmplay2/qmplay2-21.06.07-r2.ebuild b/media-video/qmplay2/qmplay2-22.03.19.ebuild
index 7af2e7f0fd0a..b7b2b595e0e7 100644
--- a/media-video/qmplay2/qmplay2-21.06.07-r2.ebuild
+++ b/media-video/qmplay2/qmplay2-22.03.19.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
@@ -13,16 +13,16 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
 else
 	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
 	S="${WORKDIR}/QMPlay2-src-${PV}"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-3"
 SLOT="0"
 
-IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
-	gme inputs libass modplug notifications opengl pipewire portaudio
-	pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv"
+IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
+	modplug notifications opengl pipewire portaudio pulseaudio sid shaders
+	+taglib vaapi vdpau videofilters visualizations vulkan xv"
 
 REQUIRED_USE="
 	audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
@@ -41,10 +41,7 @@ RDEPEND="
 	)
 	alsa? ( media-libs/alsa-lib )
 	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? (
-		dev-qt/qtdeclarative:5
-		media-libs/taglib
-	)
+	extensions? ( dev-qt/qtdeclarative:5 )
 	gme? ( media-libs/game-music-emu )
 	libass? ( media-libs/libass )
 	opengl? ( virtual/opengl )
@@ -53,9 +50,10 @@ RDEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	sid? ( media-libs/libsidplayfp )
 	shaders? ( >=media-libs/shaderc-2020.1 )
+	taglib? ( media-libs/taglib	)
 	vaapi? (
 		>=media-video/ffmpeg-4.1.3[vaapi]
-		x11-libs/libva[drm,opengl]
+		x11-libs/libva
 	)
 	vdpau? ( media-video/ffmpeg[vdpau] )
 	videofilters? ( dev-qt/qtconcurrent:5 )
@@ -63,8 +61,8 @@ RDEPEND="
 		>=dev-qt/qtgui-5.14.1:5[vulkan]
 		>=media-libs/vulkan-loader-1.2.133
 	)
-	xv? ( x11-libs/libXv )"
-
+	xv? ( x11-libs/libXv )
+"
 DEPEND="${RDEPEND}"
 BDEPEND="dev-qt/linguist-tools:5"
 
@@ -82,10 +80,11 @@ src_configure() {
 	local mycmakeargs=(
 		# core
 		-DUSE_LINK_TIME_OPTIMIZATION=false
+		-DUSE_UPDATES=OFF
 		-DUSE_ALSA=$(usex alsa)
 		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=$(usex dbus)
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134
+		-DUSE_DBUS_SUSPEND=ON
+		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
 		-DUSE_LIBASS=$(usex libass)
 		-DUSE_NOTIFY=$(usex notifications)
 		-DUSE_OPENGL=$(usex opengl)
@@ -110,18 +109,24 @@ src_configure() {
 		-DUSE_PIPEWIRE=$(usex pipewire)
 		-DUSE_PORTAUDIO=$(usex portaudio)
 		-DUSE_PULSEAUDIO=$(usex pulseaudio)
+		-DUSE_TAGLIB=$(usex taglib)
 		-DUSE_VIDEOFILTERS=$(usex videofilters)
 		-DUSE_VISUALIZATIONS=$(usex visualizations)
 
 		# extensions
 		-DUSE_EXTENSIONS=$(usex extensions)
-		-DUSE_TAGLIB=$(usex extensions)
-		-DUSE_LASTFM=$(usex extensions)
-		-DUSE_LYRICS=$(usex extensions)
-		-DUSE_MEDIABROWSER=$(usex extensions)
-		-DUSE_MPRIS2=$(usex extensions)
 	)
 
+	if use extensions; then
+		# Move inside an if, to remove unused option warning
+		mycmakeargs+=(
+			-DUSE_LASTFM=ON
+			-DUSE_LYRICS=ON
+			-DUSE_MEDIABROWSER=ON
+			-DUSE_MPRIS2=ON
+		)
+	fi
+
 	if [[ ${PV} == *9999 ]]; then
 		mycmakeargs+=( -DUSE_GIT_VERSION=true )
 	else
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 7f6b9471ab08..b7b2b595e0e7 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	taglib? ( media-libs/taglib	)
 	vaapi? (
 		>=media-video/ffmpeg-4.1.3[vaapi]
-		x11-libs/libva[drm,opengl]
+		x11-libs/libva
 	)
 	vdpau? ( media-video/ffmpeg[vdpau] )
 	videofilters? ( dev-qt/qtconcurrent:5 )