diff options
Diffstat (limited to 'app-office/libreoffice/libreoffice-24.2.9999.ebuild')
| -rw-r--r-- | app-office/libreoffice/libreoffice-24.2.9999.ebuild | 39 |
1 files changed, 16 insertions, 23 deletions
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 ) |