gentoo resync : 24.12.2018

3 files changed, 5 insertions, 59 deletions

diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index 4a3a802309fd..475a900f74af 100644
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -2,6 +2,5 @@ AUX qt-gstreamer-1.2.0-boost157.patch 5474 BLAKE2B 72827e5a70e9d204271450f3cdfbe
 AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 BLAKE2B 1be10fb02d4a68406b17ccc758bb1bc79ad85fbde217de7ac12dd5c306326e68cddcdda82b55eebb24c6befb929008c85150b99d7bc6040e7b91984260287d3e SHA512 999ccdd8d9772887e5d302a43e14c2400519306332facc1e4a1c4a65d941ca278a473c84816e4a5358f08df2b42675e7ec9285e1616f77f755562942acaaa4a3
 AUX qt-gstreamer-1.2.0-qt-5.11b3.patch 1834 BLAKE2B 9869694e31a546d1c31bc965c7e0f44de28f5566076cee8d1bb36f274f42757256d5c77e4bf7be23e12260d235eb72868252a5b920a293adc71520bd91c70e3c SHA512 235418641f23e5bbbceef53f561bdfd3b06b5d247c8d81cfb5b72388f494142458bb0171e5b146f8be9613d22a5c286eec6730414d7cbd35b62744dcfc87e667
 DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7
-EBUILD qt-gstreamer-1.2.0-r3.ebuild 1128 BLAKE2B e4000d90af874d1986748069ca1aea904911737a296e453fd0a96a20629f85399dcae76b3120d9042da124a0f969ac0c559261acdb5876e3b5197f3ce9ef3033 SHA512 73ebe2a3ad890ad1d87e58350d930adab57594017566ead036677b3d60d02ccd96f3d0c771b5990939bff1fa754c2fa0bbfdf4e96e01991476f206239993bc76
-EBUILD qt-gstreamer-1.2.0-r4.ebuild 1183 BLAKE2B e03379f8f59dcfabca30600293464b00b7db49c619a58cb1fbb0c25a9413ecb9a7a9a77af4b53913123ff40f72f0dbf66f4431cd548ff814d9340cd0e5abe424 SHA512 996b4b7cc518194bada52af455943efcf059dd109ce1d9661de34341e5aaae1e58dc1f0cc094ece20a830ed516452203a316929b563bd19af192f6db54346129
+EBUILD qt-gstreamer-1.2.0-r4.ebuild 1192 BLAKE2B 2a059bbef988d30547db5116ba902298ec0551d607dc5f26b6d5b77d5508e807a81ab852901768b9380a3670fbecc882fd11b8d4f10435e1d94a0a5b0932a6cf SHA512 1aed155d3a6128d3807f23b615dd9e5c70cfc320c87022796b754cb82cc7e9ebeab165d424fe5931cae433bba658d73337a11d164afd43dda207450674e06182
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild
deleted file mode 100644
index 11e32d10e303..000000000000
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-else
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git"
-	inherit git-r3
-fi
-
-inherit cmake-utils
-
-DESCRIPTION="C++ bindings for GStreamer with a Qt-style API"
-HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-libs/glib:2
-	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
-"
-DEPEND="${RDEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gstreamer15.patch"
-	"${FILESDIR}/${P}-boost157.patch"
-)
-
-# bug 497880
-RESTRICT="test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-		-DQTGSTREAMER_EXAMPLES=OFF
-		-DQTGSTREAMER_TESTS=$(usex test)
-		-DQT_VERSION=5
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
index b2f672cd232d..dea682c8c9e4 100644
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} != *9999* ]]; then
 	SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 else
 	EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git"
 	inherit git-r3
@@ -30,7 +30,8 @@ RDEPEND="
 	media-libs/gstreamer:1.0
 	media-libs/gst-plugins-base:1.0
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/glib-utils
 	test? ( dev-qt/qttest:5 )
 "