From 38b7258d086dd5e263c3bbe3880c8c956676bc71 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 26 Jan 2018 15:48:02 +0000 Subject: gentoo resync : 25.01.2018 --- app-office/libreoffice/Manifest | 6 +-- app-office/libreoffice/libreoffice-6.0.9999.ebuild | 18 +++---- app-office/libreoffice/libreoffice-9999.ebuild | 61 ++++++++++------------ app-office/libreoffice/metadata.xml | 3 +- 4 files changed, 41 insertions(+), 47 deletions(-) (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 3fb05e7286ea..f64f4211471d 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -18,6 +18,6 @@ DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84b EBUILD libreoffice-5.4.2.2.ebuild 17284 BLAKE2B 2f1c4a8f7a661b36fa3eaa8559eeeb9e7140cb3e1cc71ca1f4272512e3a268c7e24e60bebd9088a76f06e546bf0307a6e18626fc2e4fe55f04f7ad081befdc27 SHA512 3fde8087bbe39bc3bbf6509bb2faa9635a9e7ced06df58c67f143de24fc49f9e3742d5e61001a28fa9a0d600e8bb5ff72fb578acdd5637ac37c51679408cc810 EBUILD libreoffice-5.4.4.2.ebuild 17361 BLAKE2B 7fa4ca01338ac8cd9e07288e672ddd033368a5a0281b4c56c2ebe21d6814fec6d1aedf9f06cab4ffa4d0b54f3285cf64781d205926860e3c03907c1b34171086 SHA512 8f551d2d9de46e3ecf10953ece19d9bd005164c6d407e4b980a57dfa74b82d6fce3481d9466a909a938d17cbcf87e27c57e12c186ae8d2c405d9cb32ac76a9b1 EBUILD libreoffice-5.4.9999.ebuild 17313 BLAKE2B 1701bda68e2ebfdba50ed889d6d13a261a6e8127aa2f47aae68a4e7f39d771f716983f8beee7c927244e101783ba9e50512f35a16c959c979d1475c2baff8b55 SHA512 640c75d7e9b1806249d61006b9b6524c28cf68a6b90936effd0dcca45f5b58bc1b327ed2b37fda815d09c827bd3c5805780bf3e65078fea658518d5219e0fc21 -EBUILD libreoffice-6.0.9999.ebuild 16469 BLAKE2B dc113589f06ccf9d5521d2663a07d756a759bb0c339c30318912b29fd2b7cbb091dabbcf6fd9b50ae15f72bd40fd4dd54a4147a637b6694999d8ebb1caa6cb88 SHA512 f1848d7709e544fd6f082e3cd912049b046ef979c713aa1f165b4c6893595448f6033f688872b413e46bedc7d99ac764a7a34f395c7445380f299aabee23d780 -EBUILD libreoffice-9999.ebuild 16668 BLAKE2B 0625317ed1b43d21ab6e96f001a69f75ae04cccc6bed712bbb6b6e623f0c1e76795420a4275d63ab53b5e4458a7d23c906e7c68b81a1dc1f094e5bd12a39d5db SHA512 e5e80d8bafaf32d0ff3dad306d456c2b2fa09e003974bca70c7742fde62c2215389ac0876c378e0f235ae9bb1953ce961496bb0dc79cc530f0dc9af96003bf41 -MISC metadata.xml 1393 BLAKE2B 011d5a2e756882852e46eedb9ef66977b93131c570491008a9ebc547b91276bc2e6a7a3db045d3de0758d1ea6ca486d3ea5b4d5c7c667b08534212cce25c0867 SHA512 72cff0c78665cb79e4cb3df72a87af3dc02d9d46f6293a02974602387b50245553d90e1d7d3134d8143ffda809b3a497b43279652ede8ae7eeee9e724918bef7 +EBUILD libreoffice-6.0.9999.ebuild 16476 BLAKE2B 1fd7de3ce7a351fb0f65831e28cd8e3768144f9f861fe5a69d4821f65ec4d419989259fbd48500c31a460c18629fb516adc147375bae73453dffab8441caf3fa SHA512 bd2eff8e04a3569d88d83a11af8389576fee8a364db5c54ed24da533846c14536bcf5f3877c35742ef4f2608f2f34d97593de020be5fe9e1051b77012f5019ad +EBUILD libreoffice-9999.ebuild 16574 BLAKE2B 409d86e1d165ec3e40e72e5cc8e1c150ab1903fe68f46565cb2ada5428f2124e95b6bcafe87cc5017550f952ae5852bb0162e9740aef6fc4e91109e203eb9b73 SHA512 6c26fccf3293d87f8a4be53ecc0261cd36f8db8a1844121397af7afd8787ae1ca7fdb01a70f64f4b18095ff130afc8f8140e2b24ee39c182f206c7c01a93751c +MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323 diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 5b58caa856a0..90f72941a9bd 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc +gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" @@ -148,15 +148,15 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/gst-plugins-base:1.0 ) gtk? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) + gtk2? ( + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-2.24:2 + ) jemalloc? ( dev-libs/jemalloc ) libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) @@ -426,8 +426,8 @@ src_configure() { $(use_enable eds evolution2) $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk) - $(use_enable gtk3) + $(use_enable gtk gtk3) + $(use_enable gtk2 gtk) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) @@ -442,7 +442,7 @@ src_configure() { $(use_with odk doxygen) ) - if use eds || use gtk3; then + if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else myeconfargs+=( --disable-dconf --disable-gio ) @@ -519,7 +519,7 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # bug 593514 - if use gtk3; then + if use gtk; then dosym libreoffice/program/liblibreofficekitgtk.so \ /usr/$(get_libdir)/liblibreofficekitgtk.so fi diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 664bacbda8ea..1142e018d213 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -64,7 +64,7 @@ unset ADDONS_SRC LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive -gstreamer +gtk gtk3 kde libressl mysql odk pdfimport postgres qt4 qt5 test vlc +gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" @@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS} =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl - dev-libs/boost:= + >=dev-libs/boost-1.65.0:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= @@ -148,30 +148,31 @@ COMMON_DEPEND="${PYTHON_DEPS} media-libs/gst-plugins-base:1.0 ) gtk? ( - x11-libs/gdk-pixbuf - >=x11-libs/gtk+-2.24:2 - ) - gtk3? ( dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf x11-libs/gtk+:3 ) - libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) - libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) - mysql? ( dev-db/mysql-connector-c++ ) - pdfimport? ( app-text/poppler:=[cxx] ) - postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - kde-frameworks/kdelibs + gtk2? ( + x11-libs/gdk-pixbuf + >=x11-libs/gtk+-2.24:2 ) - qt5? ( + kde? ( dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtx11extras:5 dev-qt/qtwidgets:5 + kde-frameworks/kconfig:5 kde-frameworks/kcoreaddons:5 + kde-frameworks/ki18n:5 + kde-frameworks/kio:5 + kde-frameworks/kwindowsystem:5 ) + libreoffice_extensions_scripting-beanshell? ( dev-java/bsh ) + libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 ) + mysql? ( dev-db/mysql-connector-c++ ) + pdfimport? ( app-text/poppler:=[cxx] ) + postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) " RDEPEND="${COMMON_DEPEND} @@ -234,12 +235,11 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - kde? ( || ( qt4 qt5 ) ) + kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java ) - qt4? ( kde ) " PATCHES=( @@ -252,9 +252,6 @@ PATCHES=( ) pkg_pretend() { - use qt5 && \ - ewarn "Qt5 is a work in progress. Do _NOT_ file bugs at bugs.gentoo.org related to Qt5 support!" - use java || \ ewarn "If you plan to use Base application you should enable java or you will get various crashes." @@ -367,13 +364,8 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use qt4; then - # bug 544108, bug 599076 - export QMAKE4="$(qt4_get_bindir)/qmake" - export MOCQT4="$(qt4_get_bindir)/moc" - fi - - if use qt5; then + if use kde; then + export QT_SELECT=5 # bug 639620 needs proper fix though export QT5DIR="$(qt5_get_bindir)/../" export MOC5="$(qt5_get_bindir)/moc" fi @@ -438,14 +430,15 @@ src_configure() { $(use_enable eds evolution2) $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) - $(use_enable gtk) - $(use_enable gtk3) + $(use_enable gtk gtk3) + $(use_enable gtk2 gtk) + $(use_enable kde qt5) + $(use_enable kde kde5) + $(use_enable kde gtk3-kde5) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(use_enable qt4 kde4) - $(use_enable qt5) $(use_enable vlc) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id}) @@ -455,7 +448,7 @@ src_configure() { $(use_with odk doxygen) ) - if use eds || use gtk3; then + if use eds || use gtk; then myeconfargs+=( --enable-dconf --enable-gio ) else myeconfargs+=( --disable-dconf --disable-gio ) @@ -532,7 +525,7 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # bug 593514 - if use gtk3; then + if use gtk; then dosym libreoffice/program/liblibreofficekitgtk.so \ /usr/$(get_libdir)/liblibreofficekitgtk.so fi diff --git a/app-office/libreoffice/metadata.xml b/app-office/libreoffice/metadata.xml index 1d3010d41306..f72d5cc7d181 100644 --- a/app-office/libreoffice/metadata.xml +++ b/app-office/libreoffice/metadata.xml @@ -15,7 +15,8 @@ version Enable Collada for rendering 3D models stored in *.dae and *.kmz format Use media-libs/libgltf for inserting 3D models in the glTF format into presentations Enable support for remote files on Google Drive - Enable highly experimental gtk3 frontend + Enable legacy gtk2 frontend + Enable experimental gtk3 frontend Use dev-libs/jemalloc for allocations Build the Office Development Kit Enable PDF import via the Poppler library -- cgit v1.2.3