From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CF31915808B for ; Wed, 14 Feb 2024 19:55:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F66EE2A13; Wed, 14 Feb 2024 19:55:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E555E2A0F for ; Wed, 14 Feb 2024 19:55:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64695343026 for ; Wed, 14 Feb 2024 19:55:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC72914CF for ; Wed, 14 Feb 2024 19:55:19 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1707940504.c7740af5ecacc45f567488b7156f528e9dfdaa41.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-24.2.1.1.ebuild app-office/libreoffice/libreoffice-24.2.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c7740af5ecacc45f567488b7156f528e9dfdaa41 X-VCS-Branch: master Date: Wed, 14 Feb 2024 19:55:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dad8f651-8447-44bc-b393-843e171c99c6 X-Archives-Hash: 53e47bc99e8217cc89f93b0efb8fa521 commit: c7740af5ecacc45f567488b7156f528e9dfdaa41 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 14 19:53:21 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 14 19:55:04 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7740af5 app-office/libreoffice: Add IUSE qt5 and allow parallel build w/ qt6 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/libreoffice/libreoffice-24.2.1.1.ebuild | 39 +++++++++------------- .../libreoffice/libreoffice-24.2.9999.ebuild | 39 +++++++++------------- app-office/libreoffice/libreoffice-9999.ebuild | 39 +++++++++------------- 3 files changed, 48 insertions(+), 69 deletions(-) diff --git a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild index c9eed10d3c29..a01d614a45dd 100644 --- a/app-office/libreoffice/libreoffice-24.2.1.1.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.1.1.ebuild @@ -91,12 +91,13 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} base? ( java ) bluetooth? ( dbus ) + kde? ( || ( qt5 qt6 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -208,11 +209,7 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/pango ) kde? ( - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + qt5? ( kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 @@ -234,6 +231,12 @@ COMMON_DEPEND="${PYTHON_DEPS} !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) " # FIXME: cppunit should be moved to test conditional @@ -475,12 +478,11 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) + if use qt5; then + export QT5DIR="$(qt5_get_bindir)/.." + fi if use qt6; then export QT6DIR="$(qt6_get_bindir)/.." - else - if use kde; then - export QT5DIR="$(qt5_get_bindir)/.." - fi fi local gentoo_buildid="Gentoo official package" @@ -560,6 +562,8 @@ src_configure() { $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) + $(use_enable qt5) + $(use_enable qt6) $(use_enable vulkan skia) $(use_with accessibility lxml) $(use_with coinmp system-coinmp) @@ -570,19 +574,8 @@ src_configure() { $(use_with valgrind) ) - if use qt6; then - myeconfargs+=( - --disable-qt5 - $(use_enable qt6 qt6) - $(use_enable kde kf6) - ) - else - myeconfargs+=( - --disable-qt6 - $(use_enable kde kf5) - $(use_enable kde qt5) - ) - fi + use qt5 && myeconfargs+=( $(use_enable kde kf5) ) + use qt6 && myeconfargs+=( $(use_enable kde kf6) ) if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) diff --git a/app-office/libreoffice/libreoffice-24.2.9999.ebuild b/app-office/libreoffice/libreoffice-24.2.9999.ebuild index 8ba5fc4e88b8..dd6d14b2c12d 100644 --- a/app-office/libreoffice/libreoffice-24.2.9999.ebuild +++ b/app-office/libreoffice/libreoffice-24.2.9999.ebuild @@ -91,12 +91,13 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} base? ( java ) bluetooth? ( dbus ) + kde? ( || ( qt5 qt6 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -208,11 +209,7 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/pango ) kde? ( - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + qt5? ( kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 @@ -234,6 +231,12 @@ COMMON_DEPEND="${PYTHON_DEPS} !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) " # FIXME: cppunit should be moved to test conditional @@ -467,12 +470,11 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) + if use qt5; then + export QT5DIR="$(qt5_get_bindir)/.." + fi if use qt6; then export QT6DIR="$(qt6_get_bindir)/.." - else - if use kde; then - export QT5DIR="$(qt5_get_bindir)/.." - fi fi local gentoo_buildid="Gentoo official package" @@ -552,6 +554,8 @@ src_configure() { $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) + $(use_enable qt5) + $(use_enable qt6) $(use_enable vulkan skia) $(use_with accessibility lxml) $(use_with coinmp system-coinmp) @@ -562,19 +566,8 @@ src_configure() { $(use_with valgrind) ) - if use qt6; then - myeconfargs+=( - --disable-qt5 - $(use_enable qt6 qt6) - $(use_enable kde kf6) - ) - else - myeconfargs+=( - --disable-qt6 - $(use_enable kde kf5) - $(use_enable kde qt5) - ) - fi + use qt5 && myeconfargs+=( $(use_enable kde kf5) ) + use qt6 && myeconfargs+=( $(use_enable kde kf6) ) if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 8ba5fc4e88b8..dd6d14b2c12d 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -91,12 +91,13 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="accessibility base bluetooth +branding clang coinmp +cups custom-cflags +dbus debug eds firebird -googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt5 qt6 test valgrind vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} base? ( java ) bluetooth? ( dbus ) + kde? ( || ( qt5 qt6 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -208,11 +209,7 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/pango ) kde? ( - !qt6? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 + qt5? ( kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 @@ -234,6 +231,12 @@ COMMON_DEPEND="${PYTHON_DEPS} !mariadb? ( dev-db/mysql-connector-c:= ) pdfimport? ( >=app-text/poppler-22.06:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) " # FIXME: cppunit should be moved to test conditional @@ -467,12 +470,11 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) + if use qt5; then + export QT5DIR="$(qt5_get_bindir)/.." + fi if use qt6; then export QT6DIR="$(qt6_get_bindir)/.." - else - if use kde; then - export QT5DIR="$(qt5_get_bindir)/.." - fi fi local gentoo_buildid="Gentoo official package" @@ -552,6 +554,8 @@ src_configure() { $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) + $(use_enable qt5) + $(use_enable qt6) $(use_enable vulkan skia) $(use_with accessibility lxml) $(use_with coinmp system-coinmp) @@ -562,19 +566,8 @@ src_configure() { $(use_with valgrind) ) - if use qt6; then - myeconfargs+=( - --disable-qt5 - $(use_enable qt6 qt6) - $(use_enable kde kf6) - ) - else - myeconfargs+=( - --disable-qt6 - $(use_enable kde kf5) - $(use_enable kde qt5) - ) - fi + use qt5 && myeconfargs+=( $(use_enable kde kf5) ) + use qt6 && myeconfargs+=( $(use_enable kde kf6) ) if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio )