gentoo resync : 13.03.2018

3 files changed, 47 insertions, 5 deletions

diff --git a/x11-misc/qt5ct/Manifest b/x11-misc/qt5ct/Manifest
index b14e3bf60393..89a0315ead14 100644
--- a/x11-misc/qt5ct/Manifest
+++ b/x11-misc/qt5ct/Manifest
@@ -1,5 +1,6 @@
+AUX qt5ct-0.35-fix-qtdbus-automagic.patch 1194 BLAKE2B 7a076ca63cdbcae61a517f91c501eeb48a93dd484b6472d95fca2e4ffcbd7240b2169d316e9f5f10385c7fadcfd89195ed13ab673b2de8769d71520e7f594874 SHA512 e90688a59a3fe81cb8ffcce290d061728dcc662b3763e258745361e2eea2a6b32efd51e0e338378b83d2fe5ba73c7984e8d5f858e8ad772ffc19246b4465de60
 DIST qt5ct-0.31.tar.bz2 55724 BLAKE2B 54602ee9ed46f790f3a8bc15fa66467382b5830b9a218739bb24483f1f18fe8be8c6a375d83e0b6c02b14bec002aa1e7bf757d6608eb908da0dcf7ced2f6b59d SHA512 9162106febf93b94b8ba847157d20386568bc898d15c6123636ef9d9c50bce3ca4706fbfbfd82053dccf545f91ca40d387d1e9a5bbb6773810a1d931417eaa4e
-DIST qt5ct-0.33.tar.bz2 56448 BLAKE2B d8a94ee847e553a209d4729cbe355a6b9eecd9527774b92cae71011b120d09590601b3d74f883eb1528255a585927f92d7be0da433346cfd44c88a2a01bba50f SHA512 670ec099978b569b7607d6a0af0c7e7b66b4b4a374041893c85a8749992ae6a931fa9678fa122baede8a672c0c9798fad8c30c60205c3f9d0ad3dd867e0753ba
+DIST qt5ct-0.35.tar.bz2 62547 BLAKE2B dd61f151e1c6c58095889b90cb30bb2baaf21fd8f181af37ee43c1d00404655d57c941cee905e737aff29122ae3f588d5c7ba46dc80ca76d749cc2dd66f35d57 SHA512 2bd24221d391c420e73488738ff10762d27eb21fb28dc69da27dcbfface0cd0f16049768b55867a059c93da07eddb76da1bc63aefd516e07e5049c847da3970a
 EBUILD qt5ct-0.31.ebuild 1047 BLAKE2B 6ff8511aa072dd38cda5eb0eed4109ec4662a94e5eed4242fc657896867d823db379f5dc55bc109ff3b91432b567de95edbc3c511f08a292eebbd1d8915ff0fd SHA512 10584356810c53826c3f27b58981c251714a42423006590e174367b6e736388e2957877d75380f1ff9fcdb2c2f4e3d7bc19e610bf62d71e9a94bed72ad6daf17
-EBUILD qt5ct-0.33.ebuild 1056 BLAKE2B 0a433f1118705e454644e11ae6a21499f0ca5a8f25b2ce32f42f9d6463596cb9cee4ad272233dda2390b1306087cf8587d148a742403ba28bd32e6c1f3e1b8f2 SHA512 18841528248fdfb573df079b40c2a86c3e42e3266d419e26b904da159016e981131e3040e5aa85fa625c354cc3b3d1ef2df62f8e4b1402ca61c4cee131a18364
+EBUILD qt5ct-0.35.ebuild 1093 BLAKE2B 5a5cb102f18317f39903621d8037738a956949602aa530914e5665f98742b0611e71bd6acd3bb5f6424e52a0821d863afeca82a5b5c8bb7bda02ac63efd38110 SHA512 6fbea5b93b2ffff146e4978d8b394b6cc9524a84a62340c4f05f7e18f070e3f383c4e8688c94ca8ab7796c550eded07a0899c56497d54634680d884e343bafb6
 MISC metadata.xml 742 BLAKE2B 66a65438c6cc176182cbcce8d18ab498f3ade85754293201d352bfb1e4fcd94b6506ba7bb8aeacbd6e08ac2a575bc74592699f156b14a0093e1f0ee11b30dafe SHA512 28cac81e8d22ee5fa6fd808dbeff31f33263145c72e101c0444fdb1ab4dfc4a32a872069729a83c1b55e80ee7683214e6845af11611ac89ba51bf7cd1f0b6f53
diff --git a/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch b/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch
new file mode 100644
index 000000000000..2363e559370a
--- /dev/null
+++ b/x11-misc/qt5ct/files/qt5ct-0.35-fix-qtdbus-automagic.patch
@@ -0,0 +1,39 @@
+Index: src/qt5ct/qt5ct.pro
+===================================================================
+diff --git a/src/qt5ct/qt5ct.pro b/src/qt5ct/qt5ct.pro
+--- a/src/qt5ct/qt5ct.pro	(revision 485)
++++ b/src/qt5ct/qt5ct.pro	(revision 486)
+@@ -5,7 +5,7 @@
+ QT += widgets
+
+ greaterThan(QT_MINOR_VERSION, 8) {
+-  QT += gui-private theme_support-private
++  QT += gui-private
+ }
+
+ SOURCES += \
+Index: src/qt5ct-qtplugin/qt5ct-qtplugin.pro
+===================================================================
+diff --git a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro
+--- a/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(revision 485)
++++ b/src/qt5ct-qtplugin/qt5ct-qtplugin.pro	(revision 486)
+@@ -4,13 +4,14 @@
+ TARGET = qt5ct
+ CONFIG += plugin
+
+-greaterThan(QT_MINOR_VERSION, 7) {
+-  QT += gui-private theme_support-private
+-} else {
+-  QT += gui-private platformsupport-private
+-}
++QT += gui-private
+
+ !equals(DISABLE_DBUS, 1):qtHaveModule(dbus):greaterThan(QT_MINOR_VERSION, 5) {
++    greaterThan(QT_MINOR_VERSION, 7) {
++        QT += theme_support-private
++    } else {
++        QT += platformsupport-private
++    }
+     QT += dbus
+     message(D-Bus support: Enabled)
+ } else {
diff --git a/x11-misc/qt5ct/qt5ct-0.33.ebuild b/x11-misc/qt5ct/qt5ct-0.35.ebuild
index 05b743dbdc0a..5c14b1e6072f 100644
--- a/x11-misc/qt5ct/qt5ct-0.33.ebuild
+++ b/x11-misc/qt5ct/qt5ct-0.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,15 +20,17 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dbus? (
 		dev-qt/qtdbus:5
-		>=dev-qt/qtgui-5.7:5[dbus]
+		dev-qt/qtgui:5[dbus]
 	)
 "
 DEPEND="${RDEPEND}
 	dev-qt/linguist-tools:5
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-qtdbus-automagic.patch" )
+
 src_configure() {
-	eqmake5 DEFINES="$(usex dbus '' QT_NO_DBUS)" ${PN}.pro
+	eqmake5 DISABLE_DBUS=$(usex !dbus 1 0)
 }
 
 src_install() {