Skip to content

Commit

Permalink
app-office/libreoffice: Drop IUSE qt5 from 9999
Browse files Browse the repository at this point in the history
Signed-off-by: Andreas Sturmlechner <[email protected]>
  • Loading branch information
a17r committed Sep 9, 2024
1 parent 38f3585 commit 9002558
Showing 1 changed file with 9 additions and 29 deletions.
38 changes: 9 additions & 29 deletions app-office/libreoffice/libreoffice-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down Expand Up @@ -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 )
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down

0 comments on commit 9002558

Please sign in to comment.