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

[Andreas Sturmlechner]

commit:     fbb8dad122c69ac485679238757a8e262d0d0603
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 30 19:31:19 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 30 19:31:19 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbb8dad1

media-libs/qt-gstreamer: Drop USE=qt4,qt5

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild | 72 ++++++++----------------
 1 file changed, 24 insertions(+), 48 deletions(-)

diff --git a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
index c27fe7eaf7..33ca17cbea 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-9999.ebuild
@@ -4,75 +4,51 @@
 EAPI=6
 
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="http://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+	SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 else
-	EGIT_REPO_URI=( "git://anongit.freedesktop.org/gstreamer/${PN}" )
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/${PN}.git"
 	inherit git-r3
 fi
 
-inherit cmake-utils multibuild
+inherit cmake-utils
 
 DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
-HOMEPAGE="http://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="+qt4 qt5 test"
-
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE="test"
 
 RDEPEND="
 	dev-libs/glib:2
-	>=dev-libs/boost-1.40:=
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtopengl:5
+	dev-qt/qtwidgets:5
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtdeclarative:4
-		dev-qt/qtgui:4
-		dev-qt/qtopengl:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
-		dev-qt/qtgui:5
-		dev-qt/qtopengl:5
-		dev-qt/qtwidgets:5
-	)
 "
 DEPEND="${RDEPEND}
-	test? (
-		qt4? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)
+	test? ( dev-qt/qttest:5 )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-gstreamer15.patch"
+	"${FILESDIR}/${P}-boost157.patch"
+)
+
 # bug 497880
 RESTRICT="test"
 
-pkg_setup() {
-	MULTIBUILD_VARIANTS=( $(usex qt4 4 '') $(usex qt5 5 '') )
-}
-
 src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-			-DQTGSTREAMER_EXAMPLES=OFF
-			-DQTGSTREAMER_TESTS=$(usex test)
-			-DQT_VERSION=${MULTIBUILD_VARIANT}
-		)
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
+		-DQTGSTREAMER_EXAMPLES=OFF
+		-DQTGSTREAMER_TESTS=$(usex test)
+		-DQT_VERSION=5
+	)
+	cmake-utils_src_configure
 }