gentoo resync : 22.05.2018

5 files changed, 13 insertions, 11 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 239118bf02b3..7a7b4f5916e9 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 22f78e2ec649..b83f95a4754e 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,6 +1,6 @@
 DIST qt-creator-opensource-src-4.5.2.tar.xz 21745192 BLAKE2B 4860c6041542758647d27ae3aaac15dbbc72bbecbcf335e3bceab378c720979a3e89777762936a4b68eacec02a7b285dec08a19003ac3260de1e2e4ee12706c0 SHA512 cc3f20c109e810e8958495fd0d84461bc9ead7b4172600229969a6a331341f0b76069a71893f1ba279550293b131f6cca5b79c112d67f3aebb6244415489c223
-DIST qt-creator-opensource-src-4.6.0-rc1.tar.xz 23389240 BLAKE2B 2fbfe5a6a3b09d439439846dbcbad87d1f5032a35c36fa713e8949d1c3f2c44cf1912fd465f9c97f29204803843cff4c4ecdf7083e8963f3512c0dbfa1594a1f SHA512 eb794935bdbe26362a8dc5a7e62dc8004e808d1485039739af06c92b6e98a6b9d4870f68e5912990acd9970bd8ec518aacd759ece60fe6f0eafc7cd1af981d7d
-EBUILD qt-creator-4.5.2.ebuild 5300 BLAKE2B f1e59865b279dccbe371881fd5394365e5a8d02cd458bb3091fdf18ac11c166cde750e9dadd622caf6afdc77236fae814c99a25ceec69877d61f6eafc8040da7 SHA512 30c5cf0982ffb5552b15903c29cab698eb49654c7ac05afee6ee32ec9ee50e1b45b538834be99d62e73a7885e3daafbcfa6177603341c1fb76f8eed58e26a344
-EBUILD qt-creator-4.6.0_rc1.ebuild 5281 BLAKE2B 8deb26ceb3ab123b986daf044092be952df27043bcc27de1502c6385a9dd598f29d47676754eec6d64388991beb1faa739c5419a9b19985653867faaf1601e4b SHA512 4506188b7f0d9476bdd23c3d8e5205a9d4952aa2627406ad4bd6060feeb9c58eb822524e33e6151a2e411ac431f312f8566fef54d2df0835744260f05bef0dc3
-EBUILD qt-creator-9999.ebuild 5297 BLAKE2B 40f676b2b842e6adc5ece031d82d0cd3a0a071a9a00736c3325148a67e12ec807cb7394d81693290c6ae024e4f11cb6b4d68604c1fe1435b35b5a4d77a408bc5 SHA512 9b90f4389f825917c93865d37afa2420437aa4b299f38252a4cf8d54fb650a6a80895edb78ffe6f6cda30923474addfaed7dcd6f9cabdc7a1c42ad94fbcbe0d2
+DIST qt-creator-opensource-src-4.6.1.tar.xz 23403488 BLAKE2B 32fc6d655616302721cccedc82e54a2f3c6e61a5736f0e0f08d56e53dba7ba130ac601c4b3ca9034f9d90cc6f97b3b152a4a985c71f996cd3860124159b9f0e1 SHA512 c5cf1eac02390ce0a52799b90664faf6ba5c5106aa1f5f2ecf4397b45bfb6dcd11480a29dc94600b6e99a911949f71f3f844b34201623edb35fbd5364ce53236
+EBUILD qt-creator-4.5.2.ebuild 5300 BLAKE2B 5155f92e4c4959777f25a6fafb850be8819a5d45385cecb71204f1c93a5885ed332b18503a0f9da4fc880c8ba5f547c4328155ba5c8df95b2fd767889c262966 SHA512 e7f288cf4fd0cb6fc25ef7cc877cacf2f6f9734b014b404863a31f547a4315c037d83d6017a7671874e613175fa96de6edfe94e659d26b544840fe5293317d11
+EBUILD qt-creator-4.6.1.ebuild 5404 BLAKE2B 685c6fa906981388e0ad37f8f8ded381b3a13aaec68d13d61db7236a0c44c8f5b4ccfe44347c9150842ff02ffa4c442cb663e3a58463f0f4688ad6149e87acb8 SHA512 7c9c94343615cc4df2b357da0577bfbdd68baa3c2bc7e42649dea00d31e2f1b8de85ae8e1732103af96d4e13971adb2497691a986171d5c1423fa613fe3d8976
+EBUILD qt-creator-9999.ebuild 5402 BLAKE2B a84f3e77a0b4b152eedd4456ab9b3c85b7f33091f8432b3e9a15d7594ad5bba430e73a2a147448c6eb3f23e15be04f28c8e38216879a84a6d2cf9c5611366154 SHA512 e2772b0af847b18cc3833562a2471f3cdeb2123e17cd8445d9e3e9c3baf57a64acbc1d7a246a8fb7aeb7da81dc6cb4e603e00e1447c514a5119d7dd28a261b2b
 MISC metadata.xml 2247 BLAKE2B 4cc94d6484cfccef9fd7ffa81afd642603842cc0a840bf1a710e2dba85258d7d116b3201391d62d9e974e44fc18033cae1b4d9d242bb1aa43dfdb1364e782bcc SHA512 d3e92111e1ec61fc5ea8904066eaf205000de8a4e64ccb4b8d6ba349735466c4f851bec8154f30fc8ff21756d27ec07249892136ca56bdcc12ee4e3200616368
diff --git a/dev-qt/qt-creator/qt-creator-4.5.2.ebuild b/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
index 5e898478db5c..382084a382c2 100644
--- a/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
@@ -53,7 +53,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.10.1 )
+	qbs? ( =dev-util/qbs-1.10.1* )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
diff --git a/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
index b5759eabebf7..17290bea032b 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
@@ -19,7 +19,7 @@ else
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
 	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS=""
+	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
@@ -53,7 +53,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-5:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.10.1 )
+	qbs? ( >=dev-util/qbs-1.11.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -102,9 +102,10 @@ src_prepare() {
 		fi
 	done
 
-	# avoid building unused support libraries
+	# avoid building unused support libraries and tools
 	if ! use clangcodemodel; then
 		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+		sed -i -e '/SUBDIRS += clang\(\|refactoring\|pchmanager\)backend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then
 		sed -i -e '/glsl/d' src/libs/libs.pro || die
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index f607e30d3905..2156903101bf 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -53,7 +53,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-5:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.10.1 )
+	qbs? ( >=dev-util/qbs-1.11.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -102,9 +102,10 @@ src_prepare() {
 		fi
 	done
 
-	# avoid building unused support libraries
+	# avoid building unused support libraries and tools
 	if ! use clangcodemodel; then
 		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+		sed -i -e '/SUBDIRS += clang\(\|refactoring\|pchmanager\)backend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then
 		sed -i -e '/glsl/d' src/libs/libs.pro || die
@@ -123,7 +124,7 @@ src_prepare() {
 	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
 	sed -i -e '/\(dumpers\|offsets\)\.pro/ d' tests/auto/debugger/debugger.pro || die
 	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/tracing/tracing.pro || die
 	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
 
 	# fix path to some clang headers