From 456dbeaab3e2f71f527eae542ab44d1e372b0655 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 10 Jan 2018 05:25:01 +0000 Subject: gentoo resync : 10.01.2018 --- app-office/libreoffice/Manifest | 4 ++-- app-office/libreoffice/libreoffice-6.0.9999.ebuild | 25 +++++----------------- app-office/libreoffice/libreoffice-9999.ebuild | 1 - 3 files changed, 7 insertions(+), 23 deletions(-) (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 99d20d611c2c..3fb05e7286ea 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 16816 BLAKE2B 8a87c931db0b1e672f9f3c171faae5a7a216a650a36e2c49cb5df11a27f1f0dccfa4c903b3b32f33f4f38ceb17c0a5c71a79191b3a994c2292fae7e7fe7a8b5b SHA512 129d1823e47534741fe38d08e61044b2d86f306a0ce410286811df76fa254fd33fcc63adf92d322b3beefa18fb097479675aecc70a10dc9a7ee57f8558d07a5b -EBUILD libreoffice-9999.ebuild 16729 BLAKE2B dfd7c65cb13718cacf7ab4a845e43473bc3a4d96ca81ca4f31b8528485825dd15653a9a2f1dfcfe449274aedf6c8706f5dfc1e8fd4a3d832ecb051ee7187ddaf SHA512 51567c3a9066b0a17a62c94225e6700458dca4ffe6f3148e955f384c1260097d4bc5a4af47694a69db8981d1264f01f4dd19dd75756a714622e9a71d9bfaa099 +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 diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 5fca4ae10c01..5b58caa856a0 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 qt4 qt5 test vlc +gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" LICENSE="|| ( LGPL-3 MPL-1.1 )" @@ -163,16 +163,11 @@ COMMON_DEPEND="${PYTHON_DEPS} mysql? ( dev-db/mysql-connector-c++ ) pdfimport? ( app-text/poppler:=[cxx] ) postgres? ( >=dev-db/postgresql-9.0:*[kerberos] ) - qt4? ( + kde? ( dev-qt/qtcore:4 dev-qt/qtgui:4 kde-frameworks/kdelibs ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtwidgets:5 - kde-frameworks/kcoreaddons:5 - ) " RDEPEND="${COMMON_DEPEND} @@ -235,12 +230,10 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) - kde? ( || ( qt4 qt5 ) ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) libreoffice_extensions_wiki-publisher? ( java ) - qt4? ( kde ) " PATCHES=( @@ -254,9 +247,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." @@ -369,17 +359,12 @@ src_configure() { export PYTHON_CFLAGS=$(python_get_CFLAGS) export PYTHON_LIBS=$(python_get_LIBS) - if use qt4; then + if use kde; then # bug 544108, bug 599076 export QMAKE4="$(qt4_get_bindir)/qmake" export MOCQT4="$(qt4_get_bindir)/moc" fi - if use qt5; then - export QT5DIR="$(qt5_get_bindir)/../" - export MOC5="$(qt5_get_bindir)/moc" - fi - # system headers/libs/...: enforce using system packages # --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad # --enable-cairo: ensure that cairo is always required @@ -413,6 +398,7 @@ src_configure() { --disable-gstreamer-0-10 --disable-online-update --disable-pdfium + --disable-qt5 --disable-report-builder --with-alloc=$(use jemalloc && echo "jemalloc" || echo "system") --with-build-version="Gentoo official package" @@ -446,8 +432,7 @@ src_configure() { $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(use_enable qt4 kde4) - $(use_enable qt5) + $(use_enable kde kde4) $(use_enable vlc) $(use_with coinmp system-coinmp) $(use_with googledrive gdrive-client-id ${google_default_client_id}) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index ba7d38f7d304..664bacbda8ea 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -249,7 +249,6 @@ PATCHES=( # TODO: upstream "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" - "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602 ) pkg_pretend() { -- cgit v1.2.3