From 4650985dd0e898b82e0d2ec225931297d4fadccf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 31 Jan 2018 20:30:04 +0000 Subject: gentoo resync : 31.01.2018 --- app-office/libreoffice/Manifest | 8 +- app-office/libreoffice/libreoffice-6.0.0.3.ebuild | 569 +++++++++++++++++++++ app-office/libreoffice/libreoffice-6.0.9999.ebuild | 45 +- app-office/libreoffice/libreoffice-9999.ebuild | 15 +- 4 files changed, 606 insertions(+), 31 deletions(-) create mode 100644 app-office/libreoffice/libreoffice-6.0.0.3.ebuild (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index f64f4211471d..e9f372a70dcb 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -12,12 +12,16 @@ DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 BLAKE2B d2769842c18 DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 BLAKE2B 51db6bd90585b13857ecb494c805c9fb6874e1e65d7aee73d23e1716670836a14b376bcca810f96fd55b0ed653b2660a268030f246c822cbb04f867ef763a3b3 SHA512 2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a DIST libreoffice-5.4.2.2.tar.xz 192795940 BLAKE2B 35672c2d7c78b5aca71e4f492dd41475f4da0ca01433c0d05a811bfee39467c037e510552258b149f463f0c05dec83d2d7109342b88bc7d7775a51bf6831891a SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c DIST libreoffice-5.4.4.2.tar.xz 193657116 BLAKE2B 1be8565481bbdf930f6bbbd894dbe5d0be7faeba068517e15a2b23acfd2d8d06960e5991fd9d990c49ad13857177020e22fdb5c272587bc25cac4bdf23bb7fa1 SHA512 f7142fd73aa037b0bbffd3fa5af58049ab6688900976296ba2e53956227aef8920cb229aad4eec05ff36c8dde584415f7893893cc81cac72b305f67b80e36882 +DIST libreoffice-6.0.0.3-patchset-01.tar.xz 33032 BLAKE2B 1fad88d703b9ff097a6870d6f74731de3e6bd5f7b91938e674b28bf82bae0b075d910a930b2e3c82fc1ff5dff81f13575fed351f8165cec67903e8949e06b9d4 SHA512 2fb4f02e93b648fbf611b62ad8bfe93fd4b228bee84612a9d62e9bc061cabf51ae76d7d9cbfbad186669db109fe829765c816eb27960f97ca37e7fe0536d72e9 +DIST libreoffice-6.0.0.3.tar.xz 203284136 BLAKE2B 2d8190499439addddfa017f12b22c4b80001169af5021a546cdbf5eaea3c47a2ac1d190e98efe5022050431805417824c29295068631ec596a6357b13528c52d SHA512 2b2c0fafec5db23317a2c3236b482b0cef9c0edfabab94495a0fd3007b271eaa1dbfa97711819b3b8fb2e2375fbdfb4c662df4ffc8c519255ac84357b4c45e62 DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 BLAKE2B f03c7ddeb53c5ca3fd23401679601fcf2c4037ba17be4eb7b784c7ce7ebb71a24b8ab4aac8b7da8c6b1f14dd23bc1294ba85ff4f70ad271fb4ee3c5372e10883 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f DIST libreoffice-help-5.4.2.2.tar.xz 2343504 BLAKE2B 7d446d5b078adc8943be3fced92f367101f84c8639b84d86a1b8c2386d8aeec61dc01706078cbb251ad81abebb914acc7f5e977aa17fcd1f55db65c0861814e2 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112 DIST libreoffice-help-5.4.4.2.tar.xz 2343352 BLAKE2B d94528f6dcc85730f2443f3a84beff0cd113bb9c423d767c74d831649e56b0c92279474a0f1169ebc0ffd7804d57dba86aaa352e7fd1d9df9721f3ff6059047c SHA512 55abdde1cf0f62d213a897cc30b92ae04960c9b1e6e69c4f86242d2beecd787f44be9c3d0c8684d775ffe40b17d685a71739c9c2f08753649c4e1298fdf94226 +DIST libreoffice-help-6.0.0.3.tar.xz 2972556 BLAKE2B 6805f6a28cf29c6d55732051763f12ad2dc2c76c27c518dc40b85f2ef8f7ad4943de3a55629da4de77ee1ebd3b62a8e225e0ee260081f3c25cbffc60a21970c1 SHA512 9058edf71e34e55e23f5559af94d12d5f12c38385b30d75919283f435eac07dfc790d116b556aca0d0aa30f5119aea39f07a123a1f1e5ad172f5b19b3f7dc4b0 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 16476 BLAKE2B 1fd7de3ce7a351fb0f65831e28cd8e3768144f9f861fe5a69d4821f65ec4d419989259fbd48500c31a460c18629fb516adc147375bae73453dffab8441caf3fa SHA512 bd2eff8e04a3569d88d83a11af8389576fee8a364db5c54ed24da533846c14536bcf5f3877c35742ef4f2608f2f34d97593de020be5fe9e1051b77012f5019ad -EBUILD libreoffice-9999.ebuild 16574 BLAKE2B 409d86e1d165ec3e40e72e5cc8e1c150ab1903fe68f46565cb2ada5428f2124e95b6bcafe87cc5017550f952ae5852bb0162e9740aef6fc4e91109e203eb9b73 SHA512 6c26fccf3293d87f8a4be53ecc0261cd36f8db8a1844121397af7afd8787ae1ca7fdb01a70f64f4b18095ff130afc8f8140e2b24ee39c182f206c7c01a93751c +EBUILD libreoffice-6.0.0.3.ebuild 16584 BLAKE2B 578987c8621f47c5cd72830e622f688f62a8a9859d2dc0c9194d1052512aed93211643cbd596ef3b525657680191c66d558da2a1d63934e050ba45764db3c7ac SHA512 e72118b60e4cc70a8a94d7d0404d292759c7b073625bdadafe946a445102b1b9553004e63cb0e5ba11fa07054b384c8d80fd76567d9a7ca8116491f9b841547b +EBUILD libreoffice-6.0.9999.ebuild 16570 BLAKE2B c9cec097591e7fc082a3bdd706f0546f072414a904b8c924b43487644af3883d93c7dbfd43e63b287425520c99ec20efc6364d3c14b2e9229414c9f5229df74d SHA512 df05d7b8923e9ec013c7f8af481b7a56781a80fbd68469665b2cadc58b29409fd01f5b2fe355a9cb173fec7d51bf240c3478d68b0da65da01c3aa98456525abd +EBUILD libreoffice-9999.ebuild 16399 BLAKE2B 6d80bd72a3704f1e2e5316999b9b0a80145f1ac9127caaed496e1178e5be43e8b59c097e054dc7af2197fa121bcd1a7b1e8cbaf9b42c7e5a897f0c8e5d3de79e SHA512 5c09becaad0e632822d5a08e18f40a15eb078531cb1eaf54fa33cc31588994a650a44f928d85b73ff67e14f4f8b605dd4c039cea75674ac01719306d048c390f MISC metadata.xml 1443 BLAKE2B cbf2c4306fdcde291bcb0692af7dc9f43f1eaf05fe93d6faffbc85833dc4d5ae653cc299a9bdb55dfb335c8aff316893a72ac48488fb372f667f81212648fe75 SHA512 df37d47b0f2f9f9c229b0d558d69fcda897a54b8ef1584d9940a7817885d52aa6b17b1879cf3103a9129fcac0611b4fe49213876bd2e446c70e57735a144b323 diff --git a/app-office/libreoffice/libreoffice-6.0.0.3.ebuild b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild new file mode 100644 index 000000000000..c42d12a1a852 --- /dev/null +++ b/app-office/libreoffice/libreoffice-6.0.0.3.ebuild @@ -0,0 +1,569 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) +PYTHON_REQ_USE="threads,xml" + +# experimental ; release ; old +# Usually the tarballs are moved a lot so this should make +# everyone happy. +DEV_URI=" + https://dev-builds.libreoffice.org/pre-releases/src + https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/ + https://download.documentfoundation.org/libreoffice/old/${PV}/ +" +ADDONS_URI="https://dev-www.libreoffice.org/src/" + +BRANDING="${PN}-branding-gentoo-0.8.tar.xz" +PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz" + +[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" +inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS} +unset SCM_ECLASS + +DESCRIPTION="A full office productivity suite" +HOMEPAGE="https://www.libreoffice.org" +SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" +[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" + +# Split modules following git/tarballs +# Core MUST be first! +# Help is used for the image generator +# Only release has the tarballs +if [[ ${PV} != *9999* ]]; then + for i in ${DEV_URI}; do + SRC_URI+=" ${i}/${P}.tar.xz" + SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz" + done + unset i +fi +unset DEV_URI + +# Really required addons +# These are bundles that can't be removed for now due to huge patchsets. +# If you want them gone, patches are welcome. +ADDONS_SRC=( + "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" + # no release for 8 years, should we package it? + "libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" + # Does not build with 1.6 rhino at all + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" + # requirement of rhino + "libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" + # not packageable + "odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )" +) +SRC_URI+=" ${ADDONS_SRC[*]}" + +unset ADDONS_URI +unset ADDONS_SRC + +# Extensions that need extra work: +LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher" + +IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive +gstreamer +gtk gtk2 jemalloc kde libressl mysql odk pdfimport postgres test vlc +$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +[[ ${PV} == *9999* ]] || \ +KEYWORDS="" +# KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +COMMON_DEPEND="${PYTHON_DEPS} + app-arch/unzip + app-arch/zip + app-crypt/gpgme[cxx] + app-text/hunspell:= + >=app-text/libabw-0.1.0 + >=app-text/libebook-0.1 + app-text/libepubgen + >=app-text/libetonyek-0.1 + app-text/libexttextcat + app-text/liblangtag + >=app-text/libmspub-0.1.0 + >=app-text/libmwaw-0.3.1 + >=app-text/libodfgen-0.1.0 + app-text/libqxp + app-text/libstaroffice + app-text/libwpd:0.10[tools] + app-text/libwpg:0.3 + >=app-text/libwps-0.4 + app-text/mythes + >=dev-cpp/clucene-2.3.3.4-r2 + =dev-cpp/libcmis-0.5* + dev-db/unixODBC + dev-lang/perl + dev-libs/boost:= + dev-libs/expat + dev-libs/hyphen + dev-libs/icu:= + dev-libs/libassuan + dev-libs/libgpg-error + =dev-libs/liborcus-0.13* + dev-libs/librevenge + dev-libs/nspr + dev-libs/nss + !libressl? ( >=dev-libs/openssl-1.0.0d:0 ) + libressl? ( dev-libs/libressl ) + >=dev-libs/redland-1.0.16 + >=dev-libs/xmlsec-1.2.24[nss] + media-gfx/graphite2 + media-libs/fontconfig + media-libs/freetype:2 + >=media-libs/harfbuzz-0.9.42:=[graphite,icu] + media-libs/lcms:2 + >=media-libs/libcdr-0.1.0 + >=media-libs/libepoxy-1.3.1[X] + >=media-libs/libfreehand-0.1.0 + media-libs/libpagemaker + >=media-libs/libpng-1.4:0= + >=media-libs/libvisio-0.1.0 + media-libs/libzmf + net-libs/neon + net-misc/curl + net-nds/openldap + sci-mathematics/lpsolve + virtual/glu + virtual/jpeg:0 + virtual/opengl + x11-libs/cairo[X] + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + bluetooth? ( net-wireless/bluez ) + coinmp? ( sci-libs/coinor-mp ) + cups? ( net-print/cups ) + dbus? ( dev-libs/dbus-glib ) + eds? ( + dev-libs/glib:2 + gnome-base/dconf + gnome-extra/evolution-data-server + ) + firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 ) + gstreamer? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + gtk? ( + 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 + ) + 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 + ) + jemalloc? ( dev-libs/jemalloc ) + 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} + !app-office/libreoffice-bin + !app-office/libreoffice-bin-debug + !app-office/openoffice + media-fonts/dejavu + media-fonts/liberation-fonts + media-fonts/libertine + || ( x11-misc/xdg-utils kde-plasma/kde-cli-tools ) + java? ( >=virtual/jre-1.6 ) + kde? ( kde-frameworks/oxygen-icons:* ) + vlc? ( media-video/vlc ) +" + +if [[ ${PV} != *9999* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" +else + # Translations are not reliable on live ebuilds + # rather force people to use english only. + PDEPEND="!app-office/libreoffice-l10n" +fi + +# FIXME: cppunit should be moved to test conditional +# after everything upstream is under gbuild +# as dmake execute tests right away +DEPEND="${COMMON_DEPEND} + !=dev-libs/libatomic_ops-7.2d + >=dev-libs/libxml2-2.7.8 + dev-libs/libxslt + dev-perl/Archive-Zip + >=dev-util/cppunit-1.14.0 + >=dev-util/gperf-3 + dev-util/intltool + >=dev-util/mdds-1.2.3:1= + media-libs/glm + sys-devel/bison + sys-devel/flex + sys-devel/gettext + sys-devel/ucpp + sys-libs/zlib + virtual/pkgconfig + x11-libs/libXt + x11-libs/libXtst + x11-proto/randrproto + x11-proto/xextproto + x11-proto/xineramaproto + x11-proto/xproto + java? ( + dev-java/ant-core + >=virtual/jdk-1.6 + ) + odk? ( >=app-doc/doxygen-1.8.4 ) + test? ( + dev-util/cppunit + media-fonts/dejavu + ) +" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + bluetooth? ( dbus ) + kde? ( gtk ) + libreoffice_extensions_nlpsolver? ( java ) + libreoffice_extensions_scripting-beanshell? ( java ) + libreoffice_extensions_scripting-javascript? ( java ) + libreoffice_extensions_wiki-publisher? ( java ) +" + +PATCHES=( + # not upstreamable stuff + "${FILESDIR}/${PN}-5.4-system-pyuno.patch" + "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" + + # TODO: upstream + "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" + "${FILESDIR}/${PN}-6.0.0.1-poppler-0.62.patch" # bug 642602 + + # gtk3-kde5 vcl plugin backported from master + "${WORKDIR}"/${PATCHSET/.tar.xz/} +) + +pkg_pretend() { + use java || \ + ewarn "If you plan to use Base application you should enable java or you will get various crashes." + + if has_version "/dev/null) + --with-jvm-path="${EPREFIX}/usr/lib/" + ) + + use libreoffice_extensions_scripting-beanshell && \ + myeconfargs+=( --with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar) ) + + use libreoffice_extensions_scripting-javascript && \ + myeconfargs+=( --with-rhino-jar=$(java-pkg_getjar rhino-1.6 js.jar) ) + fi + + econf "${myeconfargs[@]}" +} + +src_compile() { + # more and more LO stuff tries to use OpenGL, including tests during build + # bug 501508, bug 540624, bug 545974 and probably more + addpredict /dev/dri + addpredict /dev/ati + addpredict /dev/nvidiactl + + # hack for offlinehelp, this needs fixing upstream at some point + # it is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + ( + grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk" || die + source "${T}/config_host.mk" 2&> /dev/null + + local path="${WORKDIR}/helpcontent2/source/auxiliary/" + mkdir -p "${path}" || die + + echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" -dir=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\"" + perl "${S}/helpcontent2/helpers/create_ilst.pl" \ + -dir=helpcontent2/source/media/helpimg \ + > "${path}/helpimg.ilst" + [[ -s "${path}/helpimg.ilst" ]] || \ + ewarn "The help images list is empty, something is fishy, report a bug." + ) + + local target + use test && target="build" || target="build-nocheck" + + # this is not a proper make script + make ${target} || die +} + +src_test() { + make unitcheck || die + make slowcheck || die +} + +src_install() { + # This is not Makefile so no buildserver + make DESTDIR="${D}" distro-pack-install -o build -o check || die + + # bug 593514 + if use gtk; then + dosym libreoffice/program/liblibreofficekitgtk.so \ + /usr/$(get_libdir)/liblibreofficekitgtk.so + fi + + # bash completion aliases + bashcomp_alias \ + libreoffice \ + unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice + + if use branding; then + insinto /usr/$(get_libdir)/${PN}/program + newins "${WORKDIR}/branding-sofficerc" sofficerc + dodir /etc/env.d + echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die + fi + + # Hack for offlinehelp, this needs fixing upstream at some point. + # It is broken because we send --without-help + # https://bugs.freedesktop.org/show_bug.cgi?id=46506 + insinto /usr/$(get_libdir)/libreoffice/help + doins xmlhelp/util/*.xsl + + pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin + pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} diff --git a/app-office/libreoffice/libreoffice-6.0.9999.ebuild b/app-office/libreoffice/libreoffice-6.0.9999.ebuild index 90f72941a9bd..4ef05313f50d 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -17,7 +17,7 @@ DEV_URI=" ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" -# PATCHSET="${P}-patchset-01.tar.xz" +PATCHSET="${PN}-6.0.0.3-patchset-01.tar.xz" [[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3" inherit multiprocessing autotools bash-completion-r1 check-reqs gnome2-utils java-pkg-opt-2 pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS} @@ -26,7 +26,7 @@ unset SCM_ECLASS DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" SRC_URI="branding? ( https://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )" -[[ -n ${PATCHSET} ]] && SRC_URI+=" http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}" +[[ -n ${PATCHSET} ]] && SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}" # Split modules following git/tarballs # Core MUST be first! @@ -157,17 +157,23 @@ COMMON_DEPEND="${PYTHON_DEPS} x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) + 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 + ) jemalloc? ( dev-libs/jemalloc ) 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] ) - kde? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - kde-frameworks/kdelibs - ) " RDEPEND="${COMMON_DEPEND} @@ -230,6 +236,7 @@ DEPEND="${COMMON_DEPEND} REQUIRED_USE="${PYTHON_REQUIRED_USE} bluetooth? ( dbus ) + kde? ( gtk ) libreoffice_extensions_nlpsolver? ( java ) libreoffice_extensions_scripting-beanshell? ( java ) libreoffice_extensions_scripting-javascript? ( java ) @@ -244,6 +251,9 @@ 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 + + # gtk3-kde5 vcl plugin backported from master + "${WORKDIR}"/${PATCHSET/.tar.xz/} ) pkg_pretend() { @@ -284,13 +294,9 @@ pkg_setup() { } src_unpack() { - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" + default - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - unpack "${PN}-help-${PV}.tar.xz" - else + if [[ ${PV} = *9999* ]]; then local base_uri branch mypv base_uri="https://anongit.freedesktop.org/git" branch="master" @@ -305,7 +311,6 @@ src_unpack() { } src_prepare() { - [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}" default AT_M4DIR="m4" eautoreconf @@ -360,9 +365,9 @@ src_configure() { export PYTHON_LIBS=$(python_get_LIBS) if use kde; then - # bug 544108, bug 599076 - export QMAKE4="$(qt4_get_bindir)/qmake" - export MOCQT4="$(qt4_get_bindir)/moc" + export QT_SELECT=5 # bug 639620 needs proper fix though + export QT5DIR="$(qt5_get_bindir)/../" + export MOC5="$(qt5_get_bindir)/moc" fi # system headers/libs/...: enforce using system packages @@ -398,7 +403,6 @@ 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" @@ -421,18 +425,19 @@ src_configure() { $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp) $(use_enable cups) - $(use_enable debug) $(use_enable dbus) + $(use_enable debug) $(use_enable eds evolution2) $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) $(use_enable gtk2 gtk) + $(use_enable kde gtk3-kde5) + $(use_enable kde qt5) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) $(use_enable postgres postgresql-sdbc) - $(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 1142e018d213..4869257cf96d 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -96,7 +96,7 @@ COMMON_DEPEND="${PYTHON_DEPS} =dev-cpp/libcmis-0.5* dev-db/unixODBC dev-lang/perl - >=dev-libs/boost-1.65.0:= + dev-libs/boost:= dev-libs/expat dev-libs/hyphen dev-libs/icu:= @@ -243,6 +243,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE} " PATCHES=( + # "${WORKDIR}"/${PATCHSET/.tar.xz/} + # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch" @@ -289,13 +291,9 @@ pkg_setup() { } src_unpack() { - [[ -n ${PATCHSET} ]] && unpack ${PATCHSET} - use branding && unpack "${BRANDING}" + default - if [[ ${PV} != *9999* ]]; then - unpack "${P}.tar.xz" - unpack "${PN}-help-${PV}.tar.xz" - else + if [[ ${PV} = *9999* ]]; then local base_uri branch mypv base_uri="https://anongit.freedesktop.org/git" branch="master" @@ -310,7 +308,6 @@ src_unpack() { } src_prepare() { - [[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}" default AT_M4DIR="m4" eautoreconf @@ -425,8 +422,8 @@ src_configure() { $(use_enable bluetooth sdremote-bluetooth) $(use_enable coinmp) $(use_enable cups) - $(use_enable debug) $(use_enable dbus) + $(use_enable debug) $(use_enable eds evolution2) $(use_enable firebird firebird-sdbc) $(use_enable gstreamer gstreamer-1-0) -- cgit v1.2.3