gentoo resync : 15.12.2019

5 files changed, 6 insertions, 205 deletions

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 25f913e5d74b..57853705a379 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,8 +1,6 @@
-DIST qt-creator-opensource-src-4.10.0-rc1.tar.xz 26226544 BLAKE2B 5fc66e73d93b2d358c4f3c23e80029b805b1aa841b71fc35077b089bf51d705b6f7f352bd36f2dd573aef0a95efea3573e08af8eea31aeb0f43d33172935cdc1 SHA512 e5f7fb5b67fd803fbcb2a96b26d96e53e5d43fd3733c4867ce9e2f4764220d1772fa788424d917acdc0c78c580ce8ee774e561c6bf5fd54feac320073d5fb263
 DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450
-EBUILD qt-creator-4.10.0_rc1.ebuild 6215 BLAKE2B 8c4740e935281c4f5c8570aab1ccd03be021aabf099abf028f032d23ef0e47273b1d65611e340e1816234f7c353a1c15d9cd0e933e488fab5967a343db3816ba SHA512 0245d9d3d243c01cbf2862381e51f03f66f73cd8ba01dd25714eee44a6bff929c8f8b3f77b151b554e9e94e32e3c3258fc6c41768cb331b12d532e4bf0e46490
-EBUILD qt-creator-4.10.1.ebuild 6234 BLAKE2B 7cb7f5acaaea1a3e589a1738de3f9d8249d623b155a130632a240d69937bd40a6ea2bf77df2fa98c1505e97075e70795e04c7418ccb4d34766308ced3e2ffcfc SHA512 bcf2a7addf603c4bcf4a1226caa24189913d1943ff6562203531aa3ceb3660aff7ffe6a6f090fac3e7dfe16b01a459691862b1ecc44f5cc9c6496ddb42c7dcec
-EBUILD qt-creator-4.8.2.ebuild 5831 BLAKE2B debd630939536f622d1e1ce7ab5013248fa1010656c11f936827497b4d748b156f7b7774ced95fb0d6e8a9e23731aa5e6ee793621e62fd9fd7b57d553ae4d4bf SHA512 e94f48f731f960c58924d31e92727f982bb0fd0b14b8d6ce1c675b551c1d280dc7b66c08ebe2954c0409eed2ce6c645fecbf3071acab15c52c640cea1f62caf1
-EBUILD qt-creator-9999.ebuild 6363 BLAKE2B 88f27a5c039b64c2aa6f28f6b9742876444b66ad54af5a4b75bd8b0962432166c6f9b6aaeacbebc40bf8083f03db6860c31ddf560b13b88f1a1e1e71b626c894 SHA512 9fcef5b8e9a1d5443bda81fac98dc3353026aafd9884b7364935935dd43705e11270ddb0504f10112624cf8e697959204d1d073a528f7920d990d86508b314af
+EBUILD qt-creator-4.10.1.ebuild 6261 BLAKE2B 2348236a6af3e4983ca68a854a61cd778037a1257a6e5c12098a8d60606b8dd242ece67e2414d3bcf18991645bc3d38c34fac65ceb72bfac14a71c7c1ae957ae SHA512 0203dd62a125f0200d86bf895bfd278eb5ad63de350fedfe47645e63bd132cb5bfe4b13a4de8cf0369259cf40ffeb0ac25dff26787a31c1f0eb79adede36ea94
+EBUILD qt-creator-4.8.2.ebuild 5858 BLAKE2B b8f8e59e01ee6b26527ee14f5da3afb5ee2965e019f93611a64d79f7799657fd25c2f5305392480f57fb1d5ab1a5e987edfb92ebdcfe25953e2ff8a681a88cf3 SHA512 046d6ba685fe9df233ef80b72cdfb6954f783df977ee2490d840a43bc69d624801f12cf305499794143b77d3f4c412f462e96c2e58996b85fb5ce46e7777a0b8
+EBUILD qt-creator-9999.ebuild 6390 BLAKE2B a75551b888633de3d5bc10ff390bbed66453fa7b64c780b1a6f121e678a09ee29b53d4a8a75c33694fdd76148721e1aa08b953d8e717ae0698129aaec3b28de1 SHA512 c9fc26c7aa7169be6819b3122b13ca7b4ac2ba9353b1579a17ee314f686482ee15c690716de785a01b4d4279b566c788aff7c1228fa526fb887ad942a9251786
 MISC metadata.xml 3388 BLAKE2B 1f27704c6c58e04867e85e8142a96d449f2a65e5b8dc883120ac7502719f97823468c680dcfcb14831e780b5390ec55a40ecc0b487cbfc03c25bd9b139fe671b SHA512 883644b034ef0a7ade3c0fac6e09f835922192b38c462f3a73f60b08e8c36902ec369f07fee2482c247ddb4d85454e90aeb2c21642cc9309ae525fd349691e27
diff --git a/dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild
deleted file mode 100644
index 87ff878b2085..000000000000
--- a/dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/"
-LICENSE="GPL-3"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
-else
-	MY_PV=${PV/_/-}
-	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/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite and KSyntaxHighlighting
-
-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier
-	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
-	cmake:cmakeprojectmanager cppcheck cvs +designer git glsl:glsleditor +help ios lsp:languageclient
-	mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor qbs:qbsprojectmanager
-	+qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion
-	valgrind winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-REQUIRED_USE="
-	clang? ( test? ( qbs ) )
-	qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.12.3:5"
-
-CDEPEND="
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}[ssl]
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtquickcontrols-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=dev-qt/qtx11extras-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	clang? ( >=sys-devel/clang-8:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	)
-	perfprofiler? ( dev-libs/elfutils )
-	qbs? ( >=dev-util/qbs-1.13.1 )
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-		>=dev-qt/qtxmlpatterns-${QT_PV}[qml]
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake[server(+)] )
-	cppcheck? ( dev-util/cppcheck )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	silversearcher? ( sys-apps/the_silver_searcher )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
-	IUSE+=" l10n_${x}"
-	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
-
-	# avoid building unused support libraries and tools
-	if ! use clang; then
-		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use lsp; then
-		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro tests/auto/auto.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
-	fi
-	if ! use perfprofiler; then
-		rm -rf src/tools/perfparser || die
-		if ! use qmlprofiler; then
-			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
-		fi
-	fi
-	if ! use qmldesigner; then
-		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
-	fi
-	if ! use valgrind; then
-		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
-		sed -i -e '/valgrind/d' tests/auto/auto.pro || die
-	fi
-
-	# automagic dep on qtwebengine
-	if ! use webengine; then
-		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' src/plugins/help/help.pro || die
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
-	sed -i -e '/\(dumpers\|namedemangler\)\.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 's/\<check\>//' tests/auto/qml/codemodel/codemodel.pro || die
-
-	# do not install test binaries
-	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die
-
-	# fix path to some clang headers
-	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
-
-	# fix translations
-	local lang languages=
-	for lang in ${PLOCALES}; do
-		use l10n_${lang} && languages+=" ${lang/-/_}"
-	done
-	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
-
-	# remove bundled qbs
-	rm -rf src/shared/qbs || die
-}
-
-src_configure() {
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
-		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
-		CONFIG+=qbs_disable_rpath \
-		CONFIG+=qbs_enable_project_file_updates \
-		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1)
-}
-
-src_test() {
-	cd tests/auto && virtx default
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}/usr" install
-
-	dodoc dist/{changes-*,known-issues}
-
-	# install documentation
-	if use doc; then
-		emake docs
-		# don't use ${PF} or the doc will not be found
-		insinto /usr/share/doc/qtcreator
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
-	fi
-}
diff --git a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
index f161df651cd0..6d9284c5fdef 100644
--- a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
@@ -33,6 +33,7 @@ QTC_PLUGINS=(android +autotest baremetal bazaar beautifier
 	+qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion
 	valgrind winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	clang? ( test? ( qbs ) )
 	qnx? ( remotelinux )
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 612329ed88df..b499cf233a8f 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
@@ -31,6 +31,7 @@ QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectman
 	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
 	silversearcher subversion valgrind winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
 
 # minimum Qt version required
 QT_PV="5.9.0:5"
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 841fd7e86eed..e24f4ae254c0 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -33,6 +33,7 @@ QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
 	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
 	silversearcher subversion valgrind webassembly winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )