[gentoo-commits] proj/kde:master commit in: media-libs/qt-gstreamer/

["Johannes Huber" <johu@gentoo.org>]

commit:     d3c9b24a1d061b7631dd200b91e99be140fc63cd
Author:     Karol Herbst <git <AT> karolherbst <DOT> de>
AuthorDate: Thu Mar  5 15:44:21 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 19:38:49 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=d3c9b24a

[media-libs/qt-gstreamer] Sync with tree

Package-Manager: portage-2.2.18

 media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 34 +++++++++---------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
index 677e6c2..120f738 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
@@ -4,9 +4,6 @@
 
 EAPI=5
 
-QT4_MINIMAL="4.7.0"
-QT5_MINIMAL="5.0.0"
-
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
@@ -29,18 +26,18 @@ RDEPEND="
 	dev-libs/glib:2
 	>=dev-libs/boost-1.40:=
 	qt4? (
-		>=dev-qt/qtcore-${QT4_MINIMAL}:4
-		>=dev-qt/qtdeclarative-${QT4_MINIMAL}:4
-		>=dev-qt/qtgui-${QT4_MINIMAL}:4
-		>=dev-qt/qtopengl-${QT4_MINIMAL}:4
+		dev-qt/qtcore:4
+		dev-qt/qtdeclarative:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
 	)
 	qt5? (
-		>=dev-qt/qtcore-${QT5_MINIMAL}:5
-		>=dev-qt/qtdeclarative-${QT5_MINIMAL}:5
-		>=dev-qt/qtgui-${QT5_MINIMAL}:5
-		>=dev-qt/qtopengl-${QT5_MINIMAL}:5
-		>=dev-qt/qtquick1-${QT5_MINIMAL}:5
-		>=dev-qt/qtwidgets-${QT5_MINIMAL}:5
+		dev-qt/qtcore:5
+		dev-qt/qtdeclarative:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtquick1:5
+		dev-qt/qtwidgets:5
 	)
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
@@ -49,7 +46,7 @@ DEPEND="
 	${RDEPEND}
 	test? (
 		qt4? (
-			>=dev-qt/qttest-${QT4_MINIMAL}:4
+			dev-qt/qttest:4
 		)
 	)
 "
@@ -58,7 +55,7 @@ DEPEND="
 RESTRICT="test"
 
 pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
+	MULTIBUILD_VARIANTS=( $(usex qt4 4 '') $(usex qt5 5 '') )
 }
 
 src_configure() {
@@ -66,13 +63,8 @@ src_configure() {
 		local mycmakeargs=(
 			-DQTGSTREAMER_EXAMPLES=OFF
 			$(cmake-utils_use test QTGSTREAMER_TESTS)
+			-DQT_VERSION=${MULTIBUILD_VARIANT}
 		)
-		if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-			mycmakeargs+=(-DQT_VERSION=4)
-		fi
-		if [[ ${MULTIBUILD_VARIANT} = qt5 ]]; then
-			mycmakeargs+=(-DQT_VERSION=5)
-		fi
 		cmake-utils_src_configure
 	}