gentoo Easter resync : 12.04.2020

5 files changed, 12 insertions, 46 deletions

diff --git a/dev-qt/qtdatavis3d/Manifest b/dev-qt/qtdatavis3d/Manifest
index 68482e1b5381..e6550bc7c87a 100644
--- a/dev-qt/qtdatavis3d/Manifest
+++ b/dev-qt/qtdatavis3d/Manifest
@@ -1,7 +1,5 @@
-DIST qtdatavis3d-everywhere-src-5.12.3.tar.xz 5200668 BLAKE2B bbcc3b21c9f604c16c862c7e7fe1b3a3d7f0d1f4b8a0da4b67e56d6912e377d1496f7a399a94cb697f117ae23123b3d6370b47c4cb7223ff8af1b584838c588a SHA512 cb295deb9aa33132294d7d7f4daaa53dd9ab4815e2d3a2c916d88e1882e018a49d8d66db9088f69375d8da759a3f3566f251802aaba82d74cad2eb45d9bbbcff
-DIST qtdatavis3d-everywhere-src-5.13.2.tar.xz 5182216 BLAKE2B 712cb724c175dcc9540dee71321fe8906514c07b1b81ad343bf64fc090baaec79a08f553a9027bd9537cf5c59bf255055d0c05d127632859b9573c5efd04dba3 SHA512 57d934282f1a0a73201ef25090eb82dd0d00317bf8b3aac55e841cd30c256c38097f5cf16b2cdf79c4f4bc42e9d40351eea1c7b2a28701b117fad394ff094dfd
 DIST qtdatavis3d-everywhere-src-5.14.1.tar.xz 5190456 BLAKE2B 823ff1db1dadc47f866c88feab042180598f3089761a80aed2bb8d13912326b972594af955bda0e77af8b0c1b4f337282c3aa447ef5bc8d38d28a85362faadae SHA512 51ca881a89bbe88011d4386edda23d42932e991d57586687dd022febe4cbfce9ff863f198e2d3b106f081c2bd8765f4c9de56b5db0a0a4a3304b464800a379d7
-EBUILD qtdatavis3d-5.12.3.ebuild 614 BLAKE2B f2827065469b80198396538fdf23ef5b4608d2eb5cc9cb6050076dbec455754de44df5a60de623e84180e8207db917a6281133e5524b39d50ef2b1342e468537 SHA512 9c80b69f1d20414bdaaa208b9b4c83be7af4dcd8e201d0b49bb48676086974f0c097dd3442f4ce43dbe459bc3f154d0d88ce718a39d34cd9e786b3ee22ed870e
-EBUILD qtdatavis3d-5.13.2.ebuild 627 BLAKE2B 00b0b894b2d0f78253ddadeeaaeac2e758141e6cf26cd66fce44e593ae7f71c8f43ece5cbdac299ae7882d3cb8e9c822917b7ceb74e2905d346e7ba94243d106 SHA512 208a5f6057b35c179e8e34481b368067f915040e8f036f5575ab10bcbde09e7554304e4c4f6b90ed83f51232ddb89eda3aaa8b6641f3524d74158b9841f75498
-EBUILD qtdatavis3d-5.14.1.ebuild 629 BLAKE2B 68255803bc31160dbe81598a7e412f98f425e69bc647b73a1ae70000105a46fa0a616bb3b6cb5e09d20dc8e65182b95eac79e9d1e7eb009b4e78c2713b32c002 SHA512 0b428bb0f9093b589ce6426607adce6130efd81bbde6826c7c9684f76133fe78a934aba07b1189e0a09d7b285409e862afd21035d58d58a46f8242f0faa3f660
-MISC metadata.xml 634 BLAKE2B 00d75cb45e34923b64e3f841adbc930a8615b627ffb00e0a013965d6c7feec165d6124069241987341c43274f46ae54a3ad913a2ba46c3b7d4e51637baaaf07d SHA512 cf0c7257d0c332cdb2dd6295c26afc38f40eb2710e197c3767c7d828cafbd545faa1926f4cff3500a1b0cee1630399690ad107278a2da129cd682c771599bf32
+DIST qtdatavis3d-everywhere-src-5.14.2.tar.xz 5190800 BLAKE2B 2e60bb97526bfac4c9bd70aae8885fc5f9b7704f8dbe8cff726ef6a60d83507f4d9c59a92b45a3fce78c21ed6d7e41466acec00910e96921a73b5d9bc9fa130d SHA512 25d207e045e58f9edc3a661b641225f6a11eb45f723847281007fa53b753430dc5792e31bdd142c95e886bfda5f6d29826cd151cb23a1e1a81cc0b91d5f7a2f6
+EBUILD qtdatavis3d-5.14.1-r1.ebuild 641 BLAKE2B 40c28d84c475f1d5bdc2f269d8377251b1db88865f03d36b992d4b954287854820e18300902a0afe39c17a817c9849fae069b6bc939f35dcb7610d6282a227d9 SHA512 09879a304e88c156d30c218fe86b1b552c0cf2b1e2bdba7450120c0060b559fc8e31c2c642dcd706d39209b3e468073afba7db8ce23ef0e9db2bf30c64aa5db8
+EBUILD qtdatavis3d-5.14.2.ebuild 644 BLAKE2B 264e461ddd6f60b2189b9d5b397f27fa02f90e716a1dec85c7448edfdba03b554f5e9f9dd220f86aa436687463aeaef47719b3c00ca4a814dad3a9132b5ac114 SHA512 91f8194351b5719c429ff819a81f6b8ae070591b710451f6022ad71f6d6a115480d4f6d0d5d9631c2aedc8215de2884f580e6c22b3409c1debe478bf49cc52e6
+MISC metadata.xml 561 BLAKE2B c42e13ff3ae121b988b887d834497106729d03d44fac01be97761e7346b0cdf67cc0a1811afe2c8422020ad8b60525533e520cb421917f70e4a4be70ff93089a SHA512 73d78a296a643dafb989554225cefd7b4c0a00431f2d65c3705207ca5282d0b73d56625426c5b029f76f7eb27b3c84272c9da64a05100a7cc84cad22bbed191a
diff --git a/dev-qt/qtdatavis3d/metadata.xml b/dev-qt/qtdatavis3d/metadata.xml
index 16d338334284..d437181335d4 100644
--- a/dev-qt/qtdatavis3d/metadata.xml
+++ b/dev-qt/qtdatavis3d/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="gles2">Use GLES 2.0 or later instead of full OpenGL</flag>
 		<flag name="qml">Build QML/QtQuick bindings and imports</flag>
 	</use>
 	<upstream>
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild
deleted file mode 100644
index 78d134ab2c34..000000000000
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.13.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit qt5-build
-
-DESCRIPTION="3D data visualization library for the Qt5 framework"
-LICENSE="GPL-3"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm64 ~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.12.3.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.14.1-r1.ebuild
index 63f8299cae03..b14bfaf7cb43 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.12.3.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.14.1-r1.ebuild
@@ -1,22 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit qt5-build
 
 DESCRIPTION="3D data visualization library for the Qt5 framework"
 LICENSE="GPL-3"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="x86"
+	KEYWORDS="amd64 arm64 x86"
 fi
 
-IUSE="gles2 qml"
+IUSE="gles2-only qml"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+	~dev-qt/qtgui-${PV}[gles2-only=]
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-qt/qtdatavis3d/qtdatavis3d-5.14.1.ebuild b/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild
index 38e1b091854d..8cee1109659b 100644
--- a/dev-qt/qtdatavis3d/qtdatavis3d-5.14.1.ebuild
+++ b/dev-qt/qtdatavis3d/qtdatavis3d-5.14.2.ebuild
@@ -11,12 +11,12 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
 	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
-IUSE="gles2 qml"
+IUSE="gles2-only qml"
 
 DEPEND="
 	~dev-qt/qtcore-${PV}
-	~dev-qt/qtgui-${PV}[gles2=]
-	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2=] )
+	~dev-qt/qtgui-${PV}[gles2-only=]
+	qml? ( ~dev-qt/qtdeclarative-${PV}[gles2-only=] )
 "
 RDEPEND="${DEPEND}"