[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 \