gentoo resync : 31.10.2017

3 files changed, 0 insertions, 119 deletions

diff --git a/dev-qt/qtmultimedia/Manifest b/dev-qt/qtmultimedia/Manifest
index 11ac7e6f81ed..7ba54f517bc2 100644
--- a/dev-qt/qtmultimedia/Manifest
+++ b/dev-qt/qtmultimedia/Manifest
@@ -1,13 +1,9 @@
 AUX qtmultimedia-4.8.0-alsa.patch 2155 SHA256 49a54bd39627b1070b106519cdff1fe33aec6a5755658c20270204b2ba850f7a SHA512 725dc78b861c82393ecd97ce293f9c165067ca940332fab22ecc252880e1c08aae301d54ddcdf38df9d32907c57bc70d772891a6dc9fdacf740de32b363f4aa4 WHIRLPOOL c5359f79a53b4d488c346e2d58924e21df3deabbb87e59762185afe43b05543578a1bc2d2bdafa31b1a345adf7a287851bde3a963c56ed1cc686beb14cedc321
 AUX qtmultimedia-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch 6852 SHA256 e647c6ad16e624aec98acd4edbf5d9fce5effd57429c6b17bd534c849d72bfec SHA512 ff513b5c68a02179e0a36803367b4dfe9f8c351fb76296570a2b382d2a1dd43fcb99033ab7844c52253c95124e2246cb81d68aa8e64e16c89d37bccaffcd9dea WHIRLPOOL 5a3108abf1c7aecf1ce86709dd65e151940c52e7e4301508b18e86429bd6cc2544632efdd9393c67f0b4056a83677b7995192fc33d853de86b58dcdbba1673f8
-DIST qt-everywhere-opensource-src-4.8.6.tar.gz 241623667 SHA256 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c SHA512 c2d07c3cf9d687cb9b93e337c89df3f0055bd02bc8aa5ecd55d3ffb238b31a4308aeabc3c51a4f94ac76a1b00796f047513d02e427ed93ae8dd99f836fff7692 WHIRLPOOL 473566814a77237dbdd37a47980c1085f6cf39599c4d6b0120959fe80dadf65c4eaafd5f528dd86cea8815562faa204bedfe3b766c2ca4f2d2c99efc21dbca84
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 SHA256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125 WHIRLPOOL ad8f01172f5bdb3a3a69fe7b03862c4c411bc8d95211053ad66ed1d60a3c0577d073d1075a1e0a80b25d9b2721addda55a2967e6ccf5e194cec8d08770ac5fc2
-DIST qtmultimedia-opensource-src-5.6.2.tar.xz 3492628 SHA256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf SHA512 e4750b1033f4ffbc139c14475fa07019bbb51a373d72a608035da583e88979fc7cc8694be90661c3977f6a1e0be2c27a98b348a632f62b2d40c224af927f9ccc WHIRLPOOL 1a9872996146371e4bf7d877c18a829986db63fca3ce57b250d9282d884a1479a7309b981c29c7bfedd4d965c5b76e94cafd11ea9c0e3c1d07852ebabb58365d
 DIST qtmultimedia-opensource-src-5.7.1.tar.xz 3563676 SHA256 a52b177fbf02600a0c8bd995ce7c2041c673bc1332c02b60e0e95bb9ebab7def SHA512 1415a4c29416ead2528ddb040a3c69480408509c6ba573f44295513bfe2aa62b8e8bb97cbd33713e605f094e1c1e1337507904d2b0c6480ddf9cf75393d8e97f WHIRLPOOL 6d37e06443b6e6d3d55e35ccebe08bc2a7a4423afe3728db5b297f15e682af31f6085ab2ebf92f63d4bff4ec69b772b6e545149b260245d3d076d4c619b8d46f
 DIST qtmultimedia-opensource-src-5.9.2.tar.xz 3594960 SHA256 c9a62700024871f204e5f107894c3a339bd645bf6dbac2bcf1bff8ce46842520 SHA512 b9fab874706440e97185475bfd0ad769c23d5ddbff5086cc0da9783777e81ed8140fb06fa0e7536ebfb67f2c9db39e1b9f3c2241834e74a9e1fb6ffd5cb7af11 WHIRLPOOL 6adf8241a45e02720167ceb6c739396a08be8e5790c64eb31e281aa83cb2c1448dcff537aa829474704594c0d9d4bd616acbebaadd824610c24ec2f56a454b94
-EBUILD qtmultimedia-4.8.6-r1.ebuild 1307 SHA256 f8e5acb11b3f9966d30dce285ba54d6a69331f2346ca07b6c9322a0fa1bd18f8 SHA512 286dd81f412c168181a8eace5bbebeaede4cb326fd098d21521033c942f4e7f8bdcfe2f8668eb4940d68266f28665c65b09b9d10e7ca4265479f64a1986307cf WHIRLPOOL f9b5295d5ac1e5473ba4ba0cfe8580bea836a26b74947d7e3ab0a233236c05a09eb318a92e4d851466bc74d286bf040384ad35a75592c48995eccc53606b05c3
 EBUILD qtmultimedia-4.8.7.ebuild 1298 SHA256 1a37459c93d17631d586808665ce83bffd102861646cf5463d5c0b835b466145 SHA512 d7a6fb8aa9927fadfd23e59a695818b8e066ccba71877848669358fa640064a6dee16c38ba988e2501e3350939fddc13c6ec90791c1b7c670f1e654b6a5fe6d0 WHIRLPOOL d8c052abab13a33a1fe9819d2573bdd5c4e38f0f0a5be19b43ff4bff57638f412a8538558553c749a2290e03433ad8b99c1aca932070c3482abc05635e5f66cc
-EBUILD qtmultimedia-5.6.2.ebuild 1494 SHA256 2a5ecd9de552db292de00e13fd9753f03ace2706689b62a1c86607b13c598f61 SHA512 7f508daf0f0b5a39448cdba3bae3fd5a17ef4a895a6ea22c4bdd19451500deb5e7c02542fa35f8f7b1ecbf6a68dc5a75634dc865349a5ad32a672fa8fbb3bfa2 WHIRLPOOL e393866c8b3d93bff7180d9dd82d0654dd58741aa7c2f9fa00b4bcecdecf8e556945f5a878709192e54e59c863d446e815d77c58b1caf009720613ea6b2d2eb3
 EBUILD qtmultimedia-5.7.1.ebuild 1501 SHA256 d2f4d571f530ebfb3211114ab8d8634a46fecf0baacc9c649dc3a50ecfd3dd96 SHA512 42e79f343a023a6311b7aa1a6a459b220f65e9857c890303528f8906c2a685ca55d48d645f953cbacdbed04a60506be4b92864c2669245eb45e5928c0db561c1 WHIRLPOOL 1d6314310fe84ac9d6a7746b1c891fa54bfb859086a8691ff9a146b5723f040c73f298a21068c540428979c9904f9577dbcf837bf0639da4cf2c2c14ad6af0db
 EBUILD qtmultimedia-5.9.2.ebuild 1352 SHA256 c956ae9655b1c0341718ca6a9f23998945b347d730bb504b9376a74d67289e52 SHA512 16551b7f0d8f0e4f696c6a1ea77b823052517f9a4077dea3f5e61ac691a738088c1964658374a9f9b306ec82ba29fa12679253abc9577a612e8ec1630197b0e9 WHIRLPOOL d785d993047d7a5dfdabb8e4dc32a8b568f9275c4179d54435575bdff9e49c9159a6459072312be9cae2ec8a011fcabe4717746720bca768c00baef8f2e83adf
 MISC ChangeLog 8290 SHA256 c07ea8e823fdb6a22b162dbb3911a9d4a0d190283bcea6738b5f9feef165d093 SHA512 0901666f734f770381901dff6eb5a12e045a83065a58ff8c6f52e26d1c19f5dfe94d6230ade485feb35d0c6330392afe1a0792bbfde9776ad6c79e8d77b9563e WHIRLPOOL e0f1975552843b64028d5ddd8ac921a7a85523e6480226583caebb353ea0d23a565019fab491b7d6018ac57e016218e8be28df995861e534e1566bf7b1553f47
diff --git a/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild b/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild
deleted file mode 100644
index 8edcfefe89ba..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-4.8.6-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-build-multilib
-
-DESCRIPTION="The Multimedia module for the Qt toolkit"
-
-if [[ ${QT4_BUILD_TYPE} == live ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="amd64 arm ~ia64 ppc ppc64 x86"
-fi
-
-IUSE="alsa"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	~dev-qt/qtgui-${PV}[aqua=,debug=,${MULTILIB_USEDEP}]
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.8.0-alsa.patch"
-	"${FILESDIR}/${PN}-4.8.6-Relax-ALSA-version-checks-for-1.1.x.patch" # bug 572426
-)
-
-QT4_TARGET_DIRECTORIES="src/multimedia"
-
-QCONFIG_ADD="multimedia"
-QCONFIG_DEFINE="QT_MULTIMEDIA"
-
-multilib_src_configure() {
-	local myconf=(
-		-multimedia -audio-backend
-		$(qt_use alsa)
-		-no-accessibility -no-qt3support -no-xmlpatterns -no-phonon -no-phonon-backend
-		-no-svg -no-webkit -no-script -no-scripttools -no-declarative
-		-system-zlib -no-gif -no-libtiff -no-libpng -no-libmng -no-libjpeg -no-openssl
-		-no-cups -no-dbus -no-gtkstyle -no-nas-sound -no-opengl
-		-no-sm -no-xshape -no-xvideo -no-xsync -no-xinerama -no-xcursor -no-xfixes
-		-no-xrandr -no-xrender -no-mitshm -no-fontconfig -no-freetype -no-xinput -no-xkb
-	)
-	qt4_multilib_src_configure
-}
diff --git a/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild
deleted file mode 100644
index bcd2410201ef..000000000000
--- a/dev-qt/qtmultimedia/qtmultimedia-5.6.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 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 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-proto/videoproto )
-"
-
-src_prepare() {
-	# do not rely on qtbase configuration
-	sed -i -e 's/contains(QT_CONFIG, \(alsa\|pulseaudio\))://' \
-		qtmultimedia.pro || die
-
-	qt_use_compile_test alsa
-	qt_use_compile_test gstreamer
-	qt_use_compile_test openal
-	qt_use_compile_test pulseaudio
-
-	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=(
-		$(usex gstreamer 'GST_VERSION=1.0' '')
-	)
-	qt5-build_src_configure
-}