gentoo resync : 16.02.1018

3 files changed, 3 insertions, 36 deletions

diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 34e384e10261..cbb90820cc91 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,5 +1,3 @@
-DIST qtdatavis3d-everywhere-src-5.11.1.tar.xz 5206688 BLAKE2B 2d5de648a9f80085f98902a8b086d5ce59c366c445b3ab80d313a537ae6b3d19924c886e4f2f3c0a219e874e4430c9327fde266e770b6ceb1f45e62f6a67aef4 SHA512 e88f2471fa39fd4f4c7900df5edadc568d000b537eb00f892fadc6cf1d7845987b9fd98adbea4c35c6469c9a9bfce087b26440a6419ca758451dbe3b669d19cd
 DIST qtdatavis3d-everywhere-src-5.11.3.tar.xz 5201492 BLAKE2B 6ccc679892b6e234075cad890823ce5b20c887479f306284c49b40672da54dddc1d65970e3771e05b48ea7acf3e031593c77f64ef32e52106506cf10281c6aa1 SHA512 6e672a7d07f197b86d7914d249078137ae247463c1da77ed01cedc71326e6e4009ecfc7cd59f2277c290ba1e3c84b741466f9feeae8391a11bb7fc458bd06aae
-EBUILD qtdatavis3d-5.11.1.ebuild 625 BLAKE2B 69a3f66a4946888b5b4c91ae7f6d82b5209fde5867b481413337a38df66f5330c1d90a32c25cd1fc5a08033b0fc16ff1deaaf14d3dfe0944c2fe92afbdaebf73 SHA512 47faf3a0929826823d725e6a1545b7f896effac942eeec73370613f2bf76d526fdc7a5389ed48228ecaedd2f1285d129a1c7fe2e91ce6e9e4a6b943662c1d14e
-EBUILD qtdatavis3d-5.11.3.ebuild 622 BLAKE2B 1ccf7676850642c1a0109c5f9c9e2f5ccbd634fe073d16e71c84fb80d5d5cb28b111f4a15257151cdf1c582869a0303f7744fe7c8d280a184762e627fe0edb77 SHA512 664223cdc4b21f5972b1e56e4a9d7d9e9d15a2ac537b86cfa9dd1102e52727cc14d1deb3378797b84ef2d9f0cd4cee663bd32915ccd6e825a3644cd036e77fff
+EBUILD qtdatavis3d-5.11.3.ebuild 620 BLAKE2B 1e2f2c6cf6ce23820b1e9ccc329c27e3d1c0aae454914e14d6775a507874e8096e7bf41def92c3fda65ebe0a7ef3df2992e7780e67408c8767e9ebe806ce8e5b SHA512 814aa60e87a25a688fe87c9283006c5deb21af8c24bea0639c8b5aa9336ac8b97d3beb8b0a9ad24b6a979f941f586bc1e93c8023be78598bd526ce2c2e44b5c3
 MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.ebuild
deleted file mode 100644
index 647770499acf..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 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
-}
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.3.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.3.ebuild
index fb629edbad01..21a6c303f73e 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.11.3.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 fi
 
 IUSE="gles2 qml"