[gentoo-commits] proj/kde:master commit in: media-gfx/kphotoalbum/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     7ba52c3be557cfa3591287f7dcbad8df2ee38203
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 09:40:44 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 10:29:39 2023 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=7ba52c3b

media-gfx/kphotoalbum: Drop IUSE qtav, update DOCS and LICENSE

Upstream commit 24cdf489f47e6c6f82aab72d309fc0aacc9cd9b8

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-gfx/kphotoalbum/kphotoalbum-9999.ebuild | 13 ++++++-------
 media-gfx/kphotoalbum/metadata.xml            |  1 -
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
index 241e7c996a..9443409019 100644
--- a/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
+++ b/media-gfx/kphotoalbum/kphotoalbum-9999.ebuild
@@ -18,11 +18,11 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
-LICENSE="GPL-2+ FDL-1.2"
+LICENSE="GPL-2+ FDL-1.2 CC-BY-SA-4.0"
 SLOT="5"
-IUSE="map phonon qtav +raw share +vlc"
+IUSE="map phonon +raw share +vlc"
 
-REQUIRED_USE="|| ( phonon qtav vlc )"
+REQUIRED_USE="|| ( phonon vlc )"
 
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -47,7 +47,6 @@ DEPEND="
 	media-libs/libjpeg-turbo:=
 	map? ( kde-apps/marble:5 )
 	phonon? ( >=media-libs/phonon-4.11.0 )
-	qtav? ( media-libs/qtav:= )
 	raw? ( kde-apps/libkdcraw:5 )
 	share? ( >=kde-frameworks/kxmlgui-${KFMIN}:5 )
 	vlc? ( media-video/vlc:= )
@@ -56,13 +55,13 @@ RDEPEND="${DEPEND}
 	media-video/ffmpeg
 "
 
-DOCS=( ChangeLog README.md )
+DOCS=( CHANGELOG.{md,old} README.md )
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake_use_find_package phonon Phonon4Qt5)
-		$(cmake_use_find_package qtav QtAV)
+		-DCMAKE_DISABLE_FIND_PACKAGE_QtAV=ON # bug 758641, last-rited
 		$(cmake_use_find_package map Marble)
+		$(cmake_use_find_package phonon Phonon4Qt5)
 		$(cmake_use_find_package raw KF5KDcraw)
 		$(cmake_use_find_package share KF5Purpose)
 		$(cmake_use_find_package vlc LIBVLC)

diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index e4b11a20d6..0fd7db4de4 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -11,7 +11,6 @@
 	<use>
 		<flag name="map">Enable map display support using <pkg>kde-apps/marble</pkg></flag>
 		<flag name="phonon">Enable <pkg>media-libs/phonon</pkg> video backend (known to crash on some video formats)</flag>
-		<flag name="qtav">Enable <pkg>media-libs/qtav</pkg> video backend (audio and video may get out of sync)</flag>
 		<flag name="share">Enable support for a share menu using <pkg>kde-frameworks/purpose</pkg></flag>
 		<flag name="vlc">Enable <pkg>media-video/vlc</pkg> video backend (recommended for X11)</flag>
 	</use>