[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/

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

commit:     393b6367aafea4b40d55035e268515271bf7dbe6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  2 21:38:42 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 21:38:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=393b6367

kde-apps/k3b: Fix USE-deps and REQUIRED_USE

If taglib is not enabled, projects adding mp3 and flac files will hang.

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 kde-apps/k3b/k3b-17.08.49.9999.ebuild | 8 +++++---
 kde-apps/k3b/k3b-9999.ebuild          | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/kde-apps/k3b/k3b-17.08.49.9999.ebuild b/kde-apps/k3b/k3b-17.08.49.9999.ebuild
index 229940f507..c5366a7575 100644
--- a/kde-apps/k3b/k3b-17.08.49.9999.ebuild
+++ b/kde-apps/k3b/k3b-17.08.49.9999.ebuild
@@ -9,6 +9,7 @@ inherit kde5
 
 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
 HOMEPAGE="http://www.k3b.org/"
+
 LICENSE="GPL-2 FDL-1.2"
 KEYWORDS=""
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
@@ -21,7 +22,7 @@ DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep kfilemetadata 'taglib?')
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
@@ -69,8 +70,9 @@ RDEPEND="${DEPEND}
 "
 
 REQUIRED_USE="
-	mp3? ( encode )
-	sox? ( encode )
+	flac? ( taglib )
+	mp3? ( encode taglib )
+	sox? ( encode taglib )
 "
 
 DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )

diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild
index 229940f507..c5366a7575 100644
--- a/kde-apps/k3b/k3b-9999.ebuild
+++ b/kde-apps/k3b/k3b-9999.ebuild
@@ -9,6 +9,7 @@ inherit kde5
 
 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
 HOMEPAGE="http://www.k3b.org/"
+
 LICENSE="GPL-2 FDL-1.2"
 KEYWORDS=""
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
@@ -21,7 +22,7 @@ DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata)
+	$(add_frameworks_dep kfilemetadata 'taglib?')
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kiconthemes)
 	$(add_frameworks_dep kio)
@@ -69,8 +70,9 @@ RDEPEND="${DEPEND}
 "
 
 REQUIRED_USE="
-	mp3? ( encode )
-	sox? ( encode )
+	flac? ( taglib )
+	mp3? ( encode taglib )
+	sox? ( encode taglib )
 "
 
 DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )