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

[Ionen Wolkens]

commit:     8dbfbac2d3f691bce0ffc2bd0618a55508990fd4
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  4 11:46:19 2024 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Dec  4 12:18:04 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dbfbac2

dev-qt/qt-creator: sync live

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

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

diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild 
b/dev-qt/qt-creator/qt-creator-9999.ebuild
index e4e0e8391798..02b286a21404 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/${P}-vendor.tar.xz
+               https://dev.gentoo.org/~ionen/distfiles/${QTC_P}-vendor.tar.xz
        "
        S=${WORKDIR}/${QTC_P}
        KEYWORDS="~amd64"
@@ -112,7 +112,7 @@ pkg_setup() {
 src_unpack() {
        if [[ ${PV} == 9999 ]]; then
                git-r3_src_unpack
-               cd "${S}/src/libs/gocmdbridge/server" || die
+               cd -- "${S}"/src/libs/gocmdbridge/server || die
                edo go mod vendor
        else
                default
@@ -126,6 +126,9 @@ src_prepare() {
        sed -e "/_IDE_DOC_PATH/s/qtcreator/${PF}/" \
                -i cmake/QtCreatorAPIInternal.cmake || die
 
+       # avoid stripping for Go, use sed to avoid rebases as may be there 
forever
+       sed -i 's/-s -w //' src/libs/gocmdbridge/server/CMakeLists.txt || 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