gentoo resync : 07.07.2018

2 files changed, 0 insertions, 66 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 43971c3e267a..c28f29dab15c 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -7,6 +7,5 @@ DIST qtmultimedia-opensource-src-5.9.6.tar.xz 3585964 BLAKE2B fdd18b1abcfbc8a1f8
 EBUILD qtmultimedia-4.8.7.ebuild 1298 BLAKE2B 2e78e5f2f0dfbf43aaabd1abcf06fb05a3612029bb9ed2f1007cda90ed32665cea64b2f56e7b64b879400a3a66ba4907fbacefa5bd431fce1a08b0db3c61c8cc SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0
 EBUILD qtmultimedia-5.11.1.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
 EBUILD qtmultimedia-5.9.4-r1.ebuild 1460 BLAKE2B e845058b50a99d2744c32adc8044b0144988bfe898770e9f5f7a316eee2e5ed17974a36ad1e9ddef786ae8f789b16221534d56eea9d84ca713b7960e8810a764 SHA512 f5f1131f8915e62c8978663187f3a02b4f19fcb8285b4557f809fa1bef9c4277d7b2fe8b4c6fe92b3f55333bea1e4244f94e5af52539968aa15b98b810d55c5a
-EBUILD qtmultimedia-5.9.4.ebuild 1351 BLAKE2B 6ffd46d9ac8586ccd662757ba2119fd40f6788c9930436eeeaf8639d1f44c2c62c3251719e4752a8781a9cd422d3b52322eea88462f9f00f84156065cba22dc5 SHA512 40b7d32b7f77d1cb9e84be35ea9580b36c8aca9701a206616ffef299255b1fd67ac153ccb55e555ca779c5be82d657141e5fccf64f737912673b66cf9103bf21
 EBUILD qtmultimedia-5.9.6.ebuild 1450 BLAKE2B c6a3a943732b92b0e8402d103747d948a71c1d9838e494f3d71443121793ca4784969bd5a230caeadb502ea48b516c81cbd5fc025a82d189ee19bf5663676e65 SHA512 31d84f0d939969958e588dde75ef6dd0fb4f3cc12178000bff34b0e3a33a33764725911239fe6f3c55665c8ccab4000eae90687f7b3aa74092b276684b506e61
 MISC metadata.xml 937 BLAKE2B 804145c6bfe640955c5de227bdf2ba51570749541d5febec508b874fa823a2386da52648b2ba2bff959de2ef1371fa6384007591606410829d6fe4c12afd7ce4 SHA512 b5007c578748a64091105fd04aec3133587dcf0f8cf22b758520776e903699de80555fa2e69206edaf8415dad037018f8c169966fb48c1d402118a6e32509d31
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
deleted file mode 100644
index ccc57e3e45a4..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.9.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="Multimedia (audio, video, radio, camera) library for the Qt5 framework"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-fi
-
-IUSE="alsa gles2 gstreamer openal pulseaudio qml widgets"
-
-RDEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	~dev-qt/qtnetwork-${PV}
-	alsa? ( media-libs/alsa-lib )
-	gstreamer? (
-		dev-libs/glib:2
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	pulseaudio? ( media-sound/pulseaudio )
-	qml? (
-		~dev-qt/qtdeclarative-${PV}
-		gles2? ( ~dev-qt/qtgui-${PV}[egl] )
-		openal? ( media-libs/openal )
-	)
-	widgets? (
-		~dev-qt/qtopengl-${PV}
-		~dev-qt/qtwidgets-${PV}[gles2=]
-	)
-"
-DEPEND="${RDEPEND}
-	gstreamer? ( x11-base/xorg-proto )
-"
-
-src_prepare() {
-	qt_use_disable_config openal openal \
-		src/imports/imports.pro
-
-	qt_use_disable_mod qml quick \
-		src/src.pro \
-		src/plugins/plugins.pro
-
-	qt_use_disable_mod widgets widgets \
-		src/src.pro \
-		src/gsttools/gsttools.pro \
-		src/plugins/gstreamer/common.pri
-
-	qt5-build_src_prepare
-}
-
-src_configure() {
-	local myqmakeargs=(
-		--
-		$(qt_use alsa)
-		$(qt_use gstreamer)
-		$(qt_use pulseaudio)
-	)
-	qt5-build_src_configure
-}