[gentoo-commits] repo/gentoo:master commit in: media-sound/flacon/

[Patrice Clement]

commit:     9df4d8fe38e899b92810fca13c078afb38595552
Author:     Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Tue May 31 01:36:43 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Jun  2 07:13:56 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9df4d8fe

media-sound/flacon: change qt USE flags in 9999 wrt Qt project policies

See https://wiki.gentoo.org/wiki/Project:Qt/Policies#Requires_one_of_two_Qt_versions

Package-Manager: portage-2.3.0_rc1

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 media-sound/flacon/flacon-9999.ebuild | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/media-sound/flacon/flacon-9999.ebuild b/media-sound/flacon/flacon-9999.ebuild
index 2dcb6be..5327c19 100644
--- a/media-sound/flacon/flacon-9999.ebuild
+++ b/media-sound/flacon/flacon-9999.ebuild
@@ -16,11 +16,11 @@ EGIT_REPO_URI="git://github.com/${PN}/${PN}.git"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS=""
-IUSE="aac flac mac mp3 opus qt4 qt5 replaygain test tta vorbis wavpack"
+IUSE="aac flac mac mp3 opus qt5 replaygain test tta vorbis wavpack"
 
 COMMON_DEPEND="
 	dev-libs/uchardet
-	qt4? (
+	!qt5? (
 		dev-qt/qtcore:4
 		dev-qt/qtgui:4
 	)
@@ -49,13 +49,11 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	qt5? ( dev-qt/linguist-tools:5 )
 	test? (
-		qt4? ( dev-qt/qttest:4 )
+		!qt5? ( dev-qt/qttest:4 )
 		qt5? ( dev-qt/qttest:5 )
 	)
 "
 
-REQUIRED_USE="^^ ( qt4 qt5 )"
-
 src_prepare() {
 	cmake-utils_src_prepare
 
@@ -73,7 +71,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		-DUSE_QT4="$(usex qt4)"
+		-DUSE_QT4="$(usex !qt5)"
 		-DUSE_QT5="$(usex qt5)"
 		-DTEST_DATA_DIR="${S}/tests/data/"
 		-DBUILD_TESTS="$(usex test 'Yes')"