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

2024-09-04 Thread Ionen Wolkens
commit: 4864940397a0b5808598d468d63605eb2e0217b1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep  4 07:57:56 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep  4 10:20:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48649403

dev-qt/qt-creator: partially fix build with clang19 and gcc15

other.resetter bit with USE=qmldesigner wrt bug #937600 comment #4
still need attention, but adding what we have so far esp. given
qmldesigner is off by default and has limited impact.

Bug: https://bugs.gentoo.org/937600
Closes: https://bugs.gentoo.org/938486
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qt-creator-14.0.1-clang19.patch  | 24 ++
 .../qt-creator-14.0.1-sol2-clang19-gcc15.patch | 18 
 dev-qt/qt-creator/qt-creator-14.0.1.ebuild |  2 ++
 3 files changed, 44 insertions(+)

diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch 
b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
new file mode 100644
index ..e296f5bf68be
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-14.0.1-clang19.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/937600
+
+qt-creator has a workaround for clang (formerly) lacking an implementation
+for __cpp_template_template_args, but the workaround causes issues now that
+it is available.
+
+https://github.com/llvm/llvm-project/pull/89807
+https://github.com/qt-creator/qt-creator/commit/d400dce35d817afd719ffadf8c8f43c8814c05c1
+--- a/src/libs/utils/algorithm.h
 b/src/libs/utils/algorithm.h
+@@ -259,5 +259,5 @@
+  typename ResultContainer = C>
+ Q_REQUIRED_RESULT decltype(auto) transform(SC &&container, F function);
+-#ifdef Q_CC_CLANG
++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
+ // "Matching of template template-arguments excludes compatible templates"
+ // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0522r0.html 
(P0522R0)
+@@ -810,5 +810,5 @@
+ }
+ 
+-#ifdef Q_CC_CLANG
++#if defined(Q_CC_CLANG) && !defined(__cpp_template_template_args)
+ template class C, // result container type
+  typename SC,  // input container type

diff --git a/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch 
b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
new file mode 100644
index ..29e600ca33ef
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-14.0.1-sol2-clang19-gcc15.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/938486
+https://bugs.gentoo.org/937600
+https://bugs.gentoo.org/936924
+https://bugreports.qt.io/browse/QTCREATORBUG-31517
+https://github.com/ThePhD/sol2/commit/d805d027e0a0a7222e936926139f06e23828ce9f
+https://codereview.qt-project.org/c/qt-creator/qt-creator/+/587620
+--- a/src/libs/3rdparty/sol2/include/sol/sol.hpp
 b/src/libs/3rdparty/sol2/include/sol/sol.hpp
+@@ -6818,7 +6818,8 @@
+   static_assert(std::is_constructible::value, "T must be constructible with Args");
+ 
+   *this = nullopt;
+-  this->construct(std::forward(args)...);
++  new (static_cast(this)) optional(std::in_place, 
std::forward(args)...);
++  return **this;
+   }
+ 
+   /// Swaps this optional with the other.

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 78c4cd5ea7ef..57312a5304e4 100644
--- a/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-14.0.1.ebuild
@@ -91,6 +91,8 @@ BDEPEND="
 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
+   "${FILESDIR}"/${PN}-14.0.1-sol2-clang19-gcc15.patch
 )
 
 pkg_setup() {



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

2024-09-03 Thread Ionen Wolkens
commit: 428554cb9beb3e721cc78c89dcdc238dd3292d74
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep  3 11:12:40 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep  3 11:51:19 2024 +
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  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..
--- 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} ==  ]]; 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
-   

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

2024-08-24 Thread Arthur Zamarin
commit: f17f5fa1535279dcd4b85db74928d7e496619666
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Aug 25 05:26:49 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Aug 25 05:26:49 2024 +
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  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/

2024-08-07 Thread Ionen Wolkens
commit: 94a28fb5091f9f3f83f4fce7b0d4b0c4dc5e3859
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Aug  7 13:23:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Aug  7 14:32:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a28fb5

dev-qt/qt-creator: add 14.0.1

Signed-off-by: Ionen Wolkens  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 ..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} ==  ]]; 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

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

2024-07-25 Thread Ionen Wolkens
commit: 46f9f704db710efc421d736c7ba92f06407f8ddd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul 25 14:01:16 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 25 15:58:26 2024 +
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 -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  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 ..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} ==  ]]; 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/qtq

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

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

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index fdf00d0e0369..23836162a90d 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2024-07-24 Thread Ionen Wolkens
commit: 45c9a720a5218d6de858897bdbe49db9b329cf9b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul 25 06:23:55 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 25 06:23:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45c9a720

dev-qt/qt-creator: drop 13.0.1

Signed-off-by: Ionen Wolkens  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..
--- 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} ==  ]]; 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
-   # ecla

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

2024-07-24 Thread Ionen Wolkens
commit: ce5f985df005e2e2cb922e593dbb13984f4bdee5
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul 25 06:26:11 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 25 06:26:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce5f985d

dev-qt/qt-creator: update journald comment

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 4 +++-
 dev-qt/qt-creator/qt-creator-.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-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 69822c51bc74..fdf00d0e0369 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2024-07-03 Thread Ionen Wolkens
commit: 669248c86189e9ace3a735a13970ee7bd57a1d5e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jul  4 01:46:44 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul  4 01:53:26 2024 +
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  gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.2.ebuild | 6 ++
 dev-qt/qt-creator/qt-creator-.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-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 7e70e0a5b37d..69822c51bc74 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2024-07-02 Thread Ionen Wolkens
commit: 9c9376b47aea93a273fa2eaeed61950133372e80
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jul  2 14:08:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jul  2 15:10:20 2024 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index f7ae725146b9..7e70e0a5b37d 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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} ==  ]]; 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} ==  ]]; 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/

2024-06-19 Thread Arthur Zamarin
commit: 1c813a9a9b5c29a7a12c0fa082a072867ad32811
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Jun 19 19:43:28 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Jun 19 19:43:28 2024 +
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  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/

2024-06-18 Thread Ionen Wolkens
commit: e8e24128704e3f80016f4e7686be8aedfe31a8fa
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun 18 17:00:00 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun 18 18:13:52 2024 +
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  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-.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-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 68c8cfe8e35c..f7ae725146b9 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

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

dev-qt/qt-creator: add 13.0.2

Signed-off-by: Ionen Wolkens  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 ..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} ==  ]]; 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 

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

2024-06-06 Thread Ionen Wolkens
commit: 96318f6a311cde6753dfb2ed05b4260b75a7a95d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Jun  6 12:47:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jun  6 13:18:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96318f6a

dev-qt/qt-creator: drop 13.0.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../qt-creator/files/qt-creator-13.0.0-qt671.patch |  29 ---
 dev-qt/qt-creator/qt-creator-13.0.0.ebuild | 269 -
 3 files changed, 299 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 93d4e63c470d..d93d9286c577 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-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/files/qt-creator-13.0.0-qt671.patch 
b/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch
deleted file mode 100644
index 986f328fa8eb..
--- a/dev-qt/qt-creator/files/qt-creator-13.0.0-qt671.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Building with Qt6.7.1 needs [1] and a part of [2]+[3]. [2] was intended
-to fix building with Qt6.8 but turned out part of it was needed for 6.7.1
-and this was adjusted in [3]. [2] does not apply cleanly so only taking
-the bit needed given 6.8 can wait for a proper release.
-
-[1] https://github.com/qt-creator/qt-creator/commit/041727fb2
-[2] https://github.com/qt-creator/qt-creator/commit/6babc022d
-[3] https://github.com/qt-creator/qt-creator/commit/fcf2d2064
 a/src/libs/utils/fsengine/fsengine_impl.h
-+++ b/src/libs/utils/fsengine/fsengine_impl.h
-@@ -52,4 +52,7 @@
- uint ownerId(FileOwner) const override;
- QString owner(FileOwner) const override;
-+#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 1)
-+using FileTime = QFile::FileTime;
-+#endif
- bool setFileTime(const QDateTime &newDate, FileTime time) override;
- QDateTime fileTime(FileTime time) const override;
 a/src/plugins/languageclient/languageclientutils.cpp
-+++ b/src/plugins/languageclient/languageclientutils.cpp
-@@ -236,6 +236,6 @@
- Client *client = 
LanguageClientManager::clientForDocument(textEditor->textDocument());
- 
--ClientExtras *extras = widget->findChild(clientExtrasName,
-- 
Qt::FindDirectChildrenOnly);
-+ClientExtras *extras = dynamic_cast(
-+widget->findChild(clientExtrasName, 
Qt::FindDirectChildrenOnly));
- if (!extras) {
- if (!client)

diff --git a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild 
b/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
deleted file mode 100644
index 12edbaa8754c..
--- a/dev-qt/qt-creator/qt-creator-13.0.0.ebuild
+++ /dev/null
@@ -1,269 +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} ==  ]]; 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]

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

2024-05-13 Thread Arthur Zamarin
commit: 27b698c805310261b6d1cd817bfc3882fb2a5f8c
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon May 13 13:23:40 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon May 13 13:23:40 2024 +
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  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/

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

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

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/qt-creator-13.0.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.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} ==  ]]; then

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index b47f014ce15a..68c8cfe8e35c 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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} ==  ]]; then



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

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

dev-qt/qt-creator: add 13.0.1

Signed-off-by: Ionen Wolkens  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 ..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} ==  ]]; 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 

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

2024-05-05 Thread Ionen Wolkens
commit: c4abce9c16710fc81cbbe511b47edff1cd96922c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun May  5 23:51:44 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun May  5 23:51:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4abce9c

dev-qt/qt-creator: drop 12.0.2

Signed-off-by: Ionen Wolkens  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..
--- 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} ==  ]]; 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 solutio

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

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

dev-qt/qt-creator: sync live

Signed-off-by: Ionen Wolkens  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index f28f40dcec29..b47f014ce15a 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2024-04-04 Thread Ionen Wolkens
commit: 2c530eace88c9c582ec5e2fd57d42319693675ee
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Apr  4 13:43:09 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Apr  4 16:37:55 2024 +
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  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 ..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} ==  ]]; 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

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qt-creator/, app-misc/brewtarget/, dev-util/qbs/

2024-04-03 Thread Michał Górny
commit: 86d95b5f3d568d1b8c01c97e75200e0113d08788
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Apr  3 09:59:24 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Apr  3 10:04:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86d95b5f

*/*: Reassign pesa's packages

Signed-off-by: Michał Górny  gentoo.org>

 app-misc/brewtarget/metadata.xml | 5 +
 dev-qt/qt-creator/metadata.xml   | 4 
 dev-util/qbs/metadata.xml| 4 
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/app-misc/brewtarget/metadata.xml b/app-misc/brewtarget/metadata.xml
index 10a2471e7a4b..37c8b5260562 100644
--- a/app-misc/brewtarget/metadata.xml
+++ b/app-misc/brewtarget/metadata.xml
@@ -1,10 +1,7 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   p...@gentoo.org
-   Davide Pesavento
-   
+   

Brewtarget/brewtarget


diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index 89e60ab1d919..581b84c86cb1 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   p...@gentoo.org
-   Davide Pesavento
-   

q...@gentoo.org
Gentoo Qt Project

diff --git a/dev-util/qbs/metadata.xml b/dev-util/qbs/metadata.xml
index 5ff340bae19d..7899bcd24454 100644
--- a/dev-util/qbs/metadata.xml
+++ b/dev-util/qbs/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-   
-   p...@gentoo.org
-   Davide Pesavento
-   

q...@gentoo.org
Gentoo Qt Project



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

2024-04-02 Thread Ionen Wolkens
commit: ed529e6ecf83a74ca626dcdff04a133b6675c188
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr  2 15:34:53 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr  2 15:50:05 2024 +
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  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-.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 @@
Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
Enable designer for QtWidgets-based 
UIs
Enable the integrated 
dev-qt/qt-docs viewer (also needed for examples)
-   Build the serial terminal 
plugin
+   Install the 'Devel' component needed to 
build external Qt Creator plugins
Build QmlDesigner and related plugins 
(Insight, StudioWelcome)
+   Build the serial terminal 
plugin
Build plugins requiring tracing 
capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)
Use dev-qt/qtwebengine with 
the help USE rather than bundled litehtml


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-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 017a06e30b56..f28f40dcec29 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

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

dev-qt/qt-creator: drop 12.0.1

Signed-off-by: Ionen Wolkens  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..
--- 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} ==  ]]; 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:=
-   =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_PC

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

2024-02-28 Thread Arthur Zamarin
commit: 53c1be4154c394755aba052baa7ec7a25f98d6b6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Feb 28 19:56:07 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Feb 28 19:56:07 2024 +
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  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/

2024-02-25 Thread Ionen Wolkens
commit: 8b7a805c7915b9042a8a729966bc6a31a6e7491e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Feb 25 14:04:18 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Feb 25 18:45:15 2024 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index f295798776cf..017a06e30b56 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2024-02-21 Thread Ionen Wolkens
commit: 1f7e9fe640ba9be8f54eaab23a7f464291cf6d0a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 22 04:50:23 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 22 06:14:33 2024 +
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  gentoo.org>

 dev-qt/qt-creator/qt-creator-12.0.2.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.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-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 4587a1c7c566..f295798776cf 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2024-02-10 Thread Ionen Wolkens
commit: d519e0ecfb408e50e11f6f3c592a2e9d521c3395
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Feb  9 11:43:42 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Feb 10 11:25:02 2024 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index a2c7444d9223..4587a1c7c566 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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} ==  ]]; 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:=
-   =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/

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

dev-qt/qt-creator: add 12.0.2

Signed-off-by: Ionen Wolkens  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 ..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} ==  ]]; 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:=
+   =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=n

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

2024-01-09 Thread Arthur Zamarin
commit: d63af00f11f22d5013365ea5f4df3d9f8776c54d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Jan  9 18:06:53 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Jan  9 18:06:53 2024 +
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  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/

2024-01-08 Thread Ionen Wolkens
commit: b3e2e734569d7886ad61637f2b1397572e4883a0
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  8 10:20:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  8 12:57:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3e2e734

dev-qt/qt-creator: drop 12.0.0

Signed-off-by: Ionen Wolkens  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..
--- 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} ==  ]]; 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:=
-   =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

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

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

dev-qt/qt-creator: add 12.0.1

Signed-off-by: Ionen Wolkens  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 ..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} ==  ]]; 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:=
+   =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
+  

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

2023-12-12 Thread Ionen Wolkens
commit: 6cb6580b8c2250e0e43bc9562d49500371afe967
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 12 12:18:15 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 12 13:16:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cb6580b

dev-qt/qt-creator: drop 11.0.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../qt-creator-11.0.2-musl-no-malloc-trim.patch|  10 -
 dev-qt/qt-creator/qt-creator-11.0.3.ebuild | 262 -
 3 files changed, 273 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index caa1ae484ad1..b48bd50d7f52 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,2 +1 @@
-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/files/qt-creator-11.0.2-musl-no-malloc-trim.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
deleted file mode 100644
index d4936882d4d2..
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-malloc_trim() is unavailable with musl
 a/src/plugins/coreplugin/mainwindow.cpp
-+++ b/src/plugins/coreplugin/mainwindow.cpp
-@@ -222,5 +222,5 @@
- m_trimTimer.setInterval(6);
- // glibc may not actually free memory in free().
--#ifdef Q_OS_LINUX
-+#if defined(Q_OS_LINUX) && defined(__GLIBC__)
- connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); });
- #endif

diff --git a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild 
b/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
deleted file mode 100644
index 089d5576fdc9..
--- a/dev-qt/qt-creator/qt-creator-11.0.3.ebuild
+++ /dev/null
@@ -1,262 +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} ==  ]]; 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:=
-   =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
-   "${FIL

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

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

dev-qt/qt-creator: add 12.0.0

Signed-off-by: Ionen Wolkens  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 ..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} ==  ]]; 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:=
+   =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
+  

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

2023-11-16 Thread Ionen Wolkens
commit: 350616b86d8afbcc42729bb243d4daf814e9a7b3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Nov 16 02:12:49 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Nov 17 05:13:41 2023 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index ab3ca9782f99..74deb347c1bd 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/files/, dev-qt/qt-creator/

2023-11-15 Thread Ionen Wolkens
commit: 221865a1afcddfe95dc5ef3825c8f0682547f0d3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 15 23:10:20 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Nov 16 00:14:47 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=221865a1

dev-qt/qt-creator: update live

Not much to update, but next release is close and checking state.

Tests pass except tst_utils_deviceshell which is failing in upstream's
CI as well (unless QTC_USE_QPROCESS=false). The change causing this is
not included in 12.0.0rc1 though, so not going to worry about it.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch  | 8 
 dev-qt/qt-creator/qt-creator-.ebuild  | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git 
a/dev-qt/qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch 
b/dev-qt/qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch
new file mode 100644
index ..b22f20425129
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-12.0.0-musl-no-malloc-trim.patch
@@ -0,0 +1,8 @@
+malloc_trim() is unavailable with musl
+--- a/src/plugins/coreplugin/icore.cpp
 b/src/plugins/coreplugin/icore.cpp
+@@ -1276,3 +1276,3 @@
+ // glibc may not actually free memory in free().
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ connect(&m_trimTimer, &QTimer::timeout, this, [] { malloc_trim(0); });

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 2680f1244fe9..ab3ca9782f99 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.ebuild
@@ -81,7 +81,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-11.0.2-musl-no-execinfo.patch
-   "${FILESDIR}"/${PN}-11.0.2-musl-no-malloc-trim.patch
+   "${FILESDIR}"/${PN}-12.0.0-musl-no-malloc-trim.patch
 )
 
 llvm_check_deps() {
@@ -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. cvs) and any 
unwanted
+   # wrappers around still optional tools (e.g. git) 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
@@ -234,12 +234,12 @@ Utilities:
 - 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)



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

2023-10-21 Thread Ionen Wolkens
commit: b10d8c99a50a6f8700138472c3b822e732eae10c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Oct 22 05:51:12 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Oct 22 05:51:12 2023 +
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  gentoo.org>

 dev-qt/qt-creator/qt-creator-11.0.3.ebuild | 4 
 dev-qt/qt-creator/qt-creator-.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-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 4c93ab7cdebc..2680f1244fe9 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/, dev-qt/qt-creator/files/

2023-10-10 Thread Ionen Wolkens
commit: 1eb216e5795dd62466726179d4e99ffc06af2253
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Oct 10 18:55:12 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Oct 10 20:18:14 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eb216e5

dev-qt/qt-creator: drop 11.0.2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../qt-creator/files/qt-creator-11.0.2-qt653.patch |  31 ---
 .../files/qt-creator-11.0.2-yaml-cpp-0.8.patch |  29 ---
 dev-qt/qt-creator/qt-creator-11.0.2.ebuild | 261 -
 4 files changed, 322 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 3d5794daf457..6402206232fe 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-11.0.3.tar.xz 49863336 BLAKE2B 
60ce53bdc0d3a2167a62cf479e9d3427b3a4f6e3ba5eb0489e0546d80fb30f9bcea1174b67cb36673a7aa2094d5f82a7d8ab34decf47fe0c260893f0a55c9795
 SHA512 
4d0faab02cb9b123f135b3a436e9f4132f459fd40400b9adab8af0a395b9d999f473f2bbab7cb5353f5a129bfc66e3e8dfe9143412cbd03c385a3d052ef221ca

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
deleted file mode 100644
index 7cbfc534bab6..
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Uses private parts of the QtQuick3D api which added a namespace in [1].
-
-Update: upstream has done a better fix in [2] (but can stick to the
-simple version check until next release).
-
-[1] 
https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
-[2] 
https://github.com/qt-creator/qt-creator/commit/291e3096cd5d0763370238252143c3bb4fe93839
 a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
-+++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
-@@ -803,5 +803,9 @@
- const QMatrix4x4 sceneTransform = parent->sceneTransform() * 
localTransform;
- 
-+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3))
-+return QSSGUtils::mat44::getPosition(sceneTransform);
-+#else
- return mat44::getPosition(sceneTransform);
-+#endif
- }
- 
 a/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
-+++ b/src/tools/qml2puppet/qml2puppet/editor3d/mousearea3d.cpp
-@@ -738,5 +738,9 @@
- const QMatrix4x4 sceneTransform = parent->sceneTransform() * 
localTransform;
- 
-+#if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 3))
-+return QSSGUtils::mat44::getPosition(sceneTransform);
-+#else
- return mat44::getPosition(sceneTransform);
-+#endif
- }
- 

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
deleted file mode 100644
index c06a2733b484..
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://bugs.gentoo.org/914732
-https://bugreports.qt.io/browse/QTCREATORBUG-29537
-
-https://github.com/qt-creator/qt-creator/commit/170f9acfb41704b68e2ba98690fd6d5e98addd85
-From: Eike Ziller 
-Date: Thu, 24 Aug 2023 13:41:33 +0200
-Subject: [PATCH] ClangTools: Add support for yaml-cpp 0.8
-
-They renamed their target from `yaml-cpp`
-to `yaml-cpp::yaml-cpp`
-
-Still support < 0.8 though.
 a/cmake/Findyaml-cpp.cmake
-+++ b/cmake/Findyaml-cpp.cmake
-@@ -16,5 +16,13 @@
- find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
-   endif()
--  set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES 
"${yaml_cpp_include_dir}")
-+  if(TARGET yaml-cpp::yaml-cpp)
-+# yaml-cpp >= 0.8
-+set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE)
-+add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp)
-+set(yaml-cpp_TARGET yaml-cpp::yaml-cpp)
-+  else()
-+set(yaml-cpp_TARGET yaml-cpp)
-+  endif()
-+  set_target_properties(${yaml-cpp_TARGET} PROPERTIES 
INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
- else()
-   if(TARGET yaml-cpp)

diff --git a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
deleted file mode 100644
index 02fc953d5706..
--- a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
+++ /dev/null
@@ -1,261 +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} ==  ]]; then
-   inherit git-r3
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt-creator/qt-creator.git";
-   

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

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

dev-qt/qt-creator: add 11.0.3

Signed-off-by: Ionen Wolkens  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 ..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} ==  ]]; 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:=
+   =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=$(us

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

2023-09-26 Thread Ionen Wolkens
commit: 85588cf697488a218b3ce24a78da7c8747f5f4e7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep 26 07:27:48 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep 26 08:06:26 2023 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index e3eb16aa2c02..eb2dcec27979 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/, dev-qt/qt-creator/files/

2023-09-26 Thread Ionen Wolkens
commit: 95fef56ce3e655745b52a9bd19da12f63b004b77
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Sep 26 07:26:54 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Sep 26 08:06:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95fef56c

dev-qt/qt-creator: fix build with yaml-cpp-0.8

Closes: https://bugs.gentoo.org/914732
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qt-creator-11.0.2-yaml-cpp-0.8.patch | 29 ++
 dev-qt/qt-creator/qt-creator-11.0.2.ebuild |  1 +
 2 files changed, 30 insertions(+)

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
new file mode 100644
index ..c06a2733b484
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-yaml-cpp-0.8.patch
@@ -0,0 +1,29 @@
+https://bugs.gentoo.org/914732
+https://bugreports.qt.io/browse/QTCREATORBUG-29537
+
+https://github.com/qt-creator/qt-creator/commit/170f9acfb41704b68e2ba98690fd6d5e98addd85
+From: Eike Ziller 
+Date: Thu, 24 Aug 2023 13:41:33 +0200
+Subject: [PATCH] ClangTools: Add support for yaml-cpp 0.8
+
+They renamed their target from `yaml-cpp`
+to `yaml-cpp::yaml-cpp`
+
+Still support < 0.8 though.
+--- a/cmake/Findyaml-cpp.cmake
 b/cmake/Findyaml-cpp.cmake
+@@ -16,5 +16,13 @@
+ find_path(yaml_cpp_include_dir yaml-cpp/yaml.h)
+   endif()
+-  set_target_properties(yaml-cpp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES 
"${yaml_cpp_include_dir}")
++  if(TARGET yaml-cpp::yaml-cpp)
++# yaml-cpp >= 0.8
++set_property(TARGET yaml-cpp::yaml-cpp PROPERTY IMPORTED_GLOBAL TRUE)
++add_library(yaml-cpp ALIAS yaml-cpp::yaml-cpp)
++set(yaml-cpp_TARGET yaml-cpp::yaml-cpp)
++  else()
++set(yaml-cpp_TARGET yaml-cpp)
++  endif()
++  set_target_properties(${yaml-cpp_TARGET} PROPERTIES 
INTERFACE_INCLUDE_DIRECTORIES "${yaml_cpp_include_dir}")
+ else()
+   if(TARGET yaml-cpp)

diff --git a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild 
b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
index 2d43880f115f..20bd6be0b986 100644
--- a/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
+++ b/dev-qt/qt-creator/qt-creator-11.0.2.ebuild
@@ -84,6 +84,7 @@ 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
+   "${FILESDIR}"/${P}-yaml-cpp-0.8.patch
 )
 
 pkg_setup() {



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

2023-09-20 Thread Ionen Wolkens
commit: c1bc5cc478c51f75ed9a5fb82a5bd70724bebdc3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep 20 08:20:53 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 20 08:30:27 2023 +
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  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 @@
Gentoo Qt Project


-   Build plugin for Android devices
-   Enable integration with popular unit 
testing frameworks (QtTest, GoogleTest, Boost.Test, Catch2)
-   Build plugin for autotools-based 
projects
-   Build plugin for bare metal 
devices
-   Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
-   Build the beautifier plugin (supports 
astyle, clang-format, and uncrustify)
-   Build plugin for Boot2Qt devices
Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
-   Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
-   Build plugin for CMake-based projects
-   Build plugin to support Coco code coverage 
tool
-   Build plugin to integrate with the Conan 
package manager
-   Enable integration with 
dev-util/cppcheck
-   Build the Chrome Trace Format 
visualizer plugin
Enable designer for QtWidgets-based 
UIs
-   Build plugin for Docker support
-   Build the GLSL editor plugin
Enable the integrated 
dev-qt/qt-docs viewer (also needed for examples)
-   Build plugin to open and view image 
files
-   Enable integration with 
Incredibuild
-   Add support for the Language Server Protocol 
(LSP)
-   Build plugin for MCU devices
-   Add support for 
dev-vcs/mercurial version control system
-   Build plugin for Meson-based projects
-   Build the graphical model editor 
plugin
-   Build plugin for Nim language support
-   Add support for Perforce version control 
system (requires manual installation of Perforce client)
-   Build the Linux Perf-based profiler 
plugin
-   Build plugin for Python language 
support
-   Build plugin for Qbs-based projects
-   Build plugin for qmake-based projects
-   Build plugins for QML-based development 
(designer, editor, project manager)
-   Build the QML profiler plugin
-   Build plugin for QNX devices
-   Build plugin for deployment and 
execution on a remote Linux host
-   Build the graphical SCXML editor 
plugin
Build the serial terminal 
plugin
-   Enable integration with 
sys-apps/the_silver_searcher
-   Add support for retrieving application 
output from journald
Build QmlDesigner and related plugins 
(Insight, StudioWelcome)
Build plugins requiring tracing 
capabilities (CtfVisualizer, PerfProfiler, QmlProfiler)
-   Enable integration with 
dev-util/valgrind
-   Build WebAssembly plugin
   

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

2023-09-20 Thread Ionen Wolkens
commit: 8768e1a03ee5dc728c3ad8dc251bbeedc149434c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep 20 06:57:05 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Sep 20 08:14:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8768e1a0

dev-qt/qt-creator: link to upstream's fix in the qt653 patch header

It would probably be fine to pull that instead, albeit without
looking closer it may be safer to keep as-is until next version.

Note that while upstream's fix removes the private API usage for
that bit, it still uses QtQuick3D private API for other things,
so binding operator needs to stay.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
index 1ad23a207d9b..7cbfc534bab6 100644
--- a/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-qt653.patch
@@ -1,5 +1,10 @@
-Uses private parts of the QtQuick3D api which added a namespace in:
-https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
+Uses private parts of the QtQuick3D api which added a namespace in [1].
+
+Update: upstream has done a better fix in [2] (but can stick to the
+simple version check until next release).
+
+[1] 
https://github.com/qt/qtquick3d/commit/2b139225745a94ab4fa7e30f28cd0207469ee68e
+[2] 
https://github.com/qt-creator/qt-creator/commit/291e3096cd5d0763370238252143c3bb4fe93839
 --- a/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
 +++ b/src/tools/qml2puppet/qml2puppet/editor3d/generalhelper.cpp
 @@ -803,5 +803,9 @@



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

2023-09-11 Thread Ionen Wolkens
commit: b28e6ecad062935854698a0911312a12de559732
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Sep 11 19:44:43 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Sep 11 21:20:07 2023 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
new file mode 100644
index ..e3eb16aa2c02
--- /dev/null
+++ b/dev-qt/qt-creator/qt-creator-.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} ==  ]]; 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:=
+   =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.
+   

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

2023-09-11 Thread Ionen Wolkens
commit: dcd602a4a0830f42b943bdb5eec75948efc0cee7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Sep  9 17:23:26 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Sep 11 21:20:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcd602a4

dev-qt/qt-creator: add 11.0.2

Not going to list every changes given this ebuild is from scratch.

There are a few ebuilds for this going around, but they about all
have (IMO) overcustomization, with a lot of USE to juggle for both
users and maintainers (some handled through sed'ing cmake files) --
all while plugins can still be disabled at runtime either way.

So this is now mostly limited to options that introduce an extra
dependency (e.g. clang). "Some" of the longest to build plugins
do have dependencies, so this still allows to cut down build time
a decent amount (not that this is a short build still).

Other small notes:
* Default IUSEs match what Qt Creator enables by default at runtime
 (albeit default USE=-tracing could be interesting for faster builds).
* Left gumbo unbundling out for now given ultimate goal is to unbundle
  litehtml instead (which itself uses gumbo), but currently it requires
  a large patch for 0.8 support (likewise to unbundle on qttools).

wrt bug #905166, delaying cleanup given restoring keywords is
non-trivial and users may need time to adjust for Qt5->Qt6, but
can be dropped anytime anyway if llvm:14 cleanup is happening
(do not consider this a blocker).

Bug: https://bugs.gentoo.org/905166
Closes: https://bugs.gentoo.org/835042
Closes: https://bugs.gentoo.org/905417
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 +
 .../files/qt-creator-11.0.2-musl-no-execinfo.patch |  47 
 .../qt-creator-11.0.2-musl-no-malloc-trim.patch|  10 +
 .../qt-creator/files/qt-creator-11.0.2-qt653.patch |  26 +++
 dev-qt/qt-creator/metadata.xml |   7 +-
 dev-qt/qt-creator/qt-creator-11.0.2.ebuild | 260 +
 6 files changed, 349 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 9fd838575706..748984c50c0c 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-8.0.2.tar.xz 48874868 BLAKE2B 
53f491441ba28f9420c76cd4adfdcb7c7ef432d756fc5bf64a507c2cd1022b35700418a7b35b7119d97f9947b5dac2a8acc56b600c3e75001f80565f1619c072
 SHA512 
59ff62e6592fd33ff74aeab13dd33f3817ba132fb98f8a87ea818e1e52b4af0dc292e362085733665f0867d67ff867794755b2f02067897a9fb1c14023c6fb23

diff --git a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch
new file mode 100644
index ..b36cfef2d4e7
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-execinfo.patch
@@ -0,0 +1,47 @@
+execinfo is unavailable with musl (unless opted to package+use libexecinfo)
+--- a/src/libs/utils/qtcassert.cpp
 b/src/libs/utils/qtcassert.cpp
+@@ -9,5 +9,5 @@
+ #include 
+ 
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ #include 
+ #include 
+@@ -30,5 +30,5 @@
+ if (maxdepth < 0 || maxdepth > ArraySize)
+ maxdepth = ArraySize;
+-#if defined(Q_OS_UNIX)
++#if defined(Q_OS_UNIX) && defined(__GLIBC__)
+ void *bt[ArraySize] = {nullptr};
+ int size = backtrace(bt, maxdepth);
+--- a/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
 b/src/plugins/qmldesigner/designercore/exceptions/exception.cpp
+@@ -4,5 +4,5 @@
+ #include "exception.h"
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ #include 
+ #include 
+@@ -31,5 +31,5 @@
+ namespace QmlDesigner {
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ const char* demangle(const char* name)
+ {
+@@ -76,5 +76,5 @@
+ }
+ 
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) && defined(__GLIBC__)
+ static QString getBackTrace()
+ {
+@@ -114,5 +114,5 @@
+   , m_file(QString::fromUtf8(file))
+   , m_description(description)
+-  #ifdef Q_OS_LINUX
++  #if defined(Q_OS_LINUX) && defined(__GLIBC__)
+   , m_backTrace(getBackTrace())
+   #endif

diff --git 
a/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch 
b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
new file mode 100644
index ..d4936882d4d2
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-11.0.2-musl-no-malloc-trim.patch
@@ -0,0 +1,10 @@
+malloc_trim() is unavailable with musl
+--- a/src/plugins/coreplugin/mainwindow.cpp
 b/src/plugins/coreplugin/mainwindow.cpp
+

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

2022-11-06 Thread Sam James
commit: 51244efdbd5106e2ed9a16c55cb0d5ad1cb093e2
Author: Peter Levine  gmail  com>
AuthorDate: Sat Nov  5 20:03:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Nov  7 06:57:17 2022 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28149
Signed-off-by: Sam James  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/

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

dev-qt/qt-creator: drop 8.0.1

Signed-off-by: Peter Levine  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28047
Signed-off-by: Sam James  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..
--- 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} == * ]]; 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-

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

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

dev-qt/qt-creator: add 8.0.2

Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Sam James  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 ..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} == * ]]; 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
+   

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

2022-11-04 Thread Sam James
commit: e41b0b28956d54254c714b6dc6b0fd3983c614c7
Author: Peter Levine  gmail  com>
AuthorDate: Tue Nov  1 23:36:12 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  5 06:32:43 2022 +
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  gmail.com>
Signed-off-by: Sam James  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/

2022-11-04 Thread Sam James
commit: 166a265815ff2e354e8d83e4fb6b076f058774bc
Author: Peter Levine  gmail  com>
AuthorDate: Mon Oct 31 00:48:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Nov  5 06:32:43 2022 +
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  gmail.com>
Signed-off-by: Sam James  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/

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

dev-qt/qt-creator: drop 6.0.0 and 

6.0.0 is shadowed by 8.0.1 and  requires QT6.

Closes: https://github.com/gentoo/gentoo/pull/26675
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Sam James  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-.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..
--- 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} == * ]]; 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
-   )
-   =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}[localstorag

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

2022-10-29 Thread Sam James
commit: 157b590574f3ca93b77040d9cc788e367d02c51b
Author: Peter Levine  gmail  com>
AuthorDate: Sat Aug  6 04:55:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 29 15:07:21 2022 +
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  gmail.com>
Signed-off-by: Sam James  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 @@
Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
Build plugin for CMake-based projects
+   Build plugin to support Coco code coverage 
tool
Build plugin to integrate with the Conan 
package manager
Enable integration with 
dev-util/cppcheck
Build the Chrome Trace Format 
visualizer plugin
@@ -27,6 +28,7 @@
Build plugin for Docker support
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
+   Build plugin to open and view image 
files
Enable integration with 
Incredibuild
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices

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 ..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} == * ]]; 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 )
+

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

2022-02-20 Thread Davide Pesavento
commit: beea7f325d1d39a57791babf68621ee8ef61339e
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Feb 20 18:16:44 2022 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Feb 20 18:17:09 2022 +
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  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 @@
Build plugin for Qbs-based projects
Build plugin for qmake-based projects
Build plugins for QML-based development 
(designer, editor, project manager)
-   Enable designer for QML/QtQuick-based 
UIs
-   Build the QML/JavaScript editor plugin
Build the QML profiler plugin
Build plugin for QNX devices
Build plugin for deployment and 
execution on a remote Linux host

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..
--- 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} == * ]]; 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

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

2021-12-02 Thread Davide Pesavento
commit: 53ee29848e4a7b874b9c53fffabe87cb193f1a2a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Thu Dec  2 19:08:57 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Thu Dec  2 19:08:57 2021 +
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  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 ..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} == * ]]; 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
+   )
+   =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-$

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

2021-11-28 Thread Davide Pesavento
commit: 70f35cac6407c88c051c2f6e9326457de6acf194
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 29 05:22:16 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 29 05:36:27 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 10d2dbc089f4..c199ce2d341b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/\//' 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/

2021-11-28 Thread Davide Pesavento
commit: 8947d869217415b683ab5d3325fd5a917e1779e3
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 29 05:28:02 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 29 05:36:28 2021 +
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  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  3 ++-
 dev-qt/qt-creator/qt-creator-.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 @@
Add support for Perforce version control 
system (requires manual installation of Perforce client)
Build the Linux Perf-based profiler 
plugin
Build plugin for Python language 
support
-   Build plugin for QBS-based projects
+   Build plugin for Qbs-based projects
+   Build plugin for qmake-based projects
Build plugins for QML-based development 
(designer, editor, project manager)
Enable designer for QML/QtQuick-based 
UIs
Build the QML/JavaScript editor plugin

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index c199ce2d341b..d0d62b73a9e0 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-28 Thread Davide Pesavento
commit: b671c1131493e983c274a36f4711549687984a74
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 29 05:34:31 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 29 05:36:28 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index d0d62b73a9e0..f8eca8f995f6 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-22 Thread Davide Pesavento
commit: be5b9f5cffb7518cad62fe41d1df1faa0ffd7748
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Nov 23 04:16:06 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 23 04:19:04 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index ceec86efbe12..10d2dbc089f4 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-22 Thread Davide Pesavento
commit: 9ba0be1a9a528038bd6892795905dea469df2cca
Author: Davide Pesavento  gentoo  org>
AuthorDate: Tue Nov 23 04:05:43 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 23 04:19:04 2021 +
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  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  5 +++--
 dev-qt/qt-creator/qt-creator-.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 @@
Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
Build the beautifier plugin (supports 
astyle, clang-format, and uncrustify)
Build plugin for Boot2Qt devices
-   Build clang-based plugins (code model, 
formatting, static analysis)
+   Build clang-based plugins for C/C++ 
development (code model, formatting, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
Build plugin for CMake-based projects
Build plugin to integrate with the Conan 
package manager
@@ -27,7 +27,7 @@
Build plugin for Docker support
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
-   Enable integration with Incredibuild 
(requires manual installation of Incredibuild)
+   Enable integration with 
Incredibuild
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system
@@ -38,6 +38,7 @@
Build the Linux Perf-based profiler 
plugin
Build plugin for Python language 
support
Build plugin for QBS-based projects
+   Build plugins for QML-based development 
(designer, editor, project manager)
Enable designer for QML/QtQuick-based 
UIs
Build the QML/JavaScript editor plugin
Build the QML profiler plugin

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 8db237c5577b..ceec86efbe12 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/l

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

2021-11-22 Thread Davide Pesavento
commit: 2c5e19cb0458cd43f3d5c3bdd4003b5e2e393ef5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 05:16:43 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Tue Nov 23 04:19:04 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 68a5ec763cc6..8db237c5577b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-21 Thread Davide Pesavento
commit: 045b7bf9c923a736f4c74cfd4295a1635d29814a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 01:40:33 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:41:54 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 78d1c1db6106..68a5ec763cc6 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-21 Thread Davide Pesavento
commit: 568743c8d27f89f9fb6e56d47ad59a3c9d2ab54c
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 01:03:19 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:06:06 2021 +
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  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  4 +++-
 dev-qt/qt-creator/qt-creator-.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 @@
Build clang-based plugins (code model, 
formatting, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
Build plugin for CMake-based projects
+   Build plugin to integrate with the Conan 
package manager
Enable integration with 
dev-util/cppcheck
Build the Chrome Trace Format 
visualizer plugin
Enable designer for QtWidgets-based 
UIs
+   Build plugin for Docker support
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
Enable integration with Incredibuild 
(requires manual installation of Incredibuild)
@@ -40,7 +42,7 @@
Build the QML/JavaScript editor plugin
Build the QML profiler plugin
Build plugin for QNX devices
-   Add support for deployment and 
execution on a remote Linux host
+   Build plugin for deployment and 
execution on a remote Linux host
Build the graphical SCXML editor 
plugin
Build the serial terminal 
plugin
Enable integration with 
sys-apps/the_silver_searcher

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index cce36015191f..78d1c1db6106 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-21 Thread Davide Pesavento
commit: f3886fbdc84d842a71a7b4dc368751552f0963c1
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:56:48 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:06:05 2021 +
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  gentoo.org>

 dev-qt/qt-creator/metadata.xml   | 3 ++-
 dev-qt/qt-creator/qt-creator-.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 @@


Build plugin for Android devices
-   Enable integration with popular unit 
testing frameworks (QtTest, Google Test, Boost.Test)
+   Enable integration with popular unit 
testing frameworks (QtTest, GoogleTest, Boost.Test, Catch2)
Build plugin for autotools-based 
projects
Build plugin for bare metal 
devices
Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
@@ -25,6 +25,7 @@
Enable designer for QtWidgets-based 
UIs
Build the GLSL editor plugin
Enable the integrated documentation 
viewer
+   Enable integration with Incredibuild 
(requires manual installation of Incredibuild)
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 0aebe5389afc..6dce0255fb7f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-21 Thread Davide Pesavento
commit: ffec9566a4e4cbe86f85980659794097a2bc4be8
Author: Davide Pesavento  gentoo  org>
AuthorDate: Mon Nov 22 00:22:37 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Mon Nov 22 01:06:06 2021 +
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  gentoo.org>

 dev-qt/qt-creator/metadata.xml   | 1 +
 dev-qt/qt-creator/qt-creator-.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 @@
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system
+   Build plugin for Meson-based projects
Build the graphical model editor 
plugin
Build plugin for Nim language support
Add support for Perforce version control 
system (requires manual installation of Perforce client)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 6dce0255fb7f..cce36015191f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-21 Thread Davide Pesavento
commit: c5861188f31fff37dbb447f5ea2eb1ea7ccd3682
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:23:32 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 21:23:41 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index b11ee8e89714..0aebe5389afc 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-21 Thread Davide Pesavento
commit: 9ac742a301f4b2f4c796964c010e47c9e50b83c7
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:15:31 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 21:23:40 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 9c177489fe96..b11ee8e89714 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-21 Thread Davide Pesavento
commit: a55f5d5cdf45ac7a350907f83aa6f907f3c2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 21:05:20 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 21:23:40 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 18260cba5420..9c177489fe96 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-21 Thread Davide Pesavento
commit: 25b802bcfecca3ca93b279aee7e1ce843639243a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Nov 21 20:09:19 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 20:09:19 2021 +
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  gentoo.org>

 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 1 +
 dev-qt/qt-creator/qt-creator-.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-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 1e0cae2ac46f..18260cba5420 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-11-21 Thread Davide Pesavento
commit: b8ff4e5c839462c4bfa518c9b6a42d1f156d3330
Author: Kritzmensch  gmail  com>
AuthorDate: Sun Nov 21 19:56:42 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Nov 21 20:01:54 2021 +
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  gentoo.org>

 dev-qt/qt-creator/qt-creator-4.15.1.ebuild | 2 +-
 dev-qt/qt-creator/qt-creator-.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-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index bfc4e05275dc..1e0cae2ac46f 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/, dev-qt/qt-creator/files/

2021-07-10 Thread Davide Pesavento
commit: 69c7ab38c931d19f61adb59bebadecc2ca598632
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 05:29:54 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:29:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69c7ab38

dev-qt/qt-creator: remove half-broken 4.12.3-r1

Bug: https://bugs.gentoo.org/757756
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Davide Pesavento  gentoo.org>

 dev-qt/qt-creator/Manifest |   1 -
 .../files/qt-creator-4.12.0-dylib-fix.patch|  84 
 .../qt-creator-4.12.0-libclangformat-ide.patch |  64 --
 dev-qt/qt-creator/metadata.xml |   2 -
 dev-qt/qt-creator/qt-creator-4.12.3-r1.ebuild  | 235 -
 5 files changed, 386 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index d88825421b0..975ecb0a7d2 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.15.1.tar.xz 44655240 BLAKE2B 
80d4b4688702f490ee478fa3efc34d72fcc586f27a480e310a3fbc5e2a5938cf61053ca87522884da2f4c2560f735a228f0fb24a63887a41fe5d21ff69f6344a
 SHA512 
a735e2c14a4e9ca94ae209039017747f51320b465fdcf9d63e62bdf4d63d5099c6b114fa14af8869acf9290fba57be6bb756dcf78edcc6f3ac620c9e844241a3

diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch 
b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
deleted file mode 100644
index 0d4deb2c795..000
--- a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001
-From: Peter Levine 
-Date: Tue, 5 May 2020 03:45:35 -0400
-Subject: [PATCH] Fix building against clang configured with
- CLANG_LINK_CLANG_DYLIB
-
-LLVM/Clang upstream only officially supports building shared
-components as a single dynamic library (via
-LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..).
-Linux distros like Fedora and Gentoo have followed suit.
-
-Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri
-file assumes clang is built with separate component libraries
-and the build fails.
-
-This change alters the build to check for the existence
-of clang component libraries and, if found, link to them, or
-otherwise to libclang-cpp.
-
-Task-number: QTCREATORBUG-23172
-Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86

- src/shared/clang/clang_installation.pri | 35 +++--
- 1 file changed, 21 insertions(+), 14 deletions(-)
-
-diff --git a/src/shared/clang/clang_installation.pri 
b/src/shared/clang/clang_installation.pri
-index 08838838bca..c191c57f1c7 100644
 a/src/shared/clang/clang_installation.pri
-+++ b/src/shared/clang/clang_installation.pri
-@@ -204,19 +204,6 @@ isEmpty(LLVM_VERSION) {
- }
- }
- 
--
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
--CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
--exists($$CLANGFORMAT_MAIN_HEADER) {
--CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
--ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangTooling -lclangToolingCore \
--   -lclangRewrite -lclangIndex -lclangFrontend 
-lclangParse -lclangSerialization \
--   -lclangSema -lclangEdit -lclangAnalysis 
-lclangDriver -lclangDynamicASTMatchers \
--   -lclangASTMatchers -lclangAST -lclangLex 
-lclangBasic
--win32:CLANGFORMAT_LIBS += -lversion
--}
--}
--win32:ALL_CLANG_LIBS += -lversion
--
- LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
- !exists($$LIBCLANG_MAIN_HEADER) {
- $$llvmWarningOrError(\
-@@ -237,10 +224,30 @@ isEmpty(LLVM_VERSION) {
- LIBCLANG_LIBS += $${CLANG_LIB}
- 
- 
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
-+CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
-+exists($$CLANGFORMAT_MAIN_HEADER) {
-+
exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib)
 {
-+CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
-+ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangTooling -lclangToolingCore \
-+   -lclangRewrite -lclangIndex -lclangFrontend 
-lclangParse -lclangSerializ

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

2021-07-10 Thread Davide Pesavento
commit: 3985c100044bc6ae7e088951d8436dccbb827810
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 05:01:57 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:01:57 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 228e4f838dd..bfc4e05275d 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-07-10 Thread Davide Pesavento
commit: a3345ca863b3f721acd8841249670c2fcba9616a
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 05:17:36 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 05:18:54 2021 +
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  gmail.com>
Signed-off-by: Davide Pesavento  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 000..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} == * ]]; 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
+   )
+   =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]
+   )
+"
+RDEPE

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

2021-07-10 Thread Davide Pesavento
commit: 18ac48856dec0d17c4dabd73bcdce52ec9531831
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 04:50:25 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:25 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index b22ecdc136b..228e4f838dd 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-07-10 Thread Davide Pesavento
commit: ed1763bf93e35fe1beea74462f7e153bbe057558
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 03:24:47 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:24 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 18e67f9fc0b..057d48b9f9a 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-07-10 Thread Davide Pesavento
commit: 9a9f0f76ee082dbefed69111aa9d802e024662e2
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 11 04:28:03 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:24 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 9c70a14da51..b22ecdc136b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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} == * ]]; 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
)

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

2021-07-10 Thread Davide Pesavento
commit: 1e407a80672c4afedfdd712eae7e3b54df1a1a1b
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 03:33:38 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:24 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 057d48b9f9a..9c70a14da51 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2021-07-10 Thread Davide Pesavento
commit: dcb874465b3c7b145f837ea5f75137c2f0c1fc47
Author: Hans Fredrik Nordhaug  gmail  com>
AuthorDate: Sun Jul 11 03:21:02 2021 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 11 04:53:23 2021 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index e9e7c228800..18e67f9fc0b 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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
)


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

2021-02-09 Thread Sam James
commit: a910274489dc79f79736cdcd542fd1a8be180d30
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 19:59:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 19:59:22 2021 +
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  gentoo.org>

 .../{qt-creator-4.12.3.ebuild => qt-creator-4.12.3-r1.ebuild} | 4 ++--
 dev-qt/qt-creator/qt-creator-.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-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 926ec1ce7a6..e9e7c228800 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-09-08 Thread Andreas Sturmlechner
commit: 918fa8ded423c49295b8d5237e04f0314e008d96
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep  3 14:22:25 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep  8 18:07:40 2020 +
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  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..000
--- 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} == * ]]; 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/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 a

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

2020-07-30 Thread Michał Górny
commit: 842efe4025a43783b75b6750c715d4cc8f4b8293
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 29 11:42:13 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jul 30 22:09:51 2020 +
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  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..000
--- 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} == * ]]; 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 )
- 

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

2020-07-13 Thread Sam James
commit: c8218b189717fc302cbf061d028927376dc195e1
Author: Sam James  gentoo  org>
AuthorDate: Mon Jul 13 16:24:57 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jul 13 16:26:46 2020 +
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  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/

2020-07-11 Thread Davide Pesavento
commit: ba2b7d524c4f050ca53081dc6ef21a32d5be1237
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 12 03:49:06 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 12 03:50:11 2020 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 957735a0949..926ec1ce7a6 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-07-11 Thread Davide Pesavento
commit: c5d2ca1fbc24be0e5550a78a2eb32fd2d1f38b8a
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 12 03:41:02 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 12 03:50:10 2020 +
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  gentoo.org>

 dev-qt/qt-creator/metadata.xml   |  2 +-
 dev-qt/qt-creator/qt-creator-.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 @@
Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
Build the beautifier plugin (supports 
astyle, clang-format, and uncrustify)
Build plugin for Boot2Qt devices
-   Build clang-based plugins (code model, 
formatting, refactoring, static analysis)
+   Build clang-based plugins (code model, 
formatting, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
Build plugin for CMake-based projects
Enable integration with 
dev-util/cppcheck

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 9ae9556b4db..957735a0949 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-07-11 Thread Davide Pesavento
commit: a98a03b54b43acd6647a45eed5cde232a0ea3ffb
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sun Jul 12 02:01:23 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sun Jul 12 02:02:44 2020 +
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  gentoo.org>

 dev-qt/qt-creator/metadata.xml   | 15 ---
 dev-qt/qt-creator/qt-creator-.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 @@

Build plugin for Android devices
Enable integration with popular unit 
testing frameworks (QtTest, Google Test, Boost.Test)
-   Enable autotools project manager 
plugin
+   Build plugin for autotools-based 
projects
Build plugin for bare metal 
devices
Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
Build the beautifier plugin (supports 
astyle, clang-format, and uncrustify)
Build plugin for Boot2Qt devices
Build clang-based plugins (code model, 
formatting, refactoring, static analysis)
Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)
-   Enable cmake project manager plugin
+   Build plugin for CMake-based projects
Enable integration with 
dev-util/cppcheck
Build the Chrome Trace Format 
visualizer plugin
Enable designer for QtWidgets-based 
UIs
-   Enable GLSL editor
+   Build the GLSL editor plugin
Enable the integrated documentation 
viewer
Build plugin for Apple iOS devices
Add support for the Language Server Protocol 
(LSP)
Build plugin for MCU devices
Add support for 
dev-vcs/mercurial version control system
-   Enable graphical model editor
+   Build the graphical model editor 
plugin
Build plugin for Nim language support
Add support for Perforce version control 
system (requires manual installation of Perforce client)
Build the Linux Perf-based profiler 
plugin
Build plugin for Python language 
support
-   Enable QBS project manager plugin
+   Build plugin for QBS-based projects
Enable designer for QML/QtQuick-based 
UIs
+   Build the QML/JavaScript editor plugin
Build the QML profiler plugin
Build plugin for QNX devices
Add support for deployment and 
execution on a remote Linux host
-   Enable graphical SCXML editor
-   Build serial terminal plugin
+   Build the graphical SCXML editor 
plugin
+   Build the serial terminal 
plugin
Enable integration with 
sys-apps/the_silver_searcher
Add support for retrieving application 
output from journald
Enable integration with 
dev-util/valgrind

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 16ef16cdafb..9ae9556b4db 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/lib

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

2020-07-11 Thread Davide Pesavento
commit: 6cf0f636da45c338d767443d0184825f09f7d5f7
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 11 23:15:51 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 11 23:16:24 2020 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 62d4e47d5e8..16ef16cdafb 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-07-11 Thread Davide Pesavento
commit: 71df5fd9bbfc42f653e683adfc72737c36ecece4
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 11 22:51:47 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 11 23:16:23 2020 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index e361cea5daf..62d4e47d5e8 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-07-11 Thread Davide Pesavento
commit: 93cc20a03347e62931d86e14b4097ea58a0f0bb5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 11 20:28:07 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 11 20:29:55 2020 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 7d9347a0077..e361cea5daf 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-07-10 Thread Davide Pesavento
commit: 31e7bec69ca4546929526629fb83d07733536765
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 11 06:21:23 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 11 06:21:39 2020 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index b4bfe6a4119..7d9347a0077 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-07-10 Thread Davide Pesavento
commit: 2ac34258437a3913a6401905c79e717d321810f5
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 11 05:31:11 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 11 06:21:39 2020 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index aacf1388261..b4bfe6a4119 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-07-10 Thread Davide Pesavento
commit: ad80680859b7e52bf9526fbc792c2964a4e46e62
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 11 03:44:55 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 11 03:45:22 2020 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index fcfb5d3eb92..aacf1388261 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-07-10 Thread Davide Pesavento
commit: 8dee990043b76e3c8038c5641d4db12a7be6a673
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 11 03:29:29 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 11 03:29:29 2020 +
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  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index a8ef911ae28..fcfb5d3eb92 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-07-10 Thread Davide Pesavento
commit: e8701058eb99ffb62d82444fab19208880afb482
Author: Davide Pesavento  gentoo  org>
AuthorDate: Sat Jul 11 03:20:22 2020 +
Commit: Davide Pesavento  gentoo  org>
CommitDate: Sat Jul 11 03:21:05 2020 +
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  gentoo.org>

 dev-qt/qt-creator/metadata.xml   | 1 +
 dev-qt/qt-creator/qt-creator-.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 @@
Enable integration with popular unit 
testing frameworks (QtTest, Google Test, Boost.Test)
Enable autotools project manager 
plugin
Build plugin for bare metal 
devices
+   Add support for GNU Bazaar version control 
system (requires manual installation of Bazaar client)
Build the beautifier plugin (supports 
astyle, clang-format, and uncrustify)
Build plugin for Boot2Qt devices
Build clang-based plugins (code model, 
formatting, refactoring, static analysis)

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index ff58c169e4e..a8ef911ae28 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-06-25 Thread Jason A. Donenfeld
commit: 37557644b260b973e4cb84f2afe4d6eb63e62ab1
Author: Peter Levine  gmail  com>
AuthorDate: Tue May 19 02:53:02 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Jun 25 07:11:06 2020 +
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  gmail.com>
Signed-off-by: Jason A. Donenfeld  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 08bc2d1eb31..3f09133f6ee 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-06-25 Thread Jason A. Donenfeld
commit: a9641eccceec1061e176904b2f9d14dd45beff0f
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Thu Jun 25 07:02:15 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Jun 25 07:11:08 2020 +
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  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/

2020-06-25 Thread Jason A. Donenfeld
commit: aee07243bc44d2d6bc85113f848fd02deba381aa
Author: Peter Levine  gmail  com>
AuthorDate: Fri May  8 07:25:58 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Jun 25 07:11:05 2020 +
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  gmail.com>
Signed-off-by: Jason A. Donenfeld  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index ee5513e7298..1ad7e3db8ef 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-06-25 Thread Jason A. Donenfeld
commit: a0ba3944f62032c98005db4dec84aa655841a7ba
Author: Peter Levine  gmail  com>
AuthorDate: Sat May 23 02:14:36 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Jun 25 07:11:04 2020 +
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  gmail.com>
Signed-off-by: Jason A. Donenfeld  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index 4dcb19e8b43..bf48a061bde 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/files/, dev-qt/qt-creator/

2020-06-25 Thread Jason A. Donenfeld
commit: bc68a1d9330ace294ef43e31bca5b5d430b73b39
Author: Jason A. Donenfeld  gentoo  org>
AuthorDate: Thu Jun 25 07:00:06 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Jun 25 07:11:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc68a1d9

dev-qt/qt-creator: rollback change to apply Peter's work

This reverts commit b5b9383e897b618372ae474fedb68517738a0d04.

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

 dev-qt/qt-creator/Manifest |  2 +-
 .../files/qt-creator-4.12.3-clang-libs.patch   | 24 --
 .../files/qt-creator-4.12.3-preload-plugins.patch  | 13 
 ...ator-4.12.3.ebuild => qt-creator-4.12.0.ebuild} |  9 ++--
 4 files changed, 3 insertions(+), 45 deletions(-)

diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 98c7d26ee6f..d7586825807 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.3.tar.xz 34351356 BLAKE2B 
7f1302df09bae10ebe1882552abd25333788d7185280e9a0c73e7da6fb8b4d929da326e42c500385fba3e044350cd46c2cf2e33e49b0cca2d9c3b4d68693115d
 SHA512 
48cd5839cff724300516f78deba3b1a7199d46d6f9a6a4c662bf2f581db167e4376a9bdd544544071591c4ee43c319c92ffcaf5ebb85412297f4144c3c7db7bf
+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/files/qt-creator-4.12.3-clang-libs.patch 
b/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch
deleted file mode 100644
index a0cc8c54738..000
--- a/dev-qt/qt-creator/files/qt-creator-4.12.3-clang-libs.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/shared/clang/clang_installation.pri 
b/src/shared/clang/clang_installation.pri
-index 08838838bc..bee3779484 100644
 a/src/shared/clang/clang_installation.pri
-+++ b/src/shared/clang/clang_installation.pri
-@@ -131,9 +131,7 @@ defineReplace(extractWarnings) {
- return($$result)
- }
- 
--CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse 
-lclangSerialization \
--  -lclangSema -lclangEdit -lclangAnalysis -lclangDriver 
-lclangDynamicASTMatchers \
--  -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex 
-lclangBasic
-+CLANGTOOLING_LIBS=-lclang-cpp
- win32:CLANGTOOLING_LIBS += -lversion
- 
- BIN_EXTENSION =
-@@ -207,7 +205,7 @@ isEmpty(LLVM_VERSION) {
- 
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
- CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
- exists($$CLANGFORMAT_MAIN_HEADER) {
--CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
-+CLANGFORMAT_LIBS=-lclang-cpp
- ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangTooling -lclangToolingCore \
--lclangRewrite -lclangIndex -lclangFrontend 
-lclangParse -lclangSerialization \
--lclangSema -lclangEdit -lclangAnalysis 
-lclangDriver -lclangDynamicASTMatchers \

diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch 
b/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch
deleted file mode 100644
index d4ec515fe05..000
--- a/dev-qt/qt-creator/files/qt-creator-4.12.3-preload-plugins.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/plugins/clangtools/clangtidyclazyrunner.cpp 
b/src/plugins/clangtools/clangtidyclazyrunner.cpp
-index 166d1c94e0..de0b9cc67b 100644
 a/src/plugins/clangtools/clangtidyclazyrunner.cpp
-+++ b/src/plugins/clangtools/clangtidyclazyrunner.cpp
-@@ -67,7 +67,7 @@ static QStringList clazyPluginArguments(const 
ClangDiagnosticConfig diagnosticCo
- QStringList arguments;
- 
- if (diagnosticConfig.isClazyEnabled()) {
--arguments << XclangArgs({"-add-plugin", "clazy"});
-+arguments << XclangArgs({"-load", "ClazyPlugin.so", "-add-plugin", 
"clazy"});
-

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

2020-06-25 Thread Jason A. Donenfeld
commit: 24dd58fe4592775fe430ee98d17ecb7825a02ade
Author: Peter Levine  gmail  com>
AuthorDate: Fri May  8 07:11:14 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Jun 25 07:11:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24dd58fe

dev-qt/qt-creator: Support clang-10

Builds and runs without issue using patch from
https://codereview.qt-project.org/c/qt-creator/qt-creator/+/299377

Closes: https://bugs.gentoo.org/720240
Closes: https://bugs.gentoo.org/711788
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Peter Levine  gmail.com>
Signed-off-by: Jason A. Donenfeld  gentoo.org>

 .../files/qt-creator-4.12.0-dylib-fix.patch| 84 ++
 dev-qt/qt-creator/qt-creator-.ebuild   | 13 +++-
 2 files changed, 95 insertions(+), 2 deletions(-)

diff --git a/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch 
b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
new file mode 100644
index 000..0d4deb2c795
--- /dev/null
+++ b/dev-qt/qt-creator/files/qt-creator-4.12.0-dylib-fix.patch
@@ -0,0 +1,84 @@
+From 1c5faa6dcf16135ee31252d13766d01536a69405 Mon Sep 17 00:00:00 2001
+From: Peter Levine 
+Date: Tue, 5 May 2020 03:45:35 -0400
+Subject: [PATCH] Fix building against clang configured with
+ CLANG_LINK_CLANG_DYLIB
+
+LLVM/Clang upstream only officially supports building shared
+components as a single dynamic library (via
+LLVM_BUILD_LLVM_DYLIB=ON, CLANG_LINK_CLANG_DYLIB=ON, etc..).
+Linux distros like Fedora and Gentoo have followed suit.
+
+Unfortunately, QT-Creator's src/shared/clang/clang_installation.pri
+file assumes clang is built with separate component libraries
+and the build fails.
+
+This change alters the build to check for the existence
+of clang component libraries and, if found, link to them, or
+otherwise to libclang-cpp.
+
+Task-number: QTCREATORBUG-23172
+Change-Id: I17df5822d7aeb471227f21f2cf4a71871d6f9b86
+---
+ src/shared/clang/clang_installation.pri | 35 +++--
+ 1 file changed, 21 insertions(+), 14 deletions(-)
+
+diff --git a/src/shared/clang/clang_installation.pri 
b/src/shared/clang/clang_installation.pri
+index 08838838bca..c191c57f1c7 100644
+--- a/src/shared/clang/clang_installation.pri
 b/src/shared/clang/clang_installation.pri
+@@ -204,19 +204,6 @@ isEmpty(LLVM_VERSION) {
+ }
+ }
+ 
+-
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
+-CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
+-exists($$CLANGFORMAT_MAIN_HEADER) {
+-CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
+-ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangTooling -lclangToolingCore \
+-   -lclangRewrite -lclangIndex -lclangFrontend 
-lclangParse -lclangSerialization \
+-   -lclangSema -lclangEdit -lclangAnalysis 
-lclangDriver -lclangDynamicASTMatchers \
+-   -lclangASTMatchers -lclangAST -lclangLex 
-lclangBasic
+-win32:CLANGFORMAT_LIBS += -lversion
+-}
+-}
+-win32:ALL_CLANG_LIBS += -lversion
+-
+ LIBCLANG_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang-c/Index.h
+ !exists($$LIBCLANG_MAIN_HEADER) {
+ $$llvmWarningOrError(\
+@@ -237,10 +224,30 @@ isEmpty(LLVM_VERSION) {
+ LIBCLANG_LIBS += $${CLANG_LIB}
+ 
+ 
isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) {
++CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h
++exists($$CLANGFORMAT_MAIN_HEADER) {
++
exists($${LLVM_LIBDIR}/libclangFormat.so*)|exists($${LLVM_LIBDIR}/libclangFormat.dylib)
 {
++CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangToolingCore -lclangRewrite -lclangLex -lclangBasic
++ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions 
-lclangTooling -lclangToolingCore \
++   -lclangRewrite -lclangIndex -lclangFrontend 
-lclangParse -lclangSerialization \
++   -lclangSema -lclangEdit -lclangAnalysis 
-lclangDriver -lclangDynamicASTMatchers \
++   -lclangASTMatchers -lclangAST -lclangLex 
-lclangBasic
++win32:CLANGFORMAT_LIBS += -lversion
++win32:ALL_CLANG_LIBS += -lversion
++} else {
++CLANGFORMAT_LIBS=-lclang-cpp
++ALL_CLANG_LIBS=-lclang-cpp
++}
++}
++
+ QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING)
+ isEmpty(QTC_DISABLE_CLANG_REFACTORING) {
+ !contains(QMAKE_DEFAULT_LIBDIRS, $$LLVM_LIBDIR): LIBTOOLING_LIBS 
= -L$${LLVM_LIBDIR}
+-LIBTOOLING_LIBS += $$CLANGTOOLING_LIBS $$LLVM_STATIC_LIBS
++
exists($${LLVM_LIBDIR}/libclangTooling.so*)|exists($${LLVM_LIBDIR}/libclang

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

2020-06-25 Thread Jason A. Donenfeld
commit: 411ad93342f83a0912716eb39e2837e77a285f25
Author: Peter Levine  gmail  com>
AuthorDate: Sat May 23 02:38:43 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Jun 25 07:11:05 2020 +
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  gmail.com>
Signed-off-by: Jason A. Donenfeld  gentoo.org>

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

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


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

2020-06-25 Thread Jason A. Donenfeld
commit: 56bf49f922c065f7196acaa926f1b56dfb874915
Author: Peter Levine  gmail  com>
AuthorDate: Mon May 11 02:38:41 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Jun 25 07:11:06 2020 +
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  gmail.com>
Signed-off-by: Jason A. Donenfeld  gentoo.org>

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

diff --git a/dev-qt/qt-creator/qt-creator-.ebuild 
b/dev-qt/qt-creator/qt-creator-.ebuild
index eb7f017e775..08bc2d1eb31 100644
--- a/dev-qt/qt-creator/qt-creator-.ebuild
+++ b/dev-qt/qt-creator/qt-creator-.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/

2020-06-25 Thread Jason A. Donenfeld
commit: 6e8f065e19fee5ee73271d794ad54b3ca74d67d8
Author: Peter Levine  gmail  com>
AuthorDate: Thu Jun  4 08:21:34 2020 +
Commit: Jason A. Donenfeld  gentoo  org>
CommitDate: Thu Jun 25 07:11:08 2020 +
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  gmail.com>
Signed-off-by: Jason A. Donenfeld  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..000
--- 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} == * ]]; 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} )
-

  1   2   >