gentoo resync : 11.07.2019

3 files changed, 3 insertions, 8 deletions

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index fd2828a3ec36..76c8f842a270 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,4 @@
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
-EBUILD qt-creator-4.8.2.ebuild 5831 BLAKE2B d061967a91717231a9e4ac5b9a8b8a5c1ee5ad36b7da3fe5409fc1251b99b2cc0ac3d360fcaa7ed22f5178a963f1d843b4d2278134e06e167efb94709a278343 SHA512 96d0f0db4f2a4ff75883594a0cdf422bb70b6a450271f20e5ac15f52cd34d1f07a77eed5be4da7299e8a42259e883c227b9207f98c9b497a428578b2650e539f
-EBUILD qt-creator-9999.ebuild 5833 BLAKE2B f585fc7be05b6714d4ac9cf6297df5d775facbe5e9ee9b4a26b4bc8897cfec3f015ed9c05d41f46433cc7541cdd80d1247e01715bf54e3060369364d5e45c66b SHA512 0d11125e27fc81f86281c4e1f10f983c9a39542252fc47b341060860ca01034931752d526c2d9391a2b7d62ba11768dcbb90faf57d6a6eebf7d5bca59ac0af1d
+EBUILD qt-creator-4.8.2.ebuild 5831 BLAKE2B debd630939536f622d1e1ce7ab5013248fa1010656c11f936827497b4d748b156f7b7774ced95fb0d6e8a9e23731aa5e6ee793621e62fd9fd7b57d553ae4d4bf SHA512 e94f48f731f960c58924d31e92727f982bb0fd0b14b8d6ce1c675b551c1d280dc7b66c08ebe2954c0409eed2ce6c645fecbf3071acab15c52c640cea1f62caf1
+EBUILD qt-creator-9999.ebuild 5705 BLAKE2B 8ad48f8f704c4880bf996e70f96dc821e69b2e14d2ea3a0f37e7f974e62381fd658f835c8257c1a791aa16b77a595172c5d231965478aa5ec67278d4a4f7f4db SHA512 ca9f726270615ce67aa6ec65e8f0547ff2a75540a7d96e525ada4357b6bc7c7c55f76016412f1ab13397bd2bf80411ca1fb1431b4e1588535d826bfbb49e38eb
 MISC metadata.xml 2543 BLAKE2B 9abd2e6827c63438d1e0bd1c046bf13c5c622bb9d185c21ae3fb3a8f1ed48abe72504232b2b40ecf58ecaa323ca288d2cb09ebed36c4d8ac2cfce66e5c95a4d3 SHA512 b97cd9bacb792c8ab7b211319e8dd03db7ac5c78ea4f8f8c3b0d209243f6927f67a294234358fc6f34df2d68772d5a1b379795153dc0338c48644d3eeb378218
diff --git a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
index 506aa593157e..612329ed88df 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
@@ -36,7 +36,7 @@ IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 QT_PV="5.9.0:5"
 
 CDEPEND="
-	>=dev-libs/botan-2.8:2=[-bindist]
+	=dev-libs/botan-2.9*:2=[-bindist]
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 8f3a9f11681f..3a1250a63894 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -36,7 +36,6 @@ IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 QT_PV="5.9.0:5"
 
 CDEPEND="
-	>=dev-libs/botan-2.8:2=[-bindist]
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
@@ -153,9 +152,6 @@ src_prepare() {
 	done
 	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
-	# remove bundled botan
-	rm -rf src/libs/3rdparty/botan || die
-
 	# remove bundled qbs
 	rm -rf src/shared/qbs || die
 }
@@ -167,7 +163,6 @@ src_configure() {
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \
-		CONFIG+=use_system_botan \
 		$(use systemd && echo CONFIG+=journald) \
 		$(use test && echo BUILD_TESTS=1)
 }