gentoo resync : 30.06.2018

4 files changed, 121 insertions, 3 deletions

diff --git a/dev-qt/qtwidgets/Manifest b/dev-qt/qtwidgets/Manifest
index 03e47d55542f..669718debbc3 100644
--- a/dev-qt/qtwidgets/Manifest
+++ b/dev-qt/qtwidgets/Manifest
@@ -1,7 +1,8 @@
-DIST qtbase-everywhere-src-5.11.0-rc2.tar.xz 46810456 BLAKE2B 4d3e0c89f828332356d8cd8f666b4973bc436a735571786ee24ee2baa3b28868007513d9937511a8262e35b3d4e2234db372b804837f0c5eeda25f4648a6ac1d SHA512 54290b950f808d2e6f3560f66b3ebe47a95a00eba163d515a34d6b17c077aa38253b0e3ebac79844ae077c8a9bc4bcb68eece21af5a9ad38a616c4151d6a98f8
+AUX qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch 5533 BLAKE2B 1a4db674e9d65134eaa894e13e2acdeb514eb98d841515e5573543387ffcd2ed6eae46c614aabcf61804a224ffdfcf1089d354c630e8c3186496ddbd6130ddcd SHA512 854c1b18627c5a243ededf28279fa3eb8ac208e495b8db54e7768340b25ffde84de0bd9e4b90044d35784a0bc1443071256eda59eafdab71718dc1c15ceaed0c
+DIST qtbase-everywhere-src-5.11.1.tar.xz 46860400 BLAKE2B 3297ace6582eeac8aee3ce39e8cb2a144190fea8af83e7da7659148e54c55962c1aa4994384ad62b98d4406b41dd72c602d09b9f22f752052c3bfbdc9b09f83a SHA512 5f45405872e541565d811c1973ae95b0f19593f4495375306917b72e21146e14fe8f7db5fbd629476476807f89ef1679aa59737ca5efdd9cbe6b14d7aa371b81
 DIST qtbase-opensource-src-5.9.4.tar.xz 45182168 BLAKE2B 39ecddf2b767c68a9b91e0af10ff3b94ea6074803d22a2fdd3802d32a001ebc302e323b5012fb14b881bf89d031f011d383d3f76f6d28bdeaed61a5bac4f9ce0 SHA512 82be3af6cbe83458a17a5dc53b9f57e56d9c1dbc1bae11e36c5a44e11b1f4cf62ef609cb775f55bfad7be38fbfeffc9cf12dd557bf7c64cbd26634c024a394dd
 DIST qtbase-opensource-src-5.9.6.tar.xz 45129248 BLAKE2B 7b68fef553a738fdddc7ad99089987592e3da5caa37534d6915984fa8b20844e44a5e535df9f0ec41d3ffb7a77bd928696e129ba90480c0ca2b15d5c7d40564c SHA512 e9d4b631abeaaced325c58778e3d2eda08c6804a3788eea826f6ec90b494db0da072e7ae184ebdb00ee504ad41e9f0c9aaadc096219d5fbb1c4833552e42d8bb
-EBUILD qtwidgets-5.11.0_rc2.ebuild 1063 BLAKE2B 3696169762f8da8af00565006c2b92a2e6e7f76cf14b19fb9a27ba5a5d4e12e23d2a23629a675415ada07211e3f664edab6c101b600147685f1f27e219e01196 SHA512 fc6b637e11f426423aa999e2b7e3817332135bf10ed757d2366973ce6f2b0ecd5b96552abe89da747c3e8544d8b5ddbd9fbb88ef9de80c5e1256eaefa4d10476
+EBUILD qtwidgets-5.11.1.ebuild 1063 BLAKE2B 3696169762f8da8af00565006c2b92a2e6e7f76cf14b19fb9a27ba5a5d4e12e23d2a23629a675415ada07211e3f664edab6c101b600147685f1f27e219e01196 SHA512 fc6b637e11f426423aa999e2b7e3817332135bf10ed757d2366973ce6f2b0ecd5b96552abe89da747c3e8544d8b5ddbd9fbb88ef9de80c5e1256eaefa4d10476
 EBUILD qtwidgets-5.9.4-r1.ebuild 1059 BLAKE2B c1c09e2e1aa5d3634ec45185b4280a86b2b2cf2cb68f949fb7389220c0f1a112f168667b52da4e2f0f9477fd58d0da98e0acada386655ba1299824fcefccd978 SHA512 8fbef18c9dd5ec033eb53f599d1078336dc357c59e8b95e4833266f579bc4242f74755f04c4d30db0c3cf5dff94a9b1343c6aeeba6d754f25c458f3395e4cb2e
-EBUILD qtwidgets-5.9.6.ebuild 1063 BLAKE2B 3696169762f8da8af00565006c2b92a2e6e7f76cf14b19fb9a27ba5a5d4e12e23d2a23629a675415ada07211e3f664edab6c101b600147685f1f27e219e01196 SHA512 fc6b637e11f426423aa999e2b7e3817332135bf10ed757d2366973ce6f2b0ecd5b96552abe89da747c3e8544d8b5ddbd9fbb88ef9de80c5e1256eaefa4d10476
+EBUILD qtwidgets-5.9.6-r1.ebuild 1137 BLAKE2B ccf92865e4eb1cd95f675f3f35efca09e492aef1b08d2c668c0acae5d4d6ea08c62dd674f7aff049022b5189c2a0811e7256bbd16333ec9550a5523b137cf275 SHA512 a9aa2cc0565586168113dc4e454627bf684d8d9aff632699d18ff21f00adf4c17f99ff8d6d7feab225c5cb7c01ebe0f9c9a43b51a97b0ae4916887e942e2c1b5
 MISC metadata.xml 569 BLAKE2B cd6274981285a9e65662016fa8042af5ee8a329f6b0f09f77cd8e34e08e00a817048f412cdaa214f32aa6ec921f607edf7d27af9c6cf04c323c5126306c81fc5 SHA512 a8f035a140ff40e92944369ea2d744c049a56becd4e10e72fe98065c203b458ea9ebae40ef23e4bb86d0487d0b68b52e6c2f9f8a99d1ffc4a12d1d372d061192
diff --git a/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch b/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch
new file mode 100644
index 000000000000..3123fc3e50f5
--- /dev/null
+++ b/dev-qt/qtwidgets/files/qtwidgets-5.9.6-QDockWidget-revert-restore-geometry.patch
@@ -0,0 +1,115 @@
+From 57bc08dac38b02128031357976436fa0f68bd574 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 Jun 2018 20:18:11 +0200
+Subject: [PATCH] Revert "Fix restoring geometry of dockwidget"
+
+See also: Regression caused by the fix for QTBUG-16252
+QTBUG: https://bugreports.qt.io/browse/QTBUG-68939
+
+This reverts commit cbfb6bda1d1ce3e169db6a0deb9bd901076653e4.
+---
+ src/widgets/widgets/qdockarealayout.cpp | 20 ++------------------
+ src/widgets/widgets/qdockarealayout_p.h |  1 -
+ 2 files changed, 2 insertions(+), 19 deletions(-)
+
+diff --git a/src/widgets/widgets/qdockarealayout.cpp b/src/widgets/widgets/qdockarealayout.cpp
+index bef7214c75..21d1d4cb85 100644
+--- a/src/widgets/widgets/qdockarealayout.cpp
++++ b/src/widgets/widgets/qdockarealayout.cpp
+@@ -226,7 +226,7 @@ static quintptr tabId(const QDockAreaLayoutItem &item)
+ static const int zero = 0;
+ 
+ QDockAreaLayoutInfo::QDockAreaLayoutInfo()
+-    : restoredSizeHint(0,0), sep(&zero), dockPos(QInternal::LeftDock), o(Qt::Horizontal), mainWindow(0)
++    : sep(&zero), dockPos(QInternal::LeftDock), o(Qt::Horizontal), mainWindow(0)
+ #if QT_CONFIG(tabbar)
+     , tabbed(false), tabBar(0), tabBarShape(QTabBar::RoundedSouth)
+ #endif
+@@ -236,7 +236,7 @@ QDockAreaLayoutInfo::QDockAreaLayoutInfo()
+ QDockAreaLayoutInfo::QDockAreaLayoutInfo(const int *_sep, QInternal::DockPosition _dockPos,
+                                             Qt::Orientation _o, int tbshape,
+                                             QMainWindow *window)
+-    : restoredSizeHint(0,0), sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window)
++    : sep(_sep), dockPos(_dockPos), o(_o), mainWindow(window)
+ #if QT_CONFIG(tabbar)
+     , tabbed(false), tabBar(0), tabBarShape(static_cast<QTabBar::Shape>(tbshape))
+ #endif
+@@ -407,9 +407,6 @@ QSize QDockAreaLayoutInfo::sizeHint() const
+     if (isEmpty())
+         return QSize(0, 0);
+ 
+-    if (!restoredSizeHint.isNull())
+-        return restoredSizeHint;
+-
+     int a = 0, b = 0;
+     int min_perp = 0;
+     int max_perp = QWIDGETSIZE_MAX;
+@@ -2376,7 +2373,6 @@ bool QDockAreaLayout::restoreState(QDataStream &stream, const QList<QDockWidget*
+         stream >> size;
+         if (!testing) {
+             docks[pos].rect = QRect(QPoint(0, 0), size);
+-            docks[pos].restoredSizeHint = size;
+         }
+         if (!docks[pos].restoreState(stream, dockwidgets, testing)) {
+             stream.setStatus(QDataStream::ReadCorruptData);
+@@ -2678,8 +2674,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
+         center_rect.setBottom(rect.bottom() - docks[QInternal::BottomDock].rect.height() - sep);
+ 
+     QSize left_hint = docks[QInternal::LeftDock].size();
+-    if (!docks[QInternal::LeftDock].restoredSizeHint.isNull())
+-        left_hint = docks[QInternal::LeftDock].restoredSizeHint;
+     if (left_hint.isNull() || fallbackToSizeHints)
+         left_hint = docks[QInternal::LeftDock].sizeHint();
+     QSize left_min = docks[QInternal::LeftDock].minimumSize();
+@@ -2687,8 +2681,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
+     left_hint = left_hint.boundedTo(left_max).expandedTo(left_min);
+ 
+     QSize right_hint = docks[QInternal::RightDock].size();
+-    if (!docks[QInternal::RightDock].restoredSizeHint.isNull())
+-        right_hint = docks[QInternal::RightDock].restoredSizeHint;
+     if (right_hint.isNull() || fallbackToSizeHints)
+         right_hint = docks[QInternal::RightDock].sizeHint();
+     QSize right_min = docks[QInternal::RightDock].minimumSize();
+@@ -2696,8 +2688,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
+     right_hint = right_hint.boundedTo(right_max).expandedTo(right_min);
+ 
+     QSize top_hint = docks[QInternal::TopDock].size();
+-    if (!docks[QInternal::TopDock].restoredSizeHint.isNull())
+-        top_hint = docks[QInternal::TopDock].restoredSizeHint;
+     if (top_hint.isNull() || fallbackToSizeHints)
+         top_hint = docks[QInternal::TopDock].sizeHint();
+     QSize top_min = docks[QInternal::TopDock].minimumSize();
+@@ -2705,8 +2695,6 @@ void QDockAreaLayout::getGrid(QVector<QLayoutStruct> *_ver_struct_list,
+     top_hint = top_hint.boundedTo(top_max).expandedTo(top_min);
+ 
+     QSize bottom_hint = docks[QInternal::BottomDock].size();
+-    if (!docks[QInternal::BottomDock].restoredSizeHint.isNull())
+-        bottom_hint = docks[QInternal::BottomDock].restoredSizeHint;
+     if (bottom_hint.isNull() || fallbackToSizeHints)
+         bottom_hint = docks[QInternal::BottomDock].sizeHint();
+     QSize bottom_min = docks[QInternal::BottomDock].minimumSize();
+@@ -3288,10 +3276,6 @@ int QDockAreaLayout::separatorMove(const QList<int> &separator, const QPoint &or
+     int delta = 0;
+     int index = separator.last();
+ 
+-    for (int i = 0; i < QInternal::DockCount; ++i)
+-        if (!docks[i].restoredSizeHint.isNull())
+-            docks[i].restoredSizeHint = QSize(0, 0);
+-
+     if (separator.count() > 1) {
+         QDockAreaLayoutInfo *info = this->info(separator);
+         delta = pick(info->o, dest - origin);
+diff --git a/src/widgets/widgets/qdockarealayout_p.h b/src/widgets/widgets/qdockarealayout_p.h
+index ea397e00ac..82244c192e 100644
+--- a/src/widgets/widgets/qdockarealayout_p.h
++++ b/src/widgets/widgets/qdockarealayout_p.h
+@@ -189,7 +189,6 @@ public:
+ 
+     QMainWindowLayout *mainWindowLayout() const;
+ 
+-    QSize restoredSizeHint;
+     const int *sep;
+     mutable QVector<QWidget*> separatorWidgets;
+     QInternal::DockPosition dockPos;
+-- 
+2.17.1
diff --git a/dev-qt/qtwidgets/qtwidgets-5.11.0_rc2.ebuild b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
index caf1f79a84de..caf1f79a84de 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.11.0_rc2.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.11.1.ebuild
diff --git a/dev-qt/qtwidgets/qtwidgets-5.9.6.ebuild b/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild
index caf1f79a84de..ac6d6e09d84f 100644
--- a/dev-qt/qtwidgets/qtwidgets-5.9.6.ebuild
+++ b/dev-qt/qtwidgets/qtwidgets-5.9.6-r1.ebuild
@@ -26,6 +26,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-QDockWidget-revert-restore-geometry.patch" )
+
 QT5_TARGET_SUBDIRS=(
 	src/tools/uic
 	src/widgets