[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     0e54d903b2acb714017d1ee2b6ed2f59d2125f17
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 24 06:34:41 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Dec 24 06:35:10 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e54d903

dev-qt/qt-creator: several test fixes

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.8.0.ebuild | 17 +++++++++--------
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
index e08af8921a1..207b4b6cbf8 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
@@ -116,11 +116,15 @@ src_prepare() {
 		sed -i -e '/glsl/d' src/libs/libs.pro || die
 	fi
 	if ! use lsp; then
-		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro || die
+		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 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
@@ -129,21 +133,18 @@ src_prepare() {
 
 	# disable broken or unreliable tests
 	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
-	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/tracing/tracing.pro || die
-	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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
 
 	# 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
+	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
+	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
 	# remove bundled botan
 	rm -rf src/libs/3rdparty/botan || die

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e08af8921a1..207b4b6cbf8 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -116,11 +116,15 @@ src_prepare() {
 		sed -i -e '/glsl/d' src/libs/libs.pro || die
 	fi
 	if ! use lsp; then
-		sed -i -e '/languageserverprotocol/d' src/libs/libs.pro || die
+		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 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
@@ -129,21 +133,18 @@ src_prepare() {
 
 	# disable broken or unreliable tests
 	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
-	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/tracing/tracing.pro || die
-	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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
 
 	# 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
+	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
+	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
 	# remove bundled botan
 	rm -rf src/libs/3rdparty/botan || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     a664cd4047bb734dbe550829a3e3757212b580f7
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 14:55:18 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 17:06:50 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a664cd40

dev-qt/qt-creator: enable llvm slot 19 in live

Closes: https://bugs.gentoo.org/942452
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 843c80b7e3c5..e4e0e8391798 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-LLVM_COMPAT=( {15..18} )
+LLVM_COMPAT=( {15..19} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jakov Smolić]

commit:     07d31b99d5b6e8bcccd1e9e9a9e0e0dab5e844a2
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 22 08:04:34 2024 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Tue Oct 22 08:04:34 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d31b99

dev-qt/qt-creator: Stabilize 14.0.2 amd64, #941959

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-14.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
index 0326b526636b..5c8f2609c396 100644
--- a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
@@ -25,7 +25,7 @@ else
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
 	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
 	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     dff5d8dbf4bf97cbb56f0a08efa0d95ad2213061
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 03:58:19 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 04:34:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff5d8db

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 99cda33d0135..843c80b7e3c5 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -77,6 +77,7 @@ COMMON_DEPEND="
 	tracing? (
 		app-arch/zstd:=
 		dev-libs/elfutils
+		>=dev-qt/qtcharts-${QT_PV}
 		>=dev-qt/qtshadertools-${QT_PV}
 	)
 "
@@ -162,6 +163,7 @@ src_configure() {
 		# to plugins with additional build-time dependencies.
 		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
 		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+		-DBUILD_PLUGIN_APPSTATISTICSMONITOR=$(usex tracing)
 
 		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
 		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
@@ -267,6 +269,7 @@ Qt Quick:
 - QmlProfiler (USE=tracing)
 
 Utilities:
+- AppStatisticsMonitor (USE=tracing)
 - Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
 - Conan (dev-util/conan)
 - Docker (app-containers/docker)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     4fd74ebf403ddfe5982fedba3c124da07a5370e8
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  2 01:07:10 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct  2 04:34:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fd74ebf

dev-qt/qt-creator: add 14.0.2

Also guard qtcharts automagic behind USE=tracing (which feels "mostly"
fitting rather than introduce one more USE over this on a big package),
existed in earlier versions but had been missed.

Tried LLVM_SLOT=19 but fails to build with it, so keeping compat
as-is for now. qttools[clang] failed on the same thing I recall and
imagine Qt has not been testing 19 yet.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/metadata.xml             |   2 +-
 dev-qt/qt-creator/qt-creator-14.0.2.ebuild | 272 +++++++++++++++++++++++++++++
 3 files changed, 274 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 4bf80b646983..8799c32d4cd0 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176 SHA512 5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a
+DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 491b00aa9900b45e8e0dea33d4a7c99f543cf3b526931121b87d51828292b1e7e422e890c69cb904a2d5ca3c20de5fa60d87a889c0036a9624c1825b63efe57f SHA512 45b7c1aef062f59446b162006f22fcba17a99f02008624ab332ae5109a31ec55caa3548f7b61a4feb04793fa049b2a67c4a3c37aa3d3e2f3eced31bd11a48ab2

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 581b84c86cb1..5e0d4e8578c0 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -12,7 +12,7 @@
 		<flag name="plugin-dev">Install the 'Devel' component needed to build external Qt Creator plugins</flag>
 		<flag name="qmldesigner">Build QmlDesigner and related plugins (Insight, StudioWelcome)</flag>
 		<flag name="serialterminal">Build the serial terminal plugin</flag>
-		<flag name="tracing">Build plugins requiring tracing capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)</flag>
+		<flag name="tracing">Build plugins for tracing requiring extra dependencies (AppStatisticsMonitor, CtfVisualizer, PerfProfiler, QmlProfiler)</flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> with the help USE rather than bundled litehtml</flag>
 	</use>
 	<upstream>

diff --git a/dev-qt/qt-creator/qt-creator-14.0.2.ebuild b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
new file mode 100644
index 000000000000..0326b526636b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-14.0.2.ebuild
@@ -0,0 +1,272 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang designer doc +help keyring plugin-dev qmldesigner
+	serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.5.4:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	dev-cpp/yaml-cpp:=
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtcharts-${QT_PV}
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+	"${FILESDIR}"/${PN}-14.0.1-clang19.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+
+	if use plugin-dev; then #928423
+		# cmake --install --component integrates poorly with the cmake
+		# eclass and the install targets are otherwise missing, so strip
+		# out EXCLUDE_FROM_ALL until figure out a better solution
+		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
+			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+	fi
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DBUILD_DOCS_BY_DEFAULT=$(usex doc)
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# sticking to bundled for now until it switches to KF6's
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+		-DBUILD_PLUGIN_APPSTATISTICSMONITOR=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		# meant to be in sync with qtbase[journald], but think(?) not worth
+		# handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
+		-Djournald=no
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+
+		# for bundled qtkeychain (no switch to unbundle right now)
+		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
+		-DLIBSECRET_SUPPORT=$(usex keyring)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-build/cmake)
+- MesonProjectManager (dev-build/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-debug/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- AppStatisticsMonitor (USE=tracing)
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     428554cb9beb3e721cc78c89dcdc238dd3292d74
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  3 11:12:40 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep  3 11:51:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=428554cb

dev-qt/qt-creator: drop 13.0.2, 14.0.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   2 -
 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 268 -----------------------------
 dev-qt/qt-creator/qt-creator-14.0.0.ebuild | 268 -----------------------------
 3 files changed, 538 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 328e0964f1e4..4bf80b646983 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1 @@
-DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac
-DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db SHA512 75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc
 DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176 SHA512 5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
deleted file mode 100644
index ee0fcd198e6e..000000000000
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt-creator/qt-creator.git"
-		"https://github.com/qt-creator/qt-creator.git"
-	)
-	EGIT_SUBMODULES=(
-		perfparser
-		src/libs/qlitehtml
-		src/libs/qlitehtml/src/3rdparty/litehtml
-	)
-else
-	QTC_PV=${PV/_/-}
-	QTC_P=${PN}-opensource-src-${QTC_PV}
-	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
-	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
-	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-	+clang designer doc +help keyring plugin-dev qmldesigner
-	serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-	dev-cpp/yaml-cpp:=
-	>=dev-qt/qt5compat-${QT_PV}
-	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') )
-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-	help? (
-		>=dev-qt/qttools-${QT_PV}[assistant]
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-	)
-	keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-	qmldesigner? (
-		>=dev-qt/qtquick3d-${QT_PV}=
-		>=dev-qt/qtsvg-${QT_PV}
-	)
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	tracing? (
-		app-arch/zstd:=
-		dev-libs/elfutils
-		>=dev-qt/qtshadertools-${QT_PV}
-	)
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-	${COMMON_DEPEND}
-	help? ( >=dev-qt/qtimageformats-${QT_PV} )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qttools-${QT_PV}[linguist]
-	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use clang && llvm-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# needed for finding docs at runtime in PF
-	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-		-i cmake/QtCreatorAPIInternal.cmake || die
-
-	if use plugin-dev; then #928423
-		# cmake --install --component integrates poorly with the cmake
-		# eclass and the install targets are otherwise missing, so strip
-		# out EXCLUDE_FROM_ALL until figure out a better solution
-		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
-			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
-	fi
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch issues, needs looking into
-	filter-lto
-
-	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
-	# needs fixing in qtbase as *64 usage comes from its headers' macros
-	use elibc_musl && append-lfs-flags
-
-	local mycmakeargs=(
-		-DBUILD_WITH_PCH=no
-		-DWITH_DOCS=$(usex doc)
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-		-DWITH_TESTS=$(usex test)
-
-		# TODO: try unbundling now that slot 6 exists+unmasked (bug #934462)
-		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
-
-		# Much can be optional, but do not want to flood users (or maintainers)
-		# with too many flags. Not to mention that many plugins are merely
-		# wrappers around still optional tools (e.g. cvs) and any unwanted
-		# plugins can be disabled at runtime. So optional flags are limited
-		# to plugins with additional build-time dependencies.
-		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
-		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
-
-		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
-		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
-
-		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
-
-		-DBUILD_PLUGIN_HELP=$(usex help)
-		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
-		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
-		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
-
-		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
-		-DENABLE_SVG_SUPPORT=$(usex svg)
-
-		-DWITH_QMLDESIGNER=$(usex qmldesigner)
-
-		# meant to be in sync with qtbase[journald], but think(?) not worth
-		# handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
-		-Djournald=no
-
-		# not packaged, but allow using if found
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
-
-		# for bundled qtkeychain (no switch to unbundle right now)
-		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
-		-DLIBSECRET_SUPPORT=$(usex keyring)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QT_QPA_PLATFORM=offscreen
-
-	local CMAKE_SKIP_TESTS=(
-		# skipping same tests+label as upstream's CI by default
-		# `grep ctest .github/workflows/build_cmake.yml`
-		tst_perfdata
-	)
-
-	cmake_src_test --label-exclude exclude_from_precheck
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_build {qch,html}_docs
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Some plugins (if used) may need optional extra dependencies/USE.
-
-This list provides associations with Gentoo's packages (if exists)
-ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
-
-dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
-else the example tab will be empty alongside missing documentation.
-
-Build Systems:
-- CMakeProjectManager (dev-build/cmake)
-- MesonProjectManager (dev-build/meson)
-- QbsProjectManager (dev-util/qbs)
-
-C++:
-- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
-- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
-- ClangFormat (USE=clang)
-
-Code Analyzer:
-- ClangTools (USE=clang)
-- Cppcheck (dev-util/cppcheck)
-- CtfVisualizer (USE=tracing)
-- PerfProfiler (USE=tracing)
-- Valgrind (dev-debug/valgrind)
-
-Core:
-- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
-
-Device Support:
-- Android (virtual/jdk, will also want the unpackaged Qt for Android)
-
-Other Languages:
-- Nim (dev-lang/nim)
-- Python (dev-lang/python)
-
-Qt Creator:
-- Designer (USE=designer)
-
-Qt Quick:
-- Insight (USE=qmldesigner)
-- QmlDesigner (USE=qmldesigner)
-- QmlProfiler (USE=tracing)
-
-Utilities:
-- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
-- Conan (dev-util/conan)
-- Docker (app-containers/docker)
-- Haskell (dev-lang/ghc)
-- ScreenRecorder (media-video/ffmpeg)
-- SerialTerminal (USE=serialterminal)
-- SilverSearcher (sys-apps/the_silver_searcher)
-- StudioWelcome (USE=qmldesigner)
-
-Version Control:
-- CVS (dev-vcs/cvs)
-- Fossil (dev-vcs/fossil)
-- Git (dev-vcs/git)
-- Mercurial (dev-vcs/mercurial)
-- Subversion (dev-vcs/subversion)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}

diff --git a/dev-qt/qt-creator/qt-creator-14.0.0.ebuild b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild
deleted file mode 100644
index a04b85dcdd48..000000000000
--- a/dev-qt/qt-creator/qt-creator-14.0.0.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt-creator/qt-creator.git"
-		"https://github.com/qt-creator/qt-creator.git"
-	)
-	EGIT_SUBMODULES=(
-		perfparser
-		src/libs/qlitehtml
-		src/libs/qlitehtml/src/3rdparty/litehtml
-	)
-else
-	QTC_PV=${PV/_/-}
-	QTC_P=${PN}-opensource-src-${QTC_PV}
-	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
-	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
-	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-	+clang designer doc +help keyring plugin-dev qmldesigner
-	serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.5.4:6
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-	dev-cpp/yaml-cpp:=
-	>=dev-qt/qt5compat-${QT_PV}
-	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? (
-		$(llvm_gen_dep '
-			sys-devel/clang:${LLVM_SLOT}=
-			sys-devel/llvm:${LLVM_SLOT}=
-		')
-	)
-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-	help? (
-		>=dev-qt/qttools-${QT_PV}[assistant]
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-	)
-	keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-	qmldesigner? (
-		>=dev-qt/qtquick3d-${QT_PV}=
-		>=dev-qt/qtsvg-${QT_PV}
-	)
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	tracing? (
-		app-arch/zstd:=
-		dev-libs/elfutils
-		>=dev-qt/qtshadertools-${QT_PV}
-	)
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-	${COMMON_DEPEND}
-	help? ( >=dev-qt/qtimageformats-${QT_PV} )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qttools-${QT_PV}[linguist]
-	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use clang && llvm-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# needed for finding docs at runtime in PF
-	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-		-i cmake/QtCreatorAPIInternal.cmake || die
-
-	if use plugin-dev; then #928423
-		# cmake --install --component integrates poorly with the cmake
-		# eclass and the install targets are otherwise missing, so strip
-		# out EXCLUDE_FROM_ALL until figure out a better solution
-		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
-			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
-	fi
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch issues, needs looking into
-	filter-lto
-
-	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
-	# needs fixing in qtbase as *64 usage comes from its headers' macros
-	use elibc_musl && append-lfs-flags
-
-	local mycmakeargs=(
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-		-DBUILD_DOCS_BY_DEFAULT=$(usex doc)
-		-DBUILD_WITH_PCH=no
-		-DWITH_DOCS=$(usex doc)
-		-DWITH_TESTS=$(usex test)
-
-		# sticking to bundled for now until it switches to KF6's
-		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
-
-		# Much can be optional, but do not want to flood users (or maintainers)
-		# with too many flags. Not to mention that many plugins are merely
-		# wrappers around still optional tools (e.g. cvs) and any unwanted
-		# plugins can be disabled at runtime. So optional flags are limited
-		# to plugins with additional build-time dependencies.
-		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
-		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
-
-		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
-		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
-
-		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
-
-		-DBUILD_PLUGIN_HELP=$(usex help)
-		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
-		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
-		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
-
-		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
-		-DENABLE_SVG_SUPPORT=$(usex svg)
-
-		-DWITH_QMLDESIGNER=$(usex qmldesigner)
-
-		# meant to be in sync with qtbase[journald], but think(?) not worth
-		# handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
-		-Djournald=no
-
-		# not packaged, but allow using if found
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
-
-		# for bundled qtkeychain (no switch to unbundle right now)
-		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
-		-DLIBSECRET_SUPPORT=$(usex keyring)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QT_QPA_PLATFORM=offscreen
-
-	local CMAKE_SKIP_TESTS=(
-		# skipping same tests+label as upstream's CI by default
-		# `grep ctest .github/workflows/build_cmake.yml`
-		tst_perfdata
-	)
-
-	cmake_src_test --label-exclude exclude_from_precheck
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Some plugins (if used) may need optional extra dependencies/USE.
-
-This list provides associations with Gentoo's packages (if exists)
-ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
-
-dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
-else the example tab will be empty alongside missing documentation.
-
-Build Systems:
-- CMakeProjectManager (dev-build/cmake)
-- MesonProjectManager (dev-build/meson)
-- QbsProjectManager (dev-util/qbs)
-
-C++:
-- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
-- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
-- ClangFormat (USE=clang)
-
-Code Analyzer:
-- ClangTools (USE=clang)
-- Cppcheck (dev-util/cppcheck)
-- CtfVisualizer (USE=tracing)
-- PerfProfiler (USE=tracing)
-- Valgrind (dev-debug/valgrind)
-
-Core:
-- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
-
-Device Support:
-- Android (virtual/jdk, will also want the unpackaged Qt for Android)
-
-Other Languages:
-- Nim (dev-lang/nim)
-- Python (dev-lang/python)
-
-Qt Creator:
-- Designer (USE=designer)
-
-Qt Quick:
-- Insight (USE=qmldesigner)
-- QmlDesigner (USE=qmldesigner)
-- QmlProfiler (USE=tracing)
-
-Utilities:
-- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
-- Conan (dev-util/conan)
-- Docker (app-containers/docker)
-- Haskell (dev-lang/ghc)
-- ScreenRecorder (media-video/ffmpeg)
-- SerialTerminal (USE=serialterminal)
-- SilverSearcher (sys-apps/the_silver_searcher)
-- StudioWelcome (USE=qmldesigner)
-
-Version Control:
-- CVS (dev-vcs/cvs)
-- Fossil (dev-vcs/fossil)
-- Git (dev-vcs/git)
-- Mercurial (dev-vcs/mercurial)
-- Subversion (dev-vcs/subversion)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Arthur Zamarin]

commit:     f17f5fa1535279dcd4b85db74928d7e496619666
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 25 05:26:49 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 25 05:26:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f17f5fa1

dev-qt/qt-creator: Stabilize 14.0.1 amd64, #938480

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-14.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
index a04b85dcdd48..78c4cd5ea7ef 100644
--- a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
@@ -25,7 +25,7 @@ else
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
 	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
 	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     94a28fb5091f9f3f83f4fce7b0d4b0c4dc5e3859
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  7 13:23:55 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Aug  7 14:32:39 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a28fb5

dev-qt/qt-creator: add 14.0.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-14.0.1.ebuild | 268 +++++++++++++++++++++++++++++
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index bd4b1c18ddcb..328e0964f1e4 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac
 DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db SHA512 75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc
+DIST qt-creator-opensource-src-14.0.1.tar.xz 52495220 BLAKE2B a93111abdc39550c18c8ecae9bbb8c645a06be373b179bca47dac4b9e9907c9a7d9c8b13a6cc834c656cd7d7e5a849a6512f8b48055ecc8ea32a0f56f6439176 SHA512 5ceacce80cd5cdef99606ca371134e5e8a5897b67ff1a52d202449e74e817bce22ee31b029b6f8643e19700742ddd8e616a48f005aae0720f200c3b03f8eab9a

diff --git a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
new file mode 100644
index 000000000000..a04b85dcdd48
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang designer doc +help keyring plugin-dev qmldesigner
+	serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.5.4:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	dev-cpp/yaml-cpp:=
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+
+	if use plugin-dev; then #928423
+		# cmake --install --component integrates poorly with the cmake
+		# eclass and the install targets are otherwise missing, so strip
+		# out EXCLUDE_FROM_ALL until figure out a better solution
+		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
+			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+	fi
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DBUILD_DOCS_BY_DEFAULT=$(usex doc)
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# sticking to bundled for now until it switches to KF6's
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		# meant to be in sync with qtbase[journald], but think(?) not worth
+		# handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
+		-Djournald=no
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+
+		# for bundled qtkeychain (no switch to unbundle right now)
+		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
+		-DLIBSECRET_SUPPORT=$(usex keyring)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-build/cmake)
+- MesonProjectManager (dev-build/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-debug/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     19cba80e727f3f11398627961455cf0a64226dea
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 14:04:18 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 15:58:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19cba80e

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index fdf00d0e0369..23836162a90d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -45,7 +45,7 @@ IUSE="
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+QT_PV=6.5.4:6
 
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
@@ -53,7 +53,12 @@ COMMON_DEPEND="
 	>=dev-qt/qt5compat-${QT_PV}
 	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
 	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') )
+	clang? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
+	)
 	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
 	help? (
 		>=dev-qt/qttools-${QT_PV}[assistant]
@@ -141,12 +146,13 @@ src_configure() {
 	use elibc_musl && append-lfs-flags
 
 	local mycmakeargs=(
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DBUILD_DOCS_BY_DEFAULT=$(usex doc)
 		-DBUILD_WITH_PCH=no
 		-DWITH_DOCS=$(usex doc)
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
 		-DWITH_TESTS=$(usex test)
 
-		# TODO: try unbundling now that slot 6 exists+unmasked (bug #934462)
+		# sticking to bundled for now until it switches to KF6's
 		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
 
 		# Much can be optional, but do not want to flood users (or maintainers)
@@ -206,12 +212,6 @@ src_test() {
 	cmake_src_test --label-exclude exclude_from_precheck
 }
 
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_build {qch,html}_docs
-}
-
 src_install() {
 	cmake_src_install
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     46f9f704db710efc421d736c7ba92f06407f8ddd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 14:01:16 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 15:58:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f9f704

dev-qt/qt-creator: add 14.0.0

Few ebuild changes, but for some notes:
* Meant to use system's lua+sol2 (newly bundled), but it does not seem
  to have a switch to use system's easily and not going to bother on
  such a big package if not.
* The bits requiring Go have not landed in 14 and remain 9999-only.
* Dropped the comment about Qt's version given cmake files may
  optionally require yet a newer one for specific features.
* There is a new switch for building docs, so can simplify a bit.
* Thought to try unbundling syntax-highlighting but after finding
  out it uses the old slot opted to keep it like that for now.

May possibly have overlooked something given there is a lot of
noise in cmake files, please report a bug if anything is off.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-14.0.0.ebuild | 268 +++++++++++++++++++++++++++++
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 883f9e3f8647..bd4b1c18ddcb 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac
+DIST qt-creator-opensource-src-14.0.0.tar.xz 52488544 BLAKE2B 8ac32b41d9791a6a94c38edf6878aae7acf4520b362f043d38e0b6097a45bbea0368953b0038e64ae32697389921bab701d1daeee787fb30206c6496374b41db SHA512 75a0b2cd3e89f0c98710e43354d75d593d441b845475d5345b5784378054edd8b426bf7cf4b326ce9a56c1a2b8a2f136254f77525441528ff32c2c4a6fb441cc

diff --git a/dev-qt/qt-creator/qt-creator-14.0.0.ebuild b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild
new file mode 100644
index 000000000000..a04b85dcdd48
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-14.0.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang designer doc +help keyring plugin-dev qmldesigner
+	serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.5.4:6
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	dev-cpp/yaml-cpp:=
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		$(llvm_gen_dep '
+			sys-devel/clang:${LLVM_SLOT}=
+			sys-devel/llvm:${LLVM_SLOT}=
+		')
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+
+	if use plugin-dev; then #928423
+		# cmake --install --component integrates poorly with the cmake
+		# eclass and the install targets are otherwise missing, so strip
+		# out EXCLUDE_FROM_ALL until figure out a better solution
+		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
+			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+	fi
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DBUILD_DOCS_BY_DEFAULT=$(usex doc)
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# sticking to bundled for now until it switches to KF6's
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		# meant to be in sync with qtbase[journald], but think(?) not worth
+		# handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
+		-Djournald=no
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+
+		# for bundled qtkeychain (no switch to unbundle right now)
+		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
+		-DLIBSECRET_SUPPORT=$(usex keyring)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-build/cmake)
+- MesonProjectManager (dev-build/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-debug/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     45c9a720a5218d6de858897bdbe49db9b329cf9b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 06:23:55 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 06:23:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c9a720

dev-qt/qt-creator: drop 13.0.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 -
 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 268 -----------------------------
 2 files changed, 269 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index e8edf350bcd8..883f9e3f8647 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-13.0.1.tar.xz 51891908 BLAKE2B ab4701be5328fccc91e885a6a331ba8c4f53cb7d9a723f03f30ad01d03281d16b1f49cd6027ad9873cd94ecf6555978df9eba14bfcbfa8e4c36d304b8b106d5a SHA512 8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4
 DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
deleted file mode 100644
index 25ae3358d8dc..000000000000
--- a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt-creator/qt-creator.git"
-		"https://github.com/qt-creator/qt-creator.git"
-	)
-	EGIT_SUBMODULES=(
-		perfparser
-		src/libs/qlitehtml
-		src/libs/qlitehtml/src/3rdparty/litehtml
-	)
-else
-	QTC_PV=${PV/_/-}
-	QTC_P=${PN}-opensource-src-${QTC_PV}
-	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
-	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
-	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-	+clang designer doc +help keyring plugin-dev qmldesigner
-	serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-	>=dev-qt/qt5compat-${QT_PV}
-	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? (
-		dev-cpp/yaml-cpp:=
-		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
-	)
-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-	help? (
-		>=dev-qt/qttools-${QT_PV}[assistant]
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-	)
-	keyring? (
-		app-crypt/libsecret
-		dev-libs/glib:2
-	)
-	qmldesigner? (
-		>=dev-qt/qtquick3d-${QT_PV}=
-		>=dev-qt/qtsvg-${QT_PV}
-	)
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	tracing? (
-		app-arch/zstd:=
-		dev-libs/elfutils
-		>=dev-qt/qtshadertools-${QT_PV}
-	)
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-	${COMMON_DEPEND}
-	help? ( >=dev-qt/qtimageformats-${QT_PV} )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qttools-${QT_PV}[linguist]
-	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use clang && llvm-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# needed for finding docs at runtime in PF
-	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-		-i cmake/QtCreatorAPIInternal.cmake || die
-
-	if use plugin-dev; then #928423
-		# cmake --install --component integrates poorly with the cmake
-		# eclass and the install targets are otherwise missing, so strip
-		# out EXCLUDE_FROM_ALL until figure out a better solution
-		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
-			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
-	fi
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch issues, needs looking into
-	filter-lto
-
-	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
-	# needs fixing in qtbase as *64 usage comes from its headers' macros
-	use elibc_musl && append-lfs-flags
-
-	local mycmakeargs=(
-		-DBUILD_WITH_PCH=no
-		-DWITH_DOCS=$(usex doc)
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-		-DWITH_TESTS=$(usex test)
-
-		# TODO: try unbundling now that slot 6 exists+unmasked (bug #934462)
-		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
-
-		# Much can be optional, but do not want to flood users (or maintainers)
-		# with too many flags. Not to mention that many plugins are merely
-		# wrappers around still optional tools (e.g. cvs) and any unwanted
-		# plugins can be disabled at runtime. So optional flags are limited
-		# to plugins with additional build-time dependencies.
-		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
-		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
-
-		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
-		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
-
-		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
-
-		-DBUILD_PLUGIN_HELP=$(usex help)
-		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
-		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
-		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
-
-		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
-		-DENABLE_SVG_SUPPORT=$(usex svg)
-
-		-DWITH_QMLDESIGNER=$(usex qmldesigner)
-
-		-Djournald=no # not really useful unless match qtbase (needs systemd)
-
-		# not packaged, but allow using if found
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
-
-		# for bundled qtkeychain (no switch to unbundle right now)
-		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
-		-DLIBSECRET_SUPPORT=$(usex keyring)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QT_QPA_PLATFORM=offscreen
-
-	local CMAKE_SKIP_TESTS=(
-		# skipping same tests+label as upstream's CI by default
-		# `grep ctest .github/workflows/build_cmake.yml`
-		tst_perfdata
-	)
-
-	cmake_src_test --label-exclude exclude_from_precheck
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_build {qch,html}_docs
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Some plugins (if used) may need optional extra dependencies/USE.
-
-This list provides associations with Gentoo's packages (if exists)
-ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
-
-dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
-else the example tab will be empty alongside missing documentation.
-
-Build Systems:
-- CMakeProjectManager (dev-build/cmake)
-- MesonProjectManager (dev-build/meson)
-- QbsProjectManager (dev-util/qbs)
-
-C++:
-- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
-- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
-- ClangFormat (USE=clang)
-
-Code Analyzer:
-- ClangTools (USE=clang)
-- Cppcheck (dev-util/cppcheck)
-- CtfVisualizer (USE=tracing)
-- PerfProfiler (USE=tracing)
-- Valgrind (dev-debug/valgrind)
-
-Core:
-- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
-
-Device Support:
-- Android (virtual/jdk, will also want the unpackaged Qt for Android)
-
-Other Languages:
-- Nim (dev-lang/nim)
-- Python (dev-lang/python)
-
-Qt Creator:
-- Designer (USE=designer)
-
-Qt Quick:
-- Insight (USE=qmldesigner)
-- QmlDesigner (USE=qmldesigner)
-- QmlProfiler (USE=tracing)
-
-Utilities:
-- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
-- Conan (dev-util/conan)
-- Docker (app-containers/docker)
-- Haskell (dev-lang/ghc)
-- ScreenRecorder (media-video/ffmpeg)
-- SerialTerminal (USE=serialterminal)
-- SilverSearcher (sys-apps/the_silver_searcher)
-- StudioWelcome (USE=qmldesigner)
-
-Version Control:
-- CVS (dev-vcs/cvs)
-- Fossil (dev-vcs/fossil)
-- Git (dev-vcs/git)
-- Mercurial (dev-vcs/mercurial)
-- Subversion (dev-vcs/subversion)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     ce5f985df005e2e2cb922e593dbb13984f4bdee5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 06:26:11 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 06:26:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5f985d

dev-qt/qt-creator: update journald comment

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 4 +++-
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
index 972b24abebe5..ee0fcd198e6e 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -155,7 +155,9 @@ src_configure() {
 
 		-DWITH_QMLDESIGNER=$(usex qmldesigner)
 
-		-Djournald=no # not really useful unless match qtbase (needs systemd)
+		# meant to be in sync with qtbase[journald], but think(?) not worth
+		# handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
+		-Djournald=no
 
 		# not packaged, but allow using if found
 		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 69822c51bc74..fdf00d0e0369 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -178,7 +178,9 @@ src_configure() {
 
 		-DWITH_QMLDESIGNER=$(usex qmldesigner)
 
-		-Djournald=no # not really useful unless match qtbase (needs systemd)
+		# meant to be in sync with qtbase[journald], but think(?) not worth
+		# handling given qt-creator can use QT_FORCE_STDERR_LOGGING=1 nowadays
+		-Djournald=no
 
 		# not packaged, but allow using if found
 		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     669248c86189e9ace3a735a13970ee7bd57a1d5e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jul  4 01:46:44 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jul  4 01:53:26 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669248c8

dev-qt/qt-creator: unconditionally depend on yaml-cpp

Missed that a plugin (qtapplicationmanager) added a dependency on
yaml-cpp while comparing comparing qt-creator-12 -> 13 and is no
longer clang-only.

Feel it's not worth a USE for the plugin on such a big package
(not for minimalism), so depending unconditionally unless someone
really wants to avoid it (at best it could be interesting to avoid
:= rebuilds).

Technically needs a revbump, but qt-creator takes a while to build
and most users already were pulling it through IUSE=+clang.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 6 ++----
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
index 25ae3358d8dc..972b24abebe5 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -44,13 +44,11 @@ QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
 
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
+	dev-cpp/yaml-cpp:=
 	>=dev-qt/qt5compat-${QT_PV}
 	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
 	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? (
-		dev-cpp/yaml-cpp:=
-		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
-	)
+	clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') )
 	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
 	help? (
 		>=dev-qt/qttools-${QT_PV}[assistant]

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 7e70e0a5b37d..69822c51bc74 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -49,13 +49,11 @@ QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
 
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
+	dev-cpp/yaml-cpp:=
 	>=dev-qt/qt5compat-${QT_PV}
 	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
 	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? (
-		dev-cpp/yaml-cpp:=
-		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
-	)
+	clang? ( $(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=') )
 	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
 	help? (
 		>=dev-qt/qttools-${QT_PV}[assistant]

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     9c9376b47aea93a273fa2eaeed61950133372e80
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul  2 14:08:51 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jul  2 15:10:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c9376b4

dev-qt/qt-creator: update live

Not tested much, but did build successfully once w/ Go bits.

May or may not consider making this optional when there is a release
after a closer look. Does not have a proper option, but it already
skips it if it does not find Go... so -DGO_BIN=no or so would likely
work.

Being off by default would also be less annoying for go rebuilds,
I doubt anyone wants to rebuild something massive like qt-creator
every go bump. Not that I really checked what this is used for yet.

For now not going to touch this too much given it may get changed
around upstream.

Closes: https://bugs.gentoo.org/935332
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index f7ae725146b9..7e70e0a5b37d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -6,7 +6,8 @@ EAPI=8
 LLVM_COMPAT=( {15..18} )
 LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..13} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+inherit cmake edo flag-o-matic go-env llvm-r1 multiprocessing
+inherit python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -23,7 +24,10 @@ else
 	QTC_PV=${PV/_/-}
 	QTC_P=${PN}-opensource-src-${QTC_PV}
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
-	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	SRC_URI="
+		https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz
+		https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz
+	"
 	S=${WORKDIR}/${QTC_P}
 	KEYWORDS="~amd64"
 fi
@@ -32,6 +36,7 @@ DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://www.qt.io/product/development-tools"
 
 LICENSE="GPL-3"
+LICENSE+=" BSD MIT" # go
 SLOT="0"
 IUSE="
 	+clang designer doc +help keyring plugin-dev qmldesigner
@@ -79,8 +84,11 @@ RDEPEND="
 	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 "
 DEPEND="${COMMON_DEPEND}"
+# intentionally skipping := on go (unlike go-module.eclass) given not
+# worth a massive rebuild every time for the minor go usage
 BDEPEND="
 	${PYTHON_DEPS}
+	>=dev-lang/go-1.21.7
 	>=dev-qt/qttools-${QT_PV}[linguist]
 	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
 "
@@ -90,11 +98,23 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )
 
+QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 	use clang && llvm-r1_pkg_setup
 }
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		git-r3_src_unpack
+		cd "${S}/src/libs/gocmdbridge/server" || die
+		edo go mod vendor
+	else
+		default
+	fi
+}
+
 src_prepare() {
 	cmake_src_prepare
 
@@ -112,6 +132,9 @@ src_prepare() {
 }
 
 src_configure() {
+	go-env_set_compile_environment
+	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
+
 	# -Werror=lto-type-mismatch issues, needs looking into
 	filter-lto
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Arthur Zamarin]

commit:     1c813a9a9b5c29a7a12c0fa082a072867ad32811
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 19 19:43:28 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 19 19:43:28 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c813a9a

dev-qt/qt-creator: Stabilize 13.0.2 amd64, #934559

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
index f7ae725146b9..25ae3358d8dc 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -25,7 +25,7 @@ else
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
 	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
 	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     e8e24128704e3f80016f4e7686be8aedfe31a8fa
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 17:00:00 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 18:13:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8e24128

dev-qt/qt-creator: update syntax-highlighting comment

Bug: https://bugs.gentoo.org/934462
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
index 036aa1705257..25ae3358d8dc 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 		-DBUILD_DEVELOPER_DOCS=$(usex doc)
 		-DWITH_TESTS=$(usex test)
 
-		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		# TODO: try unbundling now that slot 6 exists+unmasked (bug #934462)
 		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
 
 		# Much can be optional, but do not want to flood users (or maintainers)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
index 68c8cfe8e35c..f7ae725146b9 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 		-DBUILD_DEVELOPER_DOCS=$(usex doc)
 		-DWITH_TESTS=$(usex test)
 
-		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		# TODO: try unbundling now that slot 6 exists+unmasked (bug #934462)
 		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
 
 		# Much can be optional, but do not want to flood users (or maintainers)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 68c8cfe8e35c..f7ae725146b9 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -125,7 +125,7 @@ src_configure() {
 		-DBUILD_DEVELOPER_DOCS=$(usex doc)
 		-DWITH_TESTS=$(usex test)
 
-		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		# TODO: try unbundling now that slot 6 exists+unmasked (bug #934462)
 		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
 
 		# Much can be optional, but do not want to flood users (or maintainers)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     1491ae916ff1ece5cee3cf22f7f2d02ca2b041f3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 14:57:26 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 15:47:20 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1491ae91

dev-qt/qt-creator: add 13.0.2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 268 +++++++++++++++++++++++++++++
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d93d9286c577..e8edf350bcd8 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-13.0.1.tar.xz 51891908 BLAKE2B ab4701be5328fccc91e885a6a331ba8c4f53cb7d9a723f03f30ad01d03281d16b1f49cd6027ad9873cd94ecf6555978df9eba14bfcbfa8e4c36d304b8b106d5a SHA512 8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4
+DIST qt-creator-opensource-src-13.0.2.tar.xz 51881672 BLAKE2B 88a5f3b88f444fda59e61c098fe5d4324a6bafb9e552c261d1b5337fb4fe3ecbe59411aaf1c5d77a8d688f8248dd10d28f63c326c53b763912a1085c93963c2a SHA512 0b065dfb5eed95d1c50c39b49ea555f49b323d150e001001ae7ce50ad2cc4c47a8476def6397c8b7c3e26750442afb9df7a93a0ebece79dc84a879a3552da2ac

diff --git a/dev-qt/qt-creator/qt-creator-13.0.2.ebuild b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
new file mode 100644
index 000000000000..68c8cfe8e35c
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-13.0.2.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..13} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang designer doc +help keyring plugin-dev qmldesigner
+	serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		dev-cpp/yaml-cpp:=
+		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+
+	if use plugin-dev; then #928423
+		# cmake --install --component integrates poorly with the cmake
+		# eclass and the install targets are otherwise missing, so strip
+		# out EXCLUDE_FROM_ALL until figure out a better solution
+		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
+			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+	fi
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		-Djournald=no # not really useful unless match qtbase (needs systemd)
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+
+		# for bundled qtkeychain (no switch to unbundle right now)
+		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
+		-DLIBSECRET_SUPPORT=$(usex keyring)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build {qch,html}_docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-build/cmake)
+- MesonProjectManager (dev-build/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-debug/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Arthur Zamarin]

commit:     27b698c805310261b6d1cd817bfc3882fb2a5f8c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 13:23:40 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon May 13 13:23:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b698c8

dev-qt/qt-creator: Stabilize 13.0.1 amd64, #931834

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
index 68c8cfe8e35c..036aa1705257 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
@@ -25,7 +25,7 @@ else
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
 	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
 	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     4d79f466200544c70a092712a919290421661642
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 01:37:20 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 13 05:48:21 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d79f466

dev-qt/qt-creator: enable py3.13

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
index b47f014ce15a..68c8cfe8e35c 100644
--- a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LLVM_COMPAT=( {15..18} )
 LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index b47f014ce15a..68c8cfe8e35c 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 LLVM_COMPAT=( {15..18} )
 LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     9a9504bed795ce7974eaa71bf26930b728b70358
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue May  7 12:24:38 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue May  7 14:23:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9504be

dev-qt/qt-creator: add 13.0.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 268 +++++++++++++++++++++++++++++
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 3aadf1f0def7..93d4e63c470d 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-13.0.0.tar.xz 52032860 BLAKE2B 63f1fbb5209c77b9fc9df9385e94808d7ea040de4af6305c16ac4ad540771ebc78b55d0552182fa30d80326da3989a96ee8a0cce218541e418b7f355e9542786 SHA512 26fea156becc136fb55702a65c29dad825fd3fa60d8e19d8d142ab6518dc8e40fbddfe70d79d2b71f14f76c8a1d9bca34fb65e565702e67c9276aec9758bf345
+DIST qt-creator-opensource-src-13.0.1.tar.xz 51891908 BLAKE2B ab4701be5328fccc91e885a6a331ba8c4f53cb7d9a723f03f30ad01d03281d16b1f49cd6027ad9873cd94ecf6555978df9eba14bfcbfa8e4c36d304b8b106d5a SHA512 8af971d86a958b6a04da0bec78f5706d8ecf8c14621a5f9c83b415409288a0eccfecc237534288414cea5e620758d8daa104620c42fcaac718e9713e8c29afa4

diff --git a/dev-qt/qt-creator/qt-creator-13.0.1.ebuild b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
new file mode 100644
index 000000000000..b47f014ce15a
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-13.0.1.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang designer doc +help keyring plugin-dev qmldesigner
+	serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		dev-cpp/yaml-cpp:=
+		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+
+	if use plugin-dev; then #928423
+		# cmake --install --component integrates poorly with the cmake
+		# eclass and the install targets are otherwise missing, so strip
+		# out EXCLUDE_FROM_ALL until figure out a better solution
+		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
+			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+	fi
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		-Djournald=no # not really useful unless match qtbase (needs systemd)
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+
+		# for bundled qtkeychain (no switch to unbundle right now)
+		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
+		-DLIBSECRET_SUPPORT=$(usex keyring)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build {qch,html}_docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-build/cmake)
+- MesonProjectManager (dev-build/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-debug/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     c4abce9c16710fc81cbbe511b47edff1cd96922c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun May  5 23:51:44 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun May  5 23:51:44 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4abce9c

dev-qt/qt-creator: drop 12.0.2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 -
 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 260 -----------------------------
 2 files changed, 261 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index bc5430b952e8..3aadf1f0def7 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459 SHA512 cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1
 DIST qt-creator-opensource-src-13.0.0.tar.xz 52032860 BLAKE2B 63f1fbb5209c77b9fc9df9385e94808d7ea040de4af6305c16ac4ad540771ebc78b55d0552182fa30d80326da3989a96ee8a0cce218541e418b7f355e9542786 SHA512 26fea156becc136fb55702a65c29dad825fd3fa60d8e19d8d142ab6518dc8e40fbddfe70d79d2b71f14f76c8a1d9bca34fb65e565702e67c9276aec9758bf345

diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
deleted file mode 100644
index 84a477ae119f..000000000000
--- a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LLVM_COMPAT=( {15..18} )
-LLVM_OPTIONAL=1
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt-creator/qt-creator.git"
-		"https://github.com/qt-creator/qt-creator.git"
-	)
-	EGIT_SUBMODULES=(
-		perfparser
-		src/libs/qlitehtml
-		src/libs/qlitehtml/src/3rdparty/litehtml
-	)
-else
-	QTC_PV=${PV/_/-}
-	QTC_P=${PN}-opensource-src-${QTC_PV}
-	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
-	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
-	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-	+clang +designer doc +help plugin-dev qmldesigner
-	serialterminal +svg test +tracing webengine
-"
-REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
-RESTRICT="!test? ( test )"
-
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-	>=dev-qt/qt5compat-${QT_PV}
-	>=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? (
-		dev-cpp/yaml-cpp:=
-		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
-	)
-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-	help? (
-		>=dev-qt/qttools-${QT_PV}[assistant]
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-	)
-	qmldesigner? (
-		>=dev-qt/qtquick3d-${QT_PV}=
-		>=dev-qt/qtsvg-${QT_PV}
-	)
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	tracing? (
-		app-arch/zstd:=
-		dev-libs/elfutils
-		>=dev-qt/qtshadertools-${QT_PV}
-	)
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-	${COMMON_DEPEND}
-	help? ( >=dev-qt/qtimageformats-${QT_PV} )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qttools-${QT_PV}[linguist]
-	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use clang && llvm-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# needed for finding docs at runtime in PF
-	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-		-i cmake/QtCreatorAPIInternal.cmake || die
-
-	if use plugin-dev; then #928423
-		# cmake --install --component integrates poorly with the cmake
-		# eclass and the install targets are otherwise missing, so strip
-		# out EXCLUDE_FROM_ALL until figure out a better solution
-		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
-			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
-	fi
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch issues, needs looking into
-	filter-lto
-
-	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
-	# needs fixing in qtbase as *64 usage comes from its headers' macros
-	use elibc_musl && append-lfs-flags
-
-	local mycmakeargs=(
-		-DBUILD_WITH_PCH=no
-		-DWITH_DOCS=$(usex doc)
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-		-DWITH_TESTS=$(usex test)
-
-		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
-		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
-
-		# Much can be optional, but do not want to flood users (or maintainers)
-		# with too many flags. Not to mention that many plugins are merely
-		# wrappers around still optional tools (e.g. cvs) and any unwanted
-		# plugins can be disabled at runtime. So optional flags are limited
-		# to plugins with additional build-time dependencies.
-		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
-		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
-
-		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
-		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
-
-		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
-
-		-DBUILD_PLUGIN_HELP=$(usex help)
-		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
-		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
-		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
-
-		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
-		-DENABLE_SVG_SUPPORT=$(usex svg)
-
-		-DWITH_QMLDESIGNER=$(usex qmldesigner)
-
-		-Djournald=no # not really useful unless match qtbase (needs systemd)
-
-		# not packaged, but allow using if found
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QT_QPA_PLATFORM=offscreen
-
-	local CMAKE_SKIP_TESTS=(
-		# skipping same tests+label as upstream's CI by default
-		# `grep ctest .github/workflows/build_cmake.yml`
-		tst_perfdata
-	)
-
-	cmake_src_test --label-exclude exclude_from_precheck
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_build {qch,html}_docs
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Some plugins (if used) may need optional extra dependencies/USE.
-
-This list provides associations with Gentoo's packages (if exists)
-ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
-
-dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
-else the example tab will be empty alongside missing documentation.
-
-Build Systems:
-- CMakeProjectManager (dev-build/cmake)
-- MesonProjectManager (dev-build/meson)
-- QbsProjectManager (dev-util/qbs)
-
-C++:
-- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
-- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
-- ClangFormat (USE=clang)
-
-Code Analyzer:
-- ClangTools (USE=clang)
-- Cppcheck (dev-util/cppcheck)
-- CtfVisualizer (USE=tracing)
-- PerfProfiler (USE=tracing)
-- Valgrind (dev-debug/valgrind)
-
-Core:
-- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
-
-Device Support:
-- Android (virtual/jdk, will also want the unpackaged Qt for Android)
-
-Other Languages:
-- Nim (dev-lang/nim)
-- Python (dev-lang/python)
-
-Qt Creator:
-- Designer (USE=designer)
-
-Qt Quick:
-- Insight (USE=qmldesigner)
-- QmlDesigner (USE=qmldesigner)
-- QmlProfiler (USE=tracing)
-
-Utilities:
-- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
-- Conan (dev-util/conan)
-- Docker (app-containers/docker)
-- Haskell (dev-lang/ghc)
-- ScreenRecorder (media-video/ffmpeg)
-- SerialTerminal (USE=serialterminal)
-- SilverSearcher (sys-apps/the_silver_searcher)
-- StudioWelcome (USE=qmldesigner)
-
-Version Control:
-- CVS (dev-vcs/cvs)
-- Fossil (dev-vcs/fossil)
-- Git (dev-vcs/git)
-- Mercurial (dev-vcs/mercurial)
-- Subversion (dev-vcs/subversion)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     2c530eace88c9c582ec5e2fd57d42319693675ee
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  4 13:43:09 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 16:37:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c530eac

dev-qt/qt-creator: add 13.0.0

Does not seem to need real updates beside handling qtkeychain? But
may or may not have missed something given there is a lot of noise
in build system files changes.

Unfortunately upstream has not provided a switch (that I can see)
to allow using system qtkeychain[qt6] which would've been more
convenient than handling libsecret+dbus used by it.

For now opted to make dbus hard-required to simplify, doubtful
qt-creator users are minimalists in general.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-13.0.0.ebuild | 268 +++++++++++++++++++++++++++++
 2 files changed, 269 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 38f84e5fffbd..bc5430b952e8 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459 SHA512 cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1
+DIST qt-creator-opensource-src-13.0.0.tar.xz 52032860 BLAKE2B 63f1fbb5209c77b9fc9df9385e94808d7ea040de4af6305c16ac4ad540771ebc78b55d0552182fa30d80326da3989a96ee8a0cce218541e418b7f355e9542786 SHA512 26fea156becc136fb55702a65c29dad825fd3fa60d8e19d8d142ab6518dc8e40fbddfe70d79d2b71f14f76c8a1d9bca34fb65e565702e67c9276aec9758bf345

diff --git a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
new file mode 100644
index 000000000000..b47f014ce15a
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
@@ -0,0 +1,268 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang designer doc +help keyring plugin-dev qmldesigner
+	serialterminal +svg test +tracing webengine
+"
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		dev-cpp/yaml-cpp:=
+		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+
+	if use plugin-dev; then #928423
+		# cmake --install --component integrates poorly with the cmake
+		# eclass and the install targets are otherwise missing, so strip
+		# out EXCLUDE_FROM_ALL until figure out a better solution
+		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
+			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+	fi
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		-Djournald=no # not really useful unless match qtbase (needs systemd)
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+
+		# for bundled qtkeychain (no switch to unbundle right now)
+		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
+		-DLIBSECRET_SUPPORT=$(usex keyring)
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build {qch,html}_docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-build/cmake)
+- MesonProjectManager (dev-build/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-debug/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     97e8651af60e5e3aae064ac23d42e8254e468d8e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  4 16:36:17 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Apr  4 16:37:55 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e8651a

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index f28f40dcec29..b47f014ce15a 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.qt.io/product/development-tools"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="
-	+clang designer doc +help plugin-dev qmldesigner
+	+clang designer doc +help keyring plugin-dev qmldesigner
 	serialterminal +svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
@@ -45,7 +45,7 @@ QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
 # := is used where Qt's private APIs are used for safety
 COMMON_DEPEND="
 	>=dev-qt/qt5compat-${QT_PV}
-	>=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,dbus,gui,network,widgets,xml]
 	>=dev-qt/qtdeclarative-${QT_PV}=
 	clang? (
 		dev-cpp/yaml-cpp:=
@@ -56,6 +56,10 @@ COMMON_DEPEND="
 		>=dev-qt/qttools-${QT_PV}[assistant]
 		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
 	)
+	keyring? (
+		app-crypt/libsecret
+		dev-libs/glib:2
+	)
 	qmldesigner? (
 		>=dev-qt/qtquick3d-${QT_PV}=
 		>=dev-qt/qtsvg-${QT_PV}
@@ -78,7 +82,7 @@ DEPEND="${COMMON_DEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
 	>=dev-qt/qttools-${QT_PV}[linguist]
-	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
 "
 
 PATCHES=(
@@ -158,6 +162,10 @@ src_configure() {
 		# not packaged, but allow using if found
 		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
 		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+
+		# for bundled qtkeychain (no switch to unbundle right now)
+		# reminder: if ever unbundled/optional, qtbase[dbus] can be removed
+		-DLIBSECRET_SUPPORT=$(usex keyring)
 	)
 
 	cmake_src_configure

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     ed529e6ecf83a74ca626dcdff04a133b6675c188
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 15:34:53 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 15:50:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed529e6e

dev-qt/qt-creator: install Devel component with IUSE=plugin-dev

Tried to compile Qt Creator's HelloWorld plugin externally and it built
fine with the USE enabled.

Debated installing unconditionally, but it installs quite a lot of
extras. Unsure about the IUSE name choice but it should hopefully do
(did feel IUSE=devel would be a bit too generic sounding).

Went for a bit hacky solution (for now) given --component integrates
poorly with cmake.eclass and does not seem(?) other ebuilds have needed
to do this yet in ::gentoo for ideas.

Closes: https://bugs.gentoo.org/928423
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml             |  3 ++-
 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 12 ++++++++++--
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 12 ++++++++++--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index fcd44daa8386..89e60ab1d919 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -13,8 +13,9 @@
 		<flag name="clang">Build clang-based plugins for C/C++ development (code model, formatting, static analysis)</flag>
 		<flag name="designer">Enable designer for QtWidgets-based UIs</flag>
 		<flag name="help">Enable the integrated <pkg>dev-qt/qt-docs</pkg> viewer (also needed for examples)</flag>
-		<flag name="serialterminal">Build the serial terminal plugin</flag>
+		<flag name="plugin-dev">Install the 'Devel' component needed to build external Qt Creator plugins</flag>
 		<flag name="qmldesigner">Build QmlDesigner and related plugins (Insight, StudioWelcome)</flag>
+		<flag name="serialterminal">Build the serial terminal plugin</flag>
 		<flag name="tracing">Build plugins requiring tracing capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)</flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> with the help USE rather than bundled litehtml</flag>
 	</use>

diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
index 9e674d8b1aa3..84a477ae119f 100644
--- a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
@@ -34,8 +34,8 @@ HOMEPAGE="https://www.qt.io/product/development-tools"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="
-	+clang +designer doc +help qmldesigner serialterminal
-	+svg test +tracing webengine
+	+clang +designer doc +help plugin-dev qmldesigner
+	serialterminal +svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -97,6 +97,14 @@ src_prepare() {
 	# needed for finding docs at runtime in PF
 	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
 		-i cmake/QtCreatorAPIInternal.cmake || die
+
+	if use plugin-dev; then #928423
+		# cmake --install --component integrates poorly with the cmake
+		# eclass and the install targets are otherwise missing, so strip
+		# out EXCLUDE_FROM_ALL until figure out a better solution
+		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
+			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+	fi
 }
 
 src_configure() {

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 017a06e30b56..f28f40dcec29 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -34,8 +34,8 @@ HOMEPAGE="https://www.qt.io/product/development-tools"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="
-	+clang designer doc +help qmldesigner serialterminal
-	+svg test +tracing webengine
+	+clang designer doc +help plugin-dev qmldesigner
+	serialterminal +svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -97,6 +97,14 @@ src_prepare() {
 	# needed for finding docs at runtime in PF
 	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
 		-i cmake/QtCreatorAPIInternal.cmake || die
+
+	if use plugin-dev; then #928423
+		# cmake --install --component integrates poorly with the cmake
+		# eclass and the install targets are otherwise missing, so strip
+		# out EXCLUDE_FROM_ALL until figure out a better solution
+		find . \( -name CMakeLists.txt -o -name '*.cmake' \) -exec sed -i -zE \
+			's/COMPONENT[[:space:]]+Devel[[:space:]]+EXCLUDE_FROM_ALL//g' {} + || die
+	fi
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     1f6b6d2f079fdf5a0144f36ffa6bdcb51791e41a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 20 05:27:47 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Mar 20 07:01:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f6b6d2f

dev-qt/qt-creator: drop 12.0.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 -
 dev-qt/qt-creator/qt-creator-12.0.1.ebuild | 254 -----------------------------
 2 files changed, 255 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index dd4e4099f113..38f84e5fffbd 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd SHA512 03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7
 DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459 SHA512 cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1

diff --git a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
deleted file mode 100644
index 362b77f6691a..000000000000
--- a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt-creator/qt-creator.git"
-		"https://github.com/qt-creator/qt-creator.git"
-	)
-	EGIT_SUBMODULES=(
-		perfparser
-		src/libs/qlitehtml
-		src/libs/qlitehtml/src/3rdparty/litehtml
-	)
-else
-	QTC_PV=${PV/_/-}
-	QTC_P=${PN}-opensource-src-${QTC_PV}
-	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
-	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
-	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="amd64"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-	+clang +designer doc +help qmldesigner serialterminal
-	+svg test +tracing webengine
-"
-RESTRICT="!test? ( test )"
-
-LLVM_MAX_SLOT=17
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-	>=dev-qt/qt5compat-${QT_PV}
-	>=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? (
-		dev-cpp/yaml-cpp:=
-		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
-	)
-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-	help? (
-		>=dev-qt/qttools-${QT_PV}[assistant]
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-	)
-	qmldesigner? (
-		>=dev-qt/qtquick3d-${QT_PV}=
-		>=dev-qt/qtsvg-${QT_PV}
-	)
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	tracing? (
-		app-arch/zstd:=
-		dev-libs/elfutils
-		>=dev-qt/qtshadertools-${QT_PV}
-	)
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-	${COMMON_DEPEND}
-	help? ( >=dev-qt/qtimageformats-${QT_PV} )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qttools-${QT_PV}[linguist]
-	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# needed for finding docs at runtime in PF
-	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-		-i cmake/QtCreatorAPIInternal.cmake || die
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch issues, needs looking into
-	filter-lto
-
-	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
-	# needs fixing in qtbase as *64 usage comes from its headers' macros
-	use elibc_musl && append-lfs-flags
-
-	local mycmakeargs=(
-		-DBUILD_WITH_PCH=no
-		-DWITH_DOCS=$(usex doc)
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-		-DWITH_TESTS=$(usex test)
-
-		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
-		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
-
-		# Much can be optional, but do not want to flood users (or maintainers)
-		# with too many flags. Not to mention that many plugins are merely
-		# wrappers around still optional tools (e.g. cvs) and any unwanted
-		# plugins can be disabled at runtime. So optional flags are limited
-		# to plugins with additional build-time dependencies.
-		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
-		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
-
-		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
-		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
-
-		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
-
-		-DBUILD_PLUGIN_HELP=$(usex help)
-		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
-		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
-		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
-
-		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
-		-DENABLE_SVG_SUPPORT=$(usex svg)
-
-		-DWITH_QMLDESIGNER=$(usex qmldesigner)
-
-		-Djournald=no # not really useful unless match qtbase (needs systemd)
-
-		# not packaged, but allow using if found
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QT_QPA_PLATFORM=offscreen
-
-	local CMAKE_SKIP_TESTS=(
-		# skipping same tests+label as upstream's CI by default
-		# `grep ctest .github/workflows/build_cmake.yml`
-		tst_perfdata
-	)
-
-	cmake_src_test --label-exclude exclude_from_precheck
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_build {qch,html}_docs
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Some plugins (if used) may need optional extra dependencies/USE.
-
-This list provides associations with Gentoo's packages (if exists)
-ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
-
-dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
-else the example tab will be empty alongside missing documentation.
-
-Build Systems:
-- CMakeProjectManager (dev-build/cmake)
-- MesonProjectManager (dev-build/meson)
-- QbsProjectManager (dev-util/qbs)
-
-C++:
-- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
-- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
-- ClangFormat (USE=clang)
-
-Code Analyzer:
-- ClangTools (USE=clang)
-- Cppcheck (dev-util/cppcheck)
-- CtfVisualizer (USE=tracing)
-- PerfProfiler (USE=tracing)
-- Valgrind (dev-debug/valgrind)
-
-Core:
-- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
-
-Device Support:
-- Android (virtual/jdk, will also want the unpackaged Qt for Android)
-
-Other Languages:
-- Nim (dev-lang/nim)
-- Python (dev-lang/python)
-
-Qt Creator:
-- Designer (USE=designer)
-
-Qt Quick:
-- Insight (USE=qmldesigner)
-- QmlDesigner (USE=qmldesigner)
-- QmlProfiler (USE=tracing)
-
-Utilities:
-- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
-- Conan (dev-util/conan)
-- Docker (app-containers/docker)
-- Haskell (dev-lang/ghc)
-- ScreenRecorder (media-video/ffmpeg)
-- SerialTerminal (USE=serialterminal)
-- SilverSearcher (sys-apps/the_silver_searcher)
-- StudioWelcome (USE=qmldesigner)
-
-Version Control:
-- CVS (dev-vcs/cvs)
-- Fossil (dev-vcs/fossil)
-- Git (dev-vcs/git)
-- Mercurial (dev-vcs/mercurial)
-- Subversion (dev-vcs/subversion)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Arthur Zamarin]

commit:     53c1be4154c394755aba052baa7ec7a25f98d6b6
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 19:56:07 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 19:56:07 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53c1be41

dev-qt/qt-creator: Stabilize 12.0.2 amd64, #925703

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
index f295798776cf..9e674d8b1aa3 100644
--- a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
@@ -25,7 +25,7 @@ else
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
 	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
 	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     8b7a805c7915b9042a8a729966bc6a31a6e7491e
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 14:04:18 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 18:45:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7a805c

dev-qt/qt-creator: disable designer by default in live

This been set by default in the old ebuilds and opted to leave it like
that but, with Qt6 and the non-split qttools where designer is off by
default, this been annoying for users.

Default designer on qttools when most users don't need it does not
seem like the right move -- and believe users that actually want this
will know to set it themselves (perhaps even globally).

Not that I'm either a qt-creator nor designer user (just maintaining
regardless), so opinions from actual users for defaults are welcome.

(live-only to avoid long rebuilds, will propagate in next version)

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index f295798776cf..017a06e30b56 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -34,7 +34,7 @@ HOMEPAGE="https://www.qt.io/product/development-tools"
 LICENSE="GPL-3"
 SLOT="0"
 IUSE="
-	+clang +designer doc +help qmldesigner serialterminal
+	+clang designer doc +help qmldesigner serialterminal
 	+svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     1f7e9fe640ba9be8f54eaab23a7f464291cf6d0a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 04:50:23 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 06:14:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f7e9fe6

dev-qt/qt-creator: use := to match upcoming llvm-r1 changes

Currently ommited in the llvm-r1 example, but that's being changed
and >=llvm-18.1.0_rc3 will use $(ver_cut 1-2) as subslot.

No need for a revbump (slot 18 is still masked either way).

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
index 4587a1c7c566..f295798776cf 100644
--- a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtdeclarative-${QT_PV}=
 	clang? (
 		dev-cpp/yaml-cpp:=
-		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
 	)
 	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
 	help? (

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 4587a1c7c566..f295798776cf 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -49,7 +49,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtdeclarative-${QT_PV}=
 	clang? (
 		dev-cpp/yaml-cpp:=
-		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
+		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}=')
 	)
 	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
 	help? (

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     d519e0ecfb408e50e11f6f3c592a2e9d521c3395
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Feb  9 11:43:42 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 11:25:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d519e0ec

dev-qt/qt-creator: migrate live to llvm-r1, allow slot 18

Tested with 18.1.0_rc2 at same time, seems to be fine so may
as well do this now.

Will migrate 12.0.2 when add Qt6.6.2 given that will trigger
a rebuild either way.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index a2c7444d9223..4587a1c7c566 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -3,8 +3,10 @@
 
 EAPI=8
 
+LLVM_COMPAT=( {15..18} )
+LLVM_OPTIONAL=1
 PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+inherit cmake flag-o-matic llvm-r1 python-any-r1 readme.gentoo-r1 xdg
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
@@ -35,9 +37,9 @@ IUSE="
 	+clang +designer doc +help qmldesigner serialterminal
 	+svg test +tracing webengine
 "
+REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
-LLVM_MAX_SLOT=17
 QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
 
 # := is used where Qt's private APIs are used for safety
@@ -47,7 +49,7 @@ COMMON_DEPEND="
 	>=dev-qt/qtdeclarative-${QT_PV}=
 	clang? (
 		dev-cpp/yaml-cpp:=
-		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
+		$(llvm_gen_dep 'sys-devel/clang:${LLVM_SLOT}')
 	)
 	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
 	help? (
@@ -84,13 +86,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )
 
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
 pkg_setup() {
 	python-any-r1_pkg_setup
-	use clang && llvm_pkg_setup
+	use clang && llvm-r1_pkg_setup
 }
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     0c187dd394b737da645806780b2bd15e6ab238fd
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  8 02:35:52 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb  8 02:35:52 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c187dd3

dev-qt/qt-creator: add 12.0.2

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 254 +++++++++++++++++++++++++++++
 2 files changed, 255 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index a885584233a9..dd4e4099f113 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd SHA512 03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7
+DIST qt-creator-opensource-src-12.0.2.tar.xz 51028300 BLAKE2B a8a5d32ea472089182a515b1679a5de60c185112a9749784ceb8562bd0c8c97f66cf579b9862a27a24b20243f49002a6a068fcb2f9ed4dc9b57e4e2a0c233459 SHA512 cb28405aa632b390be0dbee6995f553d5663f69dafba14a338275e9ea7408bf97a132f6ff17a961fc82a9cabfb57f28a03680d994fe038696da10fe131d5d7d1

diff --git a/dev-qt/qt-creator/qt-creator-12.0.2.ebuild b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
new file mode 100644
index 000000000000..a2c7444d9223
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-12.0.2.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2023-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang +designer doc +help qmldesigner serialterminal
+	+svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		dev-cpp/yaml-cpp:=
+		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		-Djournald=no # not really useful unless match qtbase (needs systemd)
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build {qch,html}_docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-build/cmake)
+- MesonProjectManager (dev-build/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-debug/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Arthur Zamarin]

commit:     d63af00f11f22d5013365ea5f4df3d9f8776c54d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  9 18:06:53 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  9 18:06:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d63af00f

dev-qt/qt-creator: Stabilize 12.0.1 amd64, #921646

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-12.0.1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
index 74deb347c1bd..574bcb50928f 100644
--- a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -23,7 +23,7 @@ else
 	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
 	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
 	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 fi
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     b3e2e734569d7886ad61637f2b1397572e4883a0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  8 10:20:51 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan  8 12:57:48 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e2e734

dev-qt/qt-creator: drop 12.0.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 -
 dev-qt/qt-creator/qt-creator-12.0.0.ebuild | 254 -----------------------------
 2 files changed, 255 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index fe0a7019052a..a885584233a9 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-12.0.0.tar.xz 50995944 BLAKE2B 1fd4abbd9386b7d15f14c141cb82e7061e99c226a8fd68aff1807fe1dd7e92348ccaee193112fa546d6350813261e1a44e01002d3f590921091cbc13731c6382 SHA512 e2383dece32d0fb49d95a4f4190ca70e182533a8a2e4eb13c782a39b700feb1eef59508c6f5b0abaf72ad09498380ccf51ef80d71ec7294b4df2745b918316af
 DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd SHA512 03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7

diff --git a/dev-qt/qt-creator/qt-creator-12.0.0.ebuild b/dev-qt/qt-creator/qt-creator-12.0.0.ebuild
deleted file mode 100644
index 74deb347c1bd..000000000000
--- a/dev-qt/qt-creator/qt-creator-12.0.0.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"https://code.qt.io/qt-creator/qt-creator.git"
-		"https://github.com/qt-creator/qt-creator.git"
-	)
-	EGIT_SUBMODULES=(
-		perfparser
-		src/libs/qlitehtml
-		src/libs/qlitehtml/src/3rdparty/litehtml
-	)
-else
-	QTC_PV=${PV/_/-}
-	QTC_P=${PN}-opensource-src-${QTC_PV}
-	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
-	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
-	S=${WORKDIR}/${QTC_P}
-	KEYWORDS="~amd64"
-fi
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://www.qt.io/product/development-tools"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="
-	+clang +designer doc +help qmldesigner serialterminal
-	+svg test +tracing webengine
-"
-RESTRICT="!test? ( test )"
-
-LLVM_MAX_SLOT=17
-QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
-
-# := is used where Qt's private APIs are used for safety
-COMMON_DEPEND="
-	>=dev-qt/qt5compat-${QT_PV}
-	>=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
-	>=dev-qt/qtdeclarative-${QT_PV}=
-	clang? (
-		dev-cpp/yaml-cpp:=
-		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
-	)
-	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
-	help? (
-		>=dev-qt/qttools-${QT_PV}[assistant]
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
-	)
-	qmldesigner? (
-		>=dev-qt/qtquick3d-${QT_PV}=
-		>=dev-qt/qtsvg-${QT_PV}
-	)
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	svg? ( >=dev-qt/qtsvg-${QT_PV} )
-	tracing? (
-		app-arch/zstd:=
-		dev-libs/elfutils
-		>=dev-qt/qtshadertools-${QT_PV}
-	)
-"
-# qtimageformats for .webp in examples, semi-optfeature but useful in general
-RDEPEND="
-	${COMMON_DEPEND}
-	help? ( >=dev-qt/qtimageformats-${QT_PV} )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-qt/qttools-${QT_PV}[linguist]
-	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
-)
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# needed for finding docs at runtime in PF
-	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
-		-i cmake/QtCreatorAPIInternal.cmake || die
-}
-
-src_configure() {
-	# -Werror=lto-type-mismatch issues, needs looking into
-	filter-lto
-
-	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
-	# needs fixing in qtbase as *64 usage comes from its headers' macros
-	use elibc_musl && append-lfs-flags
-
-	local mycmakeargs=(
-		-DBUILD_WITH_PCH=no
-		-DWITH_DOCS=$(usex doc)
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-		-DWITH_TESTS=$(usex test)
-
-		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
-		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
-
-		# Much can be optional, but do not want to flood users (or maintainers)
-		# with too many flags. Not to mention that many plugins are merely
-		# wrappers around still optional tools (e.g. cvs) and any unwanted
-		# plugins can be disabled at runtime. So optional flags are limited
-		# to plugins with additional build-time dependencies.
-		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
-		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
-
-		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
-		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
-
-		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
-
-		-DBUILD_PLUGIN_HELP=$(usex help)
-		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
-		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
-		# TODO?: package litehtml, but support for latest releases seem
-		# to lag behind and bundled may work out better for now
-		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
-		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
-
-		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
-		-DENABLE_SVG_SUPPORT=$(usex svg)
-
-		-DWITH_QMLDESIGNER=$(usex qmldesigner)
-
-		-Djournald=no # not really useful unless match qtbase (needs systemd)
-
-		# not packaged, but allow using if found
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
-		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x QT_QPA_PLATFORM=offscreen
-
-	local CMAKE_SKIP_TESTS=(
-		# skipping same tests+label as upstream's CI by default
-		# `grep ctest .github/workflows/build_cmake.yml`
-		tst_perfdata
-	)
-
-	cmake_src_test --label-exclude exclude_from_precheck
-}
-
-src_compile() {
-	cmake_src_compile
-
-	use doc && cmake_build {qch,html}_docs
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		dodoc -r "${BUILD_DIR}"/doc/html
-		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	local DISABLE_AUTOFORMATTING=yes
-	local DOC_CONTENTS="\
-Some plugins (if used) may need optional extra dependencies/USE.
-
-This list provides associations with Gentoo's packages (if exists)
-ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
-
-dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
-else the example tab will be empty alongside missing documentation.
-
-Build Systems:
-- CMakeProjectManager (dev-util/cmake)
-- MesonProjectManager (dev-util/meson)
-- QbsProjectManager (dev-util/qbs)
-
-C++:
-- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
-- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
-- ClangFormat (USE=clang)
-
-Code Analyzer:
-- ClangTools (USE=clang)
-- Cppcheck (dev-util/cppcheck)
-- CtfVisualizer (USE=tracing)
-- PerfProfiler (USE=tracing)
-- Valgrind (dev-util/valgrind)
-
-Core:
-- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
-
-Device Support:
-- Android (virtual/jdk, will also want the unpackaged Qt for Android)
-
-Other Languages:
-- Nim (dev-lang/nim)
-- Python (dev-lang/python)
-
-Qt Creator:
-- Designer (USE=designer)
-
-Qt Quick:
-- Insight (USE=qmldesigner)
-- QmlDesigner (USE=qmldesigner)
-- QmlProfiler (USE=tracing)
-
-Utilities:
-- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
-- Conan (dev-util/conan)
-- Docker (app-containers/docker)
-- Haskell (dev-lang/ghc)
-- ScreenRecorder (media-video/ffmpeg)
-- SerialTerminal (USE=serialterminal)
-- SilverSearcher (sys-apps/the_silver_searcher)
-- StudioWelcome (USE=qmldesigner)
-
-Version Control:
-- CVS (dev-vcs/cvs)
-- Fossil (dev-vcs/fossil)
-- Git (dev-vcs/git)
-- Mercurial (dev-vcs/mercurial)
-- Subversion (dev-vcs/subversion)"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	readme.gentoo_print_elog
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     6c240f9a846f5fc8ef404576011cc653769435e2
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 12:21:38 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 13:16:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c240f9a

dev-qt/qt-creator: add 12.0.1

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-12.0.1.ebuild | 254 +++++++++++++++++++++++++++++
 2 files changed, 255 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index b48bd50d7f52..fe0a7019052a 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-12.0.0.tar.xz 50995944 BLAKE2B 1fd4abbd9386b7d15f14c141cb82e7061e99c226a8fd68aff1807fe1dd7e92348ccaee193112fa546d6350813261e1a44e01002d3f590921091cbc13731c6382 SHA512 e2383dece32d0fb49d95a4f4190ca70e182533a8a2e4eb13c782a39b700feb1eef59508c6f5b0abaf72ad09498380ccf51ef80d71ec7294b4df2745b918316af
+DIST qt-creator-opensource-src-12.0.1.tar.xz 51003336 BLAKE2B 2d4971cf81f1d1bee03c979ac4d47bd3c2814a692325d8531cedb659db5b0164cdff9d82bb4f95b932cf186fc346468e25d03ba60694f614923149c063a219cd SHA512 03a7afc1d820d07a3687a186f49bc212f4f1ab99dea5390bd3f962b4d373b1b130ed780ad5bebf1a478c77cf5e07e2af2eb701829a98c78e71b252d65a9112c7

diff --git a/dev-qt/qt-creator/qt-creator-12.0.1.ebuild b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
new file mode 100644
index 000000000000..74deb347c1bd
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-12.0.1.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang +designer doc +help qmldesigner serialterminal
+	+svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		dev-cpp/yaml-cpp:=
+		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		-Djournald=no # not really useful unless match qtbase (needs systemd)
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build {qch,html}_docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-util/cmake)
+- MesonProjectManager (dev-util/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-util/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     42f31b31a5084630a314e3f5c984f3ba12df1887
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 23 22:36:24 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Nov 24 00:05:23 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f31b31

dev-qt/qt-creator: add 12.0.0

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-12.0.0.ebuild | 254 +++++++++++++++++++++++++++++
 2 files changed, 255 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 6402206232fe..caa1ae484ad1 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-11.0.3.tar.xz 49863336 BLAKE2B 60ce53bdc0d3a2167a62cf479e9d3427b3a4f6e3ba5eb0489e0546d80fb30f9bcea1174b67cb36673a7aa2094d5f82a7d8ab34decf47fe0c260893f0a55c9795 SHA512 4d0faab02cb9b123f135b3a436e9f4132f459fd40400b9adab8af0a395b9d999f473f2bbab7cb5353f5a129bfc66e3e8dfe9143412cbd03c385a3d052ef221ca
+DIST qt-creator-opensource-src-12.0.0.tar.xz 50995944 BLAKE2B 1fd4abbd9386b7d15f14c141cb82e7061e99c226a8fd68aff1807fe1dd7e92348ccaee193112fa546d6350813261e1a44e01002d3f590921091cbc13731c6382 SHA512 e2383dece32d0fb49d95a4f4190ca70e182533a8a2e4eb13c782a39b700feb1eef59508c6f5b0abaf72ad09498380ccf51ef80d71ec7294b4df2745b918316af

diff --git a/dev-qt/qt-creator/qt-creator-12.0.0.ebuild b/dev-qt/qt-creator/qt-creator-12.0.0.ebuild
new file mode 100644
index 000000000000..74deb347c1bd
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-12.0.0.ebuild
@@ -0,0 +1,254 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang +designer doc +help qmldesigner serialterminal
+	+svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		dev-cpp/yaml-cpp:=
+		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+)
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		-Djournald=no # not really useful unless match qtbase (needs systemd)
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build {qch,html}_docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-util/cmake)
+- MesonProjectManager (dev-util/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-util/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- ScreenRecorder (media-video/ffmpeg)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     350616b86d8afbcc42729bb243d4daf814e9a7b3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 16 02:12:49 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Nov 17 05:13:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=350616b8

dev-qt/qt-creator: re-add cvs to live readme

Didn't mean to push that bit, it is now disabled by default
in qt-creator-12, but it is not *gone*.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index ab3ca9782f99..74deb347c1bd 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -120,7 +120,7 @@ src_configure() {
 
 		# Much can be optional, but do not want to flood users (or maintainers)
 		# with too many flags. Not to mention that many plugins are merely
-		# wrappers around still optional tools (e.g. git) and any unwanted
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
 		# plugins can be disabled at runtime. So optional flags are limited
 		# to plugins with additional build-time dependencies.
 		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
@@ -240,6 +240,7 @@ Utilities:
 - StudioWelcome (USE=qmldesigner)
 
 Version Control:
+- CVS (dev-vcs/cvs)
 - Fossil (dev-vcs/fossil)
 - Git (dev-vcs/git)
 - Mercurial (dev-vcs/mercurial)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     b10d8c99a50a6f8700138472c3b822e732eae10c
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 22 05:51:12 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 05:51:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10d8c99

dev-qt/qt-creator: set llvm_check_deps

Forgot, albeit typically not an issue unless someone has an extra
llvm slot without clang.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-11.0.3.ebuild | 4 ++++
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
index 881578f8093b..089d5576fdc9 100644
--- a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
+++ b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
@@ -84,6 +84,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
 )
 
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 	use clang && llvm_pkg_setup

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 4c93ab7cdebc..2680f1244fe9 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -84,6 +84,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
 )
 
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 	use clang && llvm_pkg_setup

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     a4f30e30695a9ad1f17707070a67fcf4b34770a0
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 10:10:54 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 12:31:29 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4f30e30

dev-qt/qt-creator: add 11.0.3

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-11.0.3.ebuild | 258 +++++++++++++++++++++++++++++
 2 files changed, 259 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 895a5d5946de..3d5794daf457 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-11.0.2.tar.xz 49828532 BLAKE2B 6028b71e1a7bf5ab953caa6223a2694e625449ab9e0eaa6e0dd8b34c0d64a9a5cea7b06d4aa98015d91defad04bc945db8528f87f5bddc70ba185ca32bb7ee8b SHA512 db123274e0652982f33db60b8f81610f0787357cdc7318ea2bbe105343ff905462c38e29a68f864c48bda51fee6f17859074c172f77dd2379ecc2e7028f5fcd5
+DIST qt-creator-opensource-src-11.0.3.tar.xz 49863336 BLAKE2B 60ce53bdc0d3a2167a62cf479e9d3427b3a4f6e3ba5eb0489e0546d80fb30f9bcea1174b67cb36673a7aa2094d5f82a7d8ab34decf47fe0c260893f0a55c9795 SHA512 4d0faab02cb9b123f135b3a436e9f4132f459fd40400b9adab8af0a395b9d999f473f2bbab7cb5353f5a129bfc66e3e8dfe9143412cbd03c385a3d052ef221ca

diff --git a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
new file mode 100644
index 000000000000..881578f8093b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
@@ -0,0 +1,258 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang +designer doc +help qmldesigner serialterminal
+	+svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		dev-cpp/yaml-cpp:=
+		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine '
+			-DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes
+			-DEXTERNAL_XXD=no
+		')
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		-Djournald=no # not really useful unless match qtbase (needs systemd)
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# unknown why these fails, but seems fixed in live
+		tst_tracing_timelineitemsrenderpass
+		tst_tracing_timelinenotesrenderpass
+		tst_tracing_timelineselectionrenderpass
+		# fails when built with clang, but also seems fixed in live
+		tst_process
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build {qch,html}_docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-util/cmake)
+- MesonProjectManager (dev-util/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-util/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (virtual/jdk, will also want the unpackaged Qt for Android)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     85588cf697488a218b3ce24a78da7c8747f5f4e7
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 07:27:48 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 08:06:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85588cf6

dev-qt/qt-creator: remove qt653 patch from live

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e3eb16aa2c02..eb2dcec27979 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -82,7 +82,6 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
 	"${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
-	"${FILESDIR}"/${PN}-11.0.2-qt653.patch
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     c1bc5cc478c51f75ed9a5fb82a5bd70724bebdc3
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 20 08:20:53 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 20 08:30:27 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1bc5cc4

dev-qt/qt-creator: drop 8.0.2

With llvm-17.0.1 being released, keeping a -14 ebuild around
is a stretch and would be surprised if someone still relied
on this old ebuild. So let's just drop it now.

This loses keywords for arm and x86. As noted in bug #905166,
currently no intention to restore these unless someone actually
wants and requests it.

Closes: https://bugs.gentoo.org/905166
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                |   1 -
 dev-qt/qt-creator/metadata.xml            |  37 ---
 dev-qt/qt-creator/qt-creator-8.0.2.ebuild | 446 ------------------------------
 3 files changed, 484 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 748984c50c0c..895a5d5946de 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
 DIST qt-creator-opensource-src-11.0.2.tar.xz 49828532 BLAKE2B 6028b71e1a7bf5ab953caa6223a2694e625449ab9e0eaa6e0dd8b34c0d64a9a5cea7b06d4aa98015d91defad04bc945db8528f87f5bddc70ba185ca32bb7ee8b SHA512 db123274e0652982f33db60b8f81610f0787357cdc7318ea2bbe105343ff905462c38e29a68f864c48bda51fee6f17859074c172f77dd2379ecc2e7028f5fcd5
-DIST qt-creator-opensource-src-8.0.2.tar.xz 48874868 BLAKE2B 53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072 SHA512 59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 8a364df28048..fcd44daa8386 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -10,49 +10,12 @@
 		<name>Gentoo Qt Project</name>
 	</maintainer>
 	<use>
-		<flag name="android">Build plugin for Android devices</flag>
-		<flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, GoogleTest, Boost.Test, Catch2)</flag>
-		<flag name="autotools">Build plugin for autotools-based projects</flag>
-		<flag name="baremetal">Build plugin for bare metal devices</flag>
-		<flag name="bazaar">Add support for GNU Bazaar version control system (requires manual installation of Bazaar client)</flag>
-		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
-		<flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
 		<flag name="clang">Build clang-based plugins for C/C++ development (code model, formatting, static analysis)</flag>
-		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
-		<flag name="cmake">Build plugin for CMake-based projects</flag>
-		<flag name="coco">Build plugin to support Coco code coverage tool</flag>
-		<flag name="conan">Build plugin to integrate with the Conan package manager</flag>
-		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
-		<flag name="ctfvisualizer">Build the Chrome Trace Format visualizer plugin</flag>
 		<flag name="designer">Enable designer for QtWidgets-based UIs</flag>
-		<flag name="docker">Build plugin for Docker support</flag>
-		<flag name="glsl">Build the GLSL editor plugin</flag>
 		<flag name="help">Enable the integrated <pkg>dev-qt/qt-docs</pkg> viewer (also needed for examples)</flag>
-		<flag name="imageviewer">Build plugin to open and view image files</flag>
-		<flag name="incredibuild">Enable integration with Incredibuild</flag>
-		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
-		<flag name="mcu">Build plugin for MCU devices</flag>
-		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
-		<flag name="meson">Build plugin for Meson-based projects</flag>
-		<flag name="modeling">Build the graphical model editor plugin</flag>
-		<flag name="nim">Build plugin for Nim language support</flag>
-		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
-		<flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag>
-		<flag name="python">Build plugin for Python language support</flag>
-		<flag name="qbs">Build plugin for Qbs-based projects</flag>
-		<flag name="qmake">Build plugin for qmake-based projects</flag>
-		<flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</flag>
-		<flag name="qmlprofiler">Build the QML profiler plugin</flag>
-		<flag name="qnx">Build plugin for QNX devices</flag>
-		<flag name="remotelinux">Build plugin for deployment and execution on a remote Linux host</flag>
-		<flag name="scxml">Build the graphical SCXML editor plugin</flag>
 		<flag name="serialterminal">Build the serial terminal plugin</flag>
-		<flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></flag>
-		<flag name="systemd">Add support for retrieving application output from journald</flag>
 		<flag name="qmldesigner">Build QmlDesigner and related plugins (Insight, StudioWelcome)</flag>
 		<flag name="tracing">Build plugins requiring tracing capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)</flag>
-		<flag name="valgrind">Enable integration with <pkg>dev-util/valgrind</pkg></flag>
-		<flag name="webassembly">Build WebAssembly plugin</flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> with the help USE rather than bundled litehtml</flag>
 	</use>
 	<upstream>

diff --git a/dev-qt/qt-creator/qt-creator-8.0.2.ebuild b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
deleted file mode 100644
index 5c3775b33104..000000000000
--- a/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
+++ /dev/null
@@ -1,446 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LLVM_MAX_SLOT=14
-PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
-
-inherit cmake llvm optfeature virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
-	EGIT_SUBMODULES=(
-		perfparser
-		qtscript # Need the dev branch
-		src/libs/qlitehtml
-		src/libs/qlitehtml/src/3rdparty/litehtml
-	)
-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"
-	S="${WORKDIR}"/${MY_P}
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-QTCREATOR_PLUGINS=(
-	# Misc
-	+autotest beautifier coco conan cppcheck ctfvisualizer +designer docker
-	+help imageviewer modeling perfprofiler qmlprofiler scxml serialterminal
-	silversearcher valgrind
-
-	# Buildsystems
-	autotools +cmake incredibuild meson qbs +qmake
-
-	# Languages
-	glsl +lsp nim python
-
-	# Platforms
-	android baremetal boot2qt mcu qnx remotelinux webassembly
-
-	# VCS
-	bazaar clearcase cvs +git mercurial perforce subversion
-)
-
-IUSE="+clang debug doc +qml systemd test wayland webengine
-	${QTCREATOR_PLUGINS[@]}"
-
-REQUIRED_USE="
-	android? ( lsp )
-	boot2qt? ( remotelinux )
-	clang? ( lsp )
-	coco? ( lsp )
-	mcu? ( baremetal cmake )
-	python? ( lsp )
-	qml? ( qmake )
-	qnx? ( remotelinux )
-	test? ( qbs qmake )
-"
-
-# minimum Qt version required
-QT_PV="5.15.2:5"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QT_PV}
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	help? ( !webengine? ( virtual/pkgconfig ) )
-"
-CDEPEND="
-	clang? (
-		>=dev-cpp/yaml-cpp-0.6.2:=
-		sys-devel/clang:14=
-	)
-	>=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/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	>=kde-frameworks/syntax-highlighting-5.87:5
-
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-		!webengine? ( dev-libs/gumbo )
-	)
-	imageviewer? ( >=dev-qt/qtsvg-${QT_PV} )
-	perfprofiler? (
-		app-arch/zstd
-		dev-libs/elfutils
-	)
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	systemd? ( sys-apps/systemd:= )
-	test? ( mcu? ( dev-cpp/gtest:= ) )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-cpp/benchmark
-		dev-cpp/eigen
-		dev-cpp/gtest
-		dev-libs/boost
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-	wayland? ( >=dev-qt/qtgui-${QT_PV}[wayland] )
-"
-
-# 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
-
-# FUNCTION: cmake_use_remove_addsubdirectory
-# USAGE: <flag> <subdir> <files...>
-# DESCRIPTION:
-# <flag> is the name of a flag in IUSE.
-# <subdir> is the  name of a directory called with add_subdirectory().
-# <files...> is a list of one or more qmake project files.
-#
-# This function patches <files> to remove add_subdirectory(<subdir>) from cmake
-# when <flag> is disabled, otherwise it does nothing. This can be useful to
-# avoid an automagic dependency when a subdirectory is added in cmake but the
-# corresponding feature USE flag is disabled. Similar to qt_use_disable_config()
-# from /qt5-build.eclass
-cmake_use_remove_addsubdirectory() {
-	[[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments"
-	local flag=$1
-	local subdir=$2
-	shift 2
-
-	if ! use "${flag}"; then
-		echo "$@" | xargs sed -i -e "/add_subdirectory(${subdir})/d" || die
-	fi
-}
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	if use clang; then
-		llvm_pkg_setup
-		export CLANG_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Remove automagic dep for qt5/qt6
-	sed -e "/^find_package(Qt6/,/else()/ s|if (NOT Qt6_FOUND)|if (1)|" \
-		-i cmake/FindQt5.cmake || die
-
-	# PLUGIN_RECOMMENDS is treated like a hard-dependency
-	sed -i -e '/PLUGIN_RECOMMENDS /d' \
-		src/plugins/*/CMakeLists.txt || die
-
-	cmake_use_remove_addsubdirectory glsl glsl src/libs/CMakeLists.txt
-	cmake_use_remove_addsubdirectory lsp languageserverprotocol \
-		src/libs/CMakeLists.txt tests/auto/CMakeLists.txt
-	cmake_use_remove_addsubdirectory modeling modelinglib \
-		src/libs/CMakeLists.txt
-	cmake_use_remove_addsubdirectory qml advanceddockingsystem \
-		src/libs/CMakeLists.txt
-	cmake_use_remove_addsubdirectory clang clangtools \
-		src/plugins/CMakeLists.txt
-	cmake_use_remove_addsubdirectory test test \
-		src/plugins/mcusupport/CMakeLists.txt
-
-	# fix translations
-	local languages=()
-	for lang in ${PLOCALES}; do
-		use l10n_${lang} && languages+=( "${lang/-/_}" )
-	done
-	sed -i -e "s|^set(languages.*|set(languages ${languages[*]})|" \
-		share/qtcreator/translations/CMakeLists.txt || die
-
-	# remove bundled yaml-cpp
-	rm -r src/libs/3rdparty/yaml-cpp || die
-
-	# remove bundled qbs
-	rm -r src/shared/qbs || die
-
-	# qt-creator hardcodes the CLANG_INCLUDE_DIR to the default.
-	# However, in sys-devel/clang, the directory changes with respect to
-	# -DCLANG_RESOURCE_DIR.  We sed in the correct include dir.
-	if use clang; then
-		local res_dir="$(${CLANG_PREFIX}/bin/clang -print-resource-dir || die)"
-		sed -i -e "/\w*CLANG_INCLUDE_DIR=/s|=.*|=\"${res_dir}/include\"|" \
-			src/plugins/clangtools/CMakeLists.txt || die
-	fi
-
-	if use doc; then
-		# Fix doc install path
-		sed -i -e "/set(_IDE_DOC_PATH/s|qtcreator|${PF}|" \
-			cmake/QtCreatorAPIInternal.cmake || die
-	fi
-
-	if use help && ! use webengine; then
-		# unbundled gumbo doesn't use cmake
-		local gumbo_dep='find_package(PkgConfig REQUIRED)\n'
-		gumbo_dep+='pkg_check_modules(gumbo REQUIRED IMPORTED_TARGET gumbo)\n'
-		sed -i -e '/^\s*gumbo/s|gumbo|PkgConfig::gumbo|' \
-			-e "/^find_package(litehtml/s|^|${gumbo_dep}|" \
-			src/libs/qlitehtml/src/CMakeLists.txt || die
-	fi
-
-	if use test; then
-		# Find "GoogleBenchmark" as "benchmark" and change bundled "Googletest"
-		# to external "GTest"
-		find "${S}" -type f -name CMakeLists.txt -exec \
-			xargs sed -i -e 's|TARGET GoogleBenchmark|benchmark_FOUND|g' \
-				-e 's|GoogleBenchmark\( MODULE\)\?|benchmark|g' \
-				-e 's|Googletest\( MODULE\)\?|GTest|g' {} \; || die
-		# For mcu, also link to gmock to prevent an unknown symbol
-		# error at runtime.
-		sed -i -e  's|if(TARGET GTest)|if(GTest_FOUND)|' \
-			-e 's|DEPENDS GTest|DEPENDS gtest gmock|' \
-			src/plugins/mcusupport/test/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DWITH_TESTS=$(usex test)
-		-DWITH_DEBUG_CMAKE=$(usex debug)
-
-		# Don't use SANITIZE_FLAGS to pass extra CXXFLAGS
-		-DWITH_SANITIZE=NO
-
-		# Don't build bundled ksyntaxhighlighting
-		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=NO
-
-		-DWITH_DOCS=$(usex doc)
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-
-		# Install failure.  Disable for now
-		-DWITH_ONLINE_DOCS=NO
-
-		# Force enable plugins that pride basic, neccessary IDE functionality
-		# and small, simple plugins
-		-DBUILD_PLUGIN_BINEDITOR=YES
-		-DBUILD_PLUGIN_BOOKMARKS=YES
-		-DBUILD_PLUGIN_CLASSVIEW=YES
-		-DBUILD_PLUGIN_CODEPASTER=YES
-		-DBUILD_PLUGIN_COMPILATIONDATABASEPROJECTMANAGER=YES
-		-DBUILD_PLUGIN_CORE=YES
-		-DBUILD_PLUGIN_CPPEDITOR=YES
-		-DBUILD_PLUGIN_DEBUGGER=YES
-		-DBUILD_PLUGIN_DIFFEDITOR=YES
-		-DBUILD_PLUGIN_EMACSKEYS=YES
-		-DBUILD_PLUGIN_FAKEVIM=YES
-		-DBUILD_PLUGIN_GENERICPROJECTMANAGER=YES
-		-DBUILD_PLUGIN_MACROS=YES
-		-DBUILD_PLUGIN_MARKETPLACE=YES
-		-DBUILD_PLUGIN_PROJECTEXPLORER=YES
-		-DBUILD_PLUGIN_QMLJSTOOLS=YES
-		-DBUILD_PLUGIN_QTSUPPORT=YES
-		-DBUILD_PLUGIN_RESOURCEEDITOR=YES
-		-DBUILD_PLUGIN_TASKLIST=YES
-		-DBUILD_PLUGIN_TEXTEDITOR=YES
-		-DBUILD_PLUGIN_TODO=YES
-		-DBUILD_PLUGIN_VCSBASE=YES
-		-DBUILD_PLUGIN_WELCOME=YES
-
-		# Misc
-		-DBUILD_PLUGIN_AUTOTEST=$(usex autotest)
-		-DBUILD_PLUGIN_BEAUTIFIER=$(usex beautifier)
-		-DBUILD_PLUGIN_COCO=$(usex coco)
-		-DBUILD_PLUGIN_CONAN=$(usex conan)
-		-DBUILD_PLUGIN_CPPCHECK=$(usex cppcheck)
-		-DBUILD_PLUGIN_CTFVISUALIZER=$(usex ctfvisualizer)
-		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
-		-DBUILD_PLUGIN_DOCKER=$(usex docker)
-		-DBUILD_PLUGIN_HELP=$(usex help)
-		-DBUILD_PLUGIN_IMAGEVIEWER=$(usex imageviewer)
-		-DBUILD_PLUGIN_MODELEDITOR=$(usex modeling)
-		-DBUILD_PLUGIN_PERFPROFILER=$(usex perfprofiler)
-		-DBUILD_PLUGIN_QMLPROFILER=$(usex qmlprofiler)
-		-DBUILD_PLUGIN_SCXMLEDITOR=$(usex scxml)
-		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-		-DBUILD_PLUGIN_SILVERSEARCHER=$(usex silversearcher)
-		-DBUILD_PLUGIN_VALGRIND=$(usex valgrind)
-
-		# Buildsystems
-		-DBUILD_PLUGIN_AUTOTOOLSPROJECTMANAGER=$(usex autotools)
-		-DBUILD_PLUGIN_CMAKEPROJECTMANAGER=$(usex cmake)
-		-DBUILD_PLUGIN_MESONPROJECTMANAGER=$(usex meson)
-		-DBUILD_PLUGIN_QBSPROJECTMANAGER=$(usex qbs)
-		-DBUILD_PLUGIN_QMAKEPROJECTMANAGER=$(usex qmake)
-
-		# Languages
-		-DBUILD_PLUGIN_GLSLEDITOR=$(usex glsl)
-		-DBUILD_PLUGIN_LANGUAGECLIENT=$(usex lsp)
-		-DBUILD_PLUGIN_NIM=$(usex nim)
-		-DBUILD_PLUGIN_PYTHON=$(usex python)
-
-		# Platforms
-		-DBUILD_PLUGIN_ANDROID=$(usex android)
-		-DBUILD_PLUGIN_BAREMETAL=$(usex baremetal)
-		-DBUILD_PLUGIN_BOOT2QT=$(usex boot2qt)
-		-DBUILD_PLUGIN_MCUSUPPORT=$(usex mcu)
-		-DBUILD_PLUGIN_QNX=$(usex qnx)
-		-DBUILD_PLUGIN_REMOTELINUX=$(usex remotelinux)
-		-DBUILD_PLUGIN_WEBASSEMBLY=$(usex webassembly)
-
-		# VCS
-		-DBUILD_PLUGIN_BAZAAR=$(usex bazaar)
-		-DBUILD_PLUGIN_CLEARCASE=$(usex clearcase)
-		-DBUILD_PLUGIN_CVS=$(usex cvs)
-		-DBUILD_PLUGIN_GIT=$(usex git)
-		-DBUILD_PLUGIN_GITLAB=$(usex git)
-		-DBUILD_PLUGIN_MERCURIAL=$(usex mercurial)
-		-DBUILD_PLUGIN_PERFORCE=$(usex perforce)
-		-DBUILD_PLUGIN_SUBVERSION=$(usex subversion)
-
-		# Executables
-		-DBUILD_EXECUTABLE_BUILDOUTPUTPARSER=$(usex qmake)
-		-DBUILD_EXECUTABLE_PERFPARSER=$(usex perfprofiler)
-		-DBUILD_EXECUTABLE_QML2PUPPET=$(usex qml)
-
-		# Clang stuff
-		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-
-		# QML stuff
-		# -DBUILD_PLUGIN_QMLDESIGNER=$(usex qml) #Qt6 only
-		-DBUILD_PLUGIN_QMLJSEDITOR=$(usex qml)
-		-DBUILD_PLUGIN_QMLPREVIEW=$(usex qml)
-		-DBUILD_PLUGIN_QMLPROJECTMANAGER=$(usex qml)
-		# -DBUILD_PLUGIN_STUDIOWELCOME=$(usex qml) #Qt6 only
-
-		# Don't spam "created by a different GCC executable [-Winvalid-pch]"
-		-DBUILD_WITH_PCH=NO
-		# An entire mode devoted to a giant "Hello World!" button that does nothing.
-		-DBUILD_PLUGIN_HELLOWORLD=NO
-		# Not usable in linux environment
-		-DBUILD_PLUGIN_IOS=NO
-		# Use portage to update
-		-DBUILD_PLUGIN_UPDATEINFO=NO
-	)
-
-	if use clang; then
-		mycmakeargs+=(
-			-DClang_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/clang"
-			-DLLVM_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/llvm"
-			-DCLANGTOOLING_LINK_CLANG_DYLIB=YES
-			-DBUILD_PLUGIN_CLANGTOOLS=YES
-		)
-	fi
-	if use help; then
-		mycmakeargs+=(
-			-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
-			-DBUILD_LIBRARY_QLITEHTML=$(usex webengine NO YES)
-			-DHELPVIEWER_DEFAULT_BACKEND=$(usex webengine qtwebengine litehtml)
-		)
-		if ! use webengine; then
-			mycmakeargs+=(
-				-DEXTERNAL_GUMBO=YES
-				-DEXTERNAL_XXD=NO
-				-DLITEHTML_UTF8=YES
-			)
-		fi
-	fi
-	if use test; then
-		mycmakeargs+=(
-			# Don't test pretty printing in gdb/lldb. Tests like
-			# tst_debugger_dumpers fail and it's "not officially supported"
-			# See share/qtcreator/debugger/README.txt
-			-DWITH_DEBUGGER_DUMPERS=NO
-
-			# Disable broken tests
-			-DBUILD_TEST_TST_PERFDATA=NO
-			-DBUILD_TEST_TST_QML_CHECK=NO
-			-DBUILD_TEST_TST_QML_TESTCORE=NO
-		)
-	fi
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		cmake_src_install doc/{qch,html}_docs
-		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-		docinto html
-		dodoc -r "${BUILD_DIR}"/doc/html/.
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature_header \
-		"Some enabled plugins require optional dependencies for functionality:"
-	use android && optfeature "android device support" \
-		dev-util/android-sdk-update-manager
-	if use autotest; then
-		optfeature "catch testing framework support" dev-cpp/catch
-		optfeature "gtest testing framework support" dev-cpp/gtest
-		optfeature "boost testing framework support" dev-libs/boost
-		optfeature "qt testing framework support" dev-qt/qttest
-	fi
-	if use beautifier; then
-		optfeature "astyle auto-formatting support" dev-util/astyle
-		optfeature "uncrustify auto-formatting support" dev-util/uncrustify
-	fi
-	use clang && optfeature "clazy QT static code analysis" dev-util/clazy
-	use conan && optfeature "conan package manager integration" dev-util/conan
-	use cvs && optfeature "cvs vcs integration" dev-vcs/cvs
-	use docker && optfeature "using a docker image as a device" \
-		app-containers/docker
-	use git && optfeature "git vcs integration" dev-vcs/git
-	use mercurial && optfeature "mercurial vcs integration" dev-vcs/mercurial
-	use meson && optfeature "meson buildsystem support" dev-util/meson
-	use nim && optfeature "nim language support" dev-lang/nim
-	use qbs && optfeature "QBS buildsystem support" dev-util/qbs
-	use silversearcher && optfeature "code searching with silversearcher" \
-		sys-apps/the_silver_searcher
-	use subversion && optfeature "subversion vcs integration" dev-vcs/subversion
-	use valgrind && optfeature "valgrind code analysis" dev-util/valgrind
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ionen Wolkens]

commit:     b28e6ecad062935854698a0911312a12de559732
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 11 19:44:43 2023 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 11 21:20:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28e6eca

dev-qt/qt-creator: add live ebuild

Mostly the same as 11.0.2 bare no longer any unexpected test
failures, minor adjustments due to newer litehtml, and allowing
clang-17.

May still be more that need changes but will give it a closer
look on release unless something comes up first.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 250 +++++++++++++++++++++++++++++++
 1 file changed, 250 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
new file mode 100644
index 000000000000..e3eb16aa2c02
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -0,0 +1,250 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+inherit cmake flag-o-matic llvm python-any-r1 readme.gentoo-r1 xdg
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"https://code.qt.io/qt-creator/qt-creator.git"
+		"https://github.com/qt-creator/qt-creator.git"
+	)
+	EGIT_SUBMODULES=(
+		perfparser
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+else
+	QTC_PV=${PV/_/-}
+	QTC_P=${PN}-opensource-src-${QTC_PV}
+	[[ ${QTC_PV} == ${PV} ]] && QTC_REL=official || QTC_REL=development
+	SRC_URI="https://download.qt.io/${QTC_REL}_releases/qtcreator/$(ver_cut 1-2)/${PV/_/-}/${QTC_P}.tar.xz"
+	S=${WORKDIR}/${QTC_P}
+	KEYWORDS="~amd64"
+fi
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://www.qt.io/product/development-tools"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="
+	+clang +designer doc +help qmldesigner serialterminal
+	+svg test +tracing webengine
+"
+RESTRICT="!test? ( test )"
+
+LLVM_MAX_SLOT=17
+QT_PV=6.2.0:6 # IDE_QT_VERSION_MIN
+
+# := is used where Qt's private APIs are used for safety
+COMMON_DEPEND="
+	>=dev-qt/qt5compat-${QT_PV}
+	>=dev-qt/qtbase-${QT_PV}=[concurrent,gui,network,widgets,xml]
+	>=dev-qt/qtdeclarative-${QT_PV}=
+	clang? (
+		dev-cpp/yaml-cpp:=
+		<sys-devel/clang-$((LLVM_MAX_SLOT+1)):=
+	)
+	designer? ( >=dev-qt/qttools-${QT_PV}[designer] )
+	help? (
+		>=dev-qt/qttools-${QT_PV}[assistant]
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
+	)
+	qmldesigner? (
+		>=dev-qt/qtquick3d-${QT_PV}=
+		>=dev-qt/qtsvg-${QT_PV}
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	svg? ( >=dev-qt/qtsvg-${QT_PV} )
+	tracing? (
+		app-arch/zstd:=
+		dev-libs/elfutils
+		>=dev-qt/qtshadertools-${QT_PV}
+	)
+"
+# qtimageformats for .webp in examples, semi-optfeature but useful in general
+RDEPEND="
+	${COMMON_DEPEND}
+	help? ( >=dev-qt/qtimageformats-${QT_PV} )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+"
+DEPEND="${COMMON_DEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	>=dev-qt/qttools-${QT_PV}[linguist]
+	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc] )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
+	"${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
+	"${FILESDIR}"/${PN}-11.0.2-qt653.patch
+)
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# needed for finding docs at runtime in PF
+	sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
+		-i cmake/QtCreatorAPIInternal.cmake || die
+}
+
+src_configure() {
+	# -Werror=lto-type-mismatch issues, needs looking into
+	filter-lto
+
+	# temporary workaround for musl-1.2.4 (bug #903611), this ideally
+	# needs fixing in qtbase as *64 usage comes from its headers' macros
+	use elibc_musl && append-lfs-flags
+
+	local mycmakeargs=(
+		-DBUILD_WITH_PCH=no
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+		-DWITH_TESTS=$(usex test)
+
+		# TODO?: try to unbundle with =no when syntax-highlighting:6 exists
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=yes
+
+		# Much can be optional, but do not want to flood users (or maintainers)
+		# with too many flags. Not to mention that many plugins are merely
+		# wrappers around still optional tools (e.g. cvs) and any unwanted
+		# plugins can be disabled at runtime. So optional flags are limited
+		# to plugins with additional build-time dependencies.
+		-DBUILD_LIBRARY_TRACING=$(usex tracing) # qml+perfprofiler,ctfvisual
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex tracing)
+
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+		-DCLANGTOOLING_LINK_CLANG_DYLIB=yes
+
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+		-DBUILD_LIBRARY_QLITEHTML=$(usex help $(usex !webengine))
+		# TODO?: package litehtml, but support for latest releases seem
+		# to lag behind and bundled may work out better for now
+		# https://bugreports.qt.io/browse/QTCREATORBUG-29169
+		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
+
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+
+		-DENABLE_SVG_SUPPORT=$(usex svg)
+
+		-DWITH_QMLDESIGNER=$(usex qmldesigner)
+
+		-Djournald=no # not really useful unless match qtbase (needs systemd)
+
+		# not packaged, but allow using if found
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibDDemangle=yes
+		#-DCMAKE_DISABLE_FIND_PACKAGE_LibRustcDemangle=yes
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	local -x QT_QPA_PLATFORM=offscreen
+
+	local CMAKE_SKIP_TESTS=(
+		# skipping same tests+label as upstream's CI by default
+		# `grep ctest .github/workflows/build_cmake.yml`
+		tst_perfdata
+	)
+
+	cmake_src_test --label-exclude exclude_from_precheck
+}
+
+src_compile() {
+	cmake_src_compile
+
+	use doc && cmake_build {qch,html}_docs
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/doc/html
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+	fi
+
+	local DISABLE_AUTOFORMATTING=yes
+	local DOC_CONTENTS="\
+Some plugins (if used) may need optional extra dependencies/USE.
+
+This list provides associations with Gentoo's packages (if exists)
+ordered as in Qt Creator's Help -> About Plugins (not exhaustive).
+
+dev-qt/qt-docs:6 with USE=\"examples qch\" is notably recommended, or
+else the example tab will be empty alongside missing documentation.
+
+Build Systems:
+- CMakeProjectManager (dev-util/cmake)
+- MesonProjectManager (dev-util/meson)
+- QbsProjectManager (dev-util/qbs)
+
+C++:
+- Beautifier (dev-util/astyle and/or dev-util/uncrustify)
+- ClangCodeModel (USE=clang, dev-util/clazy to understand Qt semantics)
+- ClangFormat (USE=clang)
+
+Code Analyzer:
+- ClangTools (USE=clang)
+- Cppcheck (dev-util/cppcheck)
+- CtfVisualizer (USE=tracing)
+- PerfProfiler (USE=tracing)
+- Valgrind (dev-util/valgrind)
+
+Core:
+- Help (USE=help + dev-qt/qt-docs:6 with USE=\"examples qch\")
+
+Device Support:
+- Android (dev-util/android-sdk-update-manager)
+
+Other Languages:
+- Nim (dev-lang/nim)
+- Python (dev-lang/python)
+
+Qt Creator:
+- Designer (USE=designer)
+
+Qt Quick:
+- Insight (USE=qmldesigner)
+- QmlDesigner (USE=qmldesigner)
+- QmlProfiler (USE=tracing)
+
+Utilities:
+- Autotest (dev-cpp/catch, dev-cpp/gtest, or dev-libs/boost if used)
+- Conan (dev-util/conan)
+- Docker (app-containers/docker)
+- Haskell (dev-lang/ghc)
+- SerialTerminal (USE=serialterminal)
+- SilverSearcher (sys-apps/the_silver_searcher)
+- StudioWelcome (USE=qmldesigner)
+
+Version Control:
+- CVS (dev-vcs/cvs)
+- Fossil (dev-vcs/fossil)
+- Git (dev-vcs/git)
+- Mercurial (dev-vcs/mercurial)
+- Subversion (dev-vcs/subversion)"
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	readme.gentoo_print_elog
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Sam James]

commit:     51244efdbd5106e2ed9a16c55cb0d5ad1cb093e2
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Nov  5 20:03:50 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Nov  7 06:57:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51244efd

dev-qt/qt-creator: call xdg_pkg_postinst

xdg_pkg_postinst needs to be explicitly called since we define
our own pkg_postinst.

Closes: https://bugs.gentoo.org/879887
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28149
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-8.0.2.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-8.0.2.ebuild b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
index 138e0e37a74e..5c3775b33104 100644
--- a/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
@@ -413,6 +413,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	xdg_pkg_postinst
+
 	optfeature_header \
 		"Some enabled plugins require optional dependencies for functionality:"
 	use android && optfeature "android device support" \

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Sam James]

commit:     b46bf0e8d4bac2fa871c1a1ee351599760e06c6d
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon Oct 31 00:56:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 06:32:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46bf0e8

dev-qt/qt-creator: add 8.0.2

Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                |   1 +
 dev-qt/qt-creator/qt-creator-8.0.2.ebuild | 444 ++++++++++++++++++++++++++++++
 2 files changed, 445 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 45540d8edfe6..3512b8464ddb 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-8.0.1.tar.xz 46918596 BLAKE2B 07ab50ae9ee77372c2d79a472da8cb3c65b269b8def670f66426daf9875ca44f2a66bb2ab0c01d8591420d6c43b7ca57f6ac2a6b8443cc8a5af7c89599e3966d SHA512 ffef39e8d0694b38549f301a143dec6e2fe026a1e6098acc41bd8f9c80c93d1dbb60616042901093bdaa13380034b9dd8234d82300b1fa89ab9bce81bd3f1672
+DIST qt-creator-opensource-src-8.0.2.tar.xz 48874868 BLAKE2B 53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072 SHA512 59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23

diff --git a/dev-qt/qt-creator/qt-creator-8.0.2.ebuild b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
new file mode 100644
index 000000000000..138e0e37a74e
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-8.0.2.ebuild
@@ -0,0 +1,444 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LLVM_MAX_SLOT=14
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
+
+inherit cmake llvm optfeature virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+	EGIT_SUBMODULES=(
+		perfparser
+		qtscript # Need the dev branch
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+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"
+	S="${WORKDIR}"/${MY_P}
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+QTCREATOR_PLUGINS=(
+	# Misc
+	+autotest beautifier coco conan cppcheck ctfvisualizer +designer docker
+	+help imageviewer modeling perfprofiler qmlprofiler scxml serialterminal
+	silversearcher valgrind
+
+	# Buildsystems
+	autotools +cmake incredibuild meson qbs +qmake
+
+	# Languages
+	glsl +lsp nim python
+
+	# Platforms
+	android baremetal boot2qt mcu qnx remotelinux webassembly
+
+	# VCS
+	bazaar clearcase cvs +git mercurial perforce subversion
+)
+
+IUSE="+clang debug doc +qml systemd test wayland webengine
+	${QTCREATOR_PLUGINS[@]}"
+
+REQUIRED_USE="
+	android? ( lsp )
+	boot2qt? ( remotelinux )
+	clang? ( lsp )
+	coco? ( lsp )
+	mcu? ( baremetal cmake )
+	python? ( lsp )
+	qml? ( qmake )
+	qnx? ( remotelinux )
+	test? ( qbs qmake )
+"
+
+# minimum Qt version required
+QT_PV="5.15.2:5"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_PV}
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	help? ( !webengine? ( virtual/pkgconfig ) )
+"
+CDEPEND="
+	clang? (
+		>=dev-cpp/yaml-cpp-0.6.2:=
+		sys-devel/clang:14=
+	)
+	>=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/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	>=kde-frameworks/syntax-highlighting-5.87:5
+
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+		!webengine? ( dev-libs/gumbo )
+	)
+	imageviewer? ( >=dev-qt/qtsvg-${QT_PV} )
+	perfprofiler? (
+		app-arch/zstd
+		dev-libs/elfutils
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	systemd? ( sys-apps/systemd:= )
+	test? ( mcu? ( dev-cpp/gtest:= ) )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/eigen
+		dev-cpp/gtest
+		dev-libs/boost
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+	wayland? ( >=dev-qt/qtgui-${QT_PV}[wayland] )
+"
+
+# 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
+
+# FUNCTION: cmake_use_remove_addsubdirectory
+# USAGE: <flag> <subdir> <files...>
+# DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+# <subdir> is the  name of a directory called with add_subdirectory().
+# <files...> is a list of one or more qmake project files.
+#
+# This function patches <files> to remove add_subdirectory(<subdir>) from cmake
+# when <flag> is disabled, otherwise it does nothing. This can be useful to
+# avoid an automagic dependency when a subdirectory is added in cmake but the
+# corresponding feature USE flag is disabled. Similar to qt_use_disable_config()
+# from /qt5-build.eclass
+cmake_use_remove_addsubdirectory() {
+	[[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments"
+	local flag=$1
+	local subdir=$2
+	shift 2
+
+	if ! use "${flag}"; then
+		echo "$@" | xargs sed -i -e "/add_subdirectory(${subdir})/d" || die
+	fi
+}
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	if use clang; then
+		llvm_pkg_setup
+		export CLANG_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Remove automagic dep for qt5/qt6
+	sed -e "/^find_package(Qt6/,/else()/ s|if (NOT Qt6_FOUND)|if (1)|" \
+		-i cmake/FindQt5.cmake || die
+
+	# PLUGIN_RECOMMENDS is treated like a hard-dependency
+	sed -i -e '/PLUGIN_RECOMMENDS /d' \
+		src/plugins/*/CMakeLists.txt || die
+
+	cmake_use_remove_addsubdirectory glsl glsl src/libs/CMakeLists.txt
+	cmake_use_remove_addsubdirectory lsp languageserverprotocol \
+		src/libs/CMakeLists.txt tests/auto/CMakeLists.txt
+	cmake_use_remove_addsubdirectory modeling modelinglib \
+		src/libs/CMakeLists.txt
+	cmake_use_remove_addsubdirectory qml advanceddockingsystem \
+		src/libs/CMakeLists.txt
+	cmake_use_remove_addsubdirectory clang clangtools \
+		src/plugins/CMakeLists.txt
+	cmake_use_remove_addsubdirectory test test \
+		src/plugins/mcusupport/CMakeLists.txt
+
+	# fix translations
+	local languages=()
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=( "${lang/-/_}" )
+	done
+	sed -i -e "s|^set(languages.*|set(languages ${languages[*]})|" \
+		share/qtcreator/translations/CMakeLists.txt || die
+
+	# remove bundled yaml-cpp
+	rm -r src/libs/3rdparty/yaml-cpp || die
+
+	# remove bundled qbs
+	rm -r src/shared/qbs || die
+
+	# qt-creator hardcodes the CLANG_INCLUDE_DIR to the default.
+	# However, in sys-devel/clang, the directory changes with respect to
+	# -DCLANG_RESOURCE_DIR.  We sed in the correct include dir.
+	if use clang; then
+		local res_dir="$(${CLANG_PREFIX}/bin/clang -print-resource-dir || die)"
+		sed -i -e "/\w*CLANG_INCLUDE_DIR=/s|=.*|=\"${res_dir}/include\"|" \
+			src/plugins/clangtools/CMakeLists.txt || die
+	fi
+
+	if use doc; then
+		# Fix doc install path
+		sed -i -e "/set(_IDE_DOC_PATH/s|qtcreator|${PF}|" \
+			cmake/QtCreatorAPIInternal.cmake || die
+	fi
+
+	if use help && ! use webengine; then
+		# unbundled gumbo doesn't use cmake
+		local gumbo_dep='find_package(PkgConfig REQUIRED)\n'
+		gumbo_dep+='pkg_check_modules(gumbo REQUIRED IMPORTED_TARGET gumbo)\n'
+		sed -i -e '/^\s*gumbo/s|gumbo|PkgConfig::gumbo|' \
+			-e "/^find_package(litehtml/s|^|${gumbo_dep}|" \
+			src/libs/qlitehtml/src/CMakeLists.txt || die
+	fi
+
+	if use test; then
+		# Find "GoogleBenchmark" as "benchmark" and change bundled "Googletest"
+		# to external "GTest"
+		find "${S}" -type f -name CMakeLists.txt -exec \
+			xargs sed -i -e 's|TARGET GoogleBenchmark|benchmark_FOUND|g' \
+				-e 's|GoogleBenchmark\( MODULE\)\?|benchmark|g' \
+				-e 's|Googletest\( MODULE\)\?|GTest|g' {} \; || die
+		# For mcu, also link to gmock to prevent an unknown symbol
+		# error at runtime.
+		sed -i -e  's|if(TARGET GTest)|if(GTest_FOUND)|' \
+			-e 's|DEPENDS GTest|DEPENDS gtest gmock|' \
+			src/plugins/mcusupport/test/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DWITH_TESTS=$(usex test)
+		-DWITH_DEBUG_CMAKE=$(usex debug)
+
+		# Don't use SANITIZE_FLAGS to pass extra CXXFLAGS
+		-DWITH_SANITIZE=NO
+
+		# Don't build bundled ksyntaxhighlighting
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=NO
+
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+
+		# Install failure.  Disable for now
+		-DWITH_ONLINE_DOCS=NO
+
+		# Force enable plugins that pride basic, neccessary IDE functionality
+		# and small, simple plugins
+		-DBUILD_PLUGIN_BINEDITOR=YES
+		-DBUILD_PLUGIN_BOOKMARKS=YES
+		-DBUILD_PLUGIN_CLASSVIEW=YES
+		-DBUILD_PLUGIN_CODEPASTER=YES
+		-DBUILD_PLUGIN_COMPILATIONDATABASEPROJECTMANAGER=YES
+		-DBUILD_PLUGIN_CORE=YES
+		-DBUILD_PLUGIN_CPPEDITOR=YES
+		-DBUILD_PLUGIN_DEBUGGER=YES
+		-DBUILD_PLUGIN_DIFFEDITOR=YES
+		-DBUILD_PLUGIN_EMACSKEYS=YES
+		-DBUILD_PLUGIN_FAKEVIM=YES
+		-DBUILD_PLUGIN_GENERICPROJECTMANAGER=YES
+		-DBUILD_PLUGIN_MACROS=YES
+		-DBUILD_PLUGIN_MARKETPLACE=YES
+		-DBUILD_PLUGIN_PROJECTEXPLORER=YES
+		-DBUILD_PLUGIN_QMLJSTOOLS=YES
+		-DBUILD_PLUGIN_QTSUPPORT=YES
+		-DBUILD_PLUGIN_RESOURCEEDITOR=YES
+		-DBUILD_PLUGIN_TASKLIST=YES
+		-DBUILD_PLUGIN_TEXTEDITOR=YES
+		-DBUILD_PLUGIN_TODO=YES
+		-DBUILD_PLUGIN_VCSBASE=YES
+		-DBUILD_PLUGIN_WELCOME=YES
+
+		# Misc
+		-DBUILD_PLUGIN_AUTOTEST=$(usex autotest)
+		-DBUILD_PLUGIN_BEAUTIFIER=$(usex beautifier)
+		-DBUILD_PLUGIN_COCO=$(usex coco)
+		-DBUILD_PLUGIN_CONAN=$(usex conan)
+		-DBUILD_PLUGIN_CPPCHECK=$(usex cppcheck)
+		-DBUILD_PLUGIN_CTFVISUALIZER=$(usex ctfvisualizer)
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+		-DBUILD_PLUGIN_DOCKER=$(usex docker)
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_PLUGIN_IMAGEVIEWER=$(usex imageviewer)
+		-DBUILD_PLUGIN_MODELEDITOR=$(usex modeling)
+		-DBUILD_PLUGIN_PERFPROFILER=$(usex perfprofiler)
+		-DBUILD_PLUGIN_QMLPROFILER=$(usex qmlprofiler)
+		-DBUILD_PLUGIN_SCXMLEDITOR=$(usex scxml)
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+		-DBUILD_PLUGIN_SILVERSEARCHER=$(usex silversearcher)
+		-DBUILD_PLUGIN_VALGRIND=$(usex valgrind)
+
+		# Buildsystems
+		-DBUILD_PLUGIN_AUTOTOOLSPROJECTMANAGER=$(usex autotools)
+		-DBUILD_PLUGIN_CMAKEPROJECTMANAGER=$(usex cmake)
+		-DBUILD_PLUGIN_MESONPROJECTMANAGER=$(usex meson)
+		-DBUILD_PLUGIN_QBSPROJECTMANAGER=$(usex qbs)
+		-DBUILD_PLUGIN_QMAKEPROJECTMANAGER=$(usex qmake)
+
+		# Languages
+		-DBUILD_PLUGIN_GLSLEDITOR=$(usex glsl)
+		-DBUILD_PLUGIN_LANGUAGECLIENT=$(usex lsp)
+		-DBUILD_PLUGIN_NIM=$(usex nim)
+		-DBUILD_PLUGIN_PYTHON=$(usex python)
+
+		# Platforms
+		-DBUILD_PLUGIN_ANDROID=$(usex android)
+		-DBUILD_PLUGIN_BAREMETAL=$(usex baremetal)
+		-DBUILD_PLUGIN_BOOT2QT=$(usex boot2qt)
+		-DBUILD_PLUGIN_MCUSUPPORT=$(usex mcu)
+		-DBUILD_PLUGIN_QNX=$(usex qnx)
+		-DBUILD_PLUGIN_REMOTELINUX=$(usex remotelinux)
+		-DBUILD_PLUGIN_WEBASSEMBLY=$(usex webassembly)
+
+		# VCS
+		-DBUILD_PLUGIN_BAZAAR=$(usex bazaar)
+		-DBUILD_PLUGIN_CLEARCASE=$(usex clearcase)
+		-DBUILD_PLUGIN_CVS=$(usex cvs)
+		-DBUILD_PLUGIN_GIT=$(usex git)
+		-DBUILD_PLUGIN_GITLAB=$(usex git)
+		-DBUILD_PLUGIN_MERCURIAL=$(usex mercurial)
+		-DBUILD_PLUGIN_PERFORCE=$(usex perforce)
+		-DBUILD_PLUGIN_SUBVERSION=$(usex subversion)
+
+		# Executables
+		-DBUILD_EXECUTABLE_BUILDOUTPUTPARSER=$(usex qmake)
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex perfprofiler)
+		-DBUILD_EXECUTABLE_QML2PUPPET=$(usex qml)
+
+		# Clang stuff
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+
+		# QML stuff
+		# -DBUILD_PLUGIN_QMLDESIGNER=$(usex qml) #Qt6 only
+		-DBUILD_PLUGIN_QMLJSEDITOR=$(usex qml)
+		-DBUILD_PLUGIN_QMLPREVIEW=$(usex qml)
+		-DBUILD_PLUGIN_QMLPROJECTMANAGER=$(usex qml)
+		# -DBUILD_PLUGIN_STUDIOWELCOME=$(usex qml) #Qt6 only
+
+		# Don't spam "created by a different GCC executable [-Winvalid-pch]"
+		-DBUILD_WITH_PCH=NO
+		# An entire mode devoted to a giant "Hello World!" button that does nothing.
+		-DBUILD_PLUGIN_HELLOWORLD=NO
+		# Not usable in linux environment
+		-DBUILD_PLUGIN_IOS=NO
+		# Use portage to update
+		-DBUILD_PLUGIN_UPDATEINFO=NO
+	)
+
+	if use clang; then
+		mycmakeargs+=(
+			-DClang_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/clang"
+			-DLLVM_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/llvm"
+			-DCLANGTOOLING_LINK_CLANG_DYLIB=YES
+			-DBUILD_PLUGIN_CLANGTOOLS=YES
+		)
+	fi
+	if use help; then
+		mycmakeargs+=(
+			-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+			-DBUILD_LIBRARY_QLITEHTML=$(usex webengine NO YES)
+			-DHELPVIEWER_DEFAULT_BACKEND=$(usex webengine qtwebengine litehtml)
+		)
+		if ! use webengine; then
+			mycmakeargs+=(
+				-DEXTERNAL_GUMBO=YES
+				-DEXTERNAL_XXD=NO
+				-DLITEHTML_UTF8=YES
+			)
+		fi
+	fi
+	if use test; then
+		mycmakeargs+=(
+			# Don't test pretty printing in gdb/lldb. Tests like
+			# tst_debugger_dumpers fail and it's "not officially supported"
+			# See share/qtcreator/debugger/README.txt
+			-DWITH_DEBUGGER_DUMPERS=NO
+
+			# Disable broken tests
+			-DBUILD_TEST_TST_PERFDATA=NO
+			-DBUILD_TEST_TST_QML_CHECK=NO
+			-DBUILD_TEST_TST_QML_TESTCORE=NO
+		)
+	fi
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		cmake_src_install doc/{qch,html}_docs
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+		docinto html
+		dodoc -r "${BUILD_DIR}"/doc/html/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature_header \
+		"Some enabled plugins require optional dependencies for functionality:"
+	use android && optfeature "android device support" \
+		dev-util/android-sdk-update-manager
+	if use autotest; then
+		optfeature "catch testing framework support" dev-cpp/catch
+		optfeature "gtest testing framework support" dev-cpp/gtest
+		optfeature "boost testing framework support" dev-libs/boost
+		optfeature "qt testing framework support" dev-qt/qttest
+	fi
+	if use beautifier; then
+		optfeature "astyle auto-formatting support" dev-util/astyle
+		optfeature "uncrustify auto-formatting support" dev-util/uncrustify
+	fi
+	use clang && optfeature "clazy QT static code analysis" dev-util/clazy
+	use conan && optfeature "conan package manager integration" dev-util/conan
+	use cvs && optfeature "cvs vcs integration" dev-vcs/cvs
+	use docker && optfeature "using a docker image as a device" \
+		app-containers/docker
+	use git && optfeature "git vcs integration" dev-vcs/git
+	use mercurial && optfeature "mercurial vcs integration" dev-vcs/mercurial
+	use meson && optfeature "meson buildsystem support" dev-util/meson
+	use nim && optfeature "nim language support" dev-lang/nim
+	use qbs && optfeature "QBS buildsystem support" dev-util/qbs
+	use silversearcher && optfeature "code searching with silversearcher" \
+		sys-apps/the_silver_searcher
+	use subversion && optfeature "subversion vcs integration" dev-vcs/subversion
+	use valgrind && optfeature "valgrind code analysis" dev-util/valgrind
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Sam James]

commit:     e41b0b28956d54254c714b6dc6b0fd3983c614c7
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Tue Nov  1 23:36:12 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 06:32:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e41b0b28

dev-qt/qt-creator: fix unnecessary dependence on dev-cpp/yaml-cpp

Including the clangtools plugin's CMakeLists.txt causes an
unconditional dependence on dev-cpp/yaml-cpp, whether or not the plugin
is enabled.  Removing 'add_subdirectory(clangtools)' from the parent
directory's CMakeLists.txt when the clangtools USE flag is disabled
resolves it.

Bug: https://bugs.gentoo.org/878753
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
index e110647e5230..138e0e37a74e 100644
--- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
@@ -180,6 +180,8 @@ src_prepare() {
 		src/libs/CMakeLists.txt
 	cmake_use_remove_addsubdirectory qml advanceddockingsystem \
 		src/libs/CMakeLists.txt
+	cmake_use_remove_addsubdirectory clang clangtools \
+		src/plugins/CMakeLists.txt
 	cmake_use_remove_addsubdirectory test test \
 		src/plugins/mcusupport/CMakeLists.txt
 
@@ -338,7 +340,6 @@ src_configure() {
 		# Clang stuff
 		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
 		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
 
 		# QML stuff
 		# -DBUILD_PLUGIN_QMLDESIGNER=$(usex qml) #Qt6 only
@@ -362,6 +363,7 @@ src_configure() {
 			-DClang_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/clang"
 			-DLLVM_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/llvm"
 			-DCLANGTOOLING_LINK_CLANG_DYLIB=YES
+			-DBUILD_PLUGIN_CLANGTOOLS=YES
 		)
 	fi
 	if use help; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Sam James]

commit:     d5b662bb7fc5976478227e330e949ae6bbd4b70a
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon Oct 31 01:17:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 06:32:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b662bb

dev-qt/qt-creator: drop 8.0.1

Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28047
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                |   1 -
 dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 444 ------------------------------
 2 files changed, 445 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 3512b8464ddb..9fd838575706 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-8.0.1.tar.xz 46918596 BLAKE2B 07ab50ae9ee77372c2d79a472da8cb3c65b269b8def670f66426daf9875ca44f2a66bb2ab0c01d8591420d6c43b7ca57f6ac2a6b8443cc8a5af7c89599e3966d SHA512 ffef39e8d0694b38549f301a143dec6e2fe026a1e6098acc41bd8f9c80c93d1dbb60616042901093bdaa13380034b9dd8234d82300b1fa89ab9bce81bd3f1672
 DIST qt-creator-opensource-src-8.0.2.tar.xz 48874868 BLAKE2B 53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072 SHA512 59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23

diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
deleted file mode 100644
index 138e0e37a74e..000000000000
--- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
+++ /dev/null
@@ -1,444 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-LLVM_MAX_SLOT=14
-PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
-
-inherit cmake llvm optfeature virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
-	EGIT_SUBMODULES=(
-		perfparser
-		qtscript # Need the dev branch
-		src/libs/qlitehtml
-		src/libs/qlitehtml/src/3rdparty/litehtml
-	)
-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"
-	S="${WORKDIR}"/${MY_P}
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-
-QTCREATOR_PLUGINS=(
-	# Misc
-	+autotest beautifier coco conan cppcheck ctfvisualizer +designer docker
-	+help imageviewer modeling perfprofiler qmlprofiler scxml serialterminal
-	silversearcher valgrind
-
-	# Buildsystems
-	autotools +cmake incredibuild meson qbs +qmake
-
-	# Languages
-	glsl +lsp nim python
-
-	# Platforms
-	android baremetal boot2qt mcu qnx remotelinux webassembly
-
-	# VCS
-	bazaar clearcase cvs +git mercurial perforce subversion
-)
-
-IUSE="+clang debug doc +qml systemd test wayland webengine
-	${QTCREATOR_PLUGINS[@]}"
-
-REQUIRED_USE="
-	android? ( lsp )
-	boot2qt? ( remotelinux )
-	clang? ( lsp )
-	coco? ( lsp )
-	mcu? ( baremetal cmake )
-	python? ( lsp )
-	qml? ( qmake )
-	qnx? ( remotelinux )
-	test? ( qbs qmake )
-"
-
-# minimum Qt version required
-QT_PV="5.15.2:5"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QT_PV}
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	help? ( !webengine? ( virtual/pkgconfig ) )
-"
-CDEPEND="
-	clang? (
-		>=dev-cpp/yaml-cpp-0.6.2:=
-		sys-devel/clang:14=
-	)
-	>=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/qtsql-${QT_PV}[sqlite]
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	>=kde-frameworks/syntax-highlighting-5.87:5
-
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-		!webengine? ( dev-libs/gumbo )
-	)
-	imageviewer? ( >=dev-qt/qtsvg-${QT_PV} )
-	perfprofiler? (
-		app-arch/zstd
-		dev-libs/elfutils
-	)
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	systemd? ( sys-apps/systemd:= )
-	test? ( mcu? ( dev-cpp/gtest:= ) )
-"
-DEPEND="
-	${CDEPEND}
-	test? (
-		dev-cpp/benchmark
-		dev-cpp/eigen
-		dev-cpp/gtest
-		dev-libs/boost
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-	wayland? ( >=dev-qt/qtgui-${QT_PV}[wayland] )
-"
-
-# 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
-
-# FUNCTION: cmake_use_remove_addsubdirectory
-# USAGE: <flag> <subdir> <files...>
-# DESCRIPTION:
-# <flag> is the name of a flag in IUSE.
-# <subdir> is the  name of a directory called with add_subdirectory().
-# <files...> is a list of one or more qmake project files.
-#
-# This function patches <files> to remove add_subdirectory(<subdir>) from cmake
-# when <flag> is disabled, otherwise it does nothing. This can be useful to
-# avoid an automagic dependency when a subdirectory is added in cmake but the
-# corresponding feature USE flag is disabled. Similar to qt_use_disable_config()
-# from /qt5-build.eclass
-cmake_use_remove_addsubdirectory() {
-	[[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments"
-	local flag=$1
-	local subdir=$2
-	shift 2
-
-	if ! use "${flag}"; then
-		echo "$@" | xargs sed -i -e "/add_subdirectory(${subdir})/d" || die
-	fi
-}
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	if use clang; then
-		llvm_pkg_setup
-		export CLANG_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Remove automagic dep for qt5/qt6
-	sed -e "/^find_package(Qt6/,/else()/ s|if (NOT Qt6_FOUND)|if (1)|" \
-		-i cmake/FindQt5.cmake || die
-
-	# PLUGIN_RECOMMENDS is treated like a hard-dependency
-	sed -i -e '/PLUGIN_RECOMMENDS /d' \
-		src/plugins/*/CMakeLists.txt || die
-
-	cmake_use_remove_addsubdirectory glsl glsl src/libs/CMakeLists.txt
-	cmake_use_remove_addsubdirectory lsp languageserverprotocol \
-		src/libs/CMakeLists.txt tests/auto/CMakeLists.txt
-	cmake_use_remove_addsubdirectory modeling modelinglib \
-		src/libs/CMakeLists.txt
-	cmake_use_remove_addsubdirectory qml advanceddockingsystem \
-		src/libs/CMakeLists.txt
-	cmake_use_remove_addsubdirectory clang clangtools \
-		src/plugins/CMakeLists.txt
-	cmake_use_remove_addsubdirectory test test \
-		src/plugins/mcusupport/CMakeLists.txt
-
-	# fix translations
-	local languages=()
-	for lang in ${PLOCALES}; do
-		use l10n_${lang} && languages+=( "${lang/-/_}" )
-	done
-	sed -i -e "s|^set(languages.*|set(languages ${languages[*]})|" \
-		share/qtcreator/translations/CMakeLists.txt || die
-
-	# remove bundled yaml-cpp
-	rm -r src/libs/3rdparty/yaml-cpp || die
-
-	# remove bundled qbs
-	rm -r src/shared/qbs || die
-
-	# qt-creator hardcodes the CLANG_INCLUDE_DIR to the default.
-	# However, in sys-devel/clang, the directory changes with respect to
-	# -DCLANG_RESOURCE_DIR.  We sed in the correct include dir.
-	if use clang; then
-		local res_dir="$(${CLANG_PREFIX}/bin/clang -print-resource-dir || die)"
-		sed -i -e "/\w*CLANG_INCLUDE_DIR=/s|=.*|=\"${res_dir}/include\"|" \
-			src/plugins/clangtools/CMakeLists.txt || die
-	fi
-
-	if use doc; then
-		# Fix doc install path
-		sed -i -e "/set(_IDE_DOC_PATH/s|qtcreator|${PF}|" \
-			cmake/QtCreatorAPIInternal.cmake || die
-	fi
-
-	if use help && ! use webengine; then
-		# unbundled gumbo doesn't use cmake
-		local gumbo_dep='find_package(PkgConfig REQUIRED)\n'
-		gumbo_dep+='pkg_check_modules(gumbo REQUIRED IMPORTED_TARGET gumbo)\n'
-		sed -i -e '/^\s*gumbo/s|gumbo|PkgConfig::gumbo|' \
-			-e "/^find_package(litehtml/s|^|${gumbo_dep}|" \
-			src/libs/qlitehtml/src/CMakeLists.txt || die
-	fi
-
-	if use test; then
-		# Find "GoogleBenchmark" as "benchmark" and change bundled "Googletest"
-		# to external "GTest"
-		find "${S}" -type f -name CMakeLists.txt -exec \
-			xargs sed -i -e 's|TARGET GoogleBenchmark|benchmark_FOUND|g' \
-				-e 's|GoogleBenchmark\( MODULE\)\?|benchmark|g' \
-				-e 's|Googletest\( MODULE\)\?|GTest|g' {} \; || die
-		# For mcu, also link to gmock to prevent an unknown symbol
-		# error at runtime.
-		sed -i -e  's|if(TARGET GTest)|if(GTest_FOUND)|' \
-			-e 's|DEPENDS GTest|DEPENDS gtest gmock|' \
-			src/plugins/mcusupport/test/CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	mycmakeargs+=(
-		-DWITH_TESTS=$(usex test)
-		-DWITH_DEBUG_CMAKE=$(usex debug)
-
-		# Don't use SANITIZE_FLAGS to pass extra CXXFLAGS
-		-DWITH_SANITIZE=NO
-
-		# Don't build bundled ksyntaxhighlighting
-		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=NO
-
-		-DWITH_DOCS=$(usex doc)
-		-DBUILD_DEVELOPER_DOCS=$(usex doc)
-
-		# Install failure.  Disable for now
-		-DWITH_ONLINE_DOCS=NO
-
-		# Force enable plugins that pride basic, neccessary IDE functionality
-		# and small, simple plugins
-		-DBUILD_PLUGIN_BINEDITOR=YES
-		-DBUILD_PLUGIN_BOOKMARKS=YES
-		-DBUILD_PLUGIN_CLASSVIEW=YES
-		-DBUILD_PLUGIN_CODEPASTER=YES
-		-DBUILD_PLUGIN_COMPILATIONDATABASEPROJECTMANAGER=YES
-		-DBUILD_PLUGIN_CORE=YES
-		-DBUILD_PLUGIN_CPPEDITOR=YES
-		-DBUILD_PLUGIN_DEBUGGER=YES
-		-DBUILD_PLUGIN_DIFFEDITOR=YES
-		-DBUILD_PLUGIN_EMACSKEYS=YES
-		-DBUILD_PLUGIN_FAKEVIM=YES
-		-DBUILD_PLUGIN_GENERICPROJECTMANAGER=YES
-		-DBUILD_PLUGIN_MACROS=YES
-		-DBUILD_PLUGIN_MARKETPLACE=YES
-		-DBUILD_PLUGIN_PROJECTEXPLORER=YES
-		-DBUILD_PLUGIN_QMLJSTOOLS=YES
-		-DBUILD_PLUGIN_QTSUPPORT=YES
-		-DBUILD_PLUGIN_RESOURCEEDITOR=YES
-		-DBUILD_PLUGIN_TASKLIST=YES
-		-DBUILD_PLUGIN_TEXTEDITOR=YES
-		-DBUILD_PLUGIN_TODO=YES
-		-DBUILD_PLUGIN_VCSBASE=YES
-		-DBUILD_PLUGIN_WELCOME=YES
-
-		# Misc
-		-DBUILD_PLUGIN_AUTOTEST=$(usex autotest)
-		-DBUILD_PLUGIN_BEAUTIFIER=$(usex beautifier)
-		-DBUILD_PLUGIN_COCO=$(usex coco)
-		-DBUILD_PLUGIN_CONAN=$(usex conan)
-		-DBUILD_PLUGIN_CPPCHECK=$(usex cppcheck)
-		-DBUILD_PLUGIN_CTFVISUALIZER=$(usex ctfvisualizer)
-		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
-		-DBUILD_PLUGIN_DOCKER=$(usex docker)
-		-DBUILD_PLUGIN_HELP=$(usex help)
-		-DBUILD_PLUGIN_IMAGEVIEWER=$(usex imageviewer)
-		-DBUILD_PLUGIN_MODELEDITOR=$(usex modeling)
-		-DBUILD_PLUGIN_PERFPROFILER=$(usex perfprofiler)
-		-DBUILD_PLUGIN_QMLPROFILER=$(usex qmlprofiler)
-		-DBUILD_PLUGIN_SCXMLEDITOR=$(usex scxml)
-		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-		-DBUILD_PLUGIN_SILVERSEARCHER=$(usex silversearcher)
-		-DBUILD_PLUGIN_VALGRIND=$(usex valgrind)
-
-		# Buildsystems
-		-DBUILD_PLUGIN_AUTOTOOLSPROJECTMANAGER=$(usex autotools)
-		-DBUILD_PLUGIN_CMAKEPROJECTMANAGER=$(usex cmake)
-		-DBUILD_PLUGIN_MESONPROJECTMANAGER=$(usex meson)
-		-DBUILD_PLUGIN_QBSPROJECTMANAGER=$(usex qbs)
-		-DBUILD_PLUGIN_QMAKEPROJECTMANAGER=$(usex qmake)
-
-		# Languages
-		-DBUILD_PLUGIN_GLSLEDITOR=$(usex glsl)
-		-DBUILD_PLUGIN_LANGUAGECLIENT=$(usex lsp)
-		-DBUILD_PLUGIN_NIM=$(usex nim)
-		-DBUILD_PLUGIN_PYTHON=$(usex python)
-
-		# Platforms
-		-DBUILD_PLUGIN_ANDROID=$(usex android)
-		-DBUILD_PLUGIN_BAREMETAL=$(usex baremetal)
-		-DBUILD_PLUGIN_BOOT2QT=$(usex boot2qt)
-		-DBUILD_PLUGIN_MCUSUPPORT=$(usex mcu)
-		-DBUILD_PLUGIN_QNX=$(usex qnx)
-		-DBUILD_PLUGIN_REMOTELINUX=$(usex remotelinux)
-		-DBUILD_PLUGIN_WEBASSEMBLY=$(usex webassembly)
-
-		# VCS
-		-DBUILD_PLUGIN_BAZAAR=$(usex bazaar)
-		-DBUILD_PLUGIN_CLEARCASE=$(usex clearcase)
-		-DBUILD_PLUGIN_CVS=$(usex cvs)
-		-DBUILD_PLUGIN_GIT=$(usex git)
-		-DBUILD_PLUGIN_GITLAB=$(usex git)
-		-DBUILD_PLUGIN_MERCURIAL=$(usex mercurial)
-		-DBUILD_PLUGIN_PERFORCE=$(usex perforce)
-		-DBUILD_PLUGIN_SUBVERSION=$(usex subversion)
-
-		# Executables
-		-DBUILD_EXECUTABLE_BUILDOUTPUTPARSER=$(usex qmake)
-		-DBUILD_EXECUTABLE_PERFPARSER=$(usex perfprofiler)
-		-DBUILD_EXECUTABLE_QML2PUPPET=$(usex qml)
-
-		# Clang stuff
-		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
-		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
-
-		# QML stuff
-		# -DBUILD_PLUGIN_QMLDESIGNER=$(usex qml) #Qt6 only
-		-DBUILD_PLUGIN_QMLJSEDITOR=$(usex qml)
-		-DBUILD_PLUGIN_QMLPREVIEW=$(usex qml)
-		-DBUILD_PLUGIN_QMLPROJECTMANAGER=$(usex qml)
-		# -DBUILD_PLUGIN_STUDIOWELCOME=$(usex qml) #Qt6 only
-
-		# Don't spam "created by a different GCC executable [-Winvalid-pch]"
-		-DBUILD_WITH_PCH=NO
-		# An entire mode devoted to a giant "Hello World!" button that does nothing.
-		-DBUILD_PLUGIN_HELLOWORLD=NO
-		# Not usable in linux environment
-		-DBUILD_PLUGIN_IOS=NO
-		# Use portage to update
-		-DBUILD_PLUGIN_UPDATEINFO=NO
-	)
-
-	if use clang; then
-		mycmakeargs+=(
-			-DClang_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/clang"
-			-DLLVM_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/llvm"
-			-DCLANGTOOLING_LINK_CLANG_DYLIB=YES
-			-DBUILD_PLUGIN_CLANGTOOLS=YES
-		)
-	fi
-	if use help; then
-		mycmakeargs+=(
-			-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
-			-DBUILD_LIBRARY_QLITEHTML=$(usex webengine NO YES)
-			-DHELPVIEWER_DEFAULT_BACKEND=$(usex webengine qtwebengine litehtml)
-		)
-		if ! use webengine; then
-			mycmakeargs+=(
-				-DEXTERNAL_GUMBO=YES
-				-DEXTERNAL_XXD=NO
-				-DLITEHTML_UTF8=YES
-			)
-		fi
-	fi
-	if use test; then
-		mycmakeargs+=(
-			# Don't test pretty printing in gdb/lldb. Tests like
-			# tst_debugger_dumpers fail and it's "not officially supported"
-			# See share/qtcreator/debugger/README.txt
-			-DWITH_DEBUGGER_DUMPERS=NO
-
-			# Disable broken tests
-			-DBUILD_TEST_TST_PERFDATA=NO
-			-DBUILD_TEST_TST_QML_CHECK=NO
-			-DBUILD_TEST_TST_QML_TESTCORE=NO
-		)
-	fi
-	cmake_src_configure
-}
-
-src_test() {
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	if use doc; then
-		cmake_src_install doc/{qch,html}_docs
-		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-		docinto html
-		dodoc -r "${BUILD_DIR}"/doc/html/.
-	fi
-}
-
-pkg_postinst() {
-	optfeature_header \
-		"Some enabled plugins require optional dependencies for functionality:"
-	use android && optfeature "android device support" \
-		dev-util/android-sdk-update-manager
-	if use autotest; then
-		optfeature "catch testing framework support" dev-cpp/catch
-		optfeature "gtest testing framework support" dev-cpp/gtest
-		optfeature "boost testing framework support" dev-libs/boost
-		optfeature "qt testing framework support" dev-qt/qttest
-	fi
-	if use beautifier; then
-		optfeature "astyle auto-formatting support" dev-util/astyle
-		optfeature "uncrustify auto-formatting support" dev-util/uncrustify
-	fi
-	use clang && optfeature "clazy QT static code analysis" dev-util/clazy
-	use conan && optfeature "conan package manager integration" dev-util/conan
-	use cvs && optfeature "cvs vcs integration" dev-vcs/cvs
-	use docker && optfeature "using a docker image as a device" \
-		app-containers/docker
-	use git && optfeature "git vcs integration" dev-vcs/git
-	use mercurial && optfeature "mercurial vcs integration" dev-vcs/mercurial
-	use meson && optfeature "meson buildsystem support" dev-util/meson
-	use nim && optfeature "nim language support" dev-lang/nim
-	use qbs && optfeature "QBS buildsystem support" dev-util/qbs
-	use silversearcher && optfeature "code searching with silversearcher" \
-		sys-apps/the_silver_searcher
-	use subversion && optfeature "subversion vcs integration" dev-vcs/subversion
-	use valgrind && optfeature "valgrind code analysis" dev-util/valgrind
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Sam James]

commit:     166a265815ff2e354e8d83e4fb6b076f058774bc
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon Oct 31 00:48:35 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov  5 06:32:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=166a2658

dev-qt/qt-creator: fix pkgconfig bdep

virtual/pkgconfig should be included as a build dependency if building
without qtwebengine support.  Also, such a dep should be explicitly
searched for by cmake with the 'find_package' command.

Closes: https://bugs.gentoo.org/878753
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
index f03c7c4f74e0..e110647e5230 100644
--- a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
@@ -71,6 +71,7 @@ QT_PV="5.15.2:5"
 BDEPEND="
 	>=dev-qt/linguist-tools-${QT_PV}
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	help? ( !webengine? ( virtual/pkgconfig ) )
 "
 CDEPEND="
 	clang? (
@@ -213,7 +214,8 @@ src_prepare() {
 
 	if use help && ! use webengine; then
 		# unbundled gumbo doesn't use cmake
-		local gumbo_dep='pkg_check_modules(gumbo REQUIRED IMPORTED_TARGET gumbo)\n'
+		local gumbo_dep='find_package(PkgConfig REQUIRED)\n'
+		gumbo_dep+='pkg_check_modules(gumbo REQUIRED IMPORTED_TARGET gumbo)\n'
 		sed -i -e '/^\s*gumbo/s|gumbo|PkgConfig::gumbo|' \
 			-e "/^find_package(litehtml/s|^|${gumbo_dep}|" \
 			src/libs/qlitehtml/src/CMakeLists.txt || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Sam James]

commit:     157b590574f3ca93b77040d9cc788e367d02c51b
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Aug  6 04:55:16 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 15:07:21 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=157b5905

dev-qt/qt-creator: add 8.0.1

Switched from the qmake to cmake buildsystem.  Added support for the
Coco code coverage tool. The 'git' USE flag now also builds the gitlab
plugin. The 'wayland' flag was added to enforce built-with-use
dependency. 'imageviewer' flag is added for conditional dependence on
dev-qt/qtsvg.  clangd functionality now depends on >=clang-14.*.

Bug: https://bugs.gentoo.org/828071
Bug: https://bugs.gentoo.org/846947
Closes: https://bugs.gentoo.org/876169
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                |   1 +
 dev-qt/qt-creator/metadata.xml            |   2 +
 dev-qt/qt-creator/qt-creator-8.0.1.ebuild | 440 ++++++++++++++++++++++++++++++
 3 files changed, 443 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 8613fc7c9b88..2ff50efd4154 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348 SHA512 4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb
+DIST qt-creator-opensource-src-8.0.1.tar.xz 46918596 BLAKE2B 07ab50ae9ee77372c2d79a472da8cb3c65b269b8def670f66426daf9875ca44f2a66bb2ab0c01d8591420d6c43b7ca57f6ac2a6b8443cc8a5af7c89599e3966d SHA512 ffef39e8d0694b38549f301a143dec6e2fe026a1e6098acc41bd8f9c80c93d1dbb60616042901093bdaa13380034b9dd8234d82300b1fa89ab9bce81bd3f1672

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 51e112b750a3..dc11e329b879 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -20,6 +20,7 @@
 		<flag name="clang">Build clang-based plugins for C/C++ development (code model, formatting, static analysis)</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Build plugin for CMake-based projects</flag>
+		<flag name="coco">Build plugin to support Coco code coverage tool</flag>
 		<flag name="conan">Build plugin to integrate with the Conan package manager</flag>
 		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
 		<flag name="ctfvisualizer">Build the Chrome Trace Format visualizer plugin</flag>
@@ -27,6 +28,7 @@
 		<flag name="docker">Build plugin for Docker support</flag>
 		<flag name="glsl">Build the GLSL editor plugin</flag>
 		<flag name="help">Enable the integrated documentation viewer</flag>
+		<flag name="imageviewer">Build plugin to open and view image files</flag>
 		<flag name="incredibuild">Enable integration with Incredibuild</flag>
 		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
 		<flag name="mcu">Build plugin for MCU devices</flag>

diff --git a/dev-qt/qt-creator/qt-creator-8.0.1.ebuild b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
new file mode 100644
index 000000000000..f03c7c4f74e0
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-8.0.1.ebuild
@@ -0,0 +1,440 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+LLVM_MAX_SLOT=14
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
+
+inherit cmake llvm optfeature virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
+	EGIT_SUBMODULES=(
+		perfparser
+		qtscript # Need the dev branch
+		src/libs/qlitehtml
+		src/libs/qlitehtml/src/3rdparty/litehtml
+	)
+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"
+	S="${WORKDIR}"/${MY_P}
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+
+QTCREATOR_PLUGINS=(
+	# Misc
+	+autotest beautifier coco conan cppcheck ctfvisualizer +designer docker
+	+help imageviewer modeling perfprofiler qmlprofiler scxml serialterminal
+	silversearcher valgrind
+
+	# Buildsystems
+	autotools +cmake incredibuild meson qbs +qmake
+
+	# Languages
+	glsl +lsp nim python
+
+	# Platforms
+	android baremetal boot2qt mcu qnx remotelinux webassembly
+
+	# VCS
+	bazaar clearcase cvs +git mercurial perforce subversion
+)
+
+IUSE="+clang debug doc +qml systemd test wayland webengine
+	${QTCREATOR_PLUGINS[@]}"
+
+REQUIRED_USE="
+	android? ( lsp )
+	boot2qt? ( remotelinux )
+	clang? ( lsp )
+	coco? ( lsp )
+	mcu? ( baremetal cmake )
+	python? ( lsp )
+	qml? ( qmake )
+	qnx? ( remotelinux )
+	test? ( qbs qmake )
+"
+
+# minimum Qt version required
+QT_PV="5.15.2:5"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_PV}
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+CDEPEND="
+	clang? (
+		>=dev-cpp/yaml-cpp-0.6.2:=
+		sys-devel/clang:14=
+	)
+	>=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/qtsql-${QT_PV}[sqlite]
+	>=dev-qt/qtwidgets-${QT_PV}
+	>=dev-qt/qtxml-${QT_PV}
+	>=kde-frameworks/syntax-highlighting-5.87:5
+
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+		!webengine? ( dev-libs/gumbo )
+	)
+	imageviewer? ( >=dev-qt/qtsvg-${QT_PV} )
+	perfprofiler? (
+		app-arch/zstd
+		dev-libs/elfutils
+	)
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	systemd? ( sys-apps/systemd:= )
+	test? ( mcu? ( dev-cpp/gtest:= ) )
+"
+DEPEND="
+	${CDEPEND}
+	test? (
+		dev-cpp/benchmark
+		dev-cpp/eigen
+		dev-cpp/gtest
+		dev-libs/boost
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+	wayland? ( >=dev-qt/qtgui-${QT_PV}[wayland] )
+"
+
+# 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
+
+# FUNCTION: cmake_use_remove_addsubdirectory
+# USAGE: <flag> <subdir> <files...>
+# DESCRIPTION:
+# <flag> is the name of a flag in IUSE.
+# <subdir> is the  name of a directory called with add_subdirectory().
+# <files...> is a list of one or more qmake project files.
+#
+# This function patches <files> to remove add_subdirectory(<subdir>) from cmake
+# when <flag> is disabled, otherwise it does nothing. This can be useful to
+# avoid an automagic dependency when a subdirectory is added in cmake but the
+# corresponding feature USE flag is disabled. Similar to qt_use_disable_config()
+# from /qt5-build.eclass
+cmake_use_remove_addsubdirectory() {
+	[[ $# -ge 3 ]] || die "${FUNCNAME}() requires at least three arguments"
+	local flag=$1
+	local subdir=$2
+	shift 2
+
+	if ! use "${flag}"; then
+		echo "$@" | xargs sed -i -e "/add_subdirectory(${subdir})/d" || die
+	fi
+}
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	if use clang; then
+		llvm_pkg_setup
+		export CLANG_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Remove automagic dep for qt5/qt6
+	sed -e "/^find_package(Qt6/,/else()/ s|if (NOT Qt6_FOUND)|if (1)|" \
+		-i cmake/FindQt5.cmake || die
+
+	# PLUGIN_RECOMMENDS is treated like a hard-dependency
+	sed -i -e '/PLUGIN_RECOMMENDS /d' \
+		src/plugins/*/CMakeLists.txt || die
+
+	cmake_use_remove_addsubdirectory glsl glsl src/libs/CMakeLists.txt
+	cmake_use_remove_addsubdirectory lsp languageserverprotocol \
+		src/libs/CMakeLists.txt tests/auto/CMakeLists.txt
+	cmake_use_remove_addsubdirectory modeling modelinglib \
+		src/libs/CMakeLists.txt
+	cmake_use_remove_addsubdirectory qml advanceddockingsystem \
+		src/libs/CMakeLists.txt
+	cmake_use_remove_addsubdirectory test test \
+		src/plugins/mcusupport/CMakeLists.txt
+
+	# fix translations
+	local languages=()
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=( "${lang/-/_}" )
+	done
+	sed -i -e "s|^set(languages.*|set(languages ${languages[*]})|" \
+		share/qtcreator/translations/CMakeLists.txt || die
+
+	# remove bundled yaml-cpp
+	rm -r src/libs/3rdparty/yaml-cpp || die
+
+	# remove bundled qbs
+	rm -r src/shared/qbs || die
+
+	# qt-creator hardcodes the CLANG_INCLUDE_DIR to the default.
+	# However, in sys-devel/clang, the directory changes with respect to
+	# -DCLANG_RESOURCE_DIR.  We sed in the correct include dir.
+	if use clang; then
+		local res_dir="$(${CLANG_PREFIX}/bin/clang -print-resource-dir || die)"
+		sed -i -e "/\w*CLANG_INCLUDE_DIR=/s|=.*|=\"${res_dir}/include\"|" \
+			src/plugins/clangtools/CMakeLists.txt || die
+	fi
+
+	if use doc; then
+		# Fix doc install path
+		sed -i -e "/set(_IDE_DOC_PATH/s|qtcreator|${PF}|" \
+			cmake/QtCreatorAPIInternal.cmake || die
+	fi
+
+	if use help && ! use webengine; then
+		# unbundled gumbo doesn't use cmake
+		local gumbo_dep='pkg_check_modules(gumbo REQUIRED IMPORTED_TARGET gumbo)\n'
+		sed -i -e '/^\s*gumbo/s|gumbo|PkgConfig::gumbo|' \
+			-e "/^find_package(litehtml/s|^|${gumbo_dep}|" \
+			src/libs/qlitehtml/src/CMakeLists.txt || die
+	fi
+
+	if use test; then
+		# Find "GoogleBenchmark" as "benchmark" and change bundled "Googletest"
+		# to external "GTest"
+		find "${S}" -type f -name CMakeLists.txt -exec \
+			xargs sed -i -e 's|TARGET GoogleBenchmark|benchmark_FOUND|g' \
+				-e 's|GoogleBenchmark\( MODULE\)\?|benchmark|g' \
+				-e 's|Googletest\( MODULE\)\?|GTest|g' {} \; || die
+		# For mcu, also link to gmock to prevent an unknown symbol
+		# error at runtime.
+		sed -i -e  's|if(TARGET GTest)|if(GTest_FOUND)|' \
+			-e 's|DEPENDS GTest|DEPENDS gtest gmock|' \
+			src/plugins/mcusupport/test/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	mycmakeargs+=(
+		-DWITH_TESTS=$(usex test)
+		-DWITH_DEBUG_CMAKE=$(usex debug)
+
+		# Don't use SANITIZE_FLAGS to pass extra CXXFLAGS
+		-DWITH_SANITIZE=NO
+
+		# Don't build bundled ksyntaxhighlighting
+		-DBUILD_LIBRARY_KSYNTAXHIGHLIGHTING=NO
+
+		-DWITH_DOCS=$(usex doc)
+		-DBUILD_DEVELOPER_DOCS=$(usex doc)
+
+		# Install failure.  Disable for now
+		-DWITH_ONLINE_DOCS=NO
+
+		# Force enable plugins that pride basic, neccessary IDE functionality
+		# and small, simple plugins
+		-DBUILD_PLUGIN_BINEDITOR=YES
+		-DBUILD_PLUGIN_BOOKMARKS=YES
+		-DBUILD_PLUGIN_CLASSVIEW=YES
+		-DBUILD_PLUGIN_CODEPASTER=YES
+		-DBUILD_PLUGIN_COMPILATIONDATABASEPROJECTMANAGER=YES
+		-DBUILD_PLUGIN_CORE=YES
+		-DBUILD_PLUGIN_CPPEDITOR=YES
+		-DBUILD_PLUGIN_DEBUGGER=YES
+		-DBUILD_PLUGIN_DIFFEDITOR=YES
+		-DBUILD_PLUGIN_EMACSKEYS=YES
+		-DBUILD_PLUGIN_FAKEVIM=YES
+		-DBUILD_PLUGIN_GENERICPROJECTMANAGER=YES
+		-DBUILD_PLUGIN_MACROS=YES
+		-DBUILD_PLUGIN_MARKETPLACE=YES
+		-DBUILD_PLUGIN_PROJECTEXPLORER=YES
+		-DBUILD_PLUGIN_QMLJSTOOLS=YES
+		-DBUILD_PLUGIN_QTSUPPORT=YES
+		-DBUILD_PLUGIN_RESOURCEEDITOR=YES
+		-DBUILD_PLUGIN_TASKLIST=YES
+		-DBUILD_PLUGIN_TEXTEDITOR=YES
+		-DBUILD_PLUGIN_TODO=YES
+		-DBUILD_PLUGIN_VCSBASE=YES
+		-DBUILD_PLUGIN_WELCOME=YES
+
+		# Misc
+		-DBUILD_PLUGIN_AUTOTEST=$(usex autotest)
+		-DBUILD_PLUGIN_BEAUTIFIER=$(usex beautifier)
+		-DBUILD_PLUGIN_COCO=$(usex coco)
+		-DBUILD_PLUGIN_CONAN=$(usex conan)
+		-DBUILD_PLUGIN_CPPCHECK=$(usex cppcheck)
+		-DBUILD_PLUGIN_CTFVISUALIZER=$(usex ctfvisualizer)
+		-DBUILD_PLUGIN_DESIGNER=$(usex designer)
+		-DBUILD_PLUGIN_DOCKER=$(usex docker)
+		-DBUILD_PLUGIN_HELP=$(usex help)
+		-DBUILD_PLUGIN_IMAGEVIEWER=$(usex imageviewer)
+		-DBUILD_PLUGIN_MODELEDITOR=$(usex modeling)
+		-DBUILD_PLUGIN_PERFPROFILER=$(usex perfprofiler)
+		-DBUILD_PLUGIN_QMLPROFILER=$(usex qmlprofiler)
+		-DBUILD_PLUGIN_SCXMLEDITOR=$(usex scxml)
+		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
+		-DBUILD_PLUGIN_SILVERSEARCHER=$(usex silversearcher)
+		-DBUILD_PLUGIN_VALGRIND=$(usex valgrind)
+
+		# Buildsystems
+		-DBUILD_PLUGIN_AUTOTOOLSPROJECTMANAGER=$(usex autotools)
+		-DBUILD_PLUGIN_CMAKEPROJECTMANAGER=$(usex cmake)
+		-DBUILD_PLUGIN_MESONPROJECTMANAGER=$(usex meson)
+		-DBUILD_PLUGIN_QBSPROJECTMANAGER=$(usex qbs)
+		-DBUILD_PLUGIN_QMAKEPROJECTMANAGER=$(usex qmake)
+
+		# Languages
+		-DBUILD_PLUGIN_GLSLEDITOR=$(usex glsl)
+		-DBUILD_PLUGIN_LANGUAGECLIENT=$(usex lsp)
+		-DBUILD_PLUGIN_NIM=$(usex nim)
+		-DBUILD_PLUGIN_PYTHON=$(usex python)
+
+		# Platforms
+		-DBUILD_PLUGIN_ANDROID=$(usex android)
+		-DBUILD_PLUGIN_BAREMETAL=$(usex baremetal)
+		-DBUILD_PLUGIN_BOOT2QT=$(usex boot2qt)
+		-DBUILD_PLUGIN_MCUSUPPORT=$(usex mcu)
+		-DBUILD_PLUGIN_QNX=$(usex qnx)
+		-DBUILD_PLUGIN_REMOTELINUX=$(usex remotelinux)
+		-DBUILD_PLUGIN_WEBASSEMBLY=$(usex webassembly)
+
+		# VCS
+		-DBUILD_PLUGIN_BAZAAR=$(usex bazaar)
+		-DBUILD_PLUGIN_CLEARCASE=$(usex clearcase)
+		-DBUILD_PLUGIN_CVS=$(usex cvs)
+		-DBUILD_PLUGIN_GIT=$(usex git)
+		-DBUILD_PLUGIN_GITLAB=$(usex git)
+		-DBUILD_PLUGIN_MERCURIAL=$(usex mercurial)
+		-DBUILD_PLUGIN_PERFORCE=$(usex perforce)
+		-DBUILD_PLUGIN_SUBVERSION=$(usex subversion)
+
+		# Executables
+		-DBUILD_EXECUTABLE_BUILDOUTPUTPARSER=$(usex qmake)
+		-DBUILD_EXECUTABLE_PERFPARSER=$(usex perfprofiler)
+		-DBUILD_EXECUTABLE_QML2PUPPET=$(usex qml)
+
+		# Clang stuff
+		-DBUILD_PLUGIN_CLANGCODEMODEL=$(usex clang)
+		-DBUILD_PLUGIN_CLANGFORMAT=$(usex clang)
+		-DBUILD_PLUGIN_CLANGTOOLS=$(usex clang)
+
+		# QML stuff
+		# -DBUILD_PLUGIN_QMLDESIGNER=$(usex qml) #Qt6 only
+		-DBUILD_PLUGIN_QMLJSEDITOR=$(usex qml)
+		-DBUILD_PLUGIN_QMLPREVIEW=$(usex qml)
+		-DBUILD_PLUGIN_QMLPROJECTMANAGER=$(usex qml)
+		# -DBUILD_PLUGIN_STUDIOWELCOME=$(usex qml) #Qt6 only
+
+		# Don't spam "created by a different GCC executable [-Winvalid-pch]"
+		-DBUILD_WITH_PCH=NO
+		# An entire mode devoted to a giant "Hello World!" button that does nothing.
+		-DBUILD_PLUGIN_HELLOWORLD=NO
+		# Not usable in linux environment
+		-DBUILD_PLUGIN_IOS=NO
+		# Use portage to update
+		-DBUILD_PLUGIN_UPDATEINFO=NO
+	)
+
+	if use clang; then
+		mycmakeargs+=(
+			-DClang_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/clang"
+			-DLLVM_DIR="${CLANG_PREFIX}/$(get_libdir)/cmake/llvm"
+			-DCLANGTOOLING_LINK_CLANG_DYLIB=YES
+		)
+	fi
+	if use help; then
+		mycmakeargs+=(
+			-DBUILD_HELPVIEWERBACKEND_QTWEBENGINE=$(usex webengine)
+			-DBUILD_LIBRARY_QLITEHTML=$(usex webengine NO YES)
+			-DHELPVIEWER_DEFAULT_BACKEND=$(usex webengine qtwebengine litehtml)
+		)
+		if ! use webengine; then
+			mycmakeargs+=(
+				-DEXTERNAL_GUMBO=YES
+				-DEXTERNAL_XXD=NO
+				-DLITEHTML_UTF8=YES
+			)
+		fi
+	fi
+	if use test; then
+		mycmakeargs+=(
+			# Don't test pretty printing in gdb/lldb. Tests like
+			# tst_debugger_dumpers fail and it's "not officially supported"
+			# See share/qtcreator/debugger/README.txt
+			-DWITH_DEBUGGER_DUMPERS=NO
+
+			# Disable broken tests
+			-DBUILD_TEST_TST_PERFDATA=NO
+			-DBUILD_TEST_TST_QML_CHECK=NO
+			-DBUILD_TEST_TST_QML_TESTCORE=NO
+		)
+	fi
+	cmake_src_configure
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		cmake_src_install doc/{qch,html}_docs
+		dodoc "${BUILD_DIR}"/share/doc/${PF}/qtcreator{,-dev}.qch
+		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
+		docinto html
+		dodoc -r "${BUILD_DIR}"/doc/html/.
+	fi
+}
+
+pkg_postinst() {
+	optfeature_header \
+		"Some enabled plugins require optional dependencies for functionality:"
+	use android && optfeature "android device support" \
+		dev-util/android-sdk-update-manager
+	if use autotest; then
+		optfeature "catch testing framework support" dev-cpp/catch
+		optfeature "gtest testing framework support" dev-cpp/gtest
+		optfeature "boost testing framework support" dev-libs/boost
+		optfeature "qt testing framework support" dev-qt/qttest
+	fi
+	if use beautifier; then
+		optfeature "astyle auto-formatting support" dev-util/astyle
+		optfeature "uncrustify auto-formatting support" dev-util/uncrustify
+	fi
+	use clang && optfeature "clazy QT static code analysis" dev-util/clazy
+	use conan && optfeature "conan package manager integration" dev-util/conan
+	use cvs && optfeature "cvs vcs integration" dev-vcs/cvs
+	use docker && optfeature "using a docker image as a device" \
+		app-containers/docker
+	use git && optfeature "git vcs integration" dev-vcs/git
+	use mercurial && optfeature "mercurial vcs integration" dev-vcs/mercurial
+	use meson && optfeature "meson buildsystem support" dev-util/meson
+	use nim && optfeature "nim language support" dev-lang/nim
+	use qbs && optfeature "QBS buildsystem support" dev-util/qbs
+	use silversearcher && optfeature "code searching with silversearcher" \
+		sys-apps/the_silver_searcher
+	use subversion && optfeature "subversion vcs integration" dev-vcs/subversion
+	use valgrind && optfeature "valgrind code analysis" dev-util/valgrind
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Sam James]

commit:     63f30dfe13ad002d2d76553c70fb1081c65e9291
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat Aug  6 06:44:46 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 29 15:08:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63f30dfe

dev-qt/qt-creator: drop 6.0.0 and 9999

6.0.0 is shadowed by 8.0.1 and 9999 requires QT6.

Closes: https://github.com/gentoo/gentoo/pull/26675
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                |   1 -
 dev-qt/qt-creator/qt-creator-6.0.0.ebuild | 231 ------------------------------
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 231 ------------------------------
 3 files changed, 463 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2ff50efd4154..45540d8edfe6 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348 SHA512 4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb
 DIST qt-creator-opensource-src-8.0.1.tar.xz 46918596 BLAKE2B 07ab50ae9ee77372c2d79a472da8cb3c65b269b8def670f66426daf9875ca44f2a66bb2ab0c01d8591420d6c43b7ca57f6ac2a6b8443cc8a5af7c89599e3966d SHA512 ffef39e8d0694b38549f301a143dec6e2fe026a1e6098acc41bd8f9c80c93d1dbb60616042901093bdaa13380034b9dd8234d82300b1fa89ab9bce81bd3f1672

diff --git a/dev-qt/qt-creator/qt-creator-6.0.0.ebuild b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
deleted file mode 100644
index f8eca8f995f6..000000000000
--- a/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=13
-PLOCALES="cs da de fr hr 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/"
-
-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"
-	S=${WORKDIR}/${MY_P}
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
-	clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker +git glsl:glsleditor +help incredibuild
-	+lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python
-	qbs:qbsprojectmanager +qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
-	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
-IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	android? ( lsp )
-	boot2qt? ( remotelinux )
-	clang? ( lsp )
-	mcu? ( baremetal cmake )
-	python? ( lsp )
-	qml? ( qmake )
-	qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.15:5"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-"
-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}
-	>=kde-frameworks/syntax-highlighting-5.87:5
-	clang? (
-		>=dev-cpp/yaml-cpp-0.6.2:=
-		|| (
-			sys-devel/clang:13
-			sys-devel/clang:12
-			sys-devel/clang:11
-		)
-		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
-	)
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	)
-	perfprofiler? ( dev-libs/elfutils )
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}
-	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[python]
-	cppcheck? ( dev-util/cppcheck )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-	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
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			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 -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
-
-	# avoid building unused support libraries and tools
-	if ! use clang; then
-		sed -i -e '/yaml-cpp/d' src/libs/libs.pro || die
-		sed -i -e '/clangbackend/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 -r src/tools/perfparser || die
-		if ! use ctfvisualizer && ! use qmlprofiler; then
-			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
-		fi
-	fi
-	if ! use qmake; then
-		sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die
-	fi
-	if ! use qml; then
-		sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die
-		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-		sed -i -e '/qmldesigner\|qmlprojectmanager/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\.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 '/reformatter/d' tests/auto/qml/qml.pro || die
-	sed -i -e 's/\<\(imports\|\)check\>//' tests/auto/qml/codemodel/codemodel.pro || die
-	sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro || die
-	sed -i -e '/qtcprocess/d' tests/auto/utils/utils.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_INCLUDE_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 syntax-highlighting
-	rm -r src/libs/3rdparty/syntax-highlighting || die
-
-	# remove bundled yaml-cpp
-	rm -r src/libs/3rdparty/yaml-cpp || die
-
-	# remove bundled qbs
-	rm -r src/shared/qbs || die
-
-	# TODO: unbundle sqlite
-}
-
-src_configure() {
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
-		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
-		$(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-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
deleted file mode 100644
index f8eca8f995f6..000000000000
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=13
-PLOCALES="cs da de fr hr 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/"
-
-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"
-	S=${WORKDIR}/${MY_P}
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
-	clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker +git glsl:glsleditor +help incredibuild
-	+lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python
-	qbs:qbsprojectmanager +qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
-	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
-IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	android? ( lsp )
-	boot2qt? ( remotelinux )
-	clang? ( lsp )
-	mcu? ( baremetal cmake )
-	python? ( lsp )
-	qml? ( qmake )
-	qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.15:5"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-"
-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}
-	>=kde-frameworks/syntax-highlighting-5.87:5
-	clang? (
-		>=dev-cpp/yaml-cpp-0.6.2:=
-		|| (
-			sys-devel/clang:13
-			sys-devel/clang:12
-			sys-devel/clang:11
-		)
-		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
-	)
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	)
-	perfprofiler? ( dev-libs/elfutils )
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}
-	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[python]
-	cppcheck? ( dev-util/cppcheck )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-	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
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	use clang && llvm_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			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 -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
-
-	# avoid building unused support libraries and tools
-	if ! use clang; then
-		sed -i -e '/yaml-cpp/d' src/libs/libs.pro || die
-		sed -i -e '/clangbackend/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 -r src/tools/perfparser || die
-		if ! use ctfvisualizer && ! use qmlprofiler; then
-			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
-		fi
-	fi
-	if ! use qmake; then
-		sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die
-	fi
-	if ! use qml; then
-		sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die
-		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-		sed -i -e '/qmldesigner\|qmlprojectmanager/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\.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 '/reformatter/d' tests/auto/qml/qml.pro || die
-	sed -i -e 's/\<\(imports\|\)check\>//' tests/auto/qml/codemodel/codemodel.pro || die
-	sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro || die
-	sed -i -e '/qtcprocess/d' tests/auto/utils/utils.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_INCLUDE_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 syntax-highlighting
-	rm -r src/libs/3rdparty/syntax-highlighting || die
-
-	# remove bundled yaml-cpp
-	rm -r src/libs/3rdparty/yaml-cpp || die
-
-	# remove bundled qbs
-	rm -r src/shared/qbs || die
-
-	# TODO: unbundle sqlite
-}
-
-src_configure() {
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
-		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
-		$(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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     beea7f325d1d39a57791babf68621ee8ef61339e
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 20 18:16:44 2022 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Feb 20 18:17:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beea7f32

dev-qt/qt-creator: drop old 4.15.1

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 -
 dev-qt/qt-creator/metadata.xml             |   2 -
 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 233 -----------------------------
 3 files changed, 236 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 5c1ec986bbb7..8613fc7c9b88 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
 DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348 SHA512 4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index d2e6af3e1338..51e112b750a3 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -40,8 +40,6 @@
 		<flag name="qbs">Build plugin for Qbs-based projects</flag>
 		<flag name="qmake">Build plugin for qmake-based projects</flag>
 		<flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</flag>
-		<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
-		<flag name="qmljs">Build the QML/JavaScript editor plugin</flag>
 		<flag name="qmlprofiler">Build the QML profiler plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
 		<flag name="remotelinux">Build plugin for deployment and execution on a remote Linux host</flag>

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
deleted file mode 100644
index 18260cba5420..000000000000
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=12
-PLOCALES="cs da de fr hr 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/"
-
-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"
-	S=${WORKDIR}/${MY_P}
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
-	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
-	ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial
-	modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner
-	+qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher
-	subversion valgrind webassembly)
-IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	android? ( lsp )
-	boot2qt? ( remotelinux )
-	clang? ( test? ( qbs ) )
-	mcu? ( baremetal cmake )
-	python? ( lsp )
-	qmldesigner? ( qmljs )
-	qnx? ( remotelinux )
-"
-
-# minimum Qt version required
-QT_PV="5.14:5"
-
-BDEPEND="
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-"
-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}
-	kde-frameworks/syntax-highlighting:5
-	clang? (
-		>=dev-cpp/yaml-cpp-0.6.2:=
-		|| (
-			sys-devel/clang:12
-			sys-devel/clang:11
-		)
-		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
-	)
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	)
-	perfprofiler? ( dev-libs/elfutils )
-	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
-	systemd? ( sys-apps/systemd:= )
-"
-DEPEND="${CDEPEND}
-	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[python]
-	autotools? ( sys-devel/autoconf )
-	cmake? ( >=dev-util/cmake-3.14 )
-	cppcheck? ( dev-util/cppcheck )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	qbs? ( >=dev-util/qbs-1.18 )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
-	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
-
-llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}"
-}
-
-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 -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
-	sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die
-
-	# avoid building unused support libraries and tools
-	if ! use clang; then
-		sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die
-		sed -i -e '/clangbackend/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 -r src/tools/perfparser || die
-		if ! use ctfvisualizer && ! 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 '/advanceddockingsystem/d' src/libs/libs.pro || die
-		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
-	fi
-	if ! use qmljs; then
-		sed -i -e '/qmleditorwidgets/d' src/libs/libs.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_INCLUDE_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 syntax-highlighting
-	rm -r src/libs/3rdparty/syntax-highlighting || die
-
-	# remove bundled yaml-cpp
-	rm -r src/libs/3rdparty/yaml-cpp || die
-
-	# remove bundled qbs
-	rm -r src/shared/qbs || die
-
-	# TODO: unbundle sqlite
-}
-
-src_configure() {
-	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
-		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
-		$(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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     53ee29848e4a7b874b9c53fffabe87cb193f1a2a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  2 19:08:57 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Dec  2 19:08:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53ee2984

dev-qt/qt-creator: bump to 6.0.0

Closes: https://bugs.gentoo.org/807580
Closes: https://bugs.gentoo.org/801922
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                |   1 +
 dev-qt/qt-creator/qt-creator-6.0.0.ebuild | 231 ++++++++++++++++++++++++++++++
 2 files changed, 232 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 975ecb0a7d27..5c1ec986bbb7 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3
+DIST qt-creator-opensource-src-6.0.0.tar.xz 44361156 BLAKE2B 8853b69036b969233981d31236535b2bbb74e9cf9293f0100c5caf614a5e8e80c83b0a4b038ebbefa64a4fe0cb75728d5ed34f45d8ab9cd1e283dae943fbb348 SHA512 4d97b18cb5ad8388f3ea0f1cff3b4d0cb04251d2dba22770a7d9f387efbe670b9461a8d83e08a92aefb6472c36e19d0902ff42fd85fd224318b99c66d2526bbb

diff --git a/dev-qt/qt-creator/qt-creator-6.0.0.ebuild b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
new file mode 100644
index 000000000000..f8eca8f995f6
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-6.0.0.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=13
+PLOCALES="cs da de fr hr 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/"
+
+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"
+	S=${WORKDIR}/${MY_P}
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
+	clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker +git glsl:glsleditor +help incredibuild
+	+lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python
+	qbs:qbsprojectmanager +qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
+IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	android? ( lsp )
+	boot2qt? ( remotelinux )
+	clang? ( lsp )
+	mcu? ( baremetal cmake )
+	python? ( lsp )
+	qml? ( qmake )
+	qnx? ( remotelinux )
+"
+
+# minimum Qt version required
+QT_PV="5.15:5"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+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}
+	>=kde-frameworks/syntax-highlighting-5.87:5
+	clang? (
+		>=dev-cpp/yaml-cpp-0.6.2:=
+		|| (
+			sys-devel/clang:13
+			sys-devel/clang:12
+			sys-devel/clang:11
+		)
+		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	)
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	perfprofiler? ( dev-libs/elfutils )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${CDEPEND}
+	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[python]
+	cppcheck? ( dev-util/cppcheck )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+	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
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			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 -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
+
+	# avoid building unused support libraries and tools
+	if ! use clang; then
+		sed -i -e '/yaml-cpp/d' src/libs/libs.pro || die
+		sed -i -e '/clangbackend/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 -r src/tools/perfparser || die
+		if ! use ctfvisualizer && ! use qmlprofiler; then
+			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
+		fi
+	fi
+	if ! use qmake; then
+		sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die
+	fi
+	if ! use qml; then
+		sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die
+		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
+		sed -i -e '/qmldesigner\|qmlprojectmanager/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\.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 '/reformatter/d' tests/auto/qml/qml.pro || die
+	sed -i -e 's/\<\(imports\|\)check\>//' tests/auto/qml/codemodel/codemodel.pro || die
+	sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro || die
+	sed -i -e '/qtcprocess/d' tests/auto/utils/utils.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_INCLUDE_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 syntax-highlighting
+	rm -r src/libs/3rdparty/syntax-highlighting || die
+
+	# remove bundled yaml-cpp
+	rm -r src/libs/3rdparty/yaml-cpp || die
+
+	# remove bundled qbs
+	rm -r src/shared/qbs || die
+
+	# TODO: unbundle sqlite
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		$(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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     8947d869217415b683ab5d3325fd5a917e1779e3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 05:28:02 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 05:36:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8947d869

dev-qt/qt-creator: add USE flag to disable the qmake project manager

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           |  3 ++-
 dev-qt/qt-creator/qt-creator-9999.ebuild | 16 +++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index bdaf1a3ad21f..d2e6af3e1338 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -37,7 +37,8 @@
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
 		<flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag>
 		<flag name="python">Build plugin for Python language support</flag>
-		<flag name="qbs">Build plugin for QBS-based projects</flag>
+		<flag name="qbs">Build plugin for Qbs-based projects</flag>
+		<flag name="qmake">Build plugin for qmake-based projects</flag>
 		<flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</flag>
 		<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
 		<flag name="qmljs">Build the QML/JavaScript editor plugin</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index c199ce2d341b..d0d62b73a9e0 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -24,13 +24,11 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
-	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager conan cppcheck
-	ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild +lsp:languageclient
-	mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler
-	python qbs:qbsprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
-	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind
-	webassembly)
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
+	clearcase cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild
+	+lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python
+	qbs:qbsprojectmanager qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -39,6 +37,7 @@ REQUIRED_USE="
 	clang? ( lsp )
 	mcu? ( baremetal cmake )
 	python? ( lsp )
+	qml? ( qmake )
 	qnx? ( remotelinux )
 "
 
@@ -149,6 +148,9 @@ src_prepare() {
 			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
 		fi
 	fi
+	if ! use qmake; then
+		sed -i -e '/buildoutputparser/d' src/tools/tools.pro || die
+	fi
 	if ! use qml; then
 		sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die
 		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     b671c1131493e983c274a36f4711549687984a74
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 05:34:31 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 05:36:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b671c113

dev-qt/qt-creator: enable a couple more USE flags by default

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index d0d62b73a9e0..f8eca8f995f6 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -25,9 +25,9 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt '+clang:clangcodemodel|clangformat|clangtools'
-	clearcase cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild
+	clearcase +cmake:cmakeprojectmanager conan cppcheck ctfvisualizer cvs +designer docker +git glsl:glsleditor +help incredibuild
 	+lsp:languageclient mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python
-	qbs:qbsprojectmanager qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+	qbs:qbsprojectmanager +qmake:qmakeprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
 	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     70f35cac6407c88c051c2f6e9326457de6acf194
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 29 05:22:16 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 29 05:36:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70f35cac

dev-qt/qt-creator: various test fixes

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 10d2dbc089f4..c199ce2d341b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -36,7 +36,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	android? ( lsp )
 	boot2qt? ( remotelinux )
-	clang? ( lsp test? ( qbs ) )
+	clang? ( lsp )
 	mcu? ( baremetal cmake )
 	python? ( lsp )
 	qnx? ( remotelinux )
@@ -152,7 +152,7 @@ src_prepare() {
 	if ! use qml; then
 		sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die
 		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
-		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
+		sed -i -e '/qmldesigner\|qmlprojectmanager/d' tests/auto/qml/qml.pro || die
 	fi
 	if ! use valgrind; then
 		sed -i -e '/valgrindfake/d' src/tools/tools.pro || die
@@ -166,9 +166,12 @@ src_prepare() {
 
 	# 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 '/dumpers\.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
+	sed -i -e '/reformatter/d' tests/auto/qml/qml.pro || die
+	sed -i -e 's/\<\(imports\|\)check\>//' tests/auto/qml/codemodel/codemodel.pro || die
+	sed -i -e '/timelineitemsrenderpass/d' tests/auto/tracing/tracing.pro || die
+	sed -i -e '/qtcprocess/d' tests/auto/utils/utils.pro || die
 
 	# do not install test binaries
 	sed -i -e '/CONFIG +=/s/$/ no_testcase_installs/' tests/auto/{qttest.pri,json/json.pro} || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     9ba0be1a9a528038bd6892795905dea469df2cca
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 23 04:05:43 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 04:19:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ba0be1a

dev-qt/qt-creator: merge qmldesigner and qmljs USE flags

And also put qmlpreview and qmlprojectmanager behind the new flag

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           |  5 +++--
 dev-qt/qt-creator/qt-creator-9999.ebuild | 16 ++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 8713dfe7612f..bdaf1a3ad21f 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -17,7 +17,7 @@
 		<flag name="bazaar">Add support for GNU Bazaar version control system (requires manual installation of Bazaar client)</flag>
 		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
 		<flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
-		<flag name="clang">Build clang-based plugins (code model, formatting, static analysis)</flag>
+		<flag name="clang">Build clang-based plugins for C/C++ development (code model, formatting, static analysis)</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Build plugin for CMake-based projects</flag>
 		<flag name="conan">Build plugin to integrate with the Conan package manager</flag>
@@ -27,7 +27,7 @@
 		<flag name="docker">Build plugin for Docker support</flag>
 		<flag name="glsl">Build the GLSL editor plugin</flag>
 		<flag name="help">Enable the integrated documentation viewer</flag>
-		<flag name="incredibuild">Enable integration with Incredibuild (requires manual installation of Incredibuild)</flag>
+		<flag name="incredibuild">Enable integration with Incredibuild</flag>
 		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
 		<flag name="mcu">Build plugin for MCU devices</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
@@ -38,6 +38,7 @@
 		<flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag>
 		<flag name="python">Build plugin for Python language support</flag>
 		<flag name="qbs">Build plugin for QBS-based projects</flag>
+		<flag name="qml">Build plugins for QML-based development (designer, editor, project manager)</flag>
 		<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
 		<flag name="qmljs">Build the QML/JavaScript editor plugin</flag>
 		<flag name="qmlprofiler">Build the QML profiler plugin</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 8db237c5577b..ceec86efbe12 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -28,8 +28,9 @@ QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaa
 	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager conan cppcheck
 	ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild lsp:languageclient
 	mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler
-	python qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx remotelinux
-	scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
+	python qbs:qbsprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
+	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind
+	webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -38,7 +39,6 @@ REQUIRED_USE="
 	clang? ( test? ( qbs ) )
 	mcu? ( baremetal cmake )
 	python? ( lsp )
-	qmldesigner? ( qmljs )
 	qnx? ( remotelinux )
 "
 
@@ -97,7 +97,7 @@ RDEPEND="${CDEPEND}
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
-	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+	qml? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
 	valgrind? ( dev-util/valgrind )
@@ -123,7 +123,6 @@ src_prepare() {
 	# 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
@@ -150,14 +149,11 @@ src_prepare() {
 			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
 		fi
 	fi
-	if ! use qmldesigner; then
-		sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die
+	if ! use qml; then
+		sed -i -e '/advanceddockingsystem\|qmleditorwidgets/d' src/libs/libs.pro || die
 		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
 		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
 	fi
-	if ! use qmljs; then
-		sed -i -e '/qmleditorwidgets/d' src/libs/libs.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

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     be5b9f5cffb7518cad62fe41d1df1faa0ffd7748
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 23 04:16:06 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 04:19:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be5b9f5c

dev-qt/qt-creator: clangcodemodel plugin requires USE=lsp

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index ceec86efbe12..10d2dbc089f4 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -26,7 +26,7 @@ LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager conan cppcheck
-	ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild lsp:languageclient
+	ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild +lsp:languageclient
 	mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler
 	python qbs:qbsprojectmanager '+qml:qmldesigner|qmljseditor|qmlpreview|qmlprojectmanager|studiowelcome'
 	qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher subversion valgrind
@@ -36,7 +36,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	android? ( lsp )
 	boot2qt? ( remotelinux )
-	clang? ( test? ( qbs ) )
+	clang? ( lsp test? ( qbs ) )
 	mcu? ( baremetal cmake )
 	python? ( lsp )
 	qnx? ( remotelinux )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     2c5e19cb0458cd43f3d5c3bdd4003b5e2e393ef5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 05:16:43 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Nov 23 04:19:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5e19cb

dev-qt/qt-creator: always build clangsupport and sqlite internal libs

The CppEditor plugin, which is pretty fundamental, depends on them.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 68a5ec763cc6..8db237c5577b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -132,7 +132,7 @@ src_prepare() {
 
 	# avoid building unused support libraries and tools
 	if ! use clang; then
-		sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die
+		sed -i -e '/yaml-cpp/d' src/libs/libs.pro || die
 		sed -i -e '/clangbackend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     045b7bf9c923a736f4c74cfd4295a1635d29814a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 01:40:33 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 01:41:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045b7bf9

dev-qt/qt-creator: drop RDEPEND on build tools

They are used as development tools in this context, and the
user/developer may want to use different versions from those
available via portage.

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 78d1c1db6106..68a5ec763cc6 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -93,13 +93,10 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[python]
-	autotools? ( sys-devel/autoconf )
-	cmake? ( >=dev-util/cmake-3.14 )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
-	qbs? ( >=dev-util/qbs-1.18 )
 	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     568743c8d27f89f9fb6e56d47ad59a3c9d2ab54c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 01:03:19 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 01:06:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=568743c8

dev-qt/qt-creator: add USE 'conan' and 'docker'

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           |  4 +++-
 dev-qt/qt-creator/qt-creator-9999.ebuild | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 97cf7cbe66cb..8713dfe7612f 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -20,9 +20,11 @@
 		<flag name="clang">Build clang-based plugins (code model, formatting, static analysis)</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Build plugin for CMake-based projects</flag>
+		<flag name="conan">Build plugin to integrate with the Conan package manager</flag>
 		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
 		<flag name="ctfvisualizer">Build the Chrome Trace Format visualizer plugin</flag>
 		<flag name="designer">Enable designer for QtWidgets-based UIs</flag>
+		<flag name="docker">Build plugin for Docker support</flag>
 		<flag name="glsl">Build the GLSL editor plugin</flag>
 		<flag name="help">Enable the integrated documentation viewer</flag>
 		<flag name="incredibuild">Enable integration with Incredibuild (requires manual installation of Incredibuild)</flag>
@@ -40,7 +42,7 @@
 		<flag name="qmljs">Build the QML/JavaScript editor plugin</flag>
 		<flag name="qmlprofiler">Build the QML profiler plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
-		<flag name="remotelinux">Add support for deployment and execution on a remote Linux host</flag>
+		<flag name="remotelinux">Build plugin for deployment and execution on a remote Linux host</flag>
 		<flag name="scxml">Build the graphical SCXML editor plugin</flag>
 		<flag name="serialterminal">Build the serial terminal plugin</flag>
 		<flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index cce36015191f..78d1c1db6106 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -25,11 +25,11 @@ fi
 LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
-	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
-	ctfvisualizer cvs +designer git glsl:glsleditor +help incredibuild lsp:languageclient mcu:mcusupport
-	mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python
-	qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor
-	serialterminal silversearcher subversion valgrind webassembly)
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager conan cppcheck
+	ctfvisualizer cvs +designer docker git glsl:glsleditor +help incredibuild lsp:languageclient
+	mcu:mcusupport mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler
+	python qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx remotelinux
+	scxml:scxmleditor serialterminal silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     f3886fbdc84d842a71a7b4dc368751552f0963c1
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 21:56:48 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 01:06:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3886fbd

dev-qt/qt-creator: add 'incredibuild' USE flag

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           | 3 ++-
 dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 45e6f90bbd93..883d16da2741 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -11,7 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="android">Build plugin for Android devices</flag>
-		<flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, Google Test, Boost.Test)</flag>
+		<flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, GoogleTest, Boost.Test, Catch2)</flag>
 		<flag name="autotools">Build plugin for autotools-based projects</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for GNU Bazaar version control system (requires manual installation of Bazaar client)</flag>
@@ -25,6 +25,7 @@
 		<flag name="designer">Enable designer for QtWidgets-based UIs</flag>
 		<flag name="glsl">Build the GLSL editor plugin</flag>
 		<flag name="help">Enable the integrated documentation viewer</flag>
+		<flag name="incredibuild">Enable integration with Incredibuild (requires manual installation of Incredibuild)</flag>
 		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
 		<flag name="mcu">Build plugin for MCU devices</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 0aebe5389afc..6dce0255fb7f 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -26,8 +26,8 @@ LICENSE="GPL-3"
 SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
-	ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial
-	modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner
+	ctfvisualizer cvs +designer git glsl:glsleditor +help incredibuild lsp:languageclient mcu:mcusupport
+	mercurial modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner
 	+qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher
 	subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     ffec9566a4e4cbe86f85980659794097a2bc4be8
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 22 00:22:37 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 22 01:06:06 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffec9566

dev-qt/qt-creator: add 'meson' USE flag

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           | 1 +
 dev-qt/qt-creator/qt-creator-9999.ebuild | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 883d16da2741..97cf7cbe66cb 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -29,6 +29,7 @@
 		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
 		<flag name="mcu">Build plugin for MCU devices</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
+		<flag name="meson">Build plugin for Meson-based projects</flag>
 		<flag name="modeling">Build the graphical model editor plugin</flag>
 		<flag name="nim">Build plugin for Nim language support</flag>
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 6dce0255fb7f..cce36015191f 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -27,9 +27,9 @@ SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
 	ctfvisualizer cvs +designer git glsl:glsleditor +help incredibuild lsp:languageclient mcu:mcusupport
-	mercurial modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner
-	+qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher
-	subversion valgrind webassembly)
+	mercurial meson:mesonprojectmanager modeling:modeleditor nim perforce perfprofiler python
+	qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor
+	serialterminal silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     c5861188f31fff37dbb447f5ea2eb1ea7ccd3682
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 21:23:32 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 21:23:41 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5861188

dev-qt/qt-creator: allow clang 13

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index b11ee8e89714..0aebe5389afc 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LLVM_MAX_SLOT=12
+LLVM_MAX_SLOT=13
 PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
@@ -68,6 +68,7 @@ CDEPEND="
 	clang? (
 		>=dev-cpp/yaml-cpp-0.6.2:=
 		|| (
+			sys-devel/clang:13
 			sys-devel/clang:12
 			sys-devel/clang:11
 		)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     9ac742a301f4b2f4c796964c010e47c9e50b83c7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 21:15:31 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 21:23:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ac742a3

dev-qt/qt-creator: require syntax-highlighting >= 5.87

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 9c177489fe96..b11ee8e89714 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -64,7 +64,7 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	kde-frameworks/syntax-highlighting:5
+	>=kde-frameworks/syntax-highlighting-5.87:5
 	clang? (
 		>=dev-cpp/yaml-cpp-0.6.2:=
 		|| (

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     a55f5d5cdf45ac7a350907f999983aa6f907f3c2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 21:05:20 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 21:23:40 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a55f5d5c

dev-qt/qt-creator: clang{refactoring,pchmanager} are completely gone

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 18260cba5420..9c177489fe96 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="
 "
 
 # minimum Qt version required
-QT_PV="5.14:5"
+QT_PV="5.15:5"
 
 BDEPEND="
 	>=dev-qt/linguist-tools-${QT_PV}
@@ -130,8 +130,7 @@ src_prepare() {
 				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
-	sed -i -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
-	sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die
+	sed -i -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
 
 	# avoid building unused support libraries and tools
 	if ! use clang; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     25b802bcfecca3ca93b279aee7e1ce843639243a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 20:09:19 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 20:09:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25b802bc

dev-qt/qt-creator: USE=android requires lsp

Closes: https://bugs.gentoo.org/802372
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 1 +
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
index 1e0cae2ac46f..18260cba5420 100644
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -33,6 +33,7 @@ QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaa
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
+	android? ( lsp )
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
 	mcu? ( baremetal cmake )

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 1e0cae2ac46f..18260cba5420 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 autotools:autotoolsprojectmanager baremetal bazaa
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
+	android? ( lsp )
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
 	mcu? ( baremetal cmake )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     b8ff4e5c839462c4bfa518c9b6a42d1f156d3330
Author:     Kritzmensch <streef.gtx <AT> gmail <DOT> com>
AuthorDate: Sun Nov 21 19:56:42 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 20:01:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ff4e5c

dev-qt/qt-creator: add 'baremetal' as a required dep for 'mcu'

Bug: https://bugs.gentoo.org/802372
Closes: https://github.com/gentoo/gentoo/pull/23019
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
index bfc4e05275dc..1e0cae2ac46f 100644
--- a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
-	mcu? ( cmake )
+	mcu? ( baremetal cmake )
 	python? ( lsp )
 	qmldesigner? ( qmljs )
 	qnx? ( remotelinux )

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index bfc4e05275dc..1e0cae2ac46f 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -35,7 +35,7 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
-	mcu? ( cmake )
+	mcu? ( baremetal cmake )
 	python? ( lsp )
 	qmldesigner? ( qmljs )
 	qnx? ( remotelinux )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     a3345ca863b3f721acd8841249670c2fcba9616a
Author:     Hans Fredrik Nordhaug <hansfn <AT> gmail <DOT> com>
AuthorDate: Sun Jul 11 05:17:36 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 05:18:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3345ca8

dev-qt/qt-creator: add 4.15.1

Closes: https://bugs.gentoo.org/721720
Closes: https://bugs.gentoo.org/750527
Closes: https://github.com/gentoo/gentoo/pull/21278
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Hans Fredrik Nordhaug <hansfn <AT> gmail.com>
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 232 +++++++++++++++++++++++++++++
 2 files changed, 233 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2b32f1fba3a..d88825421b0 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
+DIST qt-creator-opensource-src-4.15.1.tar.xz 44655240 BLAKE2B 80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a SHA512 a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3

diff --git a/dev-qt/qt-creator/qt-creator-4.15.1.ebuild b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
new file mode 100644
index 00000000000..bfc4e05275d
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.15.1.ebuild
@@ -0,0 +1,232 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=12
+PLOCALES="cs da de fr hr 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/"
+
+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"
+	S=${WORKDIR}/${MY_P}
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial
+	modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner
+	+qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher
+	subversion valgrind webassembly)
+IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	boot2qt? ( remotelinux )
+	clang? ( test? ( qbs ) )
+	mcu? ( cmake )
+	python? ( lsp )
+	qmldesigner? ( qmljs )
+	qnx? ( remotelinux )
+"
+
+# minimum Qt version required
+QT_PV="5.14:5"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+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}
+	kde-frameworks/syntax-highlighting:5
+	clang? (
+		>=dev-cpp/yaml-cpp-0.6.2:=
+		|| (
+			sys-devel/clang:12
+			sys-devel/clang:11
+		)
+		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	)
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	perfprofiler? ( dev-libs/elfutils )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
+	systemd? ( sys-apps/systemd:= )
+"
+DEPEND="${CDEPEND}
+	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[python]
+	autotools? ( sys-devel/autoconf )
+	cmake? ( >=dev-util/cmake-3.14 )
+	cppcheck? ( dev-util/cppcheck )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	qbs? ( >=dev-util/qbs-1.18 )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+	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
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
+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 -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
+	sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die
+
+	# avoid building unused support libraries and tools
+	if ! use clang; then
+		sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die
+		sed -i -e '/clangbackend/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 -r src/tools/perfparser || die
+		if ! use ctfvisualizer && ! 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 '/advanceddockingsystem/d' src/libs/libs.pro || die
+		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
+		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
+	fi
+	if ! use qmljs; then
+		sed -i -e '/qmleditorwidgets/d' src/libs/libs.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_INCLUDE_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 syntax-highlighting
+	rm -r src/libs/3rdparty/syntax-highlighting || die
+
+	# remove bundled yaml-cpp
+	rm -r src/libs/3rdparty/yaml-cpp || die
+
+	# remove bundled qbs
+	rm -r src/shared/qbs || die
+
+	# TODO: unbundle sqlite
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
+		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		$(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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     3985c100044bc6ae7e088951d8436dccbb827810
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 11 05:01:57 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 05:01:57 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3985c100

dev-qt/qt-creator: sync KEYWORDS

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 228e4f838dd..bfc4e05275d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -19,7 +19,7 @@ else
 	[[ ${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"
 	S=${WORKDIR}/${MY_P}
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-3"

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     18ac48856dec0d17c4dabd73bcdce52ec9531831
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 11 04:50:25 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 04:53:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ac4885

dev-qt/qt-creator: add hr translation

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index b22ecdc136b..228e4f838dd 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 LLVM_MAX_SLOT=12
-PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
+PLOCALES="cs da de fr hr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     9a9f0f76ee082dbefed69111aa9d802e024662e2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 11 04:28:03 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 04:53:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9f0f76

dev-qt/qt-creator: require clang 11 or 12

Upstream recommends 11 or later

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 9c70a14da51..b22ecdc136b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -2,15 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-LLVM_MAX_SLOT=10
+LLVM_MAX_SLOT=12
 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
@@ -20,12 +18,12 @@ 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/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
+	KEYWORDS="~amd64 ~x86"
 fi
 
-# TODO: unbundle sqlite
-
+LICENSE="GPL-3"
+SLOT="0"
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
 	ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial
@@ -69,8 +67,8 @@ CDEPEND="
 	clang? (
 		>=dev-cpp/yaml-cpp-0.6.2:=
 		|| (
-			sys-devel/clang:10
-			sys-devel/clang:9
+			sys-devel/clang:12
+			sys-devel/clang:11
 		)
 		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
 	)
@@ -99,7 +97,7 @@ RDEPEND="${CDEPEND}
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
-	qbs? ( >=dev-util/qbs-1.15 )
+	qbs? ( >=dev-util/qbs-1.18 )
 	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
@@ -199,6 +197,8 @@ src_prepare() {
 
 	# remove bundled qbs
 	rm -r src/shared/qbs || die
+
+	# TODO: unbundle sqlite
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     1e407a80672c4afedfdd712eae7e3b54df1a1a1b
Author:     Hans Fredrik Nordhaug <hansfn <AT> gmail <DOT> com>
AuthorDate: Sun Jul 11 03:33:38 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 04:53:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e407a80

dev-qt/qt-creator: adjust sed

https://github.com/gentoo/gentoo/pull/21278

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 057d48b9f9a..9c70a14da51 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -182,7 +182,7 @@ src_prepare() {
 	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
+	sed -i -e "/^CLANG_INCLUDE_DIR\s*=/s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
 
 	# fix translations
 	local lang languages=

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     ed1763bf93e35fe1beea74462f7e153bbe057558
Author:     Hans Fredrik Nordhaug <hansfn <AT> gmail <DOT> com>
AuthorDate: Sun Jul 11 03:24:47 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 04:53:24 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed1763bf

dev-qt/qt-creator: drop obsolete patch

https://github.com/gentoo/gentoo/pull/21278

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 18e67f9fc0b..057d48b9f9a 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -112,10 +112,6 @@ for x in ${PLOCALES}; do
 done
 unset x
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch
-)
-
 llvm_check_deps() {
 	has_version -d "sys-devel/clang:${LLVM_SLOT}"
 }

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     dcb874465b3c7b145f837ea5f75137c2f0c1fc47
Author:     Hans Fredrik Nordhaug <hansfn <AT> gmail <DOT> com>
AuthorDate: Sun Jul 11 03:21:02 2021 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 11 04:53:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcb87446

dev-qt/qt-creator: drop obsolete dep on dev-libs/libclangformat-ide

https://github.com/gentoo/gentoo/pull/21278

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e9e7c228800..18e67f9fc0b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -69,10 +69,8 @@ CDEPEND="
 	clang? (
 		>=dev-cpp/yaml-cpp-0.6.2:=
 		|| (
-			( sys-devel/clang:10
-				dev-libs/libclangformat-ide:10 )
-			( sys-devel/clang:9
-				dev-libs/libclangformat-ide:9 )
+			sys-devel/clang:10
+			sys-devel/clang:9
 		)
 		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
 	)
@@ -116,12 +114,10 @@ unset x
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch
-	"${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch
 )
 
 llvm_check_deps() {
-	has_version -d "sys-devel/clang:${LLVM_SLOT}" && \
-		has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}"
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
 }
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Sam James]

commit:     a910274489dc79f79736cdcd542fd1a8be180d30
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  9 19:59:22 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  9 19:59:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9102744

dev-qt/qt-creator: sys-devel/gdb[client] is gone

It's now always on.

Fixes: 2aa76f92308d2b745bf47b9ca94937f125301691
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{qt-creator-4.12.3.ebuild => qt-creator-4.12.3-r1.ebuild}         | 4 ++--
 dev-qt/qt-creator/qt-creator-9999.ebuild                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.12.3.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild
similarity index 99%
rename from dev-qt/qt-creator/qt-creator-4.12.3.ebuild
rename to dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild
index 27a1d4838af..5e676fcc1ce 100644
--- a/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -94,7 +94,7 @@ DEPEND="${CDEPEND}
 	)
 "
 RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
+	sys-devel/gdb[python]
 	cmake? ( dev-util/cmake )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 926ec1ce7a6..e9e7c228800 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -94,7 +94,7 @@ DEPEND="${CDEPEND}
 	)
 "
 RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
+	sys-devel/gdb[python]
 	autotools? ( sys-devel/autoconf )
 	cmake? ( >=dev-util/cmake-3.14 )
 	cppcheck? ( dev-util/cppcheck )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Andreas Sturmlechner]

commit:     918fa8ded423c49295b8d5237e04f0314e008d96
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  3 14:22:25 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Sep  8 18:07:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=918fa8de

dev-qt/qt-creator: Drop 4.8.2, destabilising package

This also leaves dev-util/qbs without any stable revdep so could be cleaned up.

Bug: https://bugs.gentoo.org/720240
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                |   1 -
 dev-qt/qt-creator/qt-creator-4.8.2.ebuild | 192 ------------------------------
 2 files changed, 193 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index b681d2bfa98..2b32f1fba3a 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
 DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
-DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

diff --git a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
deleted file mode 100644
index 9494b2fc37c..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
-	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
-	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
-	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"
-
-CDEPEND="
-	=dev-libs/botan-2.9*:2=[-bindist]
-	>=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-6:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	)
-	qbs? ( ~dev-util/qbs-1.12.2 )
-	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/qtxmlpatterns-5.12.1-r1:5[qml(+)]
-			<dev-qt/qtdeclarative-5.12.0[xml]
-		)
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	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+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				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 '/SUBDIRS += clangbackend/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 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
-
-	# 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 botan
-	rm -rf src/libs/3rdparty/botan || 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 \
-		CONFIG+=use_system_botan \
-		$(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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Michał Górny]

commit:     842efe4025a43783b75b6750c715d4cc8f4b8293
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 11:42:13 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 22:09:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=842efe40

dev-qt/qt-creator: Remove redundant ver (LLVM 8)

Bug: https://bugs.gentoo.org/720240
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 -
 dev-qt/qt-creator/qt-creator-4.10.1.ebuild | 201 -----------------------------
 2 files changed, 202 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 98c7d26ee6f..b681d2bfa98 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,2 @@
-DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
 DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

diff --git a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
deleted file mode 100644
index dbf46966769..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=8
-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 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[@]%:*}"
-RESTRICT="!test? ( test )"
-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]
-	cmake? ( dev-util/cmake )
-	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 ${LLVM_MAX_SLOT})") \
-		$(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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Sam James]

commit:     c8218b189717fc302cbf061d028927376dc195e1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 13 16:24:57 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 13 16:26:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8218b18

dev-qt/qt-creator: arm keyworded (bug #729580)

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.12.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.12.3.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
index ff58c169e4e..27a1d4838af 100644
--- a/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
@@ -20,7 +20,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/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     c5d2ca1fbc24be0e5550a78a2eb32fd2d1f38b8a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 03:41:02 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 03:50:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5d2ca1f

dev-qt/qt-creator: disable clangpchmanager and clangrefactoring

Upstream considers them "too unstable even for experimental status"
https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=8dff37f0d3ebcae0aa4f4839165fb70fa9cd965c

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           |  2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 6e40ad6ef7f..f1b1bb3d025 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -17,7 +17,7 @@
 		<flag name="bazaar">Add support for GNU Bazaar version control system (requires manual installation of Bazaar client)</flag>
 		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
 		<flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
-		<flag name="clang">Build clang-based plugins (code model, formatting, refactoring, static analysis)</flag>
+		<flag name="clang">Build clang-based plugins (code model, formatting, static analysis)</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Build plugin for CMake-based projects</flag>
 		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 9ae9556b4db..957735a0949 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -27,11 +27,11 @@ fi
 # TODO: unbundle sqlite
 
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
-	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
-	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help
-	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
-	qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor
-	serialterminal silversearcher subversion valgrind webassembly)
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	ctfvisualizer cvs +designer git glsl:glsleditor +help lsp:languageclient mcu:mcusupport mercurial
+	modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager +qmldesigner
+	+qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal silversearcher
+	subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -139,12 +139,13 @@ src_prepare() {
 				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
-	sed -i -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
+	sed -i -re '/\<(clangpchmanager|clangrefactoring|ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
+	sed -i -re '/clang(pchmanager|refactoring)backend/d' src/tools/tools.pro || die
 
 	# avoid building unused support libraries and tools
 	if ! use clang; then
 		sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die
-		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die
+		sed -i -e '/clangbackend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then
 		sed -i -e '/glsl/d' src/libs/libs.pro || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     ba2b7d524c4f050ca53081dc6ef21a32d5be1237
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 03:49:06 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 03:50:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2b7d52

dev-qt/qt-creator: we need cmake >= 3.14

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 957735a0949..926ec1ce7a6 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -96,7 +96,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
-	cmake? ( dev-util/cmake )
+	cmake? ( >=dev-util/cmake-3.14 )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     a98a03b54b43acd6647a45eed5cde232a0ea3ffb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 12 02:01:23 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jul 12 02:02:44 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a98a03b5

dev-qt/qt-creator: add USE=qmljs

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           | 15 ++++++++-------
 dev-qt/qt-creator/qt-creator-9999.ebuild |  8 ++++++--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index de392789cbb..6e40ad6ef7f 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -12,35 +12,36 @@
 	<use>
 		<flag name="android">Build plugin for Android devices</flag>
 		<flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, Google Test, Boost.Test)</flag>
-		<flag name="autotools">Enable autotools project manager plugin</flag>
+		<flag name="autotools">Build plugin for autotools-based projects</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for GNU Bazaar version control system (requires manual installation of Bazaar client)</flag>
 		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
 		<flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
 		<flag name="clang">Build clang-based plugins (code model, formatting, refactoring, static analysis)</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
-		<flag name="cmake">Enable cmake project manager plugin</flag>
+		<flag name="cmake">Build plugin for CMake-based projects</flag>
 		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
 		<flag name="ctfvisualizer">Build the Chrome Trace Format visualizer plugin</flag>
 		<flag name="designer">Enable designer for QtWidgets-based UIs</flag>
-		<flag name="glsl">Enable GLSL editor</flag>
+		<flag name="glsl">Build the GLSL editor plugin</flag>
 		<flag name="help">Enable the integrated documentation viewer</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
 		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
 		<flag name="mcu">Build plugin for MCU devices</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
-		<flag name="modeling">Enable graphical model editor</flag>
+		<flag name="modeling">Build the graphical model editor plugin</flag>
 		<flag name="nim">Build plugin for Nim language support</flag>
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
 		<flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag>
 		<flag name="python">Build plugin for Python language support</flag>
-		<flag name="qbs">Enable QBS project manager plugin</flag>
+		<flag name="qbs">Build plugin for QBS-based projects</flag>
 		<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
+		<flag name="qmljs">Build the QML/JavaScript editor plugin</flag>
 		<flag name="qmlprofiler">Build the QML profiler plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
 		<flag name="remotelinux">Add support for deployment and execution on a remote Linux host</flag>
-		<flag name="scxml">Enable graphical SCXML editor</flag>
-		<flag name="serialterminal">Build serial terminal plugin</flag>
+		<flag name="scxml">Build the graphical SCXML editor plugin</flag>
+		<flag name="serialterminal">Build the serial terminal plugin</flag>
 		<flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></flag>
 		<flag name="systemd">Add support for retrieving application output from journald</flag>
 		<flag name="valgrind">Enable integration with <pkg>dev-util/valgrind</pkg></flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 16ef16cdafb..9ae9556b4db 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -30,8 +30,8 @@ QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaa
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
 	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help
 	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
-	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
-	silversearcher subversion valgrind webassembly)
+	qbs:qbsprojectmanager +qmldesigner +qmljs:qmljseditor qmlprofiler qnx remotelinux scxml:scxmleditor
+	serialterminal silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -39,6 +39,7 @@ REQUIRED_USE="
 	clang? ( test? ( qbs ) )
 	mcu? ( cmake )
 	python? ( lsp )
+	qmldesigner? ( qmljs )
 	qnx? ( remotelinux )
 "
 
@@ -165,6 +166,9 @@ src_prepare() {
 		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
 		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
 	fi
+	if ! use qmljs; then
+		sed -i -e '/qmleditorwidgets/d' src/libs/libs.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

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     71df5fd9bbfc42f653e683adfc72737c36ecece4
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 22:51:47 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 23:16:23 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71df5fd9

dev-qt/qt-creator: yaml-cpp is required only with USE=clang

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e361cea5daf..62d4e47d5e8 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -51,7 +51,6 @@ BDEPEND="
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 "
 CDEPEND="
-	>=dev-cpp/yaml-cpp-0.6.2:=
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
@@ -67,6 +66,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	kde-frameworks/syntax-highlighting:5
 	clang? (
+		>=dev-cpp/yaml-cpp-0.6.2:=
 		|| (
 			( sys-devel/clang:10
 				dev-libs/libclangformat-ide:10 )
@@ -142,7 +142,7 @@ src_prepare() {
 
 	# avoid building unused support libraries and tools
 	if ! use clang; then
-		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
+		sed -i -e '/clangsupport\|yaml-cpp/d' src/libs/libs.pro || die
 		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     6cf0f636da45c338d767443d0184825f09f7d5f7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 23:15:51 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 23:16:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cf0f636

dev-qt/qt-creator: skip building two more support libs if not used

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 62d4e47d5e8..16ef16cdafb 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -142,7 +142,7 @@ src_prepare() {
 
 	# avoid building unused support libraries and tools
 	if ! use clang; then
-		sed -i -e '/clangsupport\|yaml-cpp/d' src/libs/libs.pro || die
+		sed -i -e '/clangsupport\|sqlite\|yaml-cpp/d' src/libs/libs.pro || die
 		sed -i -e '/clang\(\|pchmanager\|refactoring\)backend/d' src/tools/tools.pro || die
 	fi
 	if ! use glsl; then
@@ -161,6 +161,7 @@ src_prepare() {
 		fi
 	fi
 	if ! use qmldesigner; then
+		sed -i -e '/advanceddockingsystem/d' src/libs/libs.pro || die
 		sed -i -e '/qml2puppet/d' src/tools/tools.pro || die
 		sed -i -e '/qmldesigner/d' tests/auto/qml/qml.pro || die
 	fi

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     93cc20a03347e62931d86e14b4097ea58a0f0bb5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 20:28:07 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 20:29:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93cc20a0

dev-qt/qt-creator: drop ios and winrt USE flags

These two plugins cannot effectively be used on linux

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 7d9347a0077..e361cea5daf 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -28,10 +28,10 @@ fi
 
 QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
-	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
+	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help
 	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
 	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
-	silversearcher subversion valgrind webassembly winrt)
+	silversearcher subversion valgrind webassembly)
 IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
@@ -138,7 +138,7 @@ src_prepare() {
 				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
-	sed -i -e '/updateinfo/d' src/plugins/plugins.pro || die
+	sed -i -re '/\<(ios|updateinfo|winrt)\>/d' src/plugins/plugins.pro || die
 
 	# avoid building unused support libraries and tools
 	if ! use clang; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     31e7bec69ca4546929526629fb83d07733536765
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 06:21:23 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 06:21:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31e7bec6

dev-qt/qt-creator: stop enabling USE=webengine by default

QtWebEngine is a very large dependency and the built-in
backends (litehtml and QTextBrowser) are normally enough.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index b4bfe6a4119..7d9347a0077 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -32,7 +32,7 @@ QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaa
 	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
 	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
 	silversearcher subversion valgrind webassembly winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+IUSE="doc systemd test webengine ${QTC_PLUGINS[@]%:*}"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
 	boot2qt? ( remotelinux )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     2ac34258437a3913a6401905c79e717d321810f5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 05:31:11 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 06:21:39 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ac34258

dev-qt/qt-creator: the qbs plugin no longer links to libqbscore

https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=6913947986a1aebeb9eba6212ef270c31de28af8

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index aacf1388261..b4bfe6a4119 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -81,7 +81,6 @@ CDEPEND="
 		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:= )
 "
@@ -101,6 +100,7 @@ RDEPEND="${CDEPEND}
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
+	qbs? ( >=dev-util/qbs-1.15 )
 	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
@@ -210,8 +210,6 @@ src_configure() {
 		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
 		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
 		$(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)
 }

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     ad80680859b7e52bf9526fbc792c2964a4e46e62
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 03:44:55 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 03:45:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad806808

dev-qt/qt-creator: restore the autotools plugin

Not sure why it was dropped in the 4.10.0_rc1 version bump

Bug: https://bugs.gentoo.org/721720
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index fcfb5d3eb92..aacf1388261 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -26,7 +26,7 @@ fi
 
 # TODO: unbundle sqlite
 
-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
+QTC_PLUGINS=(android +autotest autotools:autotoolsprojectmanager baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
 	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
 	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
@@ -95,6 +95,7 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
 	cmake? ( dev-util/cmake )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     8dee990043b76e3c8038c5641d4db12a7be6a673
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 03:29:29 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 03:29:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dee9900

dev-qt/qt-creator: Qt 5.14 is now required

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index a8ef911ae28..fcfb5d3eb92 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -43,7 +43,7 @@ REQUIRED_USE="
 "
 
 # minimum Qt version required
-QT_PV="5.12.3:5"
+QT_PV="5.14:5"
 
 BDEPEND="
 	>=dev-qt/linguist-tools-${QT_PV}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     e8701058eb99ffb62d82444fab19208880afb482
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 11 03:20:22 2020 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul 11 03:21:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8701058

dev-qt/qt-creator: re-introduce bazaar USE flag

Handle it like clearcase and perforce.

Amends commit 045077ec0296e1508b28da617c6fab978620714d, which
ended up always *enabling* the plugin instead of disabling it.

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           | 1 +
 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 91079b87e4e..de392789cbb 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,6 +14,7 @@
 		<flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, Google Test, Boost.Test)</flag>
 		<flag name="autotools">Enable autotools project manager plugin</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
+		<flag name="bazaar">Add support for GNU Bazaar version control system (requires manual installation of Bazaar client)</flag>
 		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
 		<flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
 		<flag name="clang">Build clang-based plugins (code model, formatting, refactoring, static analysis)</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index ff58c169e4e..a8ef911ae28 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -26,7 +26,7 @@ fi
 
 # TODO: unbundle sqlite
 
-QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
+QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
 	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
 	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     a9641eccceec1061e176904b2f9d14dd45beff0f
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 25 07:02:15 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9641ecc

dev-qt/qt-creator: bump to 4.12.3

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                                              | 2 +-
 .../qt-creator/{qt-creator-4.12.2.ebuild => qt-creator-4.12.3.ebuild}   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 93975393d21..98c7d26ee6f 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,3 @@
 DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
-DIST qt-creator-opensource-src-4.12.2.tar.xz 34347552 BLAKE2B 03d4e0043df7081ce0feb4d1332024d8d54ac4f4eb8d42af759822177d96914506bd29071ecd09e558e61044c6dd5433eb4643159da49068a80cebd69ac7bd36 SHA512 9f935e8a684e041c2469431d5e37765c2e6f7b9eafb077e4c46571484f5e9260a9ad9d071fbe0ba9642b610690e6bb255a3f432332d812c2fae4786d2498e876
+DIST qt-creator-opensource-src-4.12.3.tar.xz 34351356 BLAKE2B 7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d SHA512 48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

diff --git a/dev-qt/qt-creator/qt-creator-4.12.2.ebuild b/dev-qt/qt-creator/qt-creator-4.12.3.ebuild
similarity index 100%
rename from dev-qt/qt-creator/qt-creator-4.12.2.ebuild
rename to dev-qt/qt-creator/qt-creator-4.12.3.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     411ad93342f83a0912716eb39e2837e77a285f25
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat May 23 02:38:43 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=411ad933

dev-qt/qt-creator: Remove sys-devel/clang:8 dependency

Prepare for eventual removal of sys-devel/clang:8

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 1ad7e3db8ef..eb7f017e775 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -70,7 +70,6 @@ CDEPEND="
 		|| (
 			sys-devel/clang:10
 			sys-devel/clang:9
-			sys-devel/clang:8
 		)
 		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
 	)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     f82ad4334793e9692be2fa6472d72c982bca747a
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri May  8 07:18:03 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82ad433

dev-qt/qt-creator: Unbundle KSyntaxHighlighting

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 01f6e2d47c2..ee5513e7298 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -24,7 +24,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting
+# TODO: unbundle sqlite and yaml-cpp
 
 QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
@@ -64,6 +64,7 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
+	kde-frameworks/syntax-highlighting:5
 	clang? (
 		|| (
 			sys-devel/clang:10
@@ -180,6 +181,9 @@ src_prepare() {
 	done
 	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
+	# remove bundled syntax-highlighting
+	rm -r src/libs/3rdparty/syntax-highlighting || die
+
 	# remove bundled qbs
 	rm -r src/shared/qbs || die
 }
@@ -187,6 +191,8 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
+		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
 		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     603dcfc248ef38913328379d1cba4d0389fe2966
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri May  8 08:55:25 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=603dcfc2

dev-qt/qt-creator: Bump qt-creator-4.12.2

Bug: https://bugs.gentoo.org/700142
Closes: https://github.com/gentoo/gentoo/pull/15711
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-4.12.2.ebuild | 235 +++++++++++++++++++++++++++++
 2 files changed, 236 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d7586825807..18ae4acc1bd 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,4 @@
 DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
 DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215
+DIST qt-creator-opensource-src-4.12.2.tar.xz 34347552 BLAKE2B 03d4e0043df7081ce0feb4d1332024d8d54ac4f4eb8d42af759822177d96914506bd29071ecd09e558e61044c6dd5433eb4643159da49068a80cebd69ac7bd36 SHA512 9f935e8a684e041c2469431d5e37765c2e6f7b9eafb077e4c46571484f5e9260a9ad9d071fbe0ba9642b610690e6bb255a3f432332d812c2fae4786d2498e876
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

diff --git a/dev-qt/qt-creator/qt-creator-4.12.2.ebuild b/dev-qt/qt-creator/qt-creator-4.12.2.ebuild
new file mode 100644
index 00000000000..ff58c169e4e
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.12.2.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=10
+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 ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
+	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
+	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
+	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
+	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 ) )
+	mcu? ( cmake )
+	python? ( lsp )
+	qnx? ( remotelinux )
+"
+
+# minimum Qt version required
+QT_PV="5.12.3:5"
+
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
+CDEPEND="
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	>=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}
+	kde-frameworks/syntax-highlighting:5
+	clang? (
+		|| (
+			( sys-devel/clang:10
+				dev-libs/libclangformat-ide:10 )
+			( sys-devel/clang:9
+				dev-libs/libclangformat-ide:9 )
+		)
+		<sys-devel/clang-$((LLVM_MAX_SLOT + 1)):=
+	)
+	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}
+	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]
+	cmake? ( dev-util/cmake )
+	cppcheck? ( dev-util/cppcheck )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
+	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
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch
+	"${FILESDIR}"/${PN}-4.12.0-libclangformat-ide.patch
+)
+
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}" && \
+		has_version -d "dev-libs/libclangformat-ide:${LLVM_SLOT}"
+}
+
+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 -r src/tools/perfparser || die
+		if ! use ctfvisualizer && ! 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 syntax-highlighting
+	rm -r src/libs/3rdparty/syntax-highlighting || die
+
+	# remove bundled yaml-cpp
+	rm -r src/libs/3rdparty/yaml-cpp || die
+
+	# remove bundled qbs
+	rm -r src/shared/qbs || die
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		KSYNTAXHIGHLIGHTING_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		KSYNTAXHIGHLIGHTING_INCLUDE_DIR="${EPREFIX}/usr/include/KF5/KSyntaxHighlighting" \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
+		$(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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     37557644b260b973e4cb84f2afe4d6eb63e62ab1
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Tue May 19 02:53:02 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37557644

dev-qt/qt-creator: Pass the correct clang stot

Add llvm_check_deps to check for the right clang slot.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 08bc2d1eb31..3f09133f6ee 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -112,6 +112,10 @@ unset x
 
 PATCHES=( "${FILESDIR}"/${PN}-4.12.0-dylib-fix.patch )
 
+llvm_check_deps() {
+	has_version -d "sys-devel/clang:${LLVM_SLOT}"
+}
+
 pkg_setup() {
 	use clang && llvm_pkg_setup
 }

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     6e8f065e19fee5ee73271d794ad54b3ca74d67d8
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Thu Jun  4 08:21:34 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8f065e

dev-qt/qt-creator: Drop qt-creator-4.12.0

Buggy ebuild and superseded by 4.12.2.

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 -
 dev-qt/qt-creator/qt-creator-4.12.0.ebuild | 204 -----------------------------
 2 files changed, 205 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 18ae4acc1bd..93975393d21 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,3 @@
 DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
-DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215
 DIST qt-creator-opensource-src-4.12.2.tar.xz 34347552 BLAKE2B 03d4e0043df7081ce0feb4d1332024d8d54ac4f4eb8d42af759822177d96914506bd29071ecd09e558e61044c6dd5433eb4643159da49068a80cebd69ac7bd36 SHA512 9f935e8a684e041c2469431d5e37765c2e6f7b9eafb077e4c46571484f5e9260a9ad9d071fbe0ba9642b610690e6bb255a3f432332d812c2fae4786d2498e876
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

diff --git a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild b/dev-qt/qt-creator/qt-creator-4.12.0.ebuild
deleted file mode 100644
index a4ca520e993..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-LLVM_MAX_SLOT=9
-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 beautifier boot2qt
-	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
-	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios +lsp:languageclient
-	mercurial modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager
-	+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 )
-	boot2qt? ( remotelinux )
-	python? ( lsp )
-"
-
-# minimum Qt version required
-QT_PV="5.12.3:5"
-
-CDEPEND="
-	>=dev-cpp/yaml-cpp-0.6.2
-	>=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-9.0.1:= )
-	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]
-	cmake? ( dev-util/cmake )
-	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 && ! use ctfvisualizer; 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 ${LLVM_MAX_SLOT})") \
-		$(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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     aee07243bc44d2d6bc85113f848fd02deba381aa
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri May  8 07:25:58 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aee07243

dev-qt/qt-creator: Unbundle yaml-cpp

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index ee5513e7298..1ad7e3db8ef 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -24,7 +24,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-# TODO: unbundle sqlite and yaml-cpp
+# TODO: unbundle sqlite
 
 QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
@@ -51,6 +51,7 @@ BDEPEND="
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 "
 CDEPEND="
+	>=dev-cpp/yaml-cpp-0.6.2:=
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
@@ -184,6 +185,9 @@ src_prepare() {
 	# remove bundled syntax-highlighting
 	rm -r src/libs/3rdparty/syntax-highlighting || die
 
+	# remove bundled yaml-cpp
+	rm -r src/libs/3rdparty/yaml-cpp || die
+
 	# remove bundled qbs
 	rm -r src/shared/qbs || die
 }

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     a0ba3944f62032c98005db4dec84aa655841a7ba
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat May 23 02:14:36 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0ba3944

dev-qt/qt-creator: Add bdeps

pkgconfig, qdoc, and binaries from linguist-tools need to execute at
build time.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 4dcb19e8b43..bf48a061bde 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -45,6 +45,11 @@ REQUIRED_USE="
 # minimum Qt version required
 QT_PV="5.12.3:5"
 
+BDEPEND="
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+"
 CDEPEND="
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
@@ -71,9 +76,6 @@ CDEPEND="
 	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}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     56bf49f922c065f7196acaa926f1b56dfb874915
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Mon May 11 02:38:41 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:06 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56bf49f9

dev-qt/qt-creator: Add dev-qt/qtquicktimeline to rdeps

qmldesigner and studiowelcome both have qmls which import
QtQuick.Timeline. If not available at runtime, stderr prints
'module "QtQuick.Timeline" is not installed"'.  When installed, all is
well and studiowelcome, if enabled, shows a nice animated splash.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index eb7f017e775..08bc2d1eb31 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -20,7 +20,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/-}/$(ver_cut 1-2)/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
@@ -98,6 +98,7 @@ RDEPEND="${CDEPEND}
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
+	qmldesigner? ( >=dev-qt/qtquicktimeline-${QT_PV} )
 	silversearcher? ( sys-apps/the_silver_searcher )
 	subversion? ( dev-vcs/subversion )
 	valgrind? ( dev-util/valgrind )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     354befb3a8c4386063a1d66a46cd3ac739b37994
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sat May 23 02:02:35 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Thu Jun 25 07:11:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354befb3

dev-qt/qt-creator: rm fixups

Don't use -f. If it fails, we likely want to know.

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine <plevine457 <AT> gmail.com>
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index c6649849153..4dcb19e8b43 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -131,7 +131,7 @@ src_prepare() {
 		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
 	fi
 	if ! use perfprofiler; then
-		rm -rf src/tools/perfparser || die
+		rm -r src/tools/perfparser || die
 		if ! use ctfvisualizer && ! use qmlprofiler; then
 			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
 		fi
@@ -170,7 +170,7 @@ src_prepare() {
 	sed -i -e "/^LANGUAGES\s*=/s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
 	# remove bundled qbs
-	rm -rf src/shared/qbs || die
+	rm -r src/shared/qbs || die
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason A. Donenfeld]

commit:     30749a61ee688244ee70711461c063a531c052b3
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Wed May  6 02:35:37 2020 +0000
Commit:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Wed May  6 02:56:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30749a61

dev-qt/qt-creator: bump to 4.12.0

Closes: https://bugs.gentoo.org/704540
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jason A. Donenfeld <zx2c4 <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                 |   1 +
 dev-qt/qt-creator/qt-creator-4.12.0.ebuild | 204 +++++++++++++++++++++++++++++
 2 files changed, 205 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 9c766617a7d..d7586825807 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-4.10.1.tar.xz 26299716 BLAKE2B a72e05fc80cb4065851e5849f49c6ec8e35b08916e928a9fea856ba30710220d8632f4a1ffaf1d1d5e2cae8e9121ab188b8f9ed672f9c8695c9e572ae609397c SHA512 ec0ac4d37e4195e906b100405869cb8e6dff618b8862d8ab620e30e034553eb944de6e4a92478ab2e67b86bd4c3e9cff6fd6051411893be36387d7821d712ce3
+DIST qt-creator-opensource-src-4.12.0.tar.xz 32575196 BLAKE2B 193e10a790f35944473c2177ba84e6e15d00effc769b4d63a51a217e4da93a4d6ca0061976d0def31c625a73d49b0adcb40e551d02a70ab7225b40f441d9b6b6 SHA512 9c35ebf095c2874b89af54b06fd190976a27f7e753a23e47db3b26947bdba64e4fe7774ae8b252867cf7f6f0c86b35d773a4012cae6d4aaa9101d7a31973f215
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

diff --git a/dev-qt/qt-creator/qt-creator-4.12.0.ebuild b/dev-qt/qt-creator/qt-creator-4.12.0.ebuild
new file mode 100644
index 00000000000..a4ca520e993
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.12.0.ebuild
@@ -0,0 +1,204 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+LLVM_MAX_SLOT=9
+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 beautifier boot2qt
+	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
+	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios +lsp:languageclient
+	mercurial modeling:modeleditor nim perforce perfprofiler python qbs:qbsprojectmanager
+	+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 )
+	boot2qt? ( remotelinux )
+	python? ( lsp )
+"
+
+# minimum Qt version required
+QT_PV="5.12.3:5"
+
+CDEPEND="
+	>=dev-cpp/yaml-cpp-0.6.2
+	>=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-9.0.1:= )
+	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]
+	cmake? ( dev-util/cmake )
+	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 && ! use ctfvisualizer; 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 ${LLVM_MAX_SLOT})") \
+		$(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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Mikle Kolyada]

commit:     045077ec0296e1508b28da617c6fab978620714d
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 27 13:54:51 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Apr 27 13:55:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=045077ec

dev-qt/qt-creator: remove bazaar references

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml             | 1 -
 dev-qt/qt-creator/qt-creator-4.10.1.ebuild | 5 ++---
 dev-qt/qt-creator/qt-creator-4.8.2.ebuild  | 5 ++---
 dev-qt/qt-creator/qt-creator-9999.ebuild   | 5 ++---
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 1d779d44115..91079b87e4e 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, Google Test, Boost.Test)</flag>
 		<flag name="autotools">Enable autotools project manager plugin</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
-		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
 		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
 		<flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
 		<flag name="clang">Build clang-based plugins (code model, formatting, refactoring, static analysis)</flag>

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 6d9284c5fde..dbf46966769 100644
--- a/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ fi
 
 # TODO: unbundle sqlite and KSyntaxHighlighting
 
-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier
+QTC_PLUGINS=(android +autotest baremetal 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
@@ -80,7 +80,6 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
-	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )

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 b499cf233a8..9494b2fc37c 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ fi
 
 # TODO: unbundle sqlite
 
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
 	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
 	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
 	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
@@ -78,7 +78,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake[server(+)] )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e24f4ae254c..c6649849153 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ fi
 
 # TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting
 
-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
+QTC_PLUGINS=(android +autotest baremetal beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
 	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
 	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
@@ -83,7 +83,6 @@ DEPEND="${CDEPEND}
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
-	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     c8d00fc561c831378fdcdf44f81d85111588f76d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  3 01:19:00 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Dec  3 01:19:00 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8d00fc5

dev-qt/qt-creator: remove 4.10.0_rc1

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                     |   1 -
 dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild | 200 -------------------------
 2 files changed, 201 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index ef507481f10..9c766617a7d 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,2 @@
-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

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 87ff878b208..00000000000
--- 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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     6263545fe9861fb558688e864516dbcbae55b630
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 04:09:36 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 05:52:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6263545f

dev-qt/qt-creator: fix USE=python

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 2b7b3ee74af..dbd6c1fbd77 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -29,13 +29,14 @@ fi
 QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
 	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
-	lsp:languageclient mercurial modeling:modeleditor nim perforce perfprofiler python:pythoneditor
+	lsp:languageclient mercurial modeling:modeleditor nim perforce perfprofiler python
 	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
 	silversearcher subversion valgrind winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 REQUIRED_USE="
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
+	python? ( lsp )
 	qnx? ( remotelinux )
 "
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     bbdb6e19709589cf079ce945a0dc9205105188bd
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 05:10:26 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 05:52:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbdb6e19

dev-qt/qt-creator: add mcu and webassembly plugins in 9999

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           | 16 +++++++++-------
 dev-qt/qt-creator/qt-creator-9999.ebuild |  5 +++--
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 457cf40adb4..1d779d44115 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -21,28 +21,30 @@
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
 		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
-		<flag name="ctfvisualizer">Build the Chrome Trace Format Visualizer plugin</flag>
+		<flag name="ctfvisualizer">Build the Chrome Trace Format visualizer plugin</flag>
 		<flag name="designer">Enable designer for QtWidgets-based UIs</flag>
-		<flag name="glsl">Enable GLSL source code editor</flag>
-		<flag name="help">Build the help plugin</flag>
+		<flag name="glsl">Enable GLSL editor</flag>
+		<flag name="help">Enable the integrated documentation viewer</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
 		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
+		<flag name="mcu">Build plugin for MCU devices</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
 		<flag name="modeling">Enable graphical model editor</flag>
-		<flag name="nim">Enable Nim source code editor</flag>
+		<flag name="nim">Build plugin for Nim language support</flag>
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
 		<flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag>
-		<flag name="python">Enable Python source code editor</flag>
+		<flag name="python">Build plugin for Python language support</flag>
 		<flag name="qbs">Enable QBS project manager plugin</flag>
 		<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
 		<flag name="qmlprofiler">Build the QML profiler plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
-		<flag name="remotelinux">Build remotelinux plugin</flag>
+		<flag name="remotelinux">Add support for deployment and execution on a remote Linux host</flag>
 		<flag name="scxml">Enable graphical SCXML editor</flag>
 		<flag name="serialterminal">Build serial terminal plugin</flag>
 		<flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></flag>
 		<flag name="systemd">Add support for retrieving application output from journald</flag>
-		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
+		<flag name="valgrind">Enable integration with <pkg>dev-util/valgrind</pkg></flag>
+		<flag name="webassembly">Build WebAssembly plugin</flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag>
 		<flag name="winrt">Build plugin for WinRT devices</flag>
 	</use>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index dbd6c1fbd77..841fd7e86ee 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -29,13 +29,14 @@ fi
 QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
 	cmake:cmakeprojectmanager cppcheck ctfvisualizer cvs +designer git glsl:glsleditor +help ios
-	lsp:languageclient mercurial modeling:modeleditor nim perforce perfprofiler python
+	lsp:languageclient mcu:mcusupport mercurial modeling:modeleditor nim perforce perfprofiler python
 	qbs:qbsprojectmanager +qmldesigner qmlprofiler qnx remotelinux scxml:scxmleditor serialterminal
-	silversearcher subversion valgrind winrt)
+	silversearcher subversion valgrind webassembly winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 REQUIRED_USE="
 	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
+	mcu? ( cmake )
 	python? ( lsp )
 	qnx? ( remotelinux )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     cdcd3965d96eee989ec92090d52ae6d1efa285fd
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 26 20:13:17 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 20:13:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcd3965

dev-qt/qt-creator: add 4.10.1

Closes: https://bugs.gentoo.org/695274
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                           |  1 +
 ...-creator-9999.ebuild => qt-creator-4.10.1.ebuild} | 20 ++++++++++----------
 dev-qt/qt-creator/qt-creator-9999.ebuild             |  9 +++++----
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index fb6e343869e..ef507481f10 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 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

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
similarity index 90%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-4.10.1.ebuild
index 6d0e795605f..f161df651cd 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.10.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+LLVM_MAX_SLOT=8
 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
@@ -25,15 +26,14 @@ fi
 
 # TODO: unbundle sqlite and KSyntaxHighlighting
 
-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
+QTC_PLUGINS=(android +autotest baremetal bazaar beautifier
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
-	cmake:cmakeprojectmanager cppcheck ctfvisualizer 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)
+	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="
-	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
 	qnx? ( remotelinux )
 "
@@ -55,7 +55,7 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clang? ( >=sys-devel/clang-8:= )
+	clang? ( sys-devel/clang:8= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
 	help? (
 		>=dev-qt/qthelp-${QT_PV}
@@ -80,7 +80,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake[server(+)] )
+	cmake? ( dev-util/cmake )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -129,7 +129,7 @@ src_prepare() {
 	fi
 	if ! use perfprofiler; then
 		rm -rf src/tools/perfparser || die
-		if ! use ctfvisualizer && ! use qmlprofiler; then
+		if ! use qmlprofiler; then
 			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
 		fi
 	fi
@@ -173,7 +173,7 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 6d0e795605f..2b7b3ee74af 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+LLVM_MAX_SLOT=8
 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
@@ -23,7 +24,7 @@ else
 	S=${WORKDIR}/${MY_P}
 fi
 
-# TODO: unbundle sqlite and KSyntaxHighlighting
+# TODO: unbundle sqlite, yaml-cpp, and KSyntaxHighlighting
 
 QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
 	'+clang:clangcodemodel|clangformat|clangpchmanager|clangrefactoring|clangtools' clearcase
@@ -55,7 +56,7 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clang? ( >=sys-devel/clang-8:= )
+	clang? ( sys-devel/clang:8= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
 	help? (
 		>=dev-qt/qthelp-${QT_PV}
@@ -80,7 +81,7 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake[server(+)] )
+	cmake? ( dev-util/cmake )
 	cppcheck? ( dev-util/cppcheck )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -173,7 +174,7 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use clang && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     2007682cfdcafcfcdb151d8defb39a226048b6e2
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 12:23:30 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Oct 26 19:28:34 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2007682c

dev-qt/qt-creator: add plugins/fix build for 9999

New plugins Boot2Qt [1] and Chrome Trace Format Visualizer [2].

1. https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=5942b824
2. https://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=7fec4182

Reported-by: Manuel Nickschas <sputnick <AT> quassel-irc.org>
Closes: https://github.com/gentoo/gentoo/pull/13036
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/metadata.xml           |  2 ++
 dev-qt/qt-creator/qt-creator-9999.ebuild | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 75d3a685298..457cf40adb4 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -16,10 +16,12 @@
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
 		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
+		<flag name="boot2qt">Build plugin for Boot2Qt devices</flag>
 		<flag name="clang">Build clang-based plugins (code model, formatting, refactoring, static analysis)</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
 		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
+		<flag name="ctfvisualizer">Build the Chrome Trace Format Visualizer plugin</flag>
 		<flag name="designer">Enable designer for QtWidgets-based UIs</flag>
 		<flag name="glsl">Enable GLSL source code editor</flag>
 		<flag name="help">Build the help plugin</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 87ff878b208..6d0e795605f 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -25,14 +25,15 @@ fi
 
 # TODO: unbundle sqlite and KSyntaxHighlighting
 
-QTC_PLUGINS=(android +autotest baremetal bazaar beautifier
+QTC_PLUGINS=(android +autotest baremetal bazaar beautifier boot2qt
 	'+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)
+	cmake:cmakeprojectmanager cppcheck ctfvisualizer 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="
+	boot2qt? ( remotelinux )
 	clang? ( test? ( qbs ) )
 	qnx? ( remotelinux )
 "
@@ -128,7 +129,7 @@ src_prepare() {
 	fi
 	if ! use perfprofiler; then
 		rm -rf src/tools/perfparser || die
-		if ! use qmlprofiler; then
+		if ! use ctfvisualizer && ! use qmlprofiler; then
 			sed -i -e '/tracing/d' src/libs/libs.pro tests/auto/auto.pro || die
 		fi
 	fi

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     6fedc93da12d9b5d5d473dc912ff0e945acba520
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  4 01:23:43 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Aug  4 01:24:39 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fedc93d

dev-qt/qt-creator: add 4.10.0_rc1

Closes: https://bugs.gentoo.org/683390
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                         |  1 +
 dev-qt/qt-creator/metadata.xml                     | 10 ++++-
 ...or-9999.ebuild => qt-creator-4.10.0_rc1.ebuild} | 51 ++++++++++++++--------
 dev-qt/qt-creator/qt-creator-9999.ebuild           | 51 ++++++++++++++--------
 4 files changed, 73 insertions(+), 40 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 553c4d0c3ad..fb6e343869e 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
+DIST qt-creator-opensource-src-4.10.0-rc1.tar.xz 26226544 BLAKE2B 5fc66e73d93b2d358c4f3c23e80029b805b1aa841b71fc35077b089bf51d705b6f7f352bd36f2dd573aef0a95efea3573e08af8eea31aeb0f43d33172935cdc1 SHA512 e5f7fb5b67fd803fbcb2a96b26d96e53e5d43fd3733c4867ce9e2f4764220d1772fa788424d917acdc0c78c580ce8ee774e561c6bf5fd54feac320073d5fb263
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index da6920d3f84..75d3a685298 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -11,14 +11,16 @@
 	</maintainer>
 	<use>
 		<flag name="android">Build plugin for Android devices</flag>
+		<flag name="autotest">Enable integration with popular unit testing frameworks (QtTest, Google Test, Boost.Test)</flag>
 		<flag name="autotools">Enable autotools project manager plugin</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
-		<flag name="clang">Build clang-based plugins (code model, format, static analysis)</flag>
+		<flag name="beautifier">Build the beautifier plugin (supports astyle, clang-format, and uncrustify)</flag>
+		<flag name="clang">Build clang-based plugins (code model, formatting, refactoring, static analysis)</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
 		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
-		<flag name="designer">Build widget designer plugin</flag>
+		<flag name="designer">Enable designer for QtWidgets-based UIs</flag>
 		<flag name="glsl">Enable GLSL source code editor</flag>
 		<flag name="help">Build the help plugin</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
@@ -27,9 +29,13 @@
 		<flag name="modeling">Enable graphical model editor</flag>
 		<flag name="nim">Enable Nim source code editor</flag>
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
+		<flag name="perfprofiler">Build the Linux Perf-based profiler plugin</flag>
 		<flag name="python">Enable Python source code editor</flag>
 		<flag name="qbs">Enable QBS project manager plugin</flag>
+		<flag name="qmldesigner">Enable designer for QML/QtQuick-based UIs</flag>
+		<flag name="qmlprofiler">Build the QML profiler plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
+		<flag name="remotelinux">Build remotelinux plugin</flag>
 		<flag name="scxml">Enable graphical SCXML editor</flag>
 		<flag name="serialterminal">Build serial terminal plugin</flag>
 		<flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild
similarity index 76%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild
index 3a1250a6389..87ff878b208 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.10.0_rc1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
@@ -18,22 +18,27 @@ 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	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
+# TODO: unbundle sqlite and KSyntaxHighlighting
 
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
-	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
-	silversearcher subversion valgrind winrt)
+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.9.0:5"
+QT_PV="5.12.3:5"
 
 CDEPEND="
 	>=dev-qt/qtconcurrent-${QT_PV}
@@ -49,13 +54,14 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clang? ( >=sys-devel/clang-6:= )
+	clang? ( >=sys-devel/clang-8:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
 	help? (
 		>=dev-qt/qthelp-${QT_PV}
 		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 	)
-	qbs? ( >=dev-util/qbs-1.13.0 )
+	perfprofiler? ( dev-libs/elfutils )
+	qbs? ( >=dev-util/qbs-1.13.1 )
 	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
 "
@@ -65,17 +71,13 @@ DEPEND="${CDEPEND}
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? (
 		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
-		|| (
-			>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
-			<dev-qt/qtdeclarative-5.12.0[xml]
-		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}
 		>=dev-qt/qttest-${QT_PV}
+		>=dev-qt/qtxmlpatterns-${QT_PV}[qml]
 	)
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake[server(+)] )
 	cppcheck? ( dev-util/cppcheck )
@@ -104,7 +106,7 @@ src_prepare() {
 	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
 		if ! use ${plugin%:*}; then
 			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+			sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
 				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
@@ -113,7 +115,7 @@ src_prepare() {
 	# avoid building unused support libraries and tools
 	if ! use clang; then
 		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-		sed -i -e '/SUBDIRS += clangbackend/d' src/tools/tools.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
@@ -124,6 +126,16 @@ src_prepare() {
 	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
@@ -138,6 +150,7 @@ src_prepare() {
 	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
@@ -172,7 +185,7 @@ src_test() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${ED}usr" install
+	emake INSTALL_ROOT="${ED}/usr" install
 
 	dodoc dist/{changes-*,known-issues}
 

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 3a1250a6389..87ff878b208 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
@@ -18,22 +18,27 @@ 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	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
+# TODO: unbundle sqlite and KSyntaxHighlighting
 
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
-	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
-	silversearcher subversion valgrind winrt)
+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.9.0:5"
+QT_PV="5.12.3:5"
 
 CDEPEND="
 	>=dev-qt/qtconcurrent-${QT_PV}
@@ -49,13 +54,14 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clang? ( >=sys-devel/clang-6:= )
+	clang? ( >=sys-devel/clang-8:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
 	help? (
 		>=dev-qt/qthelp-${QT_PV}
 		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 	)
-	qbs? ( >=dev-util/qbs-1.13.0 )
+	perfprofiler? ( dev-libs/elfutils )
+	qbs? ( >=dev-util/qbs-1.13.1 )
 	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
 "
@@ -65,17 +71,13 @@ DEPEND="${CDEPEND}
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? (
 		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
-		|| (
-			>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
-			<dev-qt/qtdeclarative-5.12.0[xml]
-		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}
 		>=dev-qt/qttest-${QT_PV}
+		>=dev-qt/qtxmlpatterns-${QT_PV}[qml]
 	)
 "
 RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
 	cmake? ( dev-util/cmake[server(+)] )
 	cppcheck? ( dev-util/cppcheck )
@@ -104,7 +106,7 @@ src_prepare() {
 	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
 		if ! use ${plugin%:*}; then
 			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+			sed -i -re "s/(^\s+|\s*SUBDIRS\s*\+=.*)\<(${plugin#*:})\>(.*)/\1\3/" \
 				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
 		fi
 	done
@@ -113,7 +115,7 @@ src_prepare() {
 	# avoid building unused support libraries and tools
 	if ! use clang; then
 		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-		sed -i -e '/SUBDIRS += clangbackend/d' src/tools/tools.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
@@ -124,6 +126,16 @@ src_prepare() {
 	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
@@ -138,6 +150,7 @@ src_prepare() {
 	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
@@ -172,7 +185,7 @@ src_test() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${ED}usr" install
+	emake INSTALL_ROOT="${ED}/usr" install
 
 	dodoc dist/{changes-*,known-issues}
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     80bdc5ef9e7b1239c7652165d6c1a33bb8b50eda
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 19:26:15 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 19:29:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80bdc5ef

dev-qt/qt-creator: botan dep was dropped in 4.9 and later

Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-9999.ebuild | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 8f3a9f11681..3a1250a6389 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)
 }

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     b21154ad1d7fc9c657e50c438c0945c226f5b0e1
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  6 19:29:33 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul  6 19:29:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b21154ad

dev-qt/qt-creator: in 4.8.2, restrict botan dep due to bug 689346

Closes: https://bugs.gentoo.org/689346
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 506aa593157..612329ed88d 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]

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     3b93637a7d6010b70cb5a3695e6f427cb7f5ee2b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 05:08:40 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 05:08:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b93637a

dev-qt/qt-creator: remove old

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                |   2 -
 dev-qt/qt-creator/metadata.xml            |   2 -
 dev-qt/qt-creator/qt-creator-4.6.2.ebuild | 177 ----------------------------
 dev-qt/qt-creator/qt-creator-4.8.0.ebuild | 189 ------------------------------
 4 files changed, 370 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 82c47cd70ce..553c4d0c3ad 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1 @@
-DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6
-DIST qt-creator-opensource-src-4.8.0.tar.xz 24545016 BLAKE2B f2c4256ab2d2eb1ac8bf897df2517f8784b97723564a9f53347de858301997c4d02f6a20269a4d74d0305f27babc65491521965b7e1941cd3c3778cb9701c8d5 SHA512 4b6c6778493b7c8b593868ebfe90ccb21eb3daec16853604ea422f29fc57be5623033c79610507931202fa34a648760c29134670d26b1c4c098e1eae28bb1743
 DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 45e3c6a24d8..da6920d3f84 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -15,8 +15,6 @@
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
 		<flag name="clang">Build clang-based plugins (code model, format, static analysis)</flag>
-		<flag name="clangcodemodel">Build clang-based code model and refactoring plugins</flag>
-		<flag name="clangstaticanalyzer">Build clang-based static analyzer plugin</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
 		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>

diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
deleted file mode 100644
index 5ab18aec2d4..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.2:5"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	clangcodemodel? ( >=sys-devel/clang-5:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( ~dev-util/qbs-1.11.1 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-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/qtxmlpatterns-5.12.1-r1:5[qml(+)]
-			<dev-qt/qtdeclarative-5.12.0[xml]
-		)
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
-	cmake? ( dev-util/cmake[server(+)] )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	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 clangcodemodel && 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+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# 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
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
-		USE_SYSTEM_BOTAN=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.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
deleted file mode 100644
index bdcfafacbeb..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
-	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
-	silversearcher subversion valgrind winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-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]
-	>=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-6:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	help? (
-		>=dev-qt/qthelp-${QT_PV}
-		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	)
-	qbs? ( ~dev-util/qbs-1.12.2 )
-	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/qtxmlpatterns-5.12.1-r1:5[qml(+)]
-			<dev-qt/qtdeclarative-5.12.0[xml]
-		)
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	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+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				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 '/SUBDIRS += clangbackend/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 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
-
-	# 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 botan
-	rm -rf src/libs/3rdparty/botan || 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 \
-		CONFIG+=use_system_botan \
-		$(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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     5973fccdf074eaa705afceacb14afe9edc868e52
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 05:06:15 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 05:06:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5973fccd

dev-qt/qt-creator: stabilize 4.8.2 on amd64

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.8.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 8d0c85c4e5b..506aa593157 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.2.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="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     83a7b166ebd273834a9e6e48eaae24e93685c0e1
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 02:38:35 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 12 02:38:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83a7b166

dev-qt/qt-creator: add 4.8.2

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                                           | 1 +
 .../qt-creator/{qt-creator-9999.ebuild => qt-creator-4.8.2.ebuild}   | 5 ++++-
 dev-qt/qt-creator/qt-creator-9999.ebuild                             | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 04e7204a2a7..82c47cd70ce 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6
 DIST qt-creator-opensource-src-4.8.0.tar.xz 24545016 BLAKE2B f2c4256ab2d2eb1ac8bf897df2517f8784b97723564a9f53347de858301997c4d02f6a20269a4d74d0305f27babc65491521965b7e1941cd3c3778cb9701c8d5 SHA512 4b6c6778493b7c8b593868ebfe90ccb21eb3daec16853604ea422f29fc57be5623033c79610507931202fa34a648760c29134670d26b1c4c098e1eae28bb1743
+DIST qt-creator-opensource-src-4.8.2.tar.xz 24600872 BLAKE2B c686ea4f0ab981cba98319d8d7dd8eee9fd967d17e80f2602e8416145bddcbd7cae928d06a950914d677c9b2e82ed855812e66d64ce7cc998742357284f41865 SHA512 9900a82b1298a1cc74b33eab6a1063ed77e11f3150b8f82a72b7703b88f979e5a332efee9a622554df5238b44470e99a061b6c70f0d8cdfc352a07ce51a4c450

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
similarity index 97%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-4.8.2.ebuild
index ba2d57c8c41..8d0c85c4e5b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.2.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
 		>=dev-qt/qthelp-${QT_PV}
 		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 	)
-	qbs? ( >=dev-util/qbs-1.13.0 )
+	qbs? ( ~dev-util/qbs-1.12.2 )
 	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
 "
@@ -140,6 +140,9 @@ src_prepare() {
 	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
 
+	# 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
 

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index ba2d57c8c41..8f3a9f11681 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -140,6 +140,9 @@ src_prepare() {
 	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
 
+	# 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
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     1092dc718538c05b2d1e94dc4f6f91006d77628d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat May 11 06:39:44 2019 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat May 11 06:39:44 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1092dc71

dev-qt/qt-creator: fix qbs dependency

Closes: https://bugs.gentoo.org/685444
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.8.0.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
index fa9b4277be5..bdcfafacbeb 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
 		>=dev-qt/qthelp-${QT_PV}
 		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 	)
-	qbs? ( >=dev-util/qbs-1.12.2 )
+	qbs? ( ~dev-util/qbs-1.12.2 )
 	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
 "

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index fa9b4277be5..ba2d57c8c41 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
 		>=dev-qt/qthelp-${QT_PV}
 		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 	)
-	qbs? ( >=dev-util/qbs-1.12.2 )
+	qbs? ( >=dev-util/qbs-1.13.0 )
 	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Andreas Sturmlechner]

commit:     1e44353c6e3750bcb64777c1e931e22af70da664
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 20:55:08 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 22:41:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e44353c

dev-qt/qt-creator: Demand new qml USEdep from qtxmlpatterns

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.6.2.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-4.8.0.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
index 852389474b3..5ab18aec2d4 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
@@ -64,7 +64,7 @@ DEPEND="${CDEPEND}
 	test? (
 		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
 		|| (
-			>=dev-qt/qtxmlpatterns-5.12.1-r1:5
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
 			<dev-qt/qtdeclarative-5.12.0[xml]
 		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}

diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
index 5411ac70e83..fa9b4277be5 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
@@ -67,7 +67,7 @@ DEPEND="${CDEPEND}
 	test? (
 		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
 		|| (
-			>=dev-qt/qtxmlpatterns-5.12.1-r1:5
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
 			<dev-qt/qtdeclarative-5.12.0[xml]
 		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 5411ac70e83..fa9b4277be5 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -67,7 +67,7 @@ DEPEND="${CDEPEND}
 	test? (
 		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
 		|| (
-			>=dev-qt/qtxmlpatterns-5.12.1-r1:5
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5[qml(+)]
 			<dev-qt/qtdeclarative-5.12.0[xml]
 		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Andreas Sturmlechner]

commit:     0cf31b5c5e3847277cd6824c146e9fcf785fef2f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 00:30:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 07:07:40 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cf31b5c

dev-qt/qt-creator: Add dev-qt/qtxmlpatterns alternative test DEPEND

In Qt 5.12, xmllistmodel moved from qtdeclarative[xml] into qtxmlpatterns.

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.6.2.ebuild | 8 ++++++--
 dev-qt/qt-creator/qt-creator-4.8.0.ebuild | 8 ++++++--
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
index 7e5bc26a04d..852389474b3 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -62,7 +62,11 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+		|| (
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5
+			<dev-qt/qtdeclarative-5.12.0[xml]
+		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}
 		>=dev-qt/qttest-${QT_PV}
 	)

diff --git a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
index 207b4b6cbf8..5411ac70e83 100644
--- a/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,7 +65,11 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+		|| (
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5
+			<dev-qt/qtdeclarative-5.12.0[xml]
+		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}
 		>=dev-qt/qttest-${QT_PV}
 	)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 207b4b6cbf8..5411ac70e83 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -65,7 +65,11 @@ DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage]
+		|| (
+			>=dev-qt/qtxmlpatterns-5.12.1-r1:5
+			<dev-qt/qtdeclarative-5.12.0[xml]
+		)
 		>=dev-qt/qtquickcontrols2-${QT_PV}
 		>=dev-qt/qttest-${QT_PV}
 	)

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     80f3fa82936c1d50b6242c1fb5c58e4da0d0fec7
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 18:40:09 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 18:40:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80f3fa82

dev-qt/qt-creator: in 4.6.2, restrict qbs dep to ~1.11.1

Closes: https://bugs.gentoo.org/661644
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/qt-creator-4.6.2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
index 975beaf20cf..7e5bc26a04d 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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.11.1 )
+	qbs? ( ~dev-util/qbs-1.11.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     01bd7fba65a1c76324e36077bca49b4da7f457ac
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 08:09:48 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 08:49:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01bd7fba

dev-qt/qt-creator: add 4.8.0

 * new plugins: cppcheck, LSP client, silver searcher, serial terminal
 * make help plugin (and its qthelp dependency) optional
 * unify all clang-based plugins under USE=clang
 * enable clang and designer USE flags by default
 * disable updateinfo plugin

Closes: https://bugs.gentoo.org/661646
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>

 dev-qt/qt-creator/Manifest                         |  1 +
 dev-qt/qt-creator/metadata.xml                     |  6 +++
 ...creator-9999.ebuild => qt-creator-4.8.0.ebuild} | 47 +++++++++++++---------
 dev-qt/qt-creator/qt-creator-9999.ebuild           | 47 +++++++++++++---------
 4 files changed, 65 insertions(+), 36 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index bd6311b1d38..04e7204a2a7 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6
+DIST qt-creator-opensource-src-4.8.0.tar.xz 24545016 BLAKE2B f2c4256ab2d2eb1ac8bf897df2517f8784b97723564a9f53347de858301997c4d02f6a20269a4d74d0305f27babc65491521965b7e1941cd3c3778cb9701c8d5 SHA512 4b6c6778493b7c8b593868ebfe90ccb21eb3daec16853604ea422f29fc57be5623033c79610507931202fa34a648760c29134670d26b1c4c098e1eae28bb1743

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 5cdf568ca74..45e3c6a24d8 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,13 +14,17 @@
 		<flag name="autotools">Enable autotools project manager plugin</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
+		<flag name="clang">Build clang-based plugins (code model, format, static analysis)</flag>
 		<flag name="clangcodemodel">Build clang-based code model and refactoring plugins</flag>
 		<flag name="clangstaticanalyzer">Build clang-based static analyzer plugin</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
+		<flag name="cppcheck">Enable integration with <pkg>dev-util/cppcheck</pkg></flag>
 		<flag name="designer">Build widget designer plugin</flag>
 		<flag name="glsl">Enable GLSL source code editor</flag>
+		<flag name="help">Build the help plugin</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
+		<flag name="lsp">Add support for the Language Server Protocol (LSP)</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
 		<flag name="modeling">Enable graphical model editor</flag>
 		<flag name="nim">Enable Nim source code editor</flag>
@@ -29,6 +33,8 @@
 		<flag name="qbs">Enable QBS project manager plugin</flag>
 		<flag name="qnx">Build plugin for QNX devices</flag>
 		<flag name="scxml">Enable graphical SCXML editor</flag>
+		<flag name="serialterminal">Build serial terminal plugin</flag>
+		<flag name="silversearcher">Enable integration with <pkg>sys-apps/the_silver_searcher</pkg></flag>
 		<flag name="systemd">Add support for retrieving application output from journald</flag>
 		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
similarity index 80%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-4.8.0.ebuild
index 5f8021eb3f5..e08af8921a1 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
 
@@ -26,22 +26,21 @@ fi
 # TODO: unbundle sqlite
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
+	silversearcher subversion valgrind winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="5.9.0:5"
 
 CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-libs/botan-2.8:2=[-bindist]
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
 	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}[ssl]
 	>=dev-qt/qtprintsupport-${QT_PV}
 	>=dev-qt/qtquickcontrols-${QT_PV}
@@ -51,11 +50,15 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clangcodemodel? ( >=sys-devel/clang-6:= )
+	clang? ( >=sys-devel/clang-6:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.11.1 )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	qbs? ( >=dev-util/qbs-1.12.2 )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
 DEPEND="${CDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
@@ -71,11 +74,12 @@ RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-6:* )
 	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 )
 "
@@ -87,7 +91,7 @@ done
 unset x
 
 pkg_setup() {
-	use clangcodemodel && llvm_pkg_setup
+	use clang && llvm_pkg_setup
 }
 
 src_prepare() {
@@ -101,15 +105,19 @@ src_prepare() {
 				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 clangcodemodel; then
+	if ! use clang; 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
+		sed -i -e '/SUBDIRS += clangbackend/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 || die
+	fi
 	if ! use modeling; then
 		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
 	fi
@@ -137,6 +145,9 @@ 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
 }
@@ -144,13 +155,13 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(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 \
+		CONFIG+=use_system_botan \
 		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1) \
-		USE_SYSTEM_BOTAN=1
+		$(use test && echo BUILD_TESTS=1)
 }
 
 src_test() {

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 5f8021eb3f5..e08af8921a1 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+PLOCALES="cs da de fr ja pl ru sl uk zh-CN zh-TW"
 
 inherit llvm qmake-utils virtualx xdg
 
@@ -26,22 +26,21 @@ fi
 # TODO: unbundle sqlite
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
+	'+clang:clangcodemodel|clangformat|clangtools' clearcase cmake:cmakeprojectmanager cppcheck
+	cvs +designer git glsl:glsleditor +help ios lsp:languageclient mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor serialterminal
+	silversearcher subversion valgrind winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="5.9.0:5"
 
 CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-libs/botan-2.8:2=[-bindist]
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
 	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${QT_PV}
 	>=dev-qt/qtnetwork-${QT_PV}[ssl]
 	>=dev-qt/qtprintsupport-${QT_PV}
 	>=dev-qt/qtquickcontrols-${QT_PV}
@@ -51,11 +50,15 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clangcodemodel? ( >=sys-devel/clang-6:= )
+	clang? ( >=sys-devel/clang-6:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.11.1 )
+	help? (
+		>=dev-qt/qthelp-${QT_PV}
+		webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+	)
+	qbs? ( >=dev-util/qbs-1.12.2 )
+	serialterminal? ( >=dev-qt/qtserialport-${QT_PV} )
 	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
 DEPEND="${CDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
@@ -71,11 +74,12 @@ RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-6:* )
 	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 )
 "
@@ -87,7 +91,7 @@ done
 unset x
 
 pkg_setup() {
-	use clangcodemodel && llvm_pkg_setup
+	use clang && llvm_pkg_setup
 }
 
 src_prepare() {
@@ -101,15 +105,19 @@ src_prepare() {
 				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 clangcodemodel; then
+	if ! use clang; 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
+		sed -i -e '/SUBDIRS += clangbackend/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 || die
+	fi
 	if ! use modeling; then
 		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
 	fi
@@ -137,6 +145,9 @@ 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
 }
@@ -144,13 +155,13 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(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 \
+		CONFIG+=use_system_botan \
 		$(use systemd && echo CONFIG+=journald) \
-		$(use test && echo BUILD_TESTS=1) \
-		USE_SYSTEM_BOTAN=1
+		$(use test && echo BUILD_TESTS=1)
 }
 
 src_test() {

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     d78430f7ca01df809148fb02e92b78036b53321f
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 02:54:21 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 02:57:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d78430f7

dev-qt/qt-creator: remove old

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-qt/qt-creator/Manifest                |   2 -
 dev-qt/qt-creator/qt-creator-4.5.2.ebuild | 172 -----------------------------
 dev-qt/qt-creator/qt-creator-4.6.1.ebuild | 173 ------------------------------
 3 files changed, 347 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 5b3b986443e..bd6311b1d38 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1 @@
-DIST qt-creator-opensource-src-4.5.2.tar.xz 21745192 BLAKE2B 4860c6041542758647d27ae3aaac15dbbc72bbecbcf335e3bceab378c720979a3e89777762936a4b68eacec02a7b285dec08a19003ac3260de1e2e4ee12706c0 SHA512 cc3f20c109e810e8958495fd0d84461bc9ead7b4172600229969a6a331341f0b76069a71893f1ba279550293b131f6cca5b79c112d67f3aebb6244415489c223
-DIST qt-creator-opensource-src-4.6.1.tar.xz 23403488 BLAKE2B 32fc6d655616302721cccedc82e54a2f3c6e61a5736f0e0f08d56e53dba7ba130ac601c4b3ca9034f9d90cc6f97b3b152a4a985c71f996cd3860124159b9f0e1 SHA512 c5cf1eac02390ce0a52799b90664faf6ba5c5106aa1f5f2ecf4397b45bfb6dcd11480a29dc94600b6e99a911949f71f3f844b34201623edb35fbd5364ce53236
 DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6

diff --git a/dev-qt/qt-creator/qt-creator-4.5.2.ebuild b/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
deleted file mode 100644
index 382084a382c..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.2:5"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	clangcodemodel? ( >=sys-devel/clang-3.9:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( =dev-util/qbs-1.10.1* )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
-	cmake? ( dev-util/cmake[server(+)] )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	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 clangcodemodel && 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+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# avoid building unused support libraries
-	if ! use clangcodemodel; then
-		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
-		USE_SYSTEM_BOTAN=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.6.1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
deleted file mode 100644
index 17290bea032..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.2:5"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	clangcodemodel? ( >=sys-devel/clang-5:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.11.1 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
-	cmake? ( dev-util/cmake[server(+)] )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	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 clangcodemodel && 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+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# 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
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
-		USE_SYSTEM_BOTAN=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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     f324373202175c1cd8408aa9754df3aced305668
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 20 02:56:26 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jul 20 02:57:52 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3243732

dev-qt/qt-creator: stabilize 4.6.2 on amd64

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 dev-qt/qt-creator/qt-creator-4.6.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
index 17290bea032..975beaf20cf 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.2.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="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     eb573bb605e4f621a542d0aa4348e28e659f1a42
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 17:03:20 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 17:09:19 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb573bb6

dev-qt/qt-creator: raise clang dependency

http://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=319daa2612dcdd205e271cf2b4b5bf4532fad163

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-qt/qt-creator/qt-creator-9999.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 2156903101b..5f8021eb3f5 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -51,7 +51,7 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clangcodemodel? ( >=sys-devel/clang-5:= )
+	clangcodemodel? ( >=sys-devel/clang-6:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
 	qbs? ( >=dev-util/qbs-1.11.1 )
 	systemd? ( sys-apps/systemd:= )
@@ -71,7 +71,7 @@ RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
+	clangstaticanalyzer? ( >=sys-devel/clang-6:* )
 	cmake? ( dev-util/cmake[server(+)] )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     beb7de3061eca67819ecfd8d670492712b0b41f2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 16 17:07:41 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jun 16 17:09:21 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb7de30

dev-qt/qt-creator: add 4.6.2

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 dev-qt/qt-creator/Manifest                |   1 +
 dev-qt/qt-creator/qt-creator-4.6.2.ebuild | 173 ++++++++++++++++++++++++++++++
 2 files changed, 174 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 9e873a51476..5b3b986443e 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-4.5.2.tar.xz 21745192 BLAKE2B 4860c6041542758647d27ae3aaac15dbbc72bbecbcf335e3bceab378c720979a3e89777762936a4b68eacec02a7b285dec08a19003ac3260de1e2e4ee12706c0 SHA512 cc3f20c109e810e8958495fd0d84461bc9ead7b4172600229969a6a331341f0b76069a71893f1ba279550293b131f6cca5b79c112d67f3aebb6244415489c223
 DIST qt-creator-opensource-src-4.6.1.tar.xz 23403488 BLAKE2B 32fc6d655616302721cccedc82e54a2f3c6e61a5736f0e0f08d56e53dba7ba130ac601c4b3ca9034f9d90cc6f97b3b152a4a985c71f996cd3860124159b9f0e1 SHA512 c5cf1eac02390ce0a52799b90664faf6ba5c5106aa1f5f2ecf4397b45bfb6dcd11480a29dc94600b6e99a911949f71f3f844b34201623edb35fbd5364ce53236
+DIST qt-creator-opensource-src-4.6.2.tar.xz 23397676 BLAKE2B a6c641d2daaa1d692919739de1a26da0a8806db3a8678dffc792fc77855ecf14136ad1e990e678f66afc471950c6bcc0803a6d47a21af6eb91ff010e77383ee6 SHA512 32d583cc3684b268a649e265ebe97bde0a9fdcea60013d8966edef6df3fa0097bcb19d9fc7abf5ece9b59870ad1049e8320477df4321f0f311843e359aaea6b6

diff --git a/dev-qt/qt-creator/qt-creator-4.6.2.ebuild b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
new file mode 100644
index 00000000000..17290bea032
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.6.2.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	clangcodemodel? ( >=sys-devel/clang-5:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.11.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	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 clangcodemodel && 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+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# 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
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
+		USE_SYSTEM_BOTAN=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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     b896c907ad2d2b3d7fedb7d21ee252f3c1133f21
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 21 05:10:08 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 21 05:11:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b896c907

dev-qt/qt-creator: fix build with USE=-clangcodemodel

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 dev-qt/qt-creator/qt-creator-4.6.1.ebuild | 3 ++-
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.6.1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
index f18340089d1..17290bea032 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
@@ -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 9a301fa2fae..2156903101b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -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

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     6de6c65b71105cdc04595d55acf7271340a771f0
Author:     Asgeir Bjarni Ingvarsson <asgeir <AT> fundinn <DOT> org>
AuthorDate: Fri May  4 16:48:04 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 21 05:11:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6de6c65b

dev-qt/qt-creator: version bump to 4.6.1

Closes: https://bugs.gentoo.org/651960
Closes: https://github.com/gentoo/gentoo/pull/8257
Package-Manager: Portage-2.3.38, Repoman-2.3.9

 dev-qt/qt-creator/Manifest                                          | 1 +
 .../qt-creator/{qt-creator-9999.ebuild => qt-creator-4.6.1.ebuild}  | 6 +++---
 dev-qt/qt-creator/qt-creator-9999.ebuild                            | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2e69608aea8..fd77dd7b3a1 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 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
+DIST qt-creator-opensource-src-4.6.1.tar.xz 23403488 BLAKE2B 32fc6d655616302721cccedc82e54a2f3c6e61a5736f0e0f08d56e53dba7ba130ac601c4b3ca9034f9d90cc6f97b3b152a4a985c71f996cd3860124159b9f0e1 SHA512 c5cf1eac02390ce0a52799b90664faf6ba5c5106aa1f5f2ecf4397b45bfb6dcd11480a29dc94600b6e99a911949f71f3f844b34201623edb35fbd5364ce53236

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
similarity index 98%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-4.6.1.ebuild
index 29fd39334fc..f18340089d1 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.1.ebuild
@@ -33,7 +33,7 @@ QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectman
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
-QT_PV="5.9.0:5"
+QT_PV="5.6.2:5"
 
 CDEPEND="
 	=dev-libs/botan-1.10*[-bindist,threads]
@@ -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] )
 "
@@ -123,7 +123,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/tracing/tracing.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
 	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
 
 	# fix path to some clang headers

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 29fd39334fc..9a301fa2fae 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] )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     e342fad546aaedba42f19135a036e0aa862f4364
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon May 21 00:33:39 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon May 21 05:11:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e342fad5

dev-qt/qt-creator: remove 4.6.0_rc1

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 dev-qt/qt-creator/Manifest                    |   1 -
 dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild | 172 --------------------------
 2 files changed, 173 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index fd77dd7b3a1..9e873a51476 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,2 @@
 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
 DIST qt-creator-opensource-src-4.6.1.tar.xz 23403488 BLAKE2B 32fc6d655616302721cccedc82e54a2f3c6e61a5736f0e0f08d56e53dba7ba130ac601c4b3ca9034f9d90cc6f97b3b152a4a985c71f996cd3860124159b9f0e1 SHA512 c5cf1eac02390ce0a52799b90664faf6ba5c5106aa1f5f2ecf4397b45bfb6dcd11480a29dc94600b6e99a911949f71f3f844b34201623edb35fbd5364ce53236

diff --git a/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild
deleted file mode 100644
index b5759eabebf..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS=""
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.2:5"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	clangcodemodel? ( >=sys-devel/clang-5:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.10.1 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
-	cmake? ( dev-util/cmake[server(+)] )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	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 clangcodemodel && 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+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# avoid building unused support libraries
-	if ! use clangcodemodel; then
-		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
-		USE_SYSTEM_BOTAN=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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     7b86decd390c206f2249021e7913174fa22f70ff
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 20 23:56:39 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 20 23:56:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b86decd

dev-qt/qt-creator: in 4.5.2, pin qbs dep to =1.10.1*

Closes: https://bugs.gentoo.org/655784
Package-Manager: Portage-2.3.38, Repoman-2.3.9

 dev-qt/qt-creator/qt-creator-4.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 5e898478db5..382084a382c 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] )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     affd2f5dd1a3339b81a06d14c6e41251da7354da
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu May 17 14:13:19 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 20 23:48:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=affd2f5d

dev-qt/qt-creator: Fix sed in src_prepare()

We disable unreliable tests by using sed magic, and one of the files
(and directories) related to this was renamed from 'timeline' to 'tracing'.

http://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=734611131dc20283b118353130bdd5e16ce0aeaf

Closes: https://github.com/gentoo/gentoo/pull/8454
Package-Manager: Portage-2.3.38, Repoman-2.3.9

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index f607e30d390..29fd39334fc 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -123,7 +123,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

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     0f381bf84bad5197663e32ec75f29e41a8a6ff57
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 01:27:44 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 01:27:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f381bf8

dev-qt/qt-creator: remove old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qt-creator/Manifest                |   2 -
 dev-qt/qt-creator/qt-creator-4.4.1.ebuild | 188 ------------------------------
 dev-qt/qt-creator/qt-creator-4.5.0.ebuild | 188 ------------------------------
 3 files changed, 378 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 28a9dcbdec6..2e69608aea8 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,2 @@
-DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
-DIST qt-creator-opensource-src-4.5.0.tar.xz 21641628 BLAKE2B 83d8ef57b87278994451d34b69a17a7d6c872b014c82940593c83c53e4a693054bdcfa38c4706083ed2bc0386ae5fa8afcea4747d1dee67a2a9b1e0a3fa6aeed SHA512 9296ebef4a3d5ae40a9fa3a4039e77b8e407dfb52af3a88b4cc615a89e163d92de420d9db614bc689adc695879f0c2e1906e9a218e7a6b96c4b222d52c94912c
 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

diff --git a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
deleted file mode 100644
index 6b958f5b91d..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils toolchain-funcs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.2:5"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	clangcodemodel? ( >=sys-devel/clang-3.9:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.9.1 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
-	cmake? ( dev-util/cmake[server(+)] )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	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 clangcodemodel && llvm_pkg_setup
-}
-
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
-			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.9 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# avoid building unused support libraries
-	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
-		USE_SYSTEM_BOTAN=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.5.0.ebuild b/dev-qt/qt-creator/qt-creator-4.5.0.ebuild
deleted file mode 100644
index 38641edea7d..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.5.0.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils toolchain-funcs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.2:5"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	clangcodemodel? ( >=sys-devel/clang-3.9:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.9.1 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
-	cmake? ( dev-util/cmake[server(+)] )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	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 clangcodemodel && llvm_pkg_setup
-}
-
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
-			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.9 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# avoid building unused support libraries
-	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
-		USE_SYSTEM_BOTAN=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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     7e90745ad1eb9894e9fc69ddf69559cc21fa8291
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 24 01:25:14 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar 24 01:25:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e90745a

dev-qt/qt-creator: stabilize 4.5.2 on amd64

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qt-creator/qt-creator-4.5.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 13568271468..5e898478db5 100644
--- a/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.5.2.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="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     43f45f5f6ac4ce77aa70481e1ffcf47388b25102
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 00:14:36 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 00:15:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43f45f5f

dev-qt/qt-creator: fix sed

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qt-creator/qt-creator-4.5.2.ebuild     | 2 +-
 dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 6581a0d4a74..13568271468 100644
--- a/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
@@ -104,7 +104,7 @@ src_prepare() {
 
 	# avoid building unused support libraries
 	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+		sed -i -e '/clangsupport/d' src/libs/libs.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-4.6.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild
index 502a2a9e1c8..b5759eabebf 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild
@@ -104,7 +104,7 @@ src_prepare() {
 
 	# avoid building unused support libraries
 	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+		sed -i -e '/clangsupport/d' src/libs/libs.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 bfb220f695a..f607e30d390 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -104,7 +104,7 @@ src_prepare() {
 
 	# avoid building unused support libraries
 	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+		sed -i -e '/clangsupport/d' src/libs/libs.pro || die
 	fi
 	if ! use glsl; then
 		sed -i -e '/glsl/d' src/libs/libs.pro || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     d0741f330f6c11a26db806fab884e23972226a1b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 22:57:07 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 00:15:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0741f33

dev-qt/qt-creator: raise qt deps in live ebuild

See https://codereview.qt-project.org/223368

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qt-creator/qt-creator-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index f7561482786..bfb220f695a 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -33,7 +33,7 @@ QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectman
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
-QT_PV="5.6.2:5"
+QT_PV="5.9.0:5"
 
 CDEPEND="
 	=dev-libs/botan-1.10*[-bindist,threads]

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     448c6f5cef800078b56fd4a32027436aefd74a59
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 22:52:45 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 00:15:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=448c6f5c

dev-qt/qt-creator: bump to 4.6.0_rc1

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qt-creator/Manifest                         |  2 +-
 ....0_beta1.ebuild => qt-creator-4.6.0_rc1.ebuild} | 22 +++-----------------
 dev-qt/qt-creator/qt-creator-9999.ebuild           | 24 ++++------------------
 3 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 93809d0a535..28a9dcbdec6 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,4 @@
 DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
 DIST qt-creator-opensource-src-4.5.0.tar.xz 21641628 BLAKE2B 83d8ef57b87278994451d34b69a17a7d6c872b014c82940593c83c53e4a693054bdcfa38c4706083ed2bc0386ae5fa8afcea4747d1dee67a2a9b1e0a3fa6aeed SHA512 9296ebef4a3d5ae40a9fa3a4039e77b8e407dfb52af3a88b4cc615a89e163d92de420d9db614bc689adc695879f0c2e1906e9a218e7a6b96c4b222d52c94912c
 DIST qt-creator-opensource-src-4.5.2.tar.xz 21745192 BLAKE2B 4860c6041542758647d27ae3aaac15dbbc72bbecbcf335e3bceab378c720979a3e89777762936a4b68eacec02a7b285dec08a19003ac3260de1e2e4ee12706c0 SHA512 cc3f20c109e810e8958495fd0d84461bc9ead7b4172600229969a6a331341f0b76069a71893f1ba279550293b131f6cca5b79c112d67f3aebb6244415489c223
-DIST qt-creator-opensource-src-4.6.0-beta1.tar.xz 23559992 BLAKE2B 20a89a2e833fd5f618cc8b7301530abe3cb2f54f687fe3f08a3881e3ffdd90f98cf32ccd7e7461bfb4b80547bd5cfbd732257626ea938a6459a69ba9a72f7958 SHA512 034735898b24884822ede430dd777066a5b93f38c383861d85268d0d65a140116f3a2d639b0c33862768127e3e0881a7b08ff710c5a210ccfa42c5e8a9fe1ff6
+DIST qt-creator-opensource-src-4.6.0-rc1.tar.xz 23389240 BLAKE2B 2fbfe5a6a3b09d439439846dbcbad87d1f5032a35c36fa713e8949d1c3f2c44cf1912fd465f9c97f29204803843cff4c4ecdf7083e8963f3512c0dbfa1594a1f SHA512 eb794935bdbe26362a8dc5a7e62dc8004e808d1485039739af06c92b6e98a6b9d4870f68e5912990acd9970bd8ec518aacd759ece60fe6f0eafc7cd1af981d7d

diff --git a/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild
similarity index 91%
rename from dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild
rename to dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild
index 609adb4c9e7..502a2a9e1c8 100644
--- a/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.6.0_rc1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
 
-inherit llvm qmake-utils toolchain-funcs virtualx xdg
+inherit llvm qmake-utils virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/"
@@ -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.9.1 )
+	qbs? ( >=dev-util/qbs-1.10.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -71,7 +71,7 @@ RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
+	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
 	cmake? ( dev-util/cmake[server(+)] )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -90,22 +90,6 @@ pkg_setup() {
 	use clangcodemodel && llvm_pkg_setup
 }
 
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
-			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.9 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
 src_prepare() {
 	default
 

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 38641edea7d..f7561482786 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
 
-inherit llvm qmake-utils toolchain-funcs virtualx xdg
+inherit llvm qmake-utils virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/"
@@ -51,9 +51,9 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clangcodemodel? ( >=sys-devel/clang-3.9:= )
+	clangcodemodel? ( >=sys-devel/clang-5:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.9.1 )
+	qbs? ( >=dev-util/qbs-1.10.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -71,7 +71,7 @@ RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
+	clangstaticanalyzer? ( >=sys-devel/clang-5:* )
 	cmake? ( dev-util/cmake[server(+)] )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -90,22 +90,6 @@ pkg_setup() {
 	use clangcodemodel && llvm_pkg_setup
 }
 
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
-			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.9 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
 src_prepare() {
 	default
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     732c263c3b626541d2f838f7012ff61a87aa3740
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 20:06:53 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 20:07:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=732c263c

dev-qt/qt-creator: add 4.5.2

Closes: https://bugs.gentoo.org/650510
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qt-creator/Manifest                |   1 +
 dev-qt/qt-creator/qt-creator-4.5.2.ebuild | 172 ++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 02b8cee5840..93809d0a535 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,4 @@
 DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
 DIST qt-creator-opensource-src-4.5.0.tar.xz 21641628 BLAKE2B 83d8ef57b87278994451d34b69a17a7d6c872b014c82940593c83c53e4a693054bdcfa38c4706083ed2bc0386ae5fa8afcea4747d1dee67a2a9b1e0a3fa6aeed SHA512 9296ebef4a3d5ae40a9fa3a4039e77b8e407dfb52af3a88b4cc615a89e163d92de420d9db614bc689adc695879f0c2e1906e9a218e7a6b96c4b222d52c94912c
+DIST qt-creator-opensource-src-4.5.2.tar.xz 21745192 BLAKE2B 4860c6041542758647d27ae3aaac15dbbc72bbecbcf335e3bceab378c720979a3e89777762936a4b68eacec02a7b285dec08a19003ac3260de1e2e4ee12706c0 SHA512 cc3f20c109e810e8958495fd0d84461bc9ead7b4172600229969a6a331341f0b76069a71893f1ba279550293b131f6cca5b79c112d67f3aebb6244415489c223
 DIST qt-creator-opensource-src-4.6.0-beta1.tar.xz 23559992 BLAKE2B 20a89a2e833fd5f618cc8b7301530abe3cb2f54f687fe3f08a3881e3ffdd90f98cf32ccd7e7461bfb4b80547bd5cfbd732257626ea938a6459a69ba9a72f7958 SHA512 034735898b24884822ede430dd777066a5b93f38c383861d85268d0d65a140116f3a2d639b0c33862768127e3e0881a7b08ff710c5a210ccfa42c5e8a9fe1ff6

diff --git a/dev-qt/qt-creator/qt-creator-4.5.2.ebuild b/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
new file mode 100644
index 00000000000..6581a0d4a74
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.5.2.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	clangcodemodel? ( >=sys-devel/clang-3.9:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.10.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	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 clangcodemodel && 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+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
+		USE_SYSTEM_BOTAN=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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason Donenfeld]

commit:     17f471ecb332922afd446afc32990bf80b593c8a
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  7 13:28:42 2018 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Wed Feb  7 13:28:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17f471ec

dev-qt/qt-creator: add unkeyworded beta

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qt-creator/Manifest                      |   1 +
 dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild | 188 ++++++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 75af4a7e30e..02b8cee5840 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
 DIST qt-creator-opensource-src-4.5.0.tar.xz 21641628 BLAKE2B 83d8ef57b87278994451d34b69a17a7d6c872b014c82940593c83c53e4a693054bdcfa38c4706083ed2bc0386ae5fa8afcea4747d1dee67a2a9b1e0a3fa6aeed SHA512 9296ebef4a3d5ae40a9fa3a4039e77b8e407dfb52af3a88b4cc615a89e163d92de420d9db614bc689adc695879f0c2e1906e9a218e7a6b96c4b222d52c94912c
+DIST qt-creator-opensource-src-4.6.0-beta1.tar.xz 23559992 BLAKE2B 20a89a2e833fd5f618cc8b7301530abe3cb2f54f687fe3f08a3881e3ffdd90f98cf32ccd7e7461bfb4b80547bd5cfbd732257626ea938a6459a69ba9a72f7958 SHA512 034735898b24884822ede430dd777066a5b93f38c383861d85268d0d65a140116f3a2d639b0c33862768127e3e0881a7b08ff710c5a210ccfa42c5e8a9fe1ff6

diff --git a/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild
new file mode 100644
index 00000000000..609adb4c9e7
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.6.0_beta1.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils toolchain-funcs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS=""
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	clangcodemodel? ( >=sys-devel/clang-5:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.9.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	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 clangcodemodel && llvm_pkg_setup
+}
+
+src_unpack() {
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
+			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
+			die "GCC >= 4.9 required"
+		fi
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
+		USE_SYSTEM_BOTAN=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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Jason Donenfeld]

commit:     59ba4ad77e885b090b06f980aa51836eb0a1f76c
Author:     Jason A. Donenfeld <zx2c4 <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  7 13:10:45 2018 +0000
Commit:     Jason Donenfeld <zx2c4 <AT> gentoo <DOT> org>
CommitDate: Wed Feb  7 13:11:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59ba4ad7

dev-qt/qt-creator: version bump

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-qt/qt-creator/Manifest                |   1 +
 dev-qt/qt-creator/qt-creator-4.5.0.ebuild | 188 ++++++++++++++++++++++++++++++
 2 files changed, 189 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index ed5e2668bc9..75af4a7e30e 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
+DIST qt-creator-opensource-src-4.5.0.tar.xz 21641628 BLAKE2B 83d8ef57b87278994451d34b69a17a7d6c872b014c82940593c83c53e4a693054bdcfa38c4706083ed2bc0386ae5fa8afcea4747d1dee67a2a9b1e0a3fa6aeed SHA512 9296ebef4a3d5ae40a9fa3a4039e77b8e407dfb52af3a88b4cc615a89e163d92de420d9db614bc689adc695879f0c2e1906e9a218e7a6b96c4b222d52c94912c

diff --git a/dev-qt/qt-creator/qt-creator-4.5.0.ebuild b/dev-qt/qt-creator/qt-creator-4.5.0.ebuild
new file mode 100644
index 00000000000..38641edea7d
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.5.0.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
+
+inherit llvm qmake-utils toolchain-funcs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.2:5"
+
+CDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	clangcodemodel? ( >=sys-devel/clang-3.9:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.9.1 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${CDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
+	cmake? ( dev-util/cmake[server(+)] )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	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 clangcodemodel && llvm_pkg_setup
+}
+
+src_unpack() {
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
+			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
+			die "GCC >= 4.9 required"
+		fi
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.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 '/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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && 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) \
+		USE_SYSTEM_BOTAN=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
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     c7aa9d68278394a4ee10470a9cf8767f37f01f64
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 23:03:22 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 23:06:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7aa9d68

dev-qt/qt-creator: remove 4.3.1

x86 is demoted to ~arch

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 dev-qt/qt-creator/Manifest                |   1 -
 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 194 ------------------------------
 2 files changed, 195 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 9c237a1bba6..ed5e2668bc9 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-4.3.1.tar.xz 17298892 BLAKE2B a15d4c78ee65230d587cc469881d9ff350b61a1b5b3671691924a9383bb04cecd916b72e92abb4dad933a4dd42087c3460d70af289ef9ff1e77138d3a82d4a4e SHA512 9fd89cee4a3b17662ac83bd63065f66f6b446774eb28ab4e56b85b82dc8c6b9b7be512014e5096dd343d913688700c3297b49bf4abe920429ca72cc665c95226
 DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336

diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
deleted file mode 100644
index 8e8a0f9cca3..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-LLVM_MAX_SLOT=4
-PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
-
-inherit llvm qmake-utils toolchain-funcs 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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="amd64 ~arm x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.0:5"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	clangcodemodel? (
-		<sys-devel/clang-5:=
-		|| ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 )
-	)
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.8.1-r1 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? (
-		<sys-devel/clang-5:*
-		|| ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 )
-	)
-	cmake? ( dev-util/cmake[server(+)] )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	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 clangcodemodel && llvm_pkg_setup
-}
-
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
-			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.9 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# avoid building unused support libraries
-	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.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 '/sdktool/ d' tests/auto/auto.pro || die
-	sed -i -e '/dumpers\.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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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 clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
-		$(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) \
-		USE_SYSTEM_BOTAN=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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     393740a060f9b713a628c4367186325570e62cb1
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 23:00:09 2018 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 23:06:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393740a0

dev-qt/qt-creator: stabilize 4.4.1 on amd64

Bug: https://bugs.gentoo.org/644948
Package-Manager: Portage-2.3.20, Repoman-2.3.6

 dev-qt/qt-creator/qt-creator-4.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
index 38641edea7d..6b958f5b91d 100644
--- a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.4.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="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Ulrich Müller]

commit:     219b6892d36fc266ac6e8c2c960fb33d86ed7743
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 14:24:13 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 15:38:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219b6892

dev-qt/qt-creator: Migrate from LINGUAS to L10N.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 15 ++++++++++-----
 dev-qt/qt-creator/qt-creator-4.4.1.ebuild | 15 ++++++++++-----
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 15 ++++++++++-----
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
index 5be7d95dd51..8e8a0f9cca3 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 LLVM_MAX_SLOT=4
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
 
-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/"
@@ -88,7 +88,8 @@ RDEPEND="${CDEPEND}
 "
 # qt translations must also be installed or qt-creator translations won't be loaded
 for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
 done
 unset x
 
@@ -151,7 +152,11 @@ src_prepare() {
 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
 
 	# fix translations
-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
+	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

diff --git a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
index 322f20850b8..38641edea7d 100644
--- a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
 
-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/"
@@ -81,7 +81,8 @@ RDEPEND="${CDEPEND}
 "
 # qt translations must also be installed or qt-creator translations won't be loaded
 for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
 done
 unset x
 
@@ -145,7 +146,11 @@ src_prepare() {
 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
 
 	# fix translations
-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
+	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

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 322f20850b8..38641edea7d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
 
-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/"
@@ -81,7 +81,8 @@ RDEPEND="${CDEPEND}
 "
 # qt translations must also be installed or qt-creator translations won't be loaded
 for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
 done
 unset x
 
@@ -145,7 +146,11 @@ src_prepare() {
 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
 
 	# fix translations
-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
+	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

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     58641f1052356f3da0fec847a6ce33c40995832b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 23:48:31 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 23:48:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58641f10

dev-qt/qt-creator: restrict max clang version

Closes: https://bugs.gentoo.org/631194
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
index fbfc4412faa..5be7d95dd51 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+LLVM_MAX_SLOT=4
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
 inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
@@ -51,7 +52,10 @@ CDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	clangcodemodel? ( >=sys-devel/clang-3.9:= )
+	clangcodemodel? (
+		<sys-devel/clang-5:=
+		|| ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 )
+	)
 	designer? ( >=dev-qt/designer-${QT_PV} )
 	qbs? ( >=dev-util/qbs-1.8.1-r1 )
 	systemd? ( sys-apps/systemd:= )
@@ -71,7 +75,10 @@ RDEPEND="${CDEPEND}
 	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
+	clangstaticanalyzer? (
+		<sys-devel/clang-5:*
+		|| ( sys-devel/clang:4 >=sys-devel/clang-3.9:0 )
+	)
 	cmake? ( dev-util/cmake[server(+)] )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -153,7 +160,7 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix)") \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(get_llvm_prefix ${LLVM_MAX_SLOT})") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     86345041103297a90f33816e74ea573b2ca30622
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  8 22:54:33 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 22:54:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86345041

dev-qt/qt-creator: version bump

Closes: https://bugs.gentoo.org/630870
Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-qt/qt-creator/Manifest                                         | 1 +
 .../qt-creator/{qt-creator-9999.ebuild => qt-creator-4.4.1.ebuild} | 7 ++++---
 dev-qt/qt-creator/qt-creator-9999.ebuild                           | 7 ++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 02794c636e0..c9f6ab78e97 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1 +1,2 @@
 DIST qt-creator-opensource-src-4.3.1.tar.xz 17298892 SHA256 060a8843f988c158ef01bd90221e390f0d4be3ccc8da95abaeb12c7477e7a4ad SHA512 9fd89cee4a3b17662ac83bd63065f66f6b446774eb28ab4e56b85b82dc8c6b9b7be512014e5096dd343d913688700c3297b49bf4abe920429ca72cc665c95226 WHIRLPOOL 86965524785f68836a7a55a2ce9ede109e3314b9778d68eb92588cd1d3844be5ad47ae4e484f285dc74844729e8c254a11fe705ed3600476ed1c8ef4000b4e24
+DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 SHA256 0664de3dea239f8be797d2745f3d06b2c4207ebc4edc36898d7d24b6bf98c14e SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336 WHIRLPOOL bc202a42d7fb69f9a033448a456eb0d2d09d27f338f5555296c79ab40167ea3c917df40444d318818edcf87ab4fe5b2667b37a84c4e0590f52e15c6780e58ede

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
similarity index 96%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-4.4.1.ebuild
index 5982bff15ef..322f20850b8 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
@@ -33,7 +33,7 @@ QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectman
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
-QT_PV="5.6.0:5"
+QT_PV="5.6.2:5"
 
 CDEPEND="
 	=dev-libs/botan-1.10*[-bindist,threads]
@@ -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.8.1-r1 )
+	qbs? ( >=dev-util/qbs-1.9.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -134,8 +134,9 @@ src_prepare() {
 	fi
 
 	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
 	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
-	sed -i -e '/dumpers\.pro/ d' tests/auto/debugger/debugger.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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 5982bff15ef..322f20850b8 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -33,7 +33,7 @@ QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectman
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
-QT_PV="5.6.0:5"
+QT_PV="5.6.2:5"
 
 CDEPEND="
 	=dev-libs/botan-1.10*[-bindist,threads]
@@ -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.8.1-r1 )
+	qbs? ( >=dev-util/qbs-1.9.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -134,8 +134,9 @@ src_prepare() {
 	fi
 
 	# disable broken or unreliable tests
+	sed -i -e 's/\(manual\|tools\|unit\)//g' tests/tests.pro || die
 	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
-	sed -i -e '/dumpers\.pro/ d' tests/auto/debugger/debugger.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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     fe2c8495a29fb7cdfa06bf4c799b2b9a2ce7a2d4
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  5 19:06:26 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Oct  5 19:08:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe2c8495

dev-qt/qt-creator: remove old

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 dev-qt/qt-creator/Manifest                |   1 -
 dev-qt/qt-creator/metadata.xml            |   2 -
 dev-qt/qt-creator/qt-creator-3.6.1.ebuild | 159 ------------------------------
 3 files changed, 162 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index a65cd863e9e..02794c636e0 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
 DIST qt-creator-opensource-src-4.3.1.tar.xz 17298892 SHA256 060a8843f988c158ef01bd90221e390f0d4be3ccc8da95abaeb12c7477e7a4ad SHA512 9fd89cee4a3b17662ac83bd63065f66f6b446774eb28ab4e56b85b82dc8c6b9b7be512014e5096dd343d913688700c3297b49bf4abe920429ca72cc665c95226 WHIRLPOOL 86965524785f68836a7a55a2ce9ede109e3314b9778d68eb92588cd1d3844be5ad47ae4e484f285dc74844729e8c254a11fe705ed3600476ed1c8ef4000b4e24

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 48403b1106f..5cdf568ca74 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -14,7 +14,6 @@
 		<flag name="autotools">Enable autotools project manager plugin</flag>
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
-		<flag name="clang">Build clang-based code model plugin</flag>
 		<flag name="clangcodemodel">Build clang-based code model and refactoring plugins</flag>
 		<flag name="clangstaticanalyzer">Build clang-based static analyzer plugin</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
@@ -33,7 +32,6 @@
 		<flag name="systemd">Add support for retrieving application output from journald</flag>
 		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
 		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> to view documentation</flag>
-		<flag name="webkit">Use <pkg>dev-qt/qtwebkit</pkg> to view documentation</flag>
 		<flag name="winrt">Build plugin for WinRT devices</flag>
 	</use>
 	<upstream>

diff --git a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
deleted file mode 100644
index dc9c6bd7191..00000000000
--- a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="https://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~arm x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
-	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
-	perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.4.0:5"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( ~dev-util/qbs-1.4.5 )
-	systemd? ( sys-apps/systemd:= )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-for x in ${PLOCALES}; do
-	# qt translations must be installed for qt-creator translations to work
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_unpack() {
-	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
-		eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
-		die "GCC >= 4.7 required"
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# automagic dep on qtwebkit (bug 538236)
-	if ! use webkit; then
-		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webkit"
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		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="${EPREFIX}/usr") \
-		$(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) \
-		USE_SYSTEM_BOTAN=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
-
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     7bcb14c38114a9f70b877ab65d51e9b4f75701de
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 21:01:24 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 21:02:07 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bcb14c3

dev-qt/qt-creator: stabilize 4.3.1 on amd64 and x86

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
index 5982bff15ef..fbfc4412faa 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.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="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	S=${WORKDIR}/${MY_P}
 fi
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     37a6941ec0bb61630e4a9eef438208605c63d099
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  3 01:14:06 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Sep  3 01:14:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37a6941e

dev-qt/qt-creator: drop insecure git:// repo URI

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 5 +----
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
index f8f05515a13..5982bff15ef 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
@@ -13,10 +13,7 @@ SLOT="0"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${PN}/${PN}.git"
-	)
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
 else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-opensource-src-${MY_PV}

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index f8f05515a13..5982bff15ef 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -13,10 +13,7 @@ SLOT="0"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${PN}/${PN}.git"
-	)
+	EGIT_REPO_URI="https://code.qt.io/${PN}/${PN}.git"
 else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-opensource-src-${MY_PV}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     8c74e6c5dee8721876363d0a2602afcf6555ee8b
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 17:15:26 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 17:15:26 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c74e6c5

dev-qt/qt-creator: raise qbs dep

Gentoo-Bug: 625640
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
index 710e344af5d..f8f05515a13 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.8.1 )
+	qbs? ( >=dev-util/qbs-1.8.1-r1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 710e344af5d..f8f05515a13 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.8.1 )
+	qbs? ( >=dev-util/qbs-1.8.1-r1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     aff385add0333cd7357dd43ea960d55a4c5384a2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 19 16:48:40 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Aug 19 16:48:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff385ad

dev-qt/qt-creator: remove old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-qt/qt-creator/Manifest                |   1 -
 dev-qt/qt-creator/qt-creator-4.3.0.ebuild | 185 ------------------------------
 2 files changed, 186 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index f90c1079736..a65cd863e9e 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,2 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
-DIST qt-creator-opensource-src-4.3.0.tar.xz 17113068 SHA256 e99eaaf4098d575578424f57936bc5ad678499824523666c32d85c71fc8471d8 SHA512 462d2494d54c5b528ed187a43365a296c08ad2b104ada451a91d381f070472433ef91856f80a4d94091919296c95820e5d546800fc26a43a9709a6329fba02bb WHIRLPOOL ef3b4568bc19aa4c7eb4f1555d6cc24c719ecdde86f73225320b9d9a48a832a34c33dfbd5fb258fb33b733a8906dfc8afd368865aa537e996226fbefaf807782
 DIST qt-creator-opensource-src-4.3.1.tar.xz 17298892 SHA256 060a8843f988c158ef01bd90221e390f0d4be3ccc8da95abaeb12c7477e7a4ad SHA512 9fd89cee4a3b17662ac83bd63065f66f6b446774eb28ab4e56b85b82dc8c6b9b7be512014e5096dd343d913688700c3297b49bf4abe920429ca72cc665c95226 WHIRLPOOL 86965524785f68836a7a55a2ce9ede109e3314b9778d68eb92588cd1d3844be5ad47ae4e484f285dc74844729e8c254a11fe705ed3600476ed1c8ef4000b4e24

diff --git a/dev-qt/qt-creator/qt-creator-4.3.0.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
deleted file mode 100644
index b56faf74775..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit l10n llvm qmake-utils toolchain-funcs 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=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${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/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
-	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
-	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
-	winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.0:5"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	clangcodemodel? ( >=sys-devel/clang-3.9:= )
-	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.8.0 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-DEPEND="${CDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-RDEPEND="${CDEPEND}
-	sys-devel/gdb[client,python]
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
-	cmake? ( dev-util/cmake[server(+)] )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	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
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-pkg_setup() {
-	use clangcodemodel && llvm_pkg_setup
-}
-
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
-			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.9 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# avoid building unused support libraries
-	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.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 '/sdktool/ d' tests/auto/auto.pro || die
-	sed -i -e '/dumpers\.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 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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
-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" 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 clangcodemodel && 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) \
-		USE_SYSTEM_BOTAN=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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Michael Palimaka]

commit:     a66f35a6a11573a4a7a5ac87ab6601d7b73a3ab3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 23 03:00:48 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jul 23 03:01:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a66f35a6

dev-qt/qt-creator: use HTTPS

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 dev-qt/qt-creator/qt-creator-3.6.1.ebuild | 6 +++---
 dev-qt/qt-creator/qt-creator-4.3.0.ebuild | 4 ++--
 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 4 ++--
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
index e970280d4e3..dc9c6bd7191 100644
--- a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 inherit eutils l10n qmake-utils virtualx
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
 LICENSE="|| ( LGPL-2.1 LGPL-3 )"
 SLOT="0"
 
@@ -21,7 +21,7 @@ else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="amd64 ~arm x86"
 	S=${WORKDIR}/${MY_P}
 fi

diff --git a/dev-qt/qt-creator/qt-creator-4.3.0.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
index 74828af0540..b56faf74775 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
@@ -7,7 +7,7 @@ PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -21,7 +21,7 @@ else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi

diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
index caa18400f3b..710e344af5d 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
@@ -7,7 +7,7 @@ PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -21,7 +21,7 @@ else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index caa18400f3b..710e344af5d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -7,7 +7,7 @@ PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
+HOMEPAGE="https://doc.qt.io/qtcreator/"
 LICENSE="GPL-3"
 SLOT="0"
 
@@ -21,7 +21,7 @@ else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	SRC_URI="https://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     ae223e3507d8c03f0cbd3adc5e0d81bea94b8f91
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 18:37:14 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 18:42:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae223e35

dev-qt/qt-creator: version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-qt/qt-creator/Manifest                                            | 1 +
 dev-qt/qt-creator/{qt-creator-9999.ebuild => qt-creator-4.3.1.ebuild} | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild                              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 66d512a22fe..99f28de5a3a 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,4 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
 DIST qt-creator-opensource-src-4.2.0.tar.xz 16624096 SHA256 203e2bc6618590b5e5a7e17f1a05e65b255d742f0b8f0ba3246fb541dfdfbe80 SHA512 1801611d8db10041332d728a2af6b0c57b28b3ab9847a8875edb788d3b0fe6570103a408a7f52c989e40949743263d444e5db49d290860f2e7231f463fa86f7a WHIRLPOOL 841fb63bb6d25a640fb8db24412b05b93e9240db8c68de9555cc4baef50d6e08d13594f4e7cc675fda90359d8a4a4fbb8110f9cfd73315e1775a636f5f28a54d
 DIST qt-creator-opensource-src-4.3.0.tar.xz 17113068 SHA256 e99eaaf4098d575578424f57936bc5ad678499824523666c32d85c71fc8471d8 SHA512 462d2494d54c5b528ed187a43365a296c08ad2b104ada451a91d381f070472433ef91856f80a4d94091919296c95820e5d546800fc26a43a9709a6329fba02bb WHIRLPOOL ef3b4568bc19aa4c7eb4f1555d6cc24c719ecdde86f73225320b9d9a48a832a34c33dfbd5fb258fb33b733a8906dfc8afd368865aa537e996226fbefaf807782
+DIST qt-creator-opensource-src-4.3.1.tar.xz 17298892 SHA256 060a8843f988c158ef01bd90221e390f0d4be3ccc8da95abaeb12c7477e7a4ad SHA512 9fd89cee4a3b17662ac83bd63065f66f6b446774eb28ab4e56b85b82dc8c6b9b7be512014e5096dd343d913688700c3297b49bf4abe920429ca72cc665c95226 WHIRLPOOL 86965524785f68836a7a55a2ce9ede109e3314b9778d68eb92588cd1d3844be5ad47ae4e484f285dc74844729e8c254a11fe705ed3600476ed1c8ef4000b4e24

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
similarity index 99%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-4.3.1.ebuild
index 74828af0540..caa18400f3b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.8.0 )
+	qbs? ( >=dev-util/qbs-1.8.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 74828af0540..caa18400f3b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -56,7 +56,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.8.0 )
+	qbs? ( >=dev-util/qbs-1.8.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     7326507075205b7e8e6fe13e24abc82d2ab4c284
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 18:40:50 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 18:42:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73265070

dev-qt/qt-creator: remove old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-qt/qt-creator/Manifest                |   1 -
 dev-qt/qt-creator/qt-creator-4.2.0.ebuild | 183 ------------------------------
 2 files changed, 184 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 99f28de5a3a..f90c1079736 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,3 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
-DIST qt-creator-opensource-src-4.2.0.tar.xz 16624096 SHA256 203e2bc6618590b5e5a7e17f1a05e65b255d742f0b8f0ba3246fb541dfdfbe80 SHA512 1801611d8db10041332d728a2af6b0c57b28b3ab9847a8875edb788d3b0fe6570103a408a7f52c989e40949743263d444e5db49d290860f2e7231f463fa86f7a WHIRLPOOL 841fb63bb6d25a640fb8db24412b05b93e9240db8c68de9555cc4baef50d6e08d13594f4e7cc675fda90359d8a4a4fbb8110f9cfd73315e1775a636f5f28a54d
 DIST qt-creator-opensource-src-4.3.0.tar.xz 17113068 SHA256 e99eaaf4098d575578424f57936bc5ad678499824523666c32d85c71fc8471d8 SHA512 462d2494d54c5b528ed187a43365a296c08ad2b104ada451a91d381f070472433ef91856f80a4d94091919296c95820e5d546800fc26a43a9709a6329fba02bb WHIRLPOOL ef3b4568bc19aa4c7eb4f1555d6cc24c719ecdde86f73225320b9d9a48a832a34c33dfbd5fb258fb33b733a8906dfc8afd368865aa537e996226fbefaf807782
 DIST qt-creator-opensource-src-4.3.1.tar.xz 17298892 SHA256 060a8843f988c158ef01bd90221e390f0d4be3ccc8da95abaeb12c7477e7a4ad SHA512 9fd89cee4a3b17662ac83bd63065f66f6b446774eb28ab4e56b85b82dc8c6b9b7be512014e5096dd343d913688700c3297b49bf4abe920429ca72cc665c95226 WHIRLPOOL 86965524785f68836a7a55a2ce9ede109e3314b9778d68eb92588cd1d3844be5ad47ae4e484f285dc74844729e8c254a11fe705ed3600476ed1c8ef4000b4e24

diff --git a/dev-qt/qt-creator/qt-creator-4.2.0.ebuild b/dev-qt/qt-creator/qt-creator-4.2.0.ebuild
deleted file mode 100644
index cd314f54128..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.2.0.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="GPL-3"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
-	ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx
-	scxml:scxmleditor subversion valgrind winrt)
-IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.6.0:5"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	sys-devel/gdb[client,python]
-	clangcodemodel? ( >=sys-devel/clang-3.9:= )
-	qbs? ( =dev-util/qbs-1.7* )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? (
-		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
-		>=dev-qt/qtquickcontrols2-${QT_PV}
-		>=dev-qt/qttest-${QT_PV}
-	)
-"
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9 )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; then
-			eerror "GCC version 4.8 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.8 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# avoid building unused support libraries
-	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.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 '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/\(^char qmlString\|states\.qml$\)/ i return;' tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp || die
-	sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
-	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		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 clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --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) \
-		USE_SYSTEM_BOTAN=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
-
-	# create a desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
-		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     c0982cc1dd226f405fc35ce94d8694cd25b81d4a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 22:26:25 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 26 22:56:39 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0982cc1

dev-qt/qt-creator: version bump

Also fixed bug 616876.

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-qt/qt-creator/Manifest                               |  2 +-
 ...reator-4.3.0_beta1.ebuild => qt-creator-4.3.0.ebuild} | 16 ++++++----------
 dev-qt/qt-creator/qt-creator-9999.ebuild                 | 16 ++++++----------
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 2fd3a6ce706..66d512a22fe 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,3 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
 DIST qt-creator-opensource-src-4.2.0.tar.xz 16624096 SHA256 203e2bc6618590b5e5a7e17f1a05e65b255d742f0b8f0ba3246fb541dfdfbe80 SHA512 1801611d8db10041332d728a2af6b0c57b28b3ab9847a8875edb788d3b0fe6570103a408a7f52c989e40949743263d444e5db49d290860f2e7231f463fa86f7a WHIRLPOOL 841fb63bb6d25a640fb8db24412b05b93e9240db8c68de9555cc4baef50d6e08d13594f4e7cc675fda90359d8a4a4fbb8110f9cfd73315e1775a636f5f28a54d
-DIST qt-creator-opensource-src-4.3.0-beta1.tar.xz 16339884 SHA256 9f5e28747281a2e75e5f875d37fad9422ee264357b2e752c450dad5b568229e2 SHA512 84cee2c29cbe664c7ce10a93ce769e80d9264a707f3e390e13ed0708cdccddd6e48524b5c7c5d2520d66590f5b41361eab00025f52747bc64b16686ed953379f WHIRLPOOL 10f24ef14e1b26405eb7329c1a6112098685d7f233f8b083af3a2de11738acf9242a12d5d0f1a2263dc0b005634c026dc96fe74371a2449b9d249c1ebf94442e
+DIST qt-creator-opensource-src-4.3.0.tar.xz 17113068 SHA256 e99eaaf4098d575578424f57936bc5ad678499824523666c32d85c71fc8471d8 SHA512 462d2494d54c5b528ed187a43365a296c08ad2b104ada451a91d381f070472433ef91856f80a4d94091919296c95820e5d546800fc26a43a9709a6329fba02bb WHIRLPOOL ef3b4568bc19aa4c7eb4f1555d6cc24c719ecdde86f73225320b9d9a48a832a34c33dfbd5fb258fb33b733a8906dfc8afd368865aa537e996226fbefaf807782

diff --git a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
similarity index 87%
rename from dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
rename to dev-qt/qt-creator/qt-creator-4.3.0.ebuild
index 7cfd8374e2d..205855f3c41 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -56,7 +56,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.7.0 )
+	qbs? ( >=dev-util/qbs-1.8.0 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -75,7 +75,7 @@ RDEPEND="${CDEPEND}
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
 	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
-	cmake? ( dev-util/cmake )
+	cmake? ( dev-util/cmake[server(+)] )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
@@ -133,10 +133,10 @@ src_prepare() {
 	fi
 
 	# disable broken or unreliable tests
-	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/dumpers\.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 '/\(^char qmlString\|states\.qml$\)/ i return;' tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp || die
-	sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
 	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
 
 	# fix path to some clang headers
@@ -178,8 +178,4 @@ src_install() {
 		doins share/doc/qtcreator/qtcreator{,-dev}.qch
 		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
-
-	# create a desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
-		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
 }

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 7cfd8374e2d..205855f3c41 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -56,7 +56,7 @@ CDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
-	qbs? ( >=dev-util/qbs-1.7.0 )
+	qbs? ( >=dev-util/qbs-1.8.0 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
@@ -75,7 +75,7 @@ RDEPEND="${CDEPEND}
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
 	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
-	cmake? ( dev-util/cmake )
+	cmake? ( dev-util/cmake[server(+)] )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
 	mercurial? ( dev-vcs/mercurial )
@@ -133,10 +133,10 @@ src_prepare() {
 	fi
 
 	# disable broken or unreliable tests
-	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/sdktool/ d' tests/auto/auto.pro || die
+	sed -i -e '/dumpers\.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 '/\(^char qmlString\|states\.qml$\)/ i return;' tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp || die
-	sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
+	sed -i -e '/timeline\(items\|notes\|selection\)renderpass/ d' tests/auto/timeline/timeline.pro || die
 	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
 
 	# fix path to some clang headers
@@ -178,8 +178,4 @@ src_install() {
 		doins share/doc/qtcreator/qtcreator{,-dev}.qch
 		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
-
-	# create a desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
-		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
 }

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     84bc7420fb18580a36ac42d4d81ab53d2da06bf0
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 26 22:56:07 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 26 22:56:40 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84bc7420

dev-qt/qt-creator: fix bug 617728

Gentoo-Bug: 617728
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-qt/qt-creator/qt-creator-4.3.0.ebuild | 4 ++++
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-4.3.0.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
index 205855f3c41..74828af0540 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.0.ebuild
@@ -88,6 +88,10 @@ for x in ${PLOCALES}; do
 done
 unset x
 
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
 src_unpack() {
 	if tc-is-gcc; then
 		if [[ $(gcc-major-version) -lt 4 ]] || \

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 205855f3c41..74828af0540 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -88,6 +88,10 @@ for x in ${PLOCALES}; do
 done
 unset x
 
+pkg_setup() {
+	use clangcodemodel && llvm_pkg_setup
+}
+
 src_unpack() {
 	if tc-is-gcc; then
 		if [[ $(gcc-major-version) -lt 4 ]] || \

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     f2b996694e4fd84d55a3f066eb30ca5e682a8720
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 19:40:27 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 19:45:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b99669

dev-qt/qt-creator: fix path to some clang headers

Gentoo-Bug: 614872
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
index d265a06c6ee..7cfd8374e2d 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
@@ -139,9 +139,11 @@ src_prepare() {
 	sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
 	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		share/qtcreator/translations/translations.pro || die
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
 
 	# remove bundled qbs
 	rm -rf src/shared/qbs || die

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     ff777c4ebc7cfdc340a48bbbed7b1c070579b7d5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 17:40:35 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 19:44:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff777c4e

dev-qt/qt-creator: use llvm.eclass

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
index 06309b37c3b..cdf5f872afb 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
+inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -80,7 +80,7 @@ unset x
 PDEPEND="
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9 )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -151,7 +151,7 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --prefix)") \
+		$(use clangcodemodel && 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 \

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     678983f0b0ea805d2f868c1edf0461cd2211f64a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 19:44:41 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 19:45:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=678983f0

dev-qt/qt-creator: sync live ebuild

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qt-creator/qt-creator-9999.ebuild | 46 +++++++++++++++++---------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index bbdb5126434..7cfd8374e2d 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
+inherit eutils l10n llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -29,17 +29,17 @@ fi
 # TODO: unbundle sqlite
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
-	ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx
-	scxml:scxmleditor subversion valgrind winrt)
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
 IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 
 # minimum Qt version required
 QT_PV="5.6.0:5"
 
-RDEPEND="
+CDEPEND="
 	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/designer-${QT_PV}
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
 	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
@@ -54,13 +54,13 @@ RDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	sys-devel/gdb[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
 	qbs? ( >=dev-util/qbs-1.7.0 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
 	virtual/pkgconfig
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
@@ -70,16 +70,11 @@ DEPEND="${RDEPEND}
 		>=dev-qt/qttest-${QT_PV}
 	)
 "
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.9 )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -87,13 +82,18 @@ PDEPEND="
 	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
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
 
 src_unpack() {
 	if tc-is-gcc; then
 		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; then
-			eerror "GCC version 4.8 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.8 required"
+		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
+			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
+			die "GCC >= 4.9 required"
 		fi
 	fi
 
@@ -139,9 +139,11 @@ src_prepare() {
 	sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
 	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.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
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		share/qtcreator/translations/translations.pro || die
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
 
 	# remove bundled qbs
 	rm -rf src/shared/qbs || die
@@ -150,7 +152,7 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --prefix)") \
+		$(use clangcodemodel && 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 \

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     f949ccf89f35fd9f2ee7ca56bfdadf0e058f9781
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 18:53:20 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 19:44:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f949ccf8

dev-qt/qt-creator: gdb is a runtime dep only

Also move all PDEPENDs to RDEPEND, there's no reason
they have to be in PDEPEND.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
index cdf5f872afb..d265a06c6ee 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
@@ -38,7 +38,7 @@ IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
 # minimum Qt version required
 QT_PV="5.6.0:5"
 
-RDEPEND="
+CDEPEND="
 	=dev-libs/botan-1.10*[-bindist,threads]
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}
@@ -54,14 +54,13 @@ RDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	sys-devel/gdb[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.9:= )
 	designer? ( >=dev-qt/designer-${QT_PV} )
 	qbs? ( >=dev-util/qbs-1.7.0 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
 "
-DEPEND="${RDEPEND}
+DEPEND="${CDEPEND}
 	>=dev-qt/linguist-tools-${QT_PV}
 	virtual/pkgconfig
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
@@ -71,13 +70,8 @@ DEPEND="${RDEPEND}
 		>=dev-qt/qttest-${QT_PV}
 	)
 "
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
+RDEPEND="${CDEPEND}
+	sys-devel/gdb[client,python]
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
 	clangstaticanalyzer? ( >=sys-devel/clang-3.9:* )
@@ -88,6 +82,11 @@ PDEPEND="
 	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
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
 
 src_unpack() {
 	if tc-is-gcc; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     03024b484aef25ad8b2faeb6af6a2d4953499b08
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 05:48:38 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 05:48:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03024b48

dev-qt/qt-creator: version bump

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-qt/qt-creator/Manifest                      |   1 +
 dev-qt/qt-creator/metadata.xml                  |   3 +-
 dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild | 184 ++++++++++++++++++++++++
 3 files changed, 187 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index cdcef136a4c..2fd3a6ce706 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
 DIST qt-creator-opensource-src-4.2.0.tar.xz 16624096 SHA256 203e2bc6618590b5e5a7e17f1a05e65b255d742f0b8f0ba3246fb541dfdfbe80 SHA512 1801611d8db10041332d728a2af6b0c57b28b3ab9847a8875edb788d3b0fe6570103a408a7f52c989e40949743263d444e5db49d290860f2e7231f463fa86f7a WHIRLPOOL 841fb63bb6d25a640fb8db24412b05b93e9240db8c68de9555cc4baef50d6e08d13594f4e7cc675fda90359d8a4a4fbb8110f9cfd73315e1775a636f5f28a54d
+DIST qt-creator-opensource-src-4.3.0-beta1.tar.xz 16339884 SHA256 9f5e28747281a2e75e5f875d37fad9422ee264357b2e752c450dad5b568229e2 SHA512 84cee2c29cbe664c7ce10a93ce769e80d9264a707f3e390e13ed0708cdccddd6e48524b5c7c5d2520d66590f5b41361eab00025f52747bc64b16686ed953379f WHIRLPOOL 10f24ef14e1b26405eb7329c1a6112098685d7f233f8b083af3a2de11738acf9242a12d5d0f1a2263dc0b005634c026dc96fe74371a2449b9d249c1ebf94442e

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 72fd1df9089..a4821236d2e 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -15,10 +15,11 @@
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
 		<flag name="clang">Build clang-based code model plugin</flag>
-		<flag name="clangcodemodel">Build clang-based code model plugin</flag>
+		<flag name="clangcodemodel">Build clang-based code model and refactoring plugins</flag>
 		<flag name="clangstaticanalyzer">Build clang-based static analyzer plugin</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
+		<flag name="designer">Build widget designer plugin</flag>
 		<flag name="glsl">Enable GLSL source code editor</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>

diff --git a/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
new file mode 100644
index 00000000000..06309b37c3b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.3.0_beta1.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+
+inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"git://code.qt.io/${PN}/${PN}.git"
+		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	'clangcodemodel:clangcodemodel|clangrefactoring|clangpchmanager' clangstaticanalyzer clearcase
+	cmake:cmakeprojectmanager cvs designer git glsl:glsleditor ios mercurial modeling:modeleditor
+	nim perforce python:pythoneditor qbs:qbsprojectmanager qnx scxml:scxmleditor subversion valgrind
+	winrt)
+IUSE="doc systemd test +webengine ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.6.0:5"
+
+RDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	sys-devel/gdb[client,python]
+	clangcodemodel? ( >=sys-devel/clang-3.9:= )
+	designer? ( >=dev-qt/designer-${QT_PV} )
+	qbs? ( >=dev-util/qbs-1.7.0 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? (
+		>=dev-qt/qtdeclarative-${QT_PV}[localstorage,xml]
+		>=dev-qt/qtquickcontrols2-${QT_PV}
+		>=dev-qt/qttest-${QT_PV}
+	)
+"
+# qt translations must also be installed or qt-creator translations won't be loaded
+for x in ${PLOCALES}; do
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.9 )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+
+src_unpack() {
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 9 ]]; then
+			eerror "GCC version 4.9 or later is required to build Qt Creator ${PV}"
+			die "GCC >= 4.9 required"
+		fi
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.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 '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/\(^char qmlString\|states\.qml$\)/ i return;' tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp || die
+	sed -i -e 's/\<timeline\(items\|notes\|selection\)renderpass\>//' tests/auto/timeline/timeline.pro || die
+	sed -i -e 's/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix translations
+	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+		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 clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --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) \
+		USE_SYSTEM_BOTAN=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
+
+	# create a desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
+		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     58c8bdaeac776e119d647044f85ab8b11468f1b3
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 21:46:26 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 22:23:33 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58c8bdae

dev-qt/qt-creator: remove old

Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-qt/qt-creator/Manifest                |   2 -
 dev-qt/qt-creator/qt-creator-4.0.3.ebuild | 176 ----------------------------
 dev-qt/qt-creator/qt-creator-4.1.0.ebuild | 187 ------------------------------
 3 files changed, 365 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 75d3ff2b7e1..cdcef136a4c 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,2 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
-DIST qt-creator-opensource-src-4.0.3.tar.gz 21972901 SHA256 a213a9b66e7e0eb906036a1587256fc0f7bac33912d9ae5e6117459231f56449 SHA512 7b06b9d2cb050008cbbceeb2f18ad2264a2366db9ad37474b63d0a6d30a3bde86ecb770678beb88af4d5be7550e947c689d23956e2062796cbf9476006c0528a WHIRLPOOL 7d515a038dec69980305a43545d952a1083f00add756e82cd0b568bc2c31c8eb81667822295b352cad2c54c3a447a31e9c8203db25d945023fc70ff2f0d01cd5
-DIST qt-creator-opensource-src-4.1.0.tar.xz 16291164 SHA256 d00f84539203c8456a6ebca149228cd22d1bae7f41c95c88f6fc63a02aeed8c3 SHA512 73d1d73d80faeb8ce9052f23720bbc312214256d3b9867447058ce878dca85457ba6f9c69281b95f622f8bc3d9c1739641960c48c6eebba3c48806126e6b57cf WHIRLPOOL 84521639a1054d294144f181175ed696c86d37e1a67373f5e6dbf147a99b2ff9d5216630bce2c91178c066f42778b658e7bd21fd5c9e1b5143183d6986f6c7fc
 DIST qt-creator-opensource-src-4.2.0.tar.xz 16624096 SHA256 203e2bc6618590b5e5a7e17f1a05e65b255d742f0b8f0ba3246fb541dfdfbe80 SHA512 1801611d8db10041332d728a2af6b0c57b28b3ab9847a8875edb788d3b0fe6570103a408a7f52c989e40949743263d444e5db49d290860f2e7231f463fa86f7a WHIRLPOOL 841fb63bb6d25a640fb8db24412b05b93e9240db8c68de9555cc4baef50d6e08d13594f4e7cc675fda90359d8a4a4fbb8110f9cfd73315e1775a636f5f28a54d

diff --git a/dev-qt/qt-creator/qt-creator-4.0.3.ebuild b/dev-qt/qt-creator/qt-creator-4.0.3.ebuild
deleted file mode 100644
index 946de8b952f..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.0.3.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils toolchain-funcs virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="GPL-3"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-#	allow disabling modeleditor plugin
-#	it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
-	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
-
-REQUIRED_USE="?? ( webengine webkit )"
-
-# minimum Qt version required
-QT_PV="5.5.0:5"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	>=sys-devel/gdb-7.5[client,python]
-	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( ~dev-util/qbs-1.5.2 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-# qt translations must be installed for qt-creator translations to work
-for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( sys-devel/clang )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
-			eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.7 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# automagic dep on qtwebkit (bug 538236)
-	if ! use webkit; then
-		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webkit"
-	fi
-
-	# automagic dep on qtwebengine
-	if ! use webengine; then
-		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webengine"
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		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 clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
-		$(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) \
-		USE_SYSTEM_BOTAN=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
-
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}

diff --git a/dev-qt/qt-creator/qt-creator-4.1.0.ebuild b/dev-qt/qt-creator/qt-creator-4.1.0.ebuild
deleted file mode 100644
index 5cf0068e2b8..00000000000
--- a/dev-qt/qt-creator/qt-creator-4.1.0.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="GPL-3"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
-	ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx
-	subversion valgrind winrt)
-IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
-
-REQUIRED_USE="?? ( webengine webkit )"
-
-# minimum Qt version required
-QT_PV="5.6.0:5"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	sys-devel/gdb[client,python]
-	clangcodemodel? ( >=sys-devel/clang-3.8.0:= )
-	qbs? ( ~dev-util/qbs-1.6.1 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-${QT_PV}[widgets] )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-# qt translations must also be installed or qt-creator translations won't be loaded
-for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( >=sys-devel/clang-3.8.0 )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_unpack() {
-	if tc-is-gcc; then
-		if [[ $(gcc-major-version) -lt 4 ]] || \
-		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; then
-			eerror "GCC version 4.8 or later is required to build Qt Creator ${PV}"
-			die "GCC >= 4.8 required"
-		fi
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# avoid building unused support libraries
-	if ! use clangcodemodel; then
-		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
-	fi
-	if ! use glsl; then
-		sed -i -e '/glsl/d' src/libs/libs.pro || die
-	fi
-	if ! use modeling; then
-		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
-	fi
-
-	# automagic dep on qtwebkit (bug 538236)
-	if ! use webkit; then
-		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webkit"
-	fi
-
-	# automagic dep on qtwebengine
-	if ! use webengine; then
-		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webengine"
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		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 clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
-		$(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) \
-		USE_SYSTEM_BOTAN=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
-
-	# create a desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
-		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     7a4c87565f1c2c9f8598c7fefd833bed0e3f28eb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 22:23:03 2017 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 22:23:35 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a4c8756

dev-qt/qt-creator: query llvm-config instead of hardcoding the path

Fixes build against clang-4.0

Gentoo-Bug: 612634
Package-Manager: Portage-2.3.4, Repoman-2.3.2

 dev-qt/qt-creator/qt-creator-4.2.0.ebuild | 4 ++--
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.2.0.ebuild b/dev-qt/qt-creator/qt-creator-4.2.0.ebuild
index a11cc47221e..cd314f54128 100644
--- a/dev-qt/qt-creator/qt-creator-4.2.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -150,7 +150,7 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --prefix)") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 4123b53dc56..bbdb5126434 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -150,7 +150,7 @@ src_prepare() {
 src_configure() {
 	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
 		IDE_PACKAGE_MODE=1 \
-		$(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="$(llvm-config --prefix)") \
 		$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
 		CONFIG+=qbs_disable_rpath \
 		CONFIG+=qbs_enable_project_file_updates \

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     51b9134ef7acf173e69578fe5f763c84f5a32837
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 18 03:58:47 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec 18 03:58:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51b9134e

dev-qt/qt-creator: restrict dep on qbs

Build fails against the newly released qbs-1.7.0

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-qt/qt-creator/qt-creator-4.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.1.0.ebuild b/dev-qt/qt-creator/qt-creator-4.1.0.ebuild
index f2e2ab2..a34a793 100644
--- a/dev-qt/qt-creator/qt-creator-4.1.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.1.0.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	sys-devel/gdb[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.8.0:= )
-	qbs? ( >=dev-util/qbs-1.6.0 )
+	qbs? ( ~dev-util/qbs-1.6.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     c2ee671811b725d5d3a87d81a766093474f25e77
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 19:37:09 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 19:37:48 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2ee6718

dev-qt/qt-creator: version bump

Gentoo-Bug: 592148
Gentoo-Bug: 596178

Package-Manager: portage-2.3.2

 dev-qt/qt-creator/Manifest                         |  1 +
 dev-qt/qt-creator/metadata.xml                     |  2 ++
 ...creator-9999.ebuild => qt-creator-4.1.0.ebuild} | 33 ++++++++++++++--------
 dev-qt/qt-creator/qt-creator-9999.ebuild           | 33 ++++++++++++++--------
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 44ab5e3..29e324c 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,3 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
 DIST qt-creator-opensource-src-4.0.3.tar.gz 21972901 SHA256 a213a9b66e7e0eb906036a1587256fc0f7bac33912d9ae5e6117459231f56449 SHA512 7b06b9d2cb050008cbbceeb2f18ad2264a2366db9ad37474b63d0a6d30a3bde86ecb770678beb88af4d5be7550e947c689d23956e2062796cbf9476006c0528a WHIRLPOOL 7d515a038dec69980305a43545d952a1083f00add756e82cd0b568bc2c31c8eb81667822295b352cad2c54c3a447a31e9c8203db25d945023fc70ff2f0d01cd5
+DIST qt-creator-opensource-src-4.1.0.tar.xz 16291164 SHA256 d00f84539203c8456a6ebca149228cd22d1bae7f41c95c88f6fc63a02aeed8c3 SHA512 73d1d73d80faeb8ce9052f23720bbc312214256d3b9867447058ce878dca85457ba6f9c69281b95f622f8bc3d9c1739641960c48c6eebba3c48806126e6b57cf WHIRLPOOL 84521639a1054d294144f181175ed696c86d37e1a67373f5e6dbf147a99b2ff9d5216630bce2c91178c066f42778b658e7bd21fd5c9e1b5143183d6986f6c7fc

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 7356ce9..0add88d 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -22,6 +22,8 @@
 		<flag name="glsl">Enable GLSL source code editor</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
+		<flag name="modeling">Enable graphical model editor plugin</flag>
+		<flag name="nim">Enable Nim source code editor</flag>
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
 		<flag name="python">Enable Python source code editor</flag>
 		<flag name="qbs">Enable QBS project manager plugin</flag>

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-4.1.0.ebuild
similarity index 83%
copy from dev-qt/qt-creator/qt-creator-9999.ebuild
copy to dev-qt/qt-creator/qt-creator-4.1.0.ebuild
index 0a6f46b..f2e2ab2 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.1.0.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n qmake-utils toolchain-funcs virtualx
+inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -22,18 +22,17 @@ else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
 # TODO: unbundle sqlite
-#	allow disabling modeleditor plugin
-#	it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
 	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
-	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+	ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx
+	subversion valgrind winrt)
 IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
 
 REQUIRED_USE="?? ( webengine webkit )"
@@ -58,9 +57,9 @@ RDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	>=sys-devel/gdb-7.5[client,python]
-	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.2 )
+	sys-devel/gdb[client,python]
+	clangcodemodel? ( >=sys-devel/clang-3.8.0:= )
+	qbs? ( >=dev-util/qbs-1.6.0 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
@@ -80,7 +79,7 @@ unset x
 PDEPEND="
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( sys-devel/clang )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.8.0 )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -117,6 +116,17 @@ src_prepare() {
 		fi
 	done
 
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
 	# automagic dep on qtwebkit (bug 538236)
 	if ! use webkit; then
 		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
@@ -172,6 +182,7 @@ src_install() {
 		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
 
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+	# create a desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
+		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
 }

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 0a6f46b..f2e2ab2 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n qmake-utils toolchain-funcs virtualx
+inherit eutils l10n qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -22,18 +22,17 @@ else
 	MY_PV=${PV/_/-}
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~x86"
 	S=${WORKDIR}/${MY_P}
 fi
 
 # TODO: unbundle sqlite
-#	allow disabling modeleditor plugin
-#	it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
 	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
-	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+	ios mercurial modeling:modeleditor nim perforce python:pythoneditor qbs:qbsprojectmanager qnx
+	subversion valgrind winrt)
 IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
 
 REQUIRED_USE="?? ( webengine webkit )"
@@ -58,9 +57,9 @@ RDEPEND="
 	>=dev-qt/qtwidgets-${QT_PV}
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
-	>=sys-devel/gdb-7.5[client,python]
-	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.2 )
+	sys-devel/gdb[client,python]
+	clangcodemodel? ( >=sys-devel/clang-3.8.0:= )
+	qbs? ( >=dev-util/qbs-1.6.0 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
@@ -80,7 +79,7 @@ unset x
 PDEPEND="
 	autotools? ( sys-devel/autoconf )
 	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( sys-devel/clang )
+	clangstaticanalyzer? ( >=sys-devel/clang-3.8.0 )
 	cmake? ( dev-util/cmake )
 	cvs? ( dev-vcs/cvs )
 	git? ( dev-vcs/git )
@@ -117,6 +116,17 @@ src_prepare() {
 		fi
 	done
 
+	# avoid building unused support libraries
+	if ! use clangcodemodel; then
+		sed -i -e '/clangbackendipc/d' src/libs/libs.pro || die
+	fi
+	if ! use glsl; then
+		sed -i -e '/glsl/d' src/libs/libs.pro || die
+	fi
+	if ! use modeling; then
+		sed -i -e '/modelinglib/d' src/libs/libs.pro || die
+	fi
+
 	# automagic dep on qtwebkit (bug 538236)
 	if ! use webkit; then
 		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
@@ -172,6 +182,7 @@ src_install() {
 		docompress -x /usr/share/doc/qtcreator/qtcreator{,-dev}.qch
 	fi
 
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+	# create a desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Development;IDE;Qt;' \
+		'MimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;'
 }

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     7d7de6881abc6455b11842a1d14e73d1dd48e21c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 14:53:21 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 19:37:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d7de688

dev-qt/qt-creator: restrict dep on qbs to avoid build failures

Gentoo-Bug: 594256

Package-Manager: portage-2.3.2

 dev-qt/qt-creator/qt-creator-3.6.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-4.0.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
index bc74830..e1b264f 100644
--- a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
@@ -54,7 +54,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clang? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.4.5 )
+	qbs? ( ~dev-util/qbs-1.4.5 )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "

diff --git a/dev-qt/qt-creator/qt-creator-4.0.3.ebuild b/dev-qt/qt-creator/qt-creator-4.0.3.ebuild
index db3aa79..4fe4cec 100644
--- a/dev-qt/qt-creator/qt-creator-4.0.3.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.0.3.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.2 )
+	qbs? ( ~dev-util/qbs-1.5.2 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     8bb57e32cac5ae97d4cb720ba0690b2bb34873e5
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 13:38:10 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 14:06:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bb57e32

dev-qt/qt-creator: update build requirements for 9999

http://code.qt.io/cgit/qt-creator/qt-creator.git/commit/?id=7812390b0bdb31aec113fef317e4e83c4f822872

Package-Manager: portage-2.3.0

 dev-qt/qt-creator/qt-creator-9999.ebuild | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index d743d86..0a6f46b 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n qmake-utils virtualx
+inherit eutils l10n qmake-utils toolchain-funcs virtualx
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -39,7 +39,7 @@ IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
 REQUIRED_USE="?? ( webengine webkit )"
 
 # minimum Qt version required
-QT_PV="5.5.0:5"
+QT_PV="5.6.0:5"
 
 RDEPEND="
 	=dev-libs/botan-1.10*[-bindist,threads]
@@ -60,9 +60,9 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.1 )
+	qbs? ( >=dev-util/qbs-1.5.2 )
 	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
+	webengine? ( >=dev-qt/qtwebengine-${QT_PV} )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "
 DEPEND="${RDEPEND}
@@ -71,8 +71,8 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? ( >=dev-qt/qttest-${QT_PV} )
 "
+# qt translations must be installed for qt-creator translations to work
 for x in ${PLOCALES}; do
-	# qt translations must be installed for qt-creator translations to work
 	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
 done
 unset x
@@ -90,9 +90,12 @@ PDEPEND="
 "
 
 src_unpack() {
-	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
-		eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
-		die "GCC >= 4.7 required"
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 8 ]]; then
+			eerror "GCC version 4.8 or later is required to build Qt Creator ${PV}"
+			die "GCC >= 4.8 required"
+		fi
 	fi
 
 	if [[ ${PV} == *9999 ]]; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     7e6473d259f4c1cd77003d2f74b6e6af94154ef2
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  9 14:04:49 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Jul  9 14:06:03 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e6473d2

dev-qt/qt-creator: version bump

Package-Manager: portage-2.3.0

 dev-qt/qt-creator/Manifest                                |  2 +-
 .../{qt-creator-4.0.2.ebuild => qt-creator-4.0.3.ebuild}  | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 0dabfc8..44ab5e3 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1,2 @@
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
-DIST qt-creator-opensource-src-4.0.2.tar.gz 21651190 SHA256 c2fce74fef0cc3a8f5c03d7ed1e95ccfe508d855ee750647896876824fcaee10 SHA512 117b3f90a44b509fec47b1c623db76b83f1ead669b3bba5a591d4be09737f677be7a5ff5d4882087ac3118471f664ae012266857c4cdade74dcccf25730044c5 WHIRLPOOL b50b529da52d465fd7c798aff7183bac49f074184c0e29ce383a3f4dd64b2f825f40d9513e086040e22450fcf7dd254b667c9566ad37d6901ee65837aa007e1a
+DIST qt-creator-opensource-src-4.0.3.tar.gz 21972901 SHA256 a213a9b66e7e0eb906036a1587256fc0f7bac33912d9ae5e6117459231f56449 SHA512 7b06b9d2cb050008cbbceeb2f18ad2264a2366db9ad37474b63d0a6d30a3bde86ecb770678beb88af4d5be7550e947c689d23956e2062796cbf9476006c0528a WHIRLPOOL 7d515a038dec69980305a43545d952a1083f00add756e82cd0b568bc2c31c8eb81667822295b352cad2c54c3a447a31e9c8203db25d945023fc70ff2f0d01cd5

diff --git a/dev-qt/qt-creator/qt-creator-4.0.2.ebuild b/dev-qt/qt-creator/qt-creator-4.0.3.ebuild
similarity index 92%
rename from dev-qt/qt-creator/qt-creator-4.0.2.ebuild
rename to dev-qt/qt-creator/qt-creator-4.0.3.ebuild
index d743d86..db3aa79 100644
--- a/dev-qt/qt-creator/qt-creator-4.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.0.3.ebuild
@@ -5,7 +5,7 @@
 EAPI=6
 PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
 
-inherit eutils l10n qmake-utils virtualx
+inherit eutils l10n qmake-utils toolchain-funcs virtualx
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="http://doc.qt.io/qtcreator/"
@@ -60,7 +60,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.1 )
+	qbs? ( >=dev-util/qbs-1.5.2 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
@@ -71,8 +71,8 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-qt/qdoc-${QT_PV} )
 	test? ( >=dev-qt/qttest-${QT_PV} )
 "
+# qt translations must be installed for qt-creator translations to work
 for x in ${PLOCALES}; do
-	# qt translations must be installed for qt-creator translations to work
 	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
 done
 unset x
@@ -90,9 +90,12 @@ PDEPEND="
 "
 
 src_unpack() {
-	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
-		eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
-		die "GCC >= 4.7 required"
+	if tc-is-gcc; then
+		if [[ $(gcc-major-version) -lt 4 ]] || \
+		   [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+			eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
+			die "GCC >= 4.7 required"
+		fi
 	fi
 
 	if [[ ${PV} == *9999 ]]; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     257a4b5edd13056b3ed32b5f9ee9c83185fd3578
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 16:49:10 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 16:49:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=257a4b5e

dev-qt/qt-creator: remove ancient versions (finally)

Package-Manager: portage-2.3.0_rc1

 dev-qt/qt-creator/Manifest                |   2 -
 dev-qt/qt-creator/metadata.xml            |   2 -
 dev-qt/qt-creator/qt-creator-2.8.1.ebuild | 122 ------------------------
 dev-qt/qt-creator/qt-creator-3.4.2.ebuild | 150 ------------------------------
 4 files changed, 276 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 8ef015a..0dabfc8 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,2 @@
-DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
-DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
 DIST qt-creator-opensource-src-4.0.2.tar.gz 21651190 SHA256 c2fce74fef0cc3a8f5c03d7ed1e95ccfe508d855ee750647896876824fcaee10 SHA512 117b3f90a44b509fec47b1c623db76b83f1ead669b3bba5a591d4be09737f677be7a5ff5d4882087ac3118471f664ae012266857c4cdade74dcccf25730044c5 WHIRLPOOL b50b529da52d465fd7c798aff7183bac49f074184c0e29ce383a3f4dd64b2f825f40d9513e086040e22450fcf7dd254b667c9566ad37d6901ee65837aa007e1a

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 6671b8a..7356ce9 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -19,10 +19,8 @@
 		<flag name="clangstaticanalyzer">Build clang-based static analyzer plugin</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
-		<flag name="fakevim">Enable support for vim-like key bindings</flag>
 		<flag name="glsl">Enable GLSL source code editor</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
-		<flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
 		<flag name="python">Enable Python source code editor</flag>

diff --git a/dev-qt/qt-creator/qt-creator-2.8.1.ebuild b/dev-qt/qt-creator/qt-creator-2.8.1.ebuild
deleted file mode 100644
index 12e9df9..0000000
--- a/dev-qt/qt-creator/qt-creator-2.8.1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="cs de es fr it ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n multilib qt4-r2
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="LGPL-2.1"
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://code.qt.io/${PN}/${PN}.git
-		https://code.qt.io/git/${PN}/${PN}.git"
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}-src
-	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
-	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86"
-
-QTC_PLUGINS=(android autotools:autotoolsprojectmanager bazaar
-	clearcase cmake:cmakeprojectmanager cvs fakevim git
-	madde mercurial perforce qnx subversion valgrind)
-IUSE="debug doc examples test ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="4.8.5:4"
-
-CDEPEND="
-	=dev-libs/botan-1.10*[threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}[ssl]
-	>=dev-qt/qtdeclarative-${QT_PV}[accessibility]
-	>=dev-qt/qtgui-${QT_PV}[accessibility]
-	>=dev-qt/qthelp-${QT_PV}[doc?]
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}
-	>=dev-qt/qtsvg-${QT_PV}[accessibility]
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-RDEPEND="${CDEPEND}
-	>=sys-devel/gdb-7.2[python]
-	examples? ( >=dev-qt/qtdemo-${QT_PV} )
-"
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_prepare() {
-	qt4-r2_src_prepare
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/^\s+${plugin#*:}\>/d" src/plugins/plugins.pro \
-				|| die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		share/qtcreator/translations/translations.pro || die
-
-	# remove bundled qbs
-	rm -rf src/shared/qbs || die
-}
-
-src_configure() {
-	EQMAKE4_EXCLUDE="share/qtcreator/templates/*
-			tests/*"
-	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		TEST=$(use test && echo 1 || echo 0) \
-		USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
-	echo ">>> Test phase [QTest]: ${CATEGORY}/${PF}"
-	cd tests/auto || die
-
-	EQMAKE4_EXCLUDE="valgrind/*"
-	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)"
-
-	emake check
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}usr" install
-
-	dodoc dist/{changes-*,known-issues}
-
-	# install documentation
-	if use doc; then
-		emake docs
-		insinto /usr/share/doc/${PF}
-		doins share/doc/qtcreator/qtcreator{,-dev}.qch
-		docompress -x /usr/share/doc/${PF}/qtcreator{,-dev}.qch
-	fi
-
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}

diff --git a/dev-qt/qt-creator/qt-creator-3.4.2.ebuild b/dev-qt/qt-creator/qt-creator-3.4.2.ebuild
deleted file mode 100644
index 2791f07..0000000
--- a/dev-qt/qt-creator/qt-creator-3.4.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n multilib qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
-	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
-	perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.3.2:5"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${QT_PV}
-	>=dev-qt/qtnetwork-${QT_PV}[ssl]
-	>=dev-qt/qtprintsupport-${QT_PV}
-	>=dev-qt/qtquick1-${QT_PV}
-	>=dev-qt/qtquickcontrols-${QT_PV}
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}
-	>=dev-qt/qtsvg-${QT_PV}
-	>=dev-qt/qtwidgets-${QT_PV}
-	>=dev-qt/qtx11extras-${QT_PV}
-	>=dev-qt/qtxml-${QT_PV}
-	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.2:= )
-	qbs? ( >=dev-util/qbs-1.4.1 )
-	systemd? ( sys-apps/systemd:= )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-for x in ${PLOCALES}; do
-	# qt translations must be installed for qt-creator translations to work
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_prepare() {
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# automagic dep on qtwebkit (bug 538236)
-	if ! use webkit; then
-		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webkit"
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
-	sed -i -e '/dumpers\.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 '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		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 \
-		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
-		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) \
-		USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
-	cd tests/auto || die
-	VIRTUALX_COMMAND=default virtualmake
-}
-
-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
-
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Michael Palimaka]

commit:     68b8ba5703c497b254291181287eaa8283f3b1e4
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 16:20:25 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 16:20:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68b8ba57

dev-qt/qt-creator: amd64/x86 stable

Gentoo-bug: 581878

Package-Manager: portage-2.3.0_rc1

 dev-qt/qt-creator/qt-creator-3.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
index f671a72..bc74830 100644
--- a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
@@ -23,7 +23,7 @@ else
 	MY_P=${PN}-opensource-src-${MY_PV}
 	[[ ${MY_PV} == ${PV} ]] && MY_REL=official || MY_REL=development
 	SRC_URI="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 	S=${WORKDIR}/${MY_P}
 fi
 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     6cff62dc485e3fed490220b11704a07237b52e1c
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 11:44:11 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 11:45:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cff62dc

dev-qt/qt-creator: version bump

Package-Manager: portage-2.3.0_rc1

 dev-qt/qt-creator/Manifest                                             | 2 +-
 dev-qt/qt-creator/{qt-creator-4.0.1.ebuild => qt-creator-4.0.2.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index e16f93d..8ef015a 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,4 @@
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
-DIST qt-creator-opensource-src-4.0.1.tar.gz 21651072 SHA256 95518a0b93d2d2fb7e5b46508fc1f59811edb2c5e05659262539dd316b8e5f4c SHA512 2286ffff9d2e0a4cc15abfeccc5b6f7cd7cebc7800debc858476216373df39116e5e6a3e1483ddeda58b42c4215e2a453f2aea1a8740e99d8d2c36b8bc1a4b95 WHIRLPOOL 1cf29c488a1ebacfcf7b251665e02bf107b0482eb45ad2f421fde8ad0dac8077655c7cf9791662ec16cb2aebeaf0f989e815b0c1153826760b0c1d3e93f02f80
+DIST qt-creator-opensource-src-4.0.2.tar.gz 21651190 SHA256 c2fce74fef0cc3a8f5c03d7ed1e95ccfe508d855ee750647896876824fcaee10 SHA512 117b3f90a44b509fec47b1c623db76b83f1ead669b3bba5a591d4be09737f677be7a5ff5d4882087ac3118471f664ae012266857c4cdade74dcccf25730044c5 WHIRLPOOL b50b529da52d465fd7c798aff7183bac49f074184c0e29ce383a3f4dd64b2f825f40d9513e086040e22450fcf7dd254b667c9566ad37d6901ee65837aa007e1a

diff --git a/dev-qt/qt-creator/qt-creator-4.0.1.ebuild b/dev-qt/qt-creator/qt-creator-4.0.2.ebuild
similarity index 100%
rename from dev-qt/qt-creator/qt-creator-4.0.1.ebuild
rename to dev-qt/qt-creator/qt-creator-4.0.2.ebuild

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     0276b3bc15ea8dcf357b35986b4d4612b12486fb
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 00:54:04 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 00:54:27 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0276b3bc

dev-qt/qt-creator: raise qbs dependency

Package-Manager: portage-2.3.0_rc1

 dev-qt/qt-creator/qt-creator-4.0.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-9999.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-4.0.1.ebuild b/dev-qt/qt-creator/qt-creator-4.0.1.ebuild
index c0f6bbb..d743d86 100644
--- a/dev-qt/qt-creator/qt-creator-4.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.0.1.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.0 )
+	qbs? ( >=dev-util/qbs-1.5.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index c0f6bbb..d743d86 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -60,7 +60,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.0 )
+	qbs? ( >=dev-util/qbs-1.5.1 )
 	systemd? ( sys-apps/systemd:= )
 	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     1d3be9551413c3ce2d0df034517e680cb3694856
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 00:49:04 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 00:54:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d3be955

dev-qt/qt-creator: remove old

Package-Manager: portage-2.3.0_rc1

 dev-qt/qt-creator/Manifest                |   1 -
 dev-qt/qt-creator/qt-creator-4.0.0.ebuild | 174 ------------------------------
 2 files changed, 175 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index fad0685..e16f93d 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,5 +1,4 @@
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
-DIST qt-creator-opensource-src-4.0.0.tar.gz 21613655 SHA256 0cc21d720bafc72ce67f45a5553c618e8fffec3f2f23b94a2b2a9ba68ed0e2c8 SHA512 7c845636b60d6eb0c23171661d02d768c564e942a0b653213b12ec121fc9f9865fe859bc647566c19adeb6fc5d1832bb901df8dc00462cb5fde7bbd3c59c5a42 WHIRLPOOL d20cd3ba5a0ea8314439d67ba444291e4251045ed37e2948854a3c6e01c2b56a4c89f0e112aa7ef6109e32c4931d521b3d2cc8cec82182c8b60d7d8c77d767a5
 DIST qt-creator-opensource-src-4.0.1.tar.gz 21651072 SHA256 95518a0b93d2d2fb7e5b46508fc1f59811edb2c5e05659262539dd316b8e5f4c SHA512 2286ffff9d2e0a4cc15abfeccc5b6f7cd7cebc7800debc858476216373df39116e5e6a3e1483ddeda58b42c4215e2a453f2aea1a8740e99d8d2c36b8bc1a4b95 WHIRLPOOL 1cf29c488a1ebacfcf7b251665e02bf107b0482eb45ad2f421fde8ad0dac8077655c7cf9791662ec16cb2aebeaf0f989e815b0c1153826760b0c1d3e93f02f80

diff --git a/dev-qt/qt-creator/qt-creator-4.0.0.ebuild b/dev-qt/qt-creator/qt-creator-4.0.0.ebuild
deleted file mode 100644
index c0f6bbb..0000000
--- a/dev-qt/qt-creator/qt-creator-4.0.0.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="GPL-3"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-# TODO: unbundle sqlite
-#	allow disabling modeleditor plugin
-#	it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
-	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
-	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
-
-REQUIRED_USE="?? ( webengine webkit )"
-
-# minimum Qt version required
-QT_PV="5.5.0:5"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	>=sys-devel/gdb-7.5[client,python]
-	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
-	qbs? ( >=dev-util/qbs-1.5.0 )
-	systemd? ( sys-apps/systemd:= )
-	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-for x in ${PLOCALES}; do
-	# qt translations must be installed for qt-creator translations to work
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	clangstaticanalyzer? ( sys-devel/clang )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_unpack() {
-	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
-		eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
-		die "GCC >= 4.7 required"
-	fi
-
-	if [[ ${PV} == *9999 ]]; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# automagic dep on qtwebkit (bug 538236)
-	if ! use webkit; then
-		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webkit"
-	fi
-
-	# automagic dep on qtwebengine
-	if ! use webengine; then
-		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webengine"
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
-	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
-	sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		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 clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
-		$(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) \
-		USE_SYSTEM_BOTAN=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
-
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     76ff324380eafdd5e79789d6dbc84c0013bdb2c0
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  8 16:46:47 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Wed Jun  8 16:46:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76ff3243

dev-qt/qt-creator: version bump

Package-Manager: portage-2.3.0_rc1

 dev-qt/qt-creator/Manifest                |   1 +
 dev-qt/qt-creator/qt-creator-4.0.1.ebuild | 174 ++++++++++++++++++++++++++++++
 2 files changed, 175 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 6a5106f..fad0685 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -2,3 +2,4 @@ DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
 DIST qt-creator-opensource-src-4.0.0.tar.gz 21613655 SHA256 0cc21d720bafc72ce67f45a5553c618e8fffec3f2f23b94a2b2a9ba68ed0e2c8 SHA512 7c845636b60d6eb0c23171661d02d768c564e942a0b653213b12ec121fc9f9865fe859bc647566c19adeb6fc5d1832bb901df8dc00462cb5fde7bbd3c59c5a42 WHIRLPOOL d20cd3ba5a0ea8314439d67ba444291e4251045ed37e2948854a3c6e01c2b56a4c89f0e112aa7ef6109e32c4931d521b3d2cc8cec82182c8b60d7d8c77d767a5
+DIST qt-creator-opensource-src-4.0.1.tar.gz 21651072 SHA256 95518a0b93d2d2fb7e5b46508fc1f59811edb2c5e05659262539dd316b8e5f4c SHA512 2286ffff9d2e0a4cc15abfeccc5b6f7cd7cebc7800debc858476216373df39116e5e6a3e1483ddeda58b42c4215e2a453f2aea1a8740e99d8d2c36b8bc1a4b95 WHIRLPOOL 1cf29c488a1ebacfcf7b251665e02bf107b0482eb45ad2f421fde8ad0dac8077655c7cf9791662ec16cb2aebeaf0f989e815b0c1153826760b0c1d3e93f02f80

diff --git a/dev-qt/qt-creator/qt-creator-4.0.1.ebuild b/dev-qt/qt-creator/qt-creator-4.0.1.ebuild
new file mode 100644
index 0000000..c0f6bbb
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.0.1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+
+inherit eutils l10n qmake-utils virtualx
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"git://code.qt.io/${PN}/${PN}.git"
+		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+#	allow disabling modeleditor plugin
+#	it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
+	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
+
+REQUIRED_USE="?? ( webengine webkit )"
+
+# minimum Qt version required
+QT_PV="5.5.0:5"
+
+RDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/designer-${QT_PV}
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	>=sys-devel/gdb-7.5[client,python]
+	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
+	qbs? ( >=dev-util/qbs-1.5.0 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+for x in ${PLOCALES}; do
+	# qt translations must be installed for qt-creator translations to work
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( sys-devel/clang )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+
+src_unpack() {
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+		eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
+		die "GCC >= 4.7 required"
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# automagic dep on qtwebkit (bug 538236)
+	if ! use webkit; then
+		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webkit"
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webengine"
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix translations
+	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+		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 clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+		$(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) \
+		USE_SYSTEM_BOTAN=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
+
+	# install desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     36e56b9c21d0c54984f2fe43e06f5e9edd04c658
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri May 13 16:15:07 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri May 13 16:15:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36e56b9c

dev-qt/qt-creator: add live ebuild

Package-Manager: portage-2.2.28

 dev-qt/qt-creator/qt-creator-9999.ebuild | 174 +++++++++++++++++++++++++++++++
 1 file changed, 174 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
new file mode 100644
index 0000000..c0f6bbb
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+
+inherit eutils l10n qmake-utils virtualx
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"git://code.qt.io/${PN}/${PN}.git"
+		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+#	allow disabling modeleditor plugin
+#	it should be possible to skip building some internal libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
+	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="doc systemd test webengine webkit ${QTC_PLUGINS[@]%:*}"
+
+REQUIRED_USE="?? ( webengine webkit )"
+
+# minimum Qt version required
+QT_PV="5.5.0:5"
+
+RDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/designer-${QT_PV}
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	>=sys-devel/gdb-7.5[client,python]
+	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
+	qbs? ( >=dev-util/qbs-1.5.0 )
+	systemd? ( sys-apps/systemd:= )
+	webengine? ( >=dev-qt/qtwebengine-5.6.0:5 )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+for x in ${PLOCALES}; do
+	# qt translations must be installed for qt-creator translations to work
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( sys-devel/clang )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+
+src_unpack() {
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+		eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
+		die "GCC >= 4.7 required"
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# automagic dep on qtwebkit (bug 538236)
+	if ! use webkit; then
+		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webkit"
+	fi
+
+	# automagic dep on qtwebengine
+	if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webengine"
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix translations
+	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+		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 clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+		$(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) \
+		USE_SYSTEM_BOTAN=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
+
+	# install desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     ccb1e8ca8e99694f016eb8f507119998f47fc309
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 17:46:50 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 17:47:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccb1e8ca

dev-qt/qt-creator: allow newer versions of clang

Package-Manager: portage-2.2.28

 dev-qt/qt-creator/qt-creator-3.6.1.ebuild     | 2 +-
 dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
index db7e6c5..f671a72 100644
--- a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
-	clang? ( =sys-devel/clang-3.6*:= )
+	clang? ( >=sys-devel/clang-3.6.2:= )
 	qbs? ( >=dev-util/qbs-1.4.5 )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )

diff --git a/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
index 71c8377..9135dff 100644
--- a/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
-	clangcodemodel? ( =sys-devel/clang-3.6.2*:= )
+	clangcodemodel? ( >=sys-devel/clang-3.6.2:= )
 	qbs? ( !dev-util/qbs )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     64c5690e58d2a178953ddd7907a5b5e59d99de25
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 23 12:08:12 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 12:08:36 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64c5690e

dev-qt/qt-creator: block dev-util/qbs for now

This is only temporary until we can unbundle it again.

Gentoo-Bug: 580880
Package-Manager: portage-2.2.28

 dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
index 1b5bd0b..71c8377 100644
--- a/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
@@ -58,6 +58,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clangcodemodel? ( =sys-devel/clang-3.6.2*:= )
+	qbs? ( !dev-util/qbs )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     42edd9e3783cb8af0751cc7b2b5edca334cb4495
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 01:45:16 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 01:45:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42edd9e3

dev-qt/qt-creator: version bump

Package-Manager: portage-2.2.28

 dev-qt/qt-creator/Manifest                    |   1 +
 dev-qt/qt-creator/metadata.xml                |   5 +-
 dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild | 172 ++++++++++++++++++++++++++
 3 files changed, 177 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 8a6a7af..a6f4506 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -2,3 +2,4 @@ DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
 DIST qt-creator-opensource-src-3.5.1.tar.gz 22580581 SHA256 5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65 SHA512 ccd5e4ee669c749b19c53f4a3c18d59f73747ca18198648be48d8e5c1cc484cc360ebdb5100546cc5811d88a5139b9997d6cec1d5eeeccf7634f1c803a6e3722 WHIRLPOOL 85883e3462eabc03e16abaaef9cc002377b0856119ce3c1aa8aa8d5cf51a90bab667219fdf40abc7ac42f1b338337a9e152944d26c46e85747da9273e4888448
 DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65
+DIST qt-creator-opensource-src-4.0.0-rc1.tar.gz 22781346 SHA256 33e478b4c5d024bcab07fa6974b2af6818666812ff88f153405bedb557e0c566 SHA512 b109a5144c276183d2c9ae1d2406bf555536b3799bf3ea442d2fed37495eb2c79a2f3fbfbbd060fdbecd4d4a54804b56b9f81285127621ffb382de89b5bdb451 WHIRLPOOL f04b51d848230b7c791659e899a8e7c517488972447a1426aa36bf95e25803ee94dd2458fa0dabd7f5a68d156a8b0ceb789331dea3200dccd0d16d8cc560e3a0

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index e395abe..2266727 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -15,16 +15,19 @@
 		<flag name="baremetal">Build plugin for bare metal devices</flag>
 		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
 		<flag name="clang">Build clang-based code model plugin</flag>
+		<flag name="clangcodemodel">Build clang-based code model plugin</flag>
+		<flag name="clangstaticanalyzer">Build clang-based static analyzer plugin</flag>
 		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
 		<flag name="cmake">Enable cmake project manager plugin</flag>
 		<flag name="fakevim">Enable support for vim-like key bindings</flag>
+		<flag name="glsl">Enable GLSL source code editor</flag>
 		<flag name="ios">Build plugin for Apple iOS devices</flag>
 		<flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
 		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
 		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
 		<flag name="python">Enable Python source code editor</flag>
 		<flag name="qbs">Enable QBS project manager plugin</flag>
-		<flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
+		<flag name="qnx">Build plugin for QNX devices</flag>
 		<flag name="systemd">Add support for retrieving application output from journald</flag>
 		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
 		<flag name="winrt">Build plugin for WinRT devices</flag>

diff --git a/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild b/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
new file mode 100644
index 0000000..1b5bd0b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-4.0.0_rc1.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+
+inherit eutils l10n qmake-utils virtualx
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/"
+LICENSE="GPL-3"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"git://code.qt.io/${PN}/${PN}.git"
+		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+# TODO: unbundle sqlite
+#	allow disabling modeleditor plugin
+#	we can avoid building some libs (clangbackendipc, glsl, modelinglib, sqlite) when the plugins that use them are disabled
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal bazaar
+	clangcodemodel clangstaticanalyzer clearcase cmake:cmakeprojectmanager cvs git glsl:glsleditor
+	ios mercurial perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.5.0:5"
+
+RDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/designer-${QT_PV}
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	>=sys-devel/gdb-7.5[client,python]
+	clangcodemodel? ( =sys-devel/clang-3.6.2*:= )
+	systemd? ( sys-apps/systemd:= )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+for x in ${PLOCALES}; do
+	# qt translations must be installed for qt-creator translations to work
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	clangstaticanalyzer? ( sys-devel/clang )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+
+src_unpack() {
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+		eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
+		die "GCC >= 4.7 required"
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# automagic dep on qtwebkit (bug 538236)
+	if ! use webkit; then
+		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webkit"
+	fi
+
+	# automagic dep on qtwebengine
+	# TODO: re-enable behind USE flag when qtwebengine enters the tree
+	#if ! use webengine; then
+		sed -i -e 's/isEmpty(QT\.webenginewidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webengine"
+	#fi
+
+	# disable broken or unreliable tests
+	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix translations
+	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+		share/qtcreator/translations/translations.pro || die
+
+	# remove bundled qbs
+	#rm -rf src/shared/qbs || die # TODO
+}
+
+src_configure() {
+	eqmake5 IDE_LIBRARY_BASENAME="$(get_libdir)" \
+		IDE_PACKAGE_MODE=1 \
+		$(use clangcodemodel && echo LLVM_INSTALL_DIR="${EPREFIX}/usr") \
+		$(use systemd && echo CONFIG+=journald) \
+		$(use test && echo BUILD_TESTS=1) \
+		USE_SYSTEM_BOTAN=1
+		# TODO: re-enable when upstream releases a compatible version of qbs
+		#$(use qbs && echo QBS_INSTALL_DIR="${EPREFIX}/usr") \
+		#CONFIG+=qbs_disable_rpath \
+		#CONFIG+=qbs_enable_project_file_updates \
+}
+
+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
+
+	# install desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     bee63c47df9c78a81718c3d8ebbe64645ab0fba8
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 18:39:36 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 18:40:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bee63c47

dev-qt/qt-creator: restrict clang dep to 3.6.x only

Later versions don't work correctly.

Package-Manager: portage-2.2.28

 dev-qt/qt-creator/qt-creator-3.5.1.ebuild | 4 ++--
 dev-qt/qt-creator/qt-creator-3.6.1.ebuild | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/qt-creator-3.5.1.ebuild b/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
index c09044e..27b0b1e 100644
--- a/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -52,7 +52,7 @@ RDEPEND="
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.6:= )
+	clang? ( =sys-devel/clang-3.6*:= )
 	qbs? ( >=dev-util/qbs-1.4.2 )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )

diff --git a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
index cc72396..db7e6c5 100644
--- a/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.6:= )
+	clang? ( =sys-devel/clang-3.6*:= )
 	qbs? ( >=dev-util/qbs-1.4.5 )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     ad40a79c169480cf903eb915ca5b1e822002f6bf
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  2 18:28:35 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sat Apr  2 18:40:06 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad40a79c

dev-qt/qt-creator: version bump

Package-Manager: portage-2.2.28

 dev-qt/qt-creator/Manifest                                            | 2 +-
 .../qt-creator/{qt-creator-3.6.0.ebuild => qt-creator-3.6.1.ebuild}   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 3f4ea60..8a6a7af 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,4 +1,4 @@
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
 DIST qt-creator-opensource-src-3.5.1.tar.gz 22580581 SHA256 5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65 SHA512 ccd5e4ee669c749b19c53f4a3c18d59f73747ca18198648be48d8e5c1cc484cc360ebdb5100546cc5811d88a5139b9997d6cec1d5eeeccf7634f1c803a6e3722 WHIRLPOOL 85883e3462eabc03e16abaaef9cc002377b0856119ce3c1aa8aa8d5cf51a90bab667219fdf40abc7ac42f1b338337a9e152944d26c46e85747da9273e4888448
-DIST qt-creator-opensource-src-3.6.0.tar.gz 23127195 SHA256 b130104963053e21f227b08009545894af33df495445a8651843bad4b52a1dec SHA512 7fdcb55161137759856deb46bf8ae46c31529d01d1d8eb7dc73dfc5adaf7912725fc4d58f612c374ad14d2e6df3c52a4c7f85e3ddc1470b473b8e37bee42ff80 WHIRLPOOL 4af9765e1aab90d2f86d99ac35fda8ade4474100ecd8c8d9c765619286c607215a0b03bf8c00ddf6c4f0de2c55c471a2be8e304fd475e7d0fbddfd0f0ca66e2b
+DIST qt-creator-opensource-src-3.6.1.tar.gz 23144233 SHA256 e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2 SHA512 be869de5fdaf7294dca95e540b7b9228015132071aaf5315a3c8b2da3043a03528b3d75e94a7fffc567bd802dba1a48568c4a335926c1d5e1e18beaae48ecc9f WHIRLPOOL c62cb18d5c9be0fac2ea9ef355d820a29183e3b0226c1fb70bef9dc7402dd16886ceacd4029764204bde4595d77098641080ad8fdf4f58e97ebb96e3abf3ae65

diff --git a/dev-qt/qt-creator/qt-creator-3.6.0.ebuild b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
similarity index 98%
rename from dev-qt/qt-creator/qt-creator-3.6.0.ebuild
rename to dev-qt/qt-creator/qt-creator-3.6.1.ebuild
index 5248c5b..cc72396 100644
--- a/dev-qt/qt-creator/qt-creator-3.6.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -54,7 +54,7 @@ RDEPEND="
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
 	clang? ( >=sys-devel/clang-3.6:= )
-	qbs? ( >=dev-util/qbs-1.4.4 )
+	qbs? ( >=dev-util/qbs-1.4.5 )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     30d650dea5305a90b4e093621ea63db18a594b25
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 23:44:43 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 23:58:22 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30d650de

dev-qt/qt-creator: re-indent metadata.xml

Package-Manager: portage-2.2.27

 dev-qt/qt-creator/metadata.xml | 64 +++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 7a42614..e395abe 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>pesa@gentoo.org</email>
-	<name>Davide Pesavento</name>
-</maintainer>
-<maintainer type="project">
-	<email>qt@gentoo.org</email>
-	<name>Gentoo Qt Project</name>
-</maintainer>
-<use>
-	<flag name="android">Build plugin for Android devices</flag>
-	<flag name="autotools">Enable autotools project manager plugin</flag>
-	<flag name="baremetal">Build plugin for bare metal devices</flag>
-	<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
-	<flag name="clang">Build clang-based code model plugin</flag>
-	<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
-	<flag name="cmake">Enable cmake project manager plugin</flag>
-	<flag name="fakevim">Enable support for vim-like key bindings</flag>
-	<flag name="ios">Build plugin for Apple iOS devices</flag>
-	<flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
-	<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
-	<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
-	<flag name="python">Enable Python source code editor</flag>
-	<flag name="qbs">Enable QBS project manager plugin</flag>
-	<flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
-	<flag name="systemd">Add support for retrieving application output from journald</flag>
-	<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
-	<flag name="winrt">Build plugin for WinRT devices</flag>
-</use>
-<upstream>
-	<bugs-to>https://bugreports.qt.io/</bugs-to>
-	<doc>http://doc.qt.io/qtcreator/</doc>
-</upstream>
+	<maintainer type="person">
+		<email>pesa@gentoo.org</email>
+		<name>Davide Pesavento</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
+	<use>
+		<flag name="android">Build plugin for Android devices</flag>
+		<flag name="autotools">Enable autotools project manager plugin</flag>
+		<flag name="baremetal">Build plugin for bare metal devices</flag>
+		<flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version control system</flag>
+		<flag name="clang">Build clang-based code model plugin</flag>
+		<flag name="clearcase">Add support for IBM ClearCase version control system (requires manual installation of ClearCase client)</flag>
+		<flag name="cmake">Enable cmake project manager plugin</flag>
+		<flag name="fakevim">Enable support for vim-like key bindings</flag>
+		<flag name="ios">Build plugin for Apple iOS devices</flag>
+		<flag name="madde">Enable integration with MADDE (Maemo Application Development and Debugging Environment)</flag>
+		<flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> version control system</flag>
+		<flag name="perforce">Add support for Perforce version control system (requires manual installation of Perforce client)</flag>
+		<flag name="python">Enable Python source code editor</flag>
+		<flag name="qbs">Enable QBS project manager plugin</flag>
+		<flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
+		<flag name="systemd">Add support for retrieving application output from journald</flag>
+		<flag name="valgrind">Add support for memory debugging using <pkg>dev-util/valgrind</pkg></flag>
+		<flag name="winrt">Build plugin for WinRT devices</flag>
+	</use>
+	<upstream>
+		<bugs-to>https://bugreports.qt.io/</bugs-to>
+		<doc>http://doc.qt.io/qtcreator/</doc>
+	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     2bf57ea4f869706e2b7d00f529f0af9140606103
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 02:32:27 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 02:34:41 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf57ea4

dev-qt/qt-creator: version bump, EAPI=6

Package-Manager: portage-2.2.26

 dev-qt/qt-creator/Manifest                |   1 +
 dev-qt/qt-creator/qt-creator-3.6.0.ebuild | 160 ++++++++++++++++++++++++++++++
 2 files changed, 161 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 64fe4c0..3f4ea60 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,4 @@
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
 DIST qt-creator-opensource-src-3.5.1.tar.gz 22580581 SHA256 5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65 SHA512 ccd5e4ee669c749b19c53f4a3c18d59f73747ca18198648be48d8e5c1cc484cc360ebdb5100546cc5811d88a5139b9997d6cec1d5eeeccf7634f1c803a6e3722 WHIRLPOOL 85883e3462eabc03e16abaaef9cc002377b0856119ce3c1aa8aa8d5cf51a90bab667219fdf40abc7ac42f1b338337a9e152944d26c46e85747da9273e4888448
+DIST qt-creator-opensource-src-3.6.0.tar.gz 23127195 SHA256 b130104963053e21f227b08009545894af33df495445a8651843bad4b52a1dec SHA512 7fdcb55161137759856deb46bf8ae46c31529d01d1d8eb7dc73dfc5adaf7912725fc4d58f612c374ad14d2e6df3c52a4c7f85e3ddc1470b473b8e37bee42ff80 WHIRLPOOL 4af9765e1aab90d2f86d99ac35fda8ade4474100ecd8c8d9c765619286c607215a0b03bf8c00ddf6c4f0de2c55c471a2be8e304fd475e7d0fbddfd0f0ca66e2b

diff --git a/dev-qt/qt-creator/qt-creator-3.6.0.ebuild b/dev-qt/qt-creator/qt-creator-3.6.0.ebuild
new file mode 100644
index 0000000..5248c5b
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-3.6.0.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+
+inherit eutils l10n qmake-utils virtualx
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"git://code.qt.io/${PN}/${PN}.git"
+		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
+	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
+	perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.4.0:5"
+
+RDEPEND="
+	=dev-libs/botan-1.10*[-bindist,threads]
+	>=dev-qt/designer-${QT_PV}
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	>=sys-devel/gdb-7.5[client,python]
+	clang? ( >=sys-devel/clang-3.6:= )
+	qbs? ( >=dev-util/qbs-1.4.4 )
+	systemd? ( sys-apps/systemd:= )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+for x in ${PLOCALES}; do
+	# qt translations must be installed for qt-creator translations to work
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+
+src_unpack() {
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+		eerror "GCC version 4.7 or later is required to build Qt Creator ${PV}"
+		die "GCC >= 4.7 required"
+	fi
+
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# automagic dep on qtwebkit (bug 538236)
+	if ! use webkit; then
+		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webkit"
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e '/SUBDIRS/ s/\<dumpers\>//' tests/auto/debugger/debugger.pro || die
+	sed -i -e '/CONFIG -=/ s/$/ testcase/' tests/auto/extensionsystem/pluginmanager/correctplugins1/plugin?/plugin?.pro || die
+	sed -i -e '/SUBDIRS/ s/\<memcheck\>//' tests/auto/valgrind/valgrind.pro || die
+
+	# fix translations
+	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+		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="${EPREFIX}/usr") \
+		$(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) \
+		USE_SYSTEM_BOTAN=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
+
+	# install desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     9d8b308a1dcf8d72e94fce6512306e724744d2f6
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 23 20:12:59 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 20:12:59 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d8b308a

dev-qt/qt-creator: promote 3.4.2 to stable on amd64

Gentoo-Bug: 562834

Package-Manager: portage-2.2.23

 dev-qt/qt-creator/qt-creator-3.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-3.4.2.ebuild b/dev-qt/qt-creator/qt-creator-3.4.2.ebuild
index fde9f62..2791f07 100644
--- a/dev-qt/qt-creator/qt-creator-3.4.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.4.2.ebuild
@@ -27,7 +27,7 @@ else
 fi
 
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 
 QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
 	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     5c093849f773e51297bcb48699fbcdf8dff2d854
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 02:17:11 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 02:17:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c093849

dev-qt/qt-creator: apply patches

Package-Manager: portage-2.2.23

 dev-qt/qt-creator/qt-creator-3.5.1.ebuild | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dev-qt/qt-creator/qt-creator-3.5.1.ebuild b/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
index d12592a..c09044e 100644
--- a/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.5.1.ebuild
@@ -80,6 +80,10 @@ PDEPEND="
 	valgrind? ( dev-util/valgrind )
 "
 
+PATCHES=(
+	"${FILESDIR}/3.5.1-tst_fileutils-parentDir.patch"
+)
+
 src_unpack() {
 	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
 		eerror "GCC version 4.7 or later is required to build Qt Creator"
@@ -94,6 +98,10 @@ src_unpack() {
 }
 
 src_prepare() {
+	# apply patches
+	[[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}"
+	epatch_user
+
 	# disable unwanted plugins
 	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
 		if ! use ${plugin%:*}; then

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     822f8cf665b7fd67bf47dc0584a5fde78df2194d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 01:47:52 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 01:48:19 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822f8cf6

dev-qt/qt-creator: remove old

Package-Manager: portage-2.2.23

 dev-qt/qt-creator/Manifest                |   2 -
 dev-qt/qt-creator/qt-creator-3.2.2.ebuild | 130 -------------------------
 dev-qt/qt-creator/qt-creator-3.5.0.ebuild | 155 ------------------------------
 3 files changed, 287 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 9ade25f..64fe4c0 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,5 +1,3 @@
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
-DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb79537f3d8d251dbc3c9808d0ff377efe5c4fad7dbd8f0 SHA512 f85381eb6f56d787e5efe02407c4b6f949fd2a766a25567ceccb3a002ec7dd9c6277d9cf39ef0afdd8e110d7bc7436344756225784009a2e01ba9fd8428f885e WHIRLPOOL aa65009cffbc10161cdd9f8e70121c5b2e80df034bb1e06400558a947dcf3284cc23d1b162f85a7ed19af216f0d94d0c5f997c0072c3f19149f64e528fde36a7
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
-DIST qt-creator-opensource-src-3.5.0.tar.gz 22583597 SHA256 5dc35f81b50d65243a6ae046125061051d03c3d50937a37e29e0669384bb0eb6 SHA512 bdae95a6ba9950ff7cfc021a89af52972ca735d3831f7df49418b06b0ce45130a42ed1d29a02dbb03f4739226adb22b55dd6701071da44f8c0e31ba389cc66d0 WHIRLPOOL 5bde80476b57df65defb2f32ef5c2263bc4c157ba0c85cf369d190ec364e916da5760ff57b53ef4f8bcad09cf7c4d24185aa52ffe08e54ce5035dc2d4ca95679
 DIST qt-creator-opensource-src-3.5.1.tar.gz 22580581 SHA256 5925ac818a08be919094e0f28fb4c5d8896765e0975d54d353e4c50f13d63e65 SHA512 ccd5e4ee669c749b19c53f4a3c18d59f73747ca18198648be48d8e5c1cc484cc360ebdb5100546cc5811d88a5139b9997d6cec1d5eeeccf7634f1c803a6e3722 WHIRLPOOL 85883e3462eabc03e16abaaef9cc002377b0856119ce3c1aa8aa8d5cf51a90bab667219fdf40abc7ac42f1b338337a9e152944d26c46e85747da9273e4888448

diff --git a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild b/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
deleted file mode 100644
index 20796e0..0000000
--- a/dev-qt/qt-creator/qt-creator-3.2.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-
-inherit eutils l10n multilib qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	S=${WORKDIR}/${MY_P}
-fi
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-
-QTC_PLUGINS=(android autotools:autotoolsprojectmanager baremetal bazaar
-	clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git
-	ios mercurial perforce python:pythoneditor qnx subversion valgrind)
-IUSE="debug doc test webkit ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="4.8.5:4"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}[ssl]
-	>=dev-qt/qtdeclarative-${QT_PV}[accessibility]
-	>=dev-qt/qtgui-${QT_PV}[accessibility]
-	>=dev-qt/qthelp-${QT_PV}[doc?]
-	>=dev-qt/qtscript-${QT_PV}
-	>=dev-qt/qtsql-${QT_PV}
-	>=dev-qt/qtsvg-${QT_PV}[accessibility]
-	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.2:= )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_prepare() {
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# automagic dep on qtwebkit (bug 538236)
-	if ! use webkit; then
-		sed -i -e 's/contains(QT_CONFIG, webkit).*$/DEFINES += QT_NO_WEBKIT/' \
-			src/plugins/help/help.pro || die "failed to disable webkit"
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
-	sed -i -e '/dumpers\.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 '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		share/qtcreator/translations/translations.pro || die
-
-	# remove bundled qbs
-	rm -rf src/shared/qbs || die
-}
-
-src_configure() {
-	EQMAKE4_EXCLUDE="share/qtcreator/templates/*
-			tests/*"
-	eqmake4 IDE_LIBRARY_BASENAME="$(get_libdir)" \
-		IDE_PACKAGE_MODE=1 \
-		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
-		$(use test && echo BUILD_TESTS=1) \
-		USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
-	cd tests/auto || die
-	VIRTUALX_COMMAND=default virtualmake
-}
-
-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
-
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}

diff --git a/dev-qt/qt-creator/qt-creator-3.5.0.ebuild b/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
deleted file mode 100644
index afceb08..0000000
--- a/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
-inherit eutils l10n multilib qmake-utils virtualx
-
-DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
-HOMEPAGE="http://doc.qt.io/qtcreator/"
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI=(
-		"git://code.qt.io/${PN}/${PN}.git"
-		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~x86"
-	S=${WORKDIR}/${MY_P}
-fi
-
-QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
-	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
-	perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
-IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
-
-# minimum Qt version required
-QT_PV="5.4.0:5"
-
-RDEPEND="
-	=dev-libs/botan-1.10*[-bindist,threads]
-	>=dev-qt/designer-${QT_PV}
-	>=dev-qt/qtconcurrent-${QT_PV}
-	>=dev-qt/qtcore-${QT_PV}
-	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
-	>=dev-qt/qtgui-${QT_PV}
-	>=dev-qt/qthelp-${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}
-	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.6:= )
-	qbs? ( >=dev-util/qbs-1.4.2 )
-	systemd? ( sys-apps/systemd:= )
-	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
-"
-DEPEND="${RDEPEND}
-	>=dev-qt/linguist-tools-${QT_PV}
-	virtual/pkgconfig
-	doc? ( >=dev-qt/qdoc-${QT_PV} )
-	test? ( >=dev-qt/qttest-${QT_PV} )
-"
-for x in ${PLOCALES}; do
-	# qt translations must be installed for qt-creator translations to work
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
-done
-unset x
-
-PDEPEND="
-	autotools? ( sys-devel/autoconf )
-	bazaar? ( dev-vcs/bzr )
-	cmake? ( dev-util/cmake )
-	cvs? ( dev-vcs/cvs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? ( dev-vcs/subversion )
-	valgrind? ( dev-util/valgrind )
-"
-
-src_unpack() {
-	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
-		eerror "GCC version 4.7 or later is required to build Qt Creator"
-		die "GCC >= 4.7 required"
-	fi
-
-	default
-}
-
-src_prepare() {
-	# disable unwanted plugins
-	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
-		if ! use ${plugin%:*}; then
-			einfo "Disabling ${plugin%:*} plugin"
-			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
-				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
-		fi
-	done
-
-	# automagic dep on qtwebkit (bug 538236)
-	if ! use webkit; then
-		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
-			src/plugins/help/help.pro || die "failed to disable webkit"
-	fi
-
-	# disable broken or unreliable tests
-	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
-	sed -i -e '/dumpers\.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 '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
-
-	# fix translations
-	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
-		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 \
-		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
-		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) \
-		USE_SYSTEM_BOTAN=1
-}
-
-src_test() {
-	cd tests/auto || die
-	VIRTUALX_COMMAND=default virtualmake
-}
-
-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
-
-	# install desktop file
-	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
-}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     6b17f9efb554c4c86cadcd46f8319bb81c52db8d
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 22:26:00 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 22:27:12 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b17f9ef

dev-qt/qt-creator: raise clang dependency

Gentoo-Bug: 560398

Package-Manager: portage-2.2.20.1

 dev-qt/qt-creator/qt-creator-3.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-3.5.0.ebuild b/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
index e88ec0b..afceb08 100644
--- a/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
@@ -52,7 +52,7 @@ RDEPEND="
 	>=dev-qt/qtx11extras-${QT_PV}
 	>=dev-qt/qtxml-${QT_PV}
 	>=sys-devel/gdb-7.5[client,python]
-	clang? ( >=sys-devel/clang-3.2:= )
+	clang? ( >=sys-devel/clang-3.6:= )
 	qbs? ( >=dev-util/qbs-1.4.2 )
 	systemd? ( sys-apps/systemd:= )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     2cf061d6af0a9cb9c94235b4e6eef7127908b206
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 20 21:58:06 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Sep 20 21:58:06 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf061d6

dev-qt/qt-creator: fix bug 560394

USE=bindist on botan disables ECDSA support, but ECDSA is required
by QtCreator's internal SSH implementation since version 3.5.0.

Package-Manager: portage-2.2.20.1

 dev-qt/qt-creator/qt-creator-3.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-qt/qt-creator/qt-creator-3.5.0.ebuild b/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
index e878225..e88ec0b 100644
--- a/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
@@ -35,7 +35,7 @@ IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
 QT_PV="5.4.0:5"
 
 RDEPEND="
-	=dev-libs/botan-1.10*[threads]
+	=dev-libs/botan-1.10*[-bindist,threads]
 	>=dev-qt/designer-${QT_PV}
 	>=dev-qt/qtconcurrent-${QT_PV}
 	>=dev-qt/qtcore-${QT_PV}

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/

[Davide Pesavento]

commit:     c7a6fb24c721d44bbdab8cb8bb42cd2978f1f845
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 14 00:19:56 2015 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Mon Sep 14 00:21:05 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7a6fb24

dev-qt/qt-creator: version bump

Package-Manager: portage-2.2.20.1

 dev-qt/qt-creator/Manifest                |   1 +
 dev-qt/qt-creator/qt-creator-3.5.0.ebuild | 155 ++++++++++++++++++++++++++++++
 2 files changed, 156 insertions(+)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 22e0b3c..ffde8f9 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,3 +1,4 @@
 DIST qt-creator-2.8.1-src.tar.gz 24381282 SHA256 d5ae007a297a4288d0e95fd605edbfb8aee80f6788c7a6cfb9cb297f50c364b9 SHA512 954b0caa9a4c6b7debf62562f3c8f1b4edee13488867208e7d41544b244a111024f2c4c144e4b44e98973cf1d7b5885c13c0b6996ade58e204887eb13bb999cb WHIRLPOOL 1aa5018e19315bd2528580ffa388ff17d96666747e4abad28ea4bcd38315e6efc66379cdda90cb32c17dd1631d0ebedff422e53ee0b9b3c40d7a5766ff4dd9b4
 DIST qt-creator-opensource-src-3.2.2.tar.gz 22789455 SHA256 a115f1d7b08446dcfeb79537f3d8d251dbc3c9808d0ff377efe5c4fad7dbd8f0 SHA512 f85381eb6f56d787e5efe02407c4b6f949fd2a766a25567ceccb3a002ec7dd9c6277d9cf39ef0afdd8e110d7bc7436344756225784009a2e01ba9fd8428f885e WHIRLPOOL aa65009cffbc10161cdd9f8e70121c5b2e80df034bb1e06400558a947dcf3284cc23d1b162f85a7ed19af216f0d94d0c5f997c0072c3f19149f64e528fde36a7
 DIST qt-creator-opensource-src-3.4.2.tar.gz 23239370 SHA256 f57df9954768badb252154a51cca9b21a4903f8e003ef944d25801cde1754bab SHA512 65a93574bf6dd35ef4769d4e8a40cb183b2904af6cd32616c15e57654ab575280e7a5d0bbe43296a012e79127831b46fa21890d65472e0c781a95461e5a50812 WHIRLPOOL a56fbb9ea76e9cc7886ee447503c4f7ca646ebf19a113ab95b9b3788d8d75871850c358f13bbd3093f544c65c65f916006cb7571a73292376a7629c236cf0e74
+DIST qt-creator-opensource-src-3.5.0.tar.gz 22583597 SHA256 5dc35f81b50d65243a6ae046125061051d03c3d50937a37e29e0669384bb0eb6 SHA512 bdae95a6ba9950ff7cfc021a89af52972ca735d3831f7df49418b06b0ce45130a42ed1d29a02dbb03f4739226adb22b55dd6701071da44f8c0e31ba389cc66d0 WHIRLPOOL 5bde80476b57df65defb2f32ef5c2263bc4c157ba0c85cf369d190ec364e916da5760ff57b53ef4f8bcad09cf7c4d24185aa52ffe08e54ce5035dc2d4ca95679

diff --git a/dev-qt/qt-creator/qt-creator-3.5.0.ebuild b/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
new file mode 100644
index 0000000..e878225
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-3.5.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+inherit eutils l10n multilib qmake-utils virtualx
+
+DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
+HOMEPAGE="http://doc.qt.io/qtcreator/"
+LICENSE="|| ( LGPL-2.1 LGPL-3 )"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI=(
+		"git://code.qt.io/${PN}/${PN}.git"
+		"https://code.qt.io/git/${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="http://download.qt.io/${MY_REL}_releases/${PN/-}/${PV%.*}/${MY_PV}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+	S=${WORKDIR}/${MY_P}
+fi
+
+QTC_PLUGINS=('android:android|qmakeandroidsupport' autotools:autotoolsprojectmanager baremetal
+	bazaar clang:clangcodemodel clearcase cmake:cmakeprojectmanager cvs git ios mercurial
+	perforce python:pythoneditor qbs:qbsprojectmanager qnx subversion valgrind winrt)
+IUSE="doc systemd test webkit ${QTC_PLUGINS[@]%:*}"
+
+# minimum Qt version required
+QT_PV="5.4.0:5"
+
+RDEPEND="
+	=dev-libs/botan-1.10*[threads]
+	>=dev-qt/designer-${QT_PV}
+	>=dev-qt/qtconcurrent-${QT_PV}
+	>=dev-qt/qtcore-${QT_PV}
+	>=dev-qt/qtdeclarative-${QT_PV}[widgets]
+	>=dev-qt/qtgui-${QT_PV}
+	>=dev-qt/qthelp-${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}
+	>=sys-devel/gdb-7.5[client,python]
+	clang? ( >=sys-devel/clang-3.2:= )
+	qbs? ( >=dev-util/qbs-1.4.2 )
+	systemd? ( sys-apps/systemd:= )
+	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/linguist-tools-${QT_PV}
+	virtual/pkgconfig
+	doc? ( >=dev-qt/qdoc-${QT_PV} )
+	test? ( >=dev-qt/qttest-${QT_PV} )
+"
+for x in ${PLOCALES}; do
+	# qt translations must be installed for qt-creator translations to work
+	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+done
+unset x
+
+PDEPEND="
+	autotools? ( sys-devel/autoconf )
+	bazaar? ( dev-vcs/bzr )
+	cmake? ( dev-util/cmake )
+	cvs? ( dev-vcs/cvs )
+	git? ( dev-vcs/git )
+	mercurial? ( dev-vcs/mercurial )
+	subversion? ( dev-vcs/subversion )
+	valgrind? ( dev-util/valgrind )
+"
+
+src_unpack() {
+	if [[ $(gcc-major-version) -lt 4 ]] || [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]]; then
+		eerror "GCC version 4.7 or later is required to build Qt Creator"
+		die "GCC >= 4.7 required"
+	fi
+
+	default
+}
+
+src_prepare() {
+	# disable unwanted plugins
+	for plugin in "${QTC_PLUGINS[@]#[+-]}"; do
+		if ! use ${plugin%:*}; then
+			einfo "Disabling ${plugin%:*} plugin"
+			sed -i -re "/(^\s+|SUBDIRS\s*\+=\s*)(${plugin#*:})\>/d" \
+				src/plugins/plugins.pro || die "failed to disable ${plugin%:*} plugin"
+		fi
+	done
+
+	# automagic dep on qtwebkit (bug 538236)
+	if ! use webkit; then
+		sed -i -e 's/isEmpty(QT\.webkitwidgets\.name)/true/' \
+			src/plugins/help/help.pro || die "failed to disable webkit"
+	fi
+
+	# disable broken or unreliable tests
+	sed -i -e '/lexer/d' tests/auto/cplusplus/cplusplus.pro || die
+	sed -i -e '/dumpers\.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 '/parsertests\.pro/d' tests/auto/valgrind/memcheck/memcheck.pro || die
+
+	# fix translations
+	sed -i -e "/^LANGUAGES =/ s:=.*:= $(l10n_get_locales):" \
+		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 \
+		LLVM_INSTALL_DIR="${EPREFIX}/usr" \
+		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) \
+		USE_SYSTEM_BOTAN=1
+}
+
+src_test() {
+	cd tests/auto || die
+	VIRTUALX_COMMAND=default virtualmake
+}
+
+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
+
+	# install desktop file
+	make_desktop_entry qtcreator 'Qt Creator' QtProject-qtcreator 'Qt;Development;IDE'
+}