5 files changed, 5 insertions, 193 deletions
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 3f42c420ed3f..9ce212ce29ae 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -1,8 +1,5 @@
-AUX qmplay2-22.10.23-fix-includes.patch 869 BLAKE2B e84d97476114c0b48930530ebeaf90032af650080ac517d78986dfe443bf9beb0e128381c39880a78df1762eb85e51f0eab5275d7b148e631138e50d656ec33b SHA512 05025c688e7885c10856669b4e943daf54dfd9580d1e4ae77d344ac0d7ab97856b588e6765ae5a4cdbf7508d24e8affaf897efb01d0c328679b2916f98a3405a
 AUX qmplay2-23.02.05-fix-libva-glx.patch 619 BLAKE2B c3aeeb812c6012bd4627b984f2fb769e88897030f9f73920102d0e95c179773854ab58002cc97b2df4ba1cea317d725a1a8e0e180143677f16067d6f96a32c73 SHA512 1ae7ab4b443e3ab439fe33748c33484f1d83a20a39d5c9c14a292c9327a4bcd2b1e0c3c456bb82aff6fca84a3e9039174e6f4d2e0beeba3b2427acbd3c389c80
-DIST QMPlay2-src-22.10.23.tar.xz 1414804 BLAKE2B c0db1187538be8ab0806abd41fbfdae5a71dda450505af1956989a3ccc10fa52997b8652f280cd66837d12a84a7a058783b65df3d4bd35665c92f1262cd8d004 SHA512 80c9408a9085084857b5b433f009bf62784cf73ceb90218ec09132be227aae97136095811ffa1211375dcbfc1f51cbefaa3690c56fc8df51d9b1cf022ce0709f
 DIST QMPlay2-src-23.02.05.tar.xz 1428992 BLAKE2B 7296ed089306e50e1051c33c23dae30f14cbb166b9d9ea8c184e8aa027a261a658e1d7770c7d574784a5cde4890c66e2104927f4473f484562378c956bea4b3f SHA512 d2e998a2df08c98b7e0232de693ee17b5c703793e2b1edadde300ca39998f40f7ad58b5850ee1f8cddf1dd9489c7f96e664db7e9deba01a612d97707aad849c0
-EBUILD qmplay2-22.10.23.ebuild 3381 BLAKE2B 7fe62b58b88d5b42dc91c1984aa8c1d1964611c7224e258b7413af8c8d71b57408332b4c235ca82bb489896d9c223c3bd496ba2f7ae05d07542f2fd88523ec45 SHA512 582a316117b54870686c734c6ddc283c8102881502e8dfc4d0e6f4ad1f918431361694cab88b2206f75afc07e318aaa2b13ea7d19abcfd21fc3578c5ea4fa19f
-EBUILD qmplay2-23.02.05.ebuild 3392 BLAKE2B 1e1fa20b9fd2dceae2398761d6b2fa416f6f93175277185c7de3649297c40c74846fb9663639660bb78403ae009edaa61a043f7c8f209ca81d32f7c7eb34a897 SHA512 4bc90041cdc1e869d4047241947be06157eae7eb64ea999260d0dcafc1042df5551e1d753d6db9be05bb04f858906743d19898f1be28d8c5e3fb2e961580a364
-EBUILD qmplay2-9999.ebuild 3326 BLAKE2B f5038c99fbd446e8ed67ec09a14bf45823618b8d30f415baedb71b5ec72274c20f5c91ec42e230419dec45a610572de80bb9a1a079853c258f24224a7014b5fa SHA512 83d6efceca7050ed8df053488cbf0b19004daa6d0723602bb5cd408b1653515ea980bcc5b295f95bfdeb6f46b38a1e92c5dc0a989a26de67dc00386e50993789
+EBUILD qmplay2-23.02.05-r1.ebuild 3389 BLAKE2B 12be8718cbd3d0c66d96f5ef50cceac405e4950adaec21cc4a046079e0060313a15941cabce43608b4b749832ccdf6f3f45b250caa9f2b0ec77e0a5bc83028c0 SHA512 6b7e3da84decd8c34d8e0a3c74016a276df649aec12749bf5920ee7a754228b8586beeca92125cb86ac4532762430a2add693624909557f5b61021ed22fff1d9
+EBUILD qmplay2-9999.ebuild 3323 BLAKE2B 68fb9bd6ac5f06f31813df124a23b6078ae42034d9bad0d90bd1ba7af300984349d19a45a9b01fc103c2d89eff1493b2dce163096690388ac5b81196722ac1a4 SHA512 d3aad38f77c863e8f45e341934715695cbbd800d533801eccdfe9769868e948e8a0119a1af0d1de67f2c4d27463b5eba52fdbdef6d5d497b54af63ebb3ef7818
 MISC metadata.xml 1287 BLAKE2B f04c4032dd3f32f10e33c551d364a9914d7663448b293ab9161da4741f53e65438749c1cd14b2ab0f5dd6a231109763642e53932d2705170a7e063e594acae36 SHA512 3f480f4d3cff62300e8eed043f16fe2a0f5cb8572be5fa00710b86036b93650b852168b7e01c2611c95755205d1a33883d67dfb8fd187d87c459d923e77c9fbd
diff --git a/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch b/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch
deleted file mode 100644
index eb77927f6ea9..000000000000
--- a/media-video/qmplay2/files/qmplay2-22.10.23-fix-includes.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://github.com/zaps166/QMPlay2/pull/541
-
-fix include memory with USE_VULKAN=OFF
-
-Those header files are using std::shared_ptr from memory header even
-when USE_VULKAN is OFF, so we must include them unconditionally.
-
-Signed-off-by: Arthur Zamarin <arthurzam@gentoo.org>
---- a/src/qmplay2/LibASS.hpp
-+++ b/src/qmplay2/LibASS.hpp
-@@ -23,6 +23,7 @@
- #include <QByteArray>
- #include <QList>
-
-+#include <memory>
- #include <set>
-
- class Settings;
-@@ -35,7 +36,6 @@ struct ass_renderer;
- struct ass_image;
-
- #ifdef USE_VULKAN
--#include <memory>
- namespace QmVk {
- class BufferPool;
- }
---- a/src/qmplay2/QMPlay2OSD.hpp
-+++ b/src/qmplay2/QMPlay2OSD.hpp
-@@ -25,14 +25,13 @@
- #include <QRect>
-
- #include <functional>
-+#include <memory>
- #include <vector>
- #include <mutex>
-
- #ifdef USE_VULKAN
- #   include <QVector4D>
-
--#   include <memory>
--
- namespace QmVk {
-
- class Buffer;
diff --git a/media-video/qmplay2/qmplay2-22.10.23.ebuild b/media-video/qmplay2/qmplay2-22.10.23.ebuild
deleted file mode 100644
index 1ef2e8a50818..000000000000
--- a/media-video/qmplay2/qmplay2-22.10.23.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake xdg
-
-DESCRIPTION="A Qt-based video player, which can play most formats and codecs"
-HOMEPAGE="https://github.com/zaps166/QMPlay2"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/zaps166/QMPlay2"
-else
-	SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz"
-	S="${WORKDIR}/QMPlay2-src-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="LGPL-3"
-SLOT="0"
-
-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 ) )
-	shaders? ( vulkan )"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-video/ffmpeg
-	|| (
-		dev-qt/qtgui:5[X(-)]
-		dev-qt/qtgui:5[xcb(-)]
-	)
-	alsa? ( media-libs/alsa-lib )
-	cdio? ( dev-libs/libcdio[cddb] )
-	extensions? ( dev-qt/qtdeclarative:5 )
-	gme? ( media-libs/game-music-emu )
-	libass? ( media-libs/libass )
-	opengl? ( virtual/opengl )
-	pipewire? ( media-video/pipewire )
-	portaudio? ( media-libs/portaudio )
-	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]
-		media-libs/libva[X]
-	)
-	vdpau? ( media-video/ffmpeg[vdpau] )
-	videofilters? ( dev-qt/qtconcurrent:5 )
-	vulkan? (
-		>=dev-qt/qtgui-5.14.1:5[vulkan]
-		>=media-libs/vulkan-loader-1.2.133
-	)
-	xv? ( x11-libs/libXv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-includes.patch"
-)
-
-src_prepare() {
-	# disable compress man pages
-	sed -r \
-		-e 's/if\(GZIP\)/if\(TRUE\)/' \
-		-e 's/(install.+QMPlay2\.1)\.gz/\1/' \
-		-i src/gui/CMakeLists.txt || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# core
-		-DUSE_LINK_TIME_OPTIMIZATION=false
-		-DUSE_UPDATES=OFF
-		-DUSE_ALSA=$(usex alsa)
-		-DUSE_AUDIOCD=$(usex cdio)
-		-DUSE_DBUS_SUSPEND=ON
-		-DUSE_FREEDESKTOP_NOTIFICATIONS=ON
-		-DUSE_LIBASS=$(usex libass)
-		-DUSE_NOTIFY=$(usex notifications)
-		-DUSE_OPENGL=$(usex opengl)
-		-DUSE_VULKAN=$(usex vulkan)
-		-DUSE_GLSLC=$(usex shaders)
-		-DUSE_XVIDEO=$(usex xv)
-
-		# ffmpeg
-		-DUSE_FFMPEG_AVDEVICE=$(usex avdevice)
-		-DUSE_FFMPEG_VAAPI=$(usex vaapi)
-		-DUSE_FFMPEG_VDPAU=$(usex vdpau)
-
-		# chiptune
-		-DUSE_CHIPTUNE_GME=$(usex gme)
-		-DUSE_CHIPTUNE_SID=$(usex sid)
-
-		# modules
-		-DUSE_AUDIOFILTERS=$(usex audiofilters)
-		-DUSE_CUVID=$(usex cuvid)
-		-DUSE_INPUTS=$(usex inputs)
-		-DUSE_MODPLUG=$(usex modplug)
-		-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)
-	)
-
-	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
-		mycmakeargs+=( -DUSE_GIT_VERSION=false )
-	fi
-
-	cmake_src_configure
-}
diff --git a/media-video/qmplay2/qmplay2-23.02.05.ebuild b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
index 04d454c891d3..e5d94c7d4ad9 100644
--- a/media-video/qmplay2/qmplay2-23.02.05.ebuild
+++ b/media-video/qmplay2/qmplay2-23.02.05-r1.ebuild
@@ -47,7 +47,7 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	pipewire? ( media-video/pipewire )
 	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sid? ( media-libs/libsidplayfp )
 	shaders? ( >=media-libs/shaderc-2020.1 )
 	taglib? ( media-libs/taglib	)
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index dcf4fed040ad..5844dfa91690 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-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
@@ -47,7 +47,7 @@ RDEPEND="
 	opengl? ( virtual/opengl )
 	pipewire? ( media-video/pipewire )
 	portaudio? ( media-libs/portaudio )
-	pulseaudio? ( media-sound/pulseaudio )
+	pulseaudio? ( media-libs/libpulse )
 	sid? ( media-libs/libsidplayfp )
 	shaders? ( >=media-libs/shaderc-2020.1 )
 	taglib? ( media-libs/taglib	)