gentoo auto-resync : 07:12:2024 - 02:07:26

5 files changed, 32 insertions, 23 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index e72c9da5663b..39dca15fde9a 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 5467be7a83cf..3eaaf90add28 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -7,6 +7,6 @@ DIST qt-creator-opensource-src-14.0.2.tar.xz 52423044 BLAKE2B 491b00aa9900b45e8e
 DIST qt-creator-opensource-src-15.0.0-vendor.tar.xz 509332 BLAKE2B 7c417a0fc14eb3b8e27aec73afa362cea43008107a68290c8fc17631fb06d24f89d7454e191a68ba199bd349142b3f1ae1ddbdff0af6bc69b6d53f61227236c0 SHA512 52fb8b585f8821919550622710b76ab7376668c8cae76ea9880d34b281f052972b3c08192ce8e994f51d86de33c247d27bf3252194dd17c1a7b37e8d5e68d42d
 DIST qt-creator-opensource-src-15.0.0.tar.xz 53254544 BLAKE2B bf295974a904c182f37321a8e7e06704906d9db34f3c96d3e7b1ac2aad2807c106f271e480e9ef7c72f98413fd6faca3c6d9e47d47b62736ce88f4722857be05 SHA512 0a003a17bec60b34c4dc4ac700125dc62be9d2cf50e9044b61cc926b1d7cfa1e8303b98f9ae25abca07cb893398c25f61c3ec28029efe50e88339e5d984d1279
 EBUILD qt-creator-14.0.2.ebuild 7753 BLAKE2B 59bda93c6f931b37f782d6fce8abbd4d7bb22c71300a9121a52cdaf69141e624d04ff4dcc99b62137ca02944e9a96ac0326e257039e00d8030b19381f23e3d75 SHA512 5aebad9c4b6b87380db5ceca2cac143ddda085b5da007f313244c808f9b33b5c536ad8f92eebbbfe7c18a57398d666312277a660f481a1896c301e5c46dd0e89
-EBUILD qt-creator-15.0.0.ebuild 8441 BLAKE2B 62b3389e675f251952f6d04b75861ae8ef8b6b607ca80e19bdbb94c1d317e7e7d000bea0ec35a0a6ce7c8ace59b7f1edffd77471e1f5e049074f90e287dbfa67 SHA512 b81ee65f55e4b923b51a32fc7515340e86f2c6d88104ad13b4f83d5ac4acbe73619d2bf4dd379589f5fb6f3f38c42e7e2b19b639ef74500deb8aa20d00ab4d05
-EBUILD qt-creator-9999.ebuild 8441 BLAKE2B 62b3389e675f251952f6d04b75861ae8ef8b6b607ca80e19bdbb94c1d317e7e7d000bea0ec35a0a6ce7c8ace59b7f1edffd77471e1f5e049074f90e287dbfa67 SHA512 b81ee65f55e4b923b51a32fc7515340e86f2c6d88104ad13b4f83d5ac4acbe73619d2bf4dd379589f5fb6f3f38c42e7e2b19b639ef74500deb8aa20d00ab4d05
-MISC metadata.xml 1273 BLAKE2B 3c4e41b9422bad858fae48bdc9814c7e259dcea2d1da6c383a54f809152d77f72438e05115463866bea7f87a9d79301ba65bbaa7e0fd3d2255b5fdfcc58a9a78 SHA512 a830e418863904943cd33deb4f09fbd98557502ccd37137d891957ee1883fe80b9a8091cdcb0d93c4d74c343ffdae9721ecc56414d0b2b9c7b79984687f07cf1
+EBUILD qt-creator-15.0.0-r1.ebuild 8679 BLAKE2B ea0ad55757f234aa2f72ec18479077a7235fa352a8a5ca83f914fdb3e321d7a409d73f2ca5cb60b5bd8c8b211ed740b3e9cfc60bd2d8953d98cfac701cee8ef8 SHA512 6789ed9cf4660e399c158897677015b6a90b8347bb8fb66598f16549954cac2ea7367ddc5abf2f3abf1451a38b5f669753bc561b92131f15eaeda88342fabb66
+EBUILD qt-creator-9999.ebuild 8679 BLAKE2B ea0ad55757f234aa2f72ec18479077a7235fa352a8a5ca83f914fdb3e321d7a409d73f2ca5cb60b5bd8c8b211ed740b3e9cfc60bd2d8953d98cfac701cee8ef8 SHA512 6789ed9cf4660e399c158897677015b6a90b8347bb8fb66598f16549954cac2ea7367ddc5abf2f3abf1451a38b5f669753bc561b92131f15eaeda88342fabb66
+MISC metadata.xml 1368 BLAKE2B 23bb887e7df5ef502d2a73395e33bc6951b9a230b10cc7fa7b7a995896f47520d8c0a73134a8a454c96a53e7a834471c1e7f6719aee079830ec3b233e5de8391 SHA512 04624384df58abd8e50d5915db90aed4ee84c2301f7eca52bd3301df8202030fefb1c792b9837a806ed1e44745280c0dd5732825504bcf928d58b828151b00eb
diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 5e0d4e8578c0..44e472f45a98 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -7,6 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="clang">Build clang-based plugins for C/C++ development (code model, formatting, static analysis)</flag>
+		<flag name="cmdbridge-server">Build the cmdbridge server using <pkg>dev-lang/go</pkg></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="plugin-dev">Install the 'Devel' component needed to build external Qt Creator plugins</flag>
diff --git a/dev-qt/qt-creator/qt-creator-15.0.0.ebuild b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
index 02b286a21404..af16e6ac46b3 100644
--- a/dev-qt/qt-creator/qt-creator-15.0.0.ebuild
+++ b/dev-qt/qt-creator/qt-creator-15.0.0-r1.ebuild
@@ -26,7 +26,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
-		https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz
+		cmdbridge-server? ( https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz )
 	"
 	S=${WORKDIR}/${QTC_P}
 	KEYWORDS="~amd64"
@@ -39,8 +39,8 @@ LICENSE="GPL-3"
 LICENSE+=" BSD MIT" # go
 SLOT="0"
 IUSE="
-	+clang designer doc +help keyring plugin-dev qmldesigner
-	serialterminal +svg test +tracing webengine
+	+clang cmdbridge-server designer doc +help keyring plugin-dev
+	qmldesigner serialterminal +svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -92,14 +92,15 @@ DEPEND="${COMMON_DEPEND}"
 # 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]
+	cmdbridge-server? ( >=dev-lang/go-1.21.7 )
 	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+	"${FILESDIR}"/${PN}-14.0.1-clang19.patch
 )
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
@@ -112,8 +113,10 @@ pkg_setup() {
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
-		cd -- "${S}"/src/libs/gocmdbridge/server || die
-		edo go mod vendor
+		if use cmdbridge-server; then
+			cd -- "${S}"/src/libs/gocmdbridge/server || die
+			edo go mod vendor
+		fi
 	else
 		default
 	fi
@@ -139,8 +142,10 @@ src_prepare() {
 }
 
 src_configure() {
-	go-env_set_compile_environment
-	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
+	if use cmdbridge-server; then
+		go-env_set_compile_environment
+		local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
+	fi
 
 	# -Werror=lto-type-mismatch issues, needs looking into
 	filter-lto
@@ -184,9 +189,8 @@ src_configure() {
 		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
 
 		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
 		-DENABLE_SVG_SUPPORT=$(usex svg)
-
+		$(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925
 		-DWITH_QMLDESIGNER=$(usex qmldesigner)
 
 		# meant to be in sync with qtbase[journald], but think(?) not worth
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 02b286a21404..af16e6ac46b3 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -26,7 +26,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
-		https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz
+		cmdbridge-server? ( https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz )
 	"
 	S=${WORKDIR}/${QTC_P}
 	KEYWORDS="~amd64"
@@ -39,8 +39,8 @@ LICENSE="GPL-3"
 LICENSE+=" BSD MIT" # go
 SLOT="0"
 IUSE="
-	+clang designer doc +help keyring plugin-dev qmldesigner
-	serialterminal +svg test +tracing webengine
+	+clang cmdbridge-server designer doc +help keyring plugin-dev
+	qmldesigner serialterminal +svg test +tracing webengine
 "
 REQUIRED_USE="clang? ( ${LLVM_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
@@ -92,14 +92,15 @@ DEPEND="${COMMON_DEPEND}"
 # 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]
+	cmdbridge-server? ( >=dev-lang/go-1.21.7 )
 	doc? ( >=dev-qt/qttools-${QT_PV}[qdoc,qtattributionsscanner] )
 "
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-15.0.0-musl-no-execinfo.patch
 	"${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
+	"${FILESDIR}"/${PN}-14.0.1-clang19.patch
 )
 
 QA_FLAGS_IGNORED="usr/libexec/qtcreator/cmdbridge-.*" # written in Go
@@ -112,8 +113,10 @@ pkg_setup() {
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
 		git-r3_src_unpack
-		cd -- "${S}"/src/libs/gocmdbridge/server || die
-		edo go mod vendor
+		if use cmdbridge-server; then
+			cd -- "${S}"/src/libs/gocmdbridge/server || die
+			edo go mod vendor
+		fi
 	else
 		default
 	fi
@@ -139,8 +142,10 @@ src_prepare() {
 }
 
 src_configure() {
-	go-env_set_compile_environment
-	local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
+	if use cmdbridge-server; then
+		go-env_set_compile_environment
+		local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false -buildmode=pie"
+	fi
 
 	# -Werror=lto-type-mismatch issues, needs looking into
 	filter-lto
@@ -184,9 +189,8 @@ src_configure() {
 		$(use help && usev !webengine -DCMAKE_DISABLE_FIND_PACKAGE_litehtml=yes)
 
 		-DBUILD_PLUGIN_SERIALTERMINAL=$(usex serialterminal)
-
 		-DENABLE_SVG_SUPPORT=$(usex svg)
-
+		$(usev !cmdbridge-server -DGO_BIN=GO_BIN-NOTFOUND) #945925
 		-DWITH_QMLDESIGNER=$(usex qmldesigner)
 
 		# meant to be in sync with qtbase[journald], but think(?) not worth