diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-09-10 12:30:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-09-10 12:30:41 +0100 |
| commit | add278b9601ff9e4af091c91c851ee46a185be8f (patch) | |
| tree | 4b654beae0eec584ae1d1f3227a57607d591a0ea /app-office/libreoffice | |
| parent | d8a7472fc6314625f7d16e0427004eb448412908 (diff) | |
gentoo auto-resync : 10:09:2024 - 12:30:41
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/Manifest | 2 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 38 |
2 files changed, 10 insertions, 30 deletions
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 81b758185140..ada16dec87f4 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -49,5 +49,5 @@ EBUILD libreoffice-24.2.5.2.ebuild 20768 BLAKE2B 49000d3394b5f2f947883f5700ef0b1 EBUILD libreoffice-24.2.6.2.ebuild 20722 BLAKE2B e435a02cac7fa1955069e253fb7df0bb12be4a9bb9425bbe2d89a19cf5231b5f093d79e1c62a6c7dd5ac35dbd995a6dfab55f4974e5a0bcbc876116db79e2e58 SHA512 52c5ae38e538ad6ae92fb5b1219f30f5d26ee87aa6a5bb4c1f3c0a4eecbdfc6672cc7a5ebdc2c0ba2f8caef33dc4e87aae8a552d27e035956e06562ced4f799f EBUILD libreoffice-24.2.9999.ebuild 20330 BLAKE2B 68c472618ca2d4e8d1304d8e4a4aa01c0144541d527b3e3e31257a8e90960a7b2dd56857d3dd06892b302e0d14233ecbcadd733f662c478d61c2737587817029 SHA512 29af45dc798b2bf15ce9b948083992e4bf6a71ffd027c4c5d9ea90e5bb2378f2b0c3696005e42ef040fd9946ead9e727bb7147f83f3b785b95d1e9f489af9ec7 EBUILD libreoffice-7.6.7.2.ebuild 19802 BLAKE2B eb2f730cbeb5c9b52aa283856836ff3bbafd1c583680b7e66573cecfa70cfe9047a890bfab3a3af44393745627a89b8b85035e0391c5b8237305286749f3ec31 SHA512 1233a6ac0fad591ff2e1f639fda080a34993087f9d3a979dac8c068d35c9302c647401624268d90886d9ef59821f5f48da007e619d0ce7dfb538b54b7a11198f -EBUILD libreoffice-9999.ebuild 20330 BLAKE2B 68c472618ca2d4e8d1304d8e4a4aa01c0144541d527b3e3e31257a8e90960a7b2dd56857d3dd06892b302e0d14233ecbcadd733f662c478d61c2737587817029 SHA512 29af45dc798b2bf15ce9b948083992e4bf6a71ffd027c4c5d9ea90e5bb2378f2b0c3696005e42ef040fd9946ead9e727bb7147f83f3b785b95d1e9f489af9ec7 +EBUILD libreoffice-9999.ebuild 19906 BLAKE2B 0b242c2390bec879c05a78e17bab5b1363555bd0473f89927a6736d5a68d0da9c8cad53197a58d82ef4869cfead3838814150f9c7d731f49b0fb4388b177c68b SHA512 b225f0125d7bc88fc5b4b24fc8702641f1169f151a852b8dc3d02e8c54a6f4bfe97198020b219e5155f945d71f086874ac59a2dcd7190b88da6636ac3c75c329 MISC metadata.xml 1233 BLAKE2B f93989caf1340cda4c3327a3d3d033d224050848b32b9d80e0b093b024bf124d238f1aae9852d1a6173e8aee79314517dd12e589079e58378e5f63626a80957c SHA512 3af0cefdceeba7a45658a2151b0534f44b9dfe6d3af8374f3061cb098f607a36a2fe134e3c0280ce6d807b523f68e708b51e6f1b4178292a528405e18f12d686 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 1360d7d1e65e..a4aacb61b9f0 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -91,13 +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 qt5 qt6 test valgrind vulkan +googledrive gstreamer +gtk kde ldap +mariadb odk pdfimport postgres qt6 test valgrind vulkan $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" REQUIRED_USE="${PYTHON_REQUIRED_USE} base? ( java ) bluetooth? ( dbus ) - kde? ( || ( qt5 qt6 ) ) + kde? ( qt6 ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -209,20 +209,11 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/pango ) kde? ( - qt5? ( - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kwindowsystem:5 - ) - qt6? ( - kde-frameworks/kconfig:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/ki18n:6 - kde-frameworks/kio:6 - kde-frameworks/kwindowsystem:6 - ) + kde-frameworks/kconfig:6 + kde-frameworks/kcoreaddons:6 + kde-frameworks/ki18n:6 + kde-frameworks/kio:6 + kde-frameworks/kwindowsystem:6 ) ldap? ( net-nds/openldap:= ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) @@ -231,12 +222,6 @@ 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 @@ -473,9 +458,6 @@ 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)/.." fi @@ -520,6 +502,7 @@ src_configure() { --disable-online-update --disable-openssl --disable-pdfium + --disable-qt5 --with-extra-buildid="${gentoo_buildid}" --enable-extension-integration --with-external-dict-dir="${EPREFIX}/usr/share/myspell" @@ -554,11 +537,11 @@ src_configure() { $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) + $(use_enable kde kf6) $(use_enable ldap) $(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) @@ -570,9 +553,6 @@ src_configure() { $(use_with valgrind) ) - 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 ) else |