Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

3 files changed, 71 insertions, 0 deletions

diff --git a/dev-qt/qtquickcontrols/Manifest b/dev-qt/qtquickcontrols/Manifest
index 6367bfae26f4..3b5ccb2a80d6 100644
--- a/dev-qt/qtquickcontrols/Manifest
+++ b/dev-qt/qtquickcontrols/Manifest
@@ -1,5 +1,8 @@
+AUX qtquickcontrols-5.12.1-scrollviewstyle-div-by-zero.patch 1850 BLAKE2B c45dc0dd51c65d82bd11925768af1ea27d64615260514c692bb41ebf5dce35b7c9b301d714d6a92d3b9c08158778569eddc0b958a8e2e26febbb5f2f9374e1d1 SHA512 bedaac438a1b15021d485306ba4e10ca41baf28b4315d9dc9797e073a2352ad3a586bf027e96a6be5482b66b76183d279f3f48896676b9134a83c33f8c887d06
 DIST qtquickcontrols-everywhere-src-5.11.3.tar.xz 6053336 BLAKE2B 304fbc5e0028f49662dd077349a28ef974470aa4e4389d633a409b6a756c24a730a675b774429246e1923fa1ff3f6b33b8cea75e588c58c55232519c4af45500 SHA512 359a2509e35240b50dea06e7197ce974a92a7f4fe902b7f6c40b087945eaa8faa0395d3d35a6c79c3a5bc75fadc75688d36338086ac67bf2ab8be795a60905b7
+DIST qtquickcontrols-everywhere-src-5.12.1.tar.xz 6055248 BLAKE2B 572b497a6694da3110dde2a3088afd442959a1cd109836366968c95e9748c416b85c986d6fb74a8316641e20dbe86178f0a24d20a826496eb707407bb4767949 SHA512 2275a9f0e3ddf7a4f42de5608b01686bf7faabe52c70dfae66ccdc7ab1283962aecb58481b42afbc5244d3abef56846bfabd9ed5229debe55d9f96cd88d16623
 DIST qtquickcontrols-everywhere-src-5.12.2.tar.xz 6054972 BLAKE2B 923583d954296c0ecf5c29d0b8aafe183542a40c03b4ff1f2b3c02da38ef020da7666c17e57f1c246a8d17331ed181fbed7c658d64abb04cdebd25e8c1eee48d SHA512 4ff3da74039de6106106f50752943765dd89f7ed0ecc15b95af1ca66bdce104f0a34aac6a870ee38bbaed0447449b73fbfd360d019f9e41d14af96d691ec8149
 EBUILD qtquickcontrols-5.11.3.ebuild 744 BLAKE2B a2852819d287a0992f4eaca8d5e0a1931d5de6ab67b9f4b19586a48047dc79813f563f97df48f43f4fd1e2aefed579bc1a8bc7c33607325b4e467aa1b239ddba SHA512 3efd926e5484f5390a05251b18c64e4117059103bc25aaa29c0c39081abb23b1b482d22aae480e161452ff502b3d0fe88094380c330d8933af886c22f80922c4
+EBUILD qtquickcontrols-5.12.1-r1.ebuild 808 BLAKE2B f298e2d0f5e39455d0f8eb2a8f0d851f72106d9dec79beeafc4b131f029e18dbf9c7b627e98407b704debb4ac369c07946241388eb837649782a40062cccdf17 SHA512 6c5f16630699ad61a9409f9d708f264e13c5ec446ccf141fe83fbcbb5c0a1df442f6ebb91d85eb05cbbd5348f5851e75d43d179655e28cdc1a9f9d5ea5d99cbf
 EBUILD qtquickcontrols-5.12.2.ebuild 742 BLAKE2B 1f67b01a5437c1c364bdf6eef6ab26b427b84d29e9f4757041b46a2bfe47732e7a1187cf118e24151df79b5b04e53c1ab798e2599136f48ea10315491d3c3898 SHA512 8f9d09adc1f1c4c7e3fa16d2d1466c097ee7fbf095fc49918e9860bac3783774de2d7c2e300dc6401902b9c3131cfde6675c0f8d567dc74ffcdc04b85c6ff21f
 MISC metadata.xml 551 BLAKE2B cbf6277d7f92518755cd42245a21869008fc6110a1e51d5ba6f8b0bf5c81634bd92300c0570d9f9fde58bb847a5ef47ce4f9fa9b0d88e4491589100274657495 SHA512 b3fd90ef9fffbd2bbfd8bd75ee09ff4dc7fb18a4ab7247a12c54c980993450466454a83938a2cbc7c423d9ddc03a46e8b29a92b443aa08166ab2fa2be2a3451c
diff --git a/dev-qt/qtquickcontrols/files/qtquickcontrols-5.12.1-scrollviewstyle-div-by-zero.patch b/dev-qt/qtquickcontrols/files/qtquickcontrols-5.12.1-scrollviewstyle-div-by-zero.patch
new file mode 100644
index 000000000000..b58f26ac53ce
--- /dev/null
+++ b/dev-qt/qtquickcontrols/files/qtquickcontrols-5.12.1-scrollviewstyle-div-by-zero.patch
@@ -0,0 +1,34 @@
+From c231395eec3494619f4977b4c5cd845b9d7341ae Mon Sep 17 00:00:00 2001
+From: Benjamin Robin <dev@benjarobin.fr>
+Date: Sun, 24 Feb 2019 10:28:14 +0100
+Subject: [PATCH] ScrollViewStyle: Avoid division by zero in extent computation
+
+If the flickableItem content is empty (contentWidth / contentHeight is
+equal to 0), prevent the division by zero in the computation of the
+extent variable.
+
+Task-number: QTBUG-73691
+Change-Id: I86becca9a1fa2508d1acafe09f46dfc952e4e96d
+Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
+---
+ src/controls/Styles/Base/ScrollViewStyle.qml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml
+index 6750399d4..36b518d39 100644
+--- a/src/controls/Styles/Base/ScrollViewStyle.qml
++++ b/src/controls/Styles/Base/ScrollViewStyle.qml
+@@ -370,8 +370,8 @@ Style {
+ 
+         property var flickableItem: control.flickableItem
+         property int extent: Math.max(minimumHandleLength, __styleData.horizontal ?
+-                                          Math.min(1, (flickableItem ? flickableItem.width/flickableItem.contentWidth : 1)) * bg.width :
+-                                          Math.min(1, (flickableItem ? flickableItem.height/flickableItem.contentHeight : 1)) * bg.height)
++                                          Math.min(1, ((flickableItem && flickableItem.contentWidth > 0.0) ? flickableItem.width/flickableItem.contentWidth : 1)) * bg.width :
++                                          Math.min(1, ((flickableItem && flickableItem.contentHeight > 0.0) ? flickableItem.height/flickableItem.contentHeight : 1)) * bg.height)
+         readonly property real range: __control.maximumValue - __control.minimumValue
+         readonly property real begin: __control.value - __control.minimumValue
+ 
+-- 
+2.16.3
+
diff --git a/dev-qt/qtquickcontrols/qtquickcontrols-5.12.1-r1.ebuild b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.1-r1.ebuild
new file mode 100644
index 000000000000..a2971f97dd8a
--- /dev/null
+++ b/dev-qt/qtquickcontrols/qtquickcontrols-5.12.1-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qt5-build
+
+DESCRIPTION="Set of Qt Quick controls to create complete user interfaces (deprecated)"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+IUSE="+widgets"
+
+DEPEND="
+	~dev-qt/qtcore-${PV}
+	~dev-qt/qtdeclarative-${PV}
+	~dev-qt/qtgui-${PV}
+	widgets? ( ~dev-qt/qtwidgets-${PV} )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-scrollviewstyle-div-by-zero.patch" )
+
+src_prepare() {
+	qt_use_disable_mod widgets widgets \
+		src/src.pro \
+		src/controls/Private/private.pri \
+		tests/auto/activeFocusOnTab/activeFocusOnTab.pro \
+		tests/auto/controls/controls.pro \
+		tests/auto/testplugin/testplugin.pro
+
+	qt5-build_src_prepare
+}