gentoo resync : 11.05.2018

3 files changed, 2 insertions, 35 deletions

diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 66366f1d4ead..946750f62a88 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,9 +1,7 @@
-DIST qtdatavis3d-everywhere-src-5.11.0-beta4.tar.xz 5202776 BLAKE2B 9fc21677e6bd09d718e88415fda31596d827521910113b3b3626e09633a9ef0619980377ab745fdd4f1572a7fa9ffe93f1c31cf63b1de11ef7cbc220f9f8a435 SHA512 af83f268e1107a9acc2f0256dd157f495c4123e9220ccf21be8746bcb3fd75281a2a66f7a038f57788d056ce7a7258fa7506d1027a742f148d71857d6d96a528
-DIST qtdatavis3d-opensource-src-5.7.1.tar.xz 5155740 BLAKE2B bd0fbd04367dfbc328d1d63fe5e2557a491f8d2dddbca4efadc190bdfa640f3ae2c7db1b29ec9ff07e3b8e03cab2b4caa4cae2ffa396d82d4db728aff252dbbc SHA512 2739f7ddcf81fa53a2673e7073c1dac54ea15b70175e19697c7711d652101f0f9a41dc5f89ea33bc5675605ba760667ead8cfde10940dbad8ec75f6897c67b5a
+DIST qtdatavis3d-everywhere-src-5.11.0-rc.tar.xz 5202356 BLAKE2B 44151a8dce78ce3afac02ef308a7c08331152c111e043416a9f71b864462d386937f87b69efd38c8c845b0b9c1e79431468ca284ad9a5e993b0dff9d038b248a SHA512 edcd3e248583e4b6348844cb81bb6b4118cdb3f916c1e999b874368febeece208a8f47c652287b8978d7e1d5db889738b981606baac80bcf319e249e255a8164
 DIST qtdatavis3d-opensource-src-5.9.4.tar.xz 5164120 BLAKE2B e8e9586da6e261f22ac6dba12b530755b1b6914f702a33d196968f7c8812e4d5a6b86dd7584c109385fa2e9bc33fcfc067b2538f8d4cff69d3a0624a26822a8e SHA512 8e314d4b0324b6d9aa9a4a63bd3e21010545ce7ffa250614ceea6052b37d7519036a4e13ce1b3cd264e5ce00453bceb774234932cf3c3a49bcded0988d4110c2
 DIST qtdatavis3d-opensource-src-5.9.5.tar.xz 5161916 BLAKE2B a284269677d9a60ef13f4970a922706ba5ec3f7ba864175989ed37b5396529286cab3cd51d6cb2a9890fca6384438b41b2adeebe2099649da1735458e68be7ef SHA512 8f8b93a4e89c1d95068ae188d11f796f6ae161a01b53254f3ef9d434b2f9335a554f377d813e82de242cbcdf68815918430bdee8329b831f82b989f5c517da94
-EBUILD qtdatavis3d-5.11.0_beta4.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
-EBUILD qtdatavis3d-5.7.1.ebuild 625 BLAKE2B 83a990e7da20777008fa1f8db5ef6e0850d0d1764ae763cb0063e7b8198277225ab00ffb6895317fe6800c34bee77f08f76177a690020f72e382ef0d9889c5e6 SHA512 6498e8bc0b6baaf227a22c047e9e2587d08b632d3bd9ed747af513b8ef607e2bc7faa420a0147cc67be744ef8468696488863282c4ab23824bad42375a0b56eb
+EBUILD qtdatavis3d-5.11.0_rc.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 EBUILD qtdatavis3d-5.9.4.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 EBUILD qtdatavis3d-5.9.5.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.0_beta4.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.0_rc.ebuild
index 647770499acf..647770499acf 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.0_beta4.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.0_rc.ebuild
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.7.1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.7.1.ebuild
deleted file mode 100644
index e097dd607326..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.7.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="gles2 qml"
-
-DEPEND="
-	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# eliminate bogus dependency on qtwidgets
-	sed -i -e '/requires.*widgets/d' qtdatavis3d.pro || die
-
-	qt_use_disable_mod qml quick \
-		src/src.pro
-
-	qt5-build_src_prepare
-}