From fe1c8b732bd548b699d4c2ef725f67f8b8c8911c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 4 May 2018 11:22:40 +0100 Subject: gentoo resync : 04.05.2018 --- app-office/libreoffice/Manifest | 4 +- app-office/libreoffice/libreoffice-6.0.9999.ebuild | 86 ++++++++++---------- app-office/libreoffice/libreoffice-9999.ebuild | 92 +++++++++++----------- 3 files changed, 89 insertions(+), 93 deletions(-) (limited to 'app-office/libreoffice') diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 30869cf684de..548d97d5ecad 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -19,6 +19,6 @@ DIST libreoffice-help-5.4.5.1.tar.xz 2343180 BLAKE2B bd36ecae88313b60e9ad220f8ce DIST libreoffice-help-6.0.3.2.tar.xz 2972952 BLAKE2B 90b62af89bbdec436e8ca5ede3aa8aa57109e22136d454850a108fd4aac1eace166432be8152d623b06ba9e04001a579b3200bbbd20caa1ac6c3b97026319dd3 SHA512 cb538553efd94c7a6f9059b6fb74351adba5449d7f4555558fd0337950528be2bbb7ddf7aaef4992eb18f432c42133d17bf8f0af9d3fe29eddd9d620ab847a40 EBUILD libreoffice-5.4.5.1.ebuild 17387 BLAKE2B 49447d04e804bb922dc23a0480c23b042feb8047ff8c3fd18ae1301e1eabf6776a9cd25718c8df8219ee2572cb6436900b7900edc59f5c945fab72e00f891102 SHA512 c5acb6351eb47e3c34dccc98c86f3eb146787a03aaf23aa195ad818719b102a26747b0de1e406845e134b27012830e8eed8abcf275e77d825225f828c67be248 EBUILD libreoffice-6.0.3.2.ebuild 16731 BLAKE2B c48eba2a33c9ef9badd692c40b3bdfaa72f8f14f02c4d65c960a21db1bd054df50c2d0fa3dcfb8496b675a5bc73476f55c90ef2d6ccfd0c2f6fb8b0970043f2d SHA512 01b3403c57518a92f1bdf9bf97130d310de2c1d5db9560f2372d20a7d06add0e2e0a4d8556642bdff7d74033e72fdae27ec37427ef25e81d8bc11ed70a5762a6 -EBUILD libreoffice-6.0.9999.ebuild 16673 BLAKE2B fe679f423f1bbd204a594999d8c536a6c82343d48adaec4e6b45e2d66b7bddec08a1b1c2d4623338ca5edc37131315878855da490d363d1bd71b7e14dd1207e7 SHA512 569e6c57c90aef81a55f0738ab4cd43204e0724121a0874a68bc51fe36df9577036390adc5508b6de9d731dd185294436f93069a95c0d6d60072d9b33d0c5127 -EBUILD libreoffice-9999.ebuild 16575 BLAKE2B 3ed50a7077744919f63574e7b5510464396dd9aeccd29bfbd77eb2b0b335b37abda7f34bdcd49768587b7a2d00dda59d10db651aa24cd32971b60a73b606d9ba SHA512 d6dd7c43ff0f0b92cbb96ce8f079f5f5b438520688ef197c9eb146f0bca53ff7431c81131ba75865a13a65372fb03cd0b5af754a692e0bd2342c854ee8921811 +EBUILD libreoffice-6.0.9999.ebuild 16671 BLAKE2B a1754528bc47efb263348c840335556661e8d558eaa20a4712e8b11740a8b3f98dba8a6c6c0fd4e6287b1906ec1469716bd287331b258b942faebfe2728a69aa SHA512 9dbcc4b34d94dcb80dda4d0e8dd15f39481447a92e0d99331cd09449a2d9be9847e206079a5b52df0d7266aeb12918171d638853bddcdc7fe3b30d57dae1f0fb +EBUILD libreoffice-9999.ebuild 16557 BLAKE2B f49927c376a1f325256ddefbd4bb7b7da135efa392bec073844470d5b7e1086fc31019786d740c2ed22ea97a26e5e5fef1cb2bec67f254a50d1a6b2950492a4d SHA512 518ce3280a8cd83a91488542083afab86f91d15c8ff384b22b7f4401ca21c111902ec7e85208d2edd1d33b7a45dd9d24424f543c90bbf0c7b2653b3644b85539 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 edf22ead40df..c29d9ffa33db 100644 --- a/app-office/libreoffice/libreoffice-6.0.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.0.9999.ebuild @@ -6,21 +6,22 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) PYTHON_REQ_USE="threads,xml" +MY_PV="${PV/_alpha/.alpha}" +MY_PV="${MY_PV/_beta/.beta}" # experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. +# 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://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src + https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ + https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src " ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" PATCHSET="${PN}-6.0.3.2-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} +[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3" +inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-utils ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="A full office productivity suite" @@ -28,14 +29,13 @@ 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! +# 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 +if [[ ${MY_PV} != *9999* ]]; then for i in ${DEV_URI}; do - SRC_URI+=" ${i}/${P}.tar.xz" - SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz" + SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" + SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" done unset i fi @@ -67,9 +67,18 @@ 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})" +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 ) +" + LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -[[ ${PV} == *9999* ]] || \ +[[ ${MY_PV} == *9999* ]] || \ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} @@ -151,12 +160,14 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf + media-libs/mesa[egl] x11-libs/gtk+:3 ) gtk2? ( x11-libs/gdk-pixbuf >=x11-libs/gtk+-2.24:2 ) + jemalloc? ( dev-libs/jemalloc ) kde? ( dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -168,7 +179,6 @@ COMMON_DEPEND="${PYTHON_DEPS} 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++ ) @@ -189,8 +199,8 @@ RDEPEND="${COMMON_DEPEND} vlc? ( media-video/vlc ) " -if [[ ${PV} != *9999* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" else # Translations are not reliable on live ebuilds # rather force people to use english only. @@ -231,15 +241,6 @@ 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 ) - libreoffice_extensions_wiki-publisher? ( java ) -" - PATCHES=( # not upstreamable stuff "${FILESDIR}/${PN}-5.4-system-pyuno.patch" @@ -252,6 +253,17 @@ PATCHES=( "${WORKDIR}"/${PATCHSET/.tar.xz/} ) +S="${WORKDIR}/${PN}-${MY_PV}" + +_check_reqs() { + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi +} + pkg_pretend() { use java || \ ewarn "If you plan to use Base application you should enable java or you will get various crashes." @@ -263,12 +275,7 @@ pkg_pretend() { fi if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi + _check_reqs check-reqs_pkg_pretend fi } @@ -279,12 +286,7 @@ pkg_setup() { xdg_environment_reset if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi + _check_reqs check-reqs_pkg_setup fi } @@ -292,12 +294,12 @@ pkg_setup() { src_unpack() { default - if [[ ${PV} = *9999* ]]; then + if [[ ${MY_PV} = *9999* ]]; then local base_uri branch mypv base_uri="https://anongit.freedesktop.org/git" branch="master" - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" + mypv=${MY_PV/.9999} + [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" git-r3_checkout "${base_uri}/${PN}/core" @@ -340,7 +342,7 @@ src_prepare() { if use branding; then # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die fi # Don't list pdfimport support in desktop when built with none, bug # 605464 @@ -554,10 +556,6 @@ src_install() { 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 diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 3799a7815c0e..45222450d1f2 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -6,36 +6,36 @@ EAPI=6 PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) PYTHON_REQ_USE="threads,xml" +MY_PV="${PV/_alpha/.alpha}" +MY_PV="${MY_PV/_beta/.beta}" # experimental ; release ; old -# Usually the tarballs are moved a lot so this should make -# everyone happy. +# 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://downloadarchive.documentfoundation.org/libreoffice/old/${PV}/src + https://download.documentfoundation.org/libreoffice/src/${MY_PV:0:5}/ + https://downloadarchive.documentfoundation.org/libreoffice/old/${MY_PV}/src " ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-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} +[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3" +inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic gnome2-utils java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg-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+=" 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! +# 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 +if [[ ${MY_PV} != *9999* ]]; then for i in ${DEV_URI}; do - SRC_URI+=" ${i}/${P}.tar.xz" - SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz" + SRC_URI+=" ${i}/${PN}-${MY_PV}.tar.xz" + SRC_URI+=" ${i}/${PN}-help-${MY_PV}.tar.xz" done unset i fi @@ -67,10 +67,19 @@ IUSE="bluetooth +branding coinmp +cups dbus debug eds firebird googledrive gstreamer +gtk gtk2 kde libressl mysql odk pdfimport postgres test vlc $(printf 'libreoffice_extensions_%s ' ${LO_EXTS})" +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 ) +" + LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" +[[ ${MY_PV} == *9999* ]] || \ +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND="${PYTHON_DEPS} app-arch/unzip @@ -151,6 +160,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-libs/glib:2 dev-libs/gobject-introspection gnome-base/dconf + media-libs/mesa[egl] x11-libs/gtk+:3 ) gtk2? ( @@ -188,8 +198,8 @@ RDEPEND="${COMMON_DEPEND} vlc? ( media-video/vlc ) " -if [[ ${PV} != *9999* ]]; then - PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*" +if [[ ${MY_PV} != *9999* ]] && [[ ${PV} != *_* ]]; then + PDEPEND="=app-office/libreoffice-l10n-$(ver_cut 1-2)*" else # Translations are not reliable on live ebuilds # rather force people to use english only. @@ -230,15 +240,6 @@ 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 ) - libreoffice_extensions_wiki-publisher? ( java ) -" - PATCHES=( # "${WORKDIR}"/${PATCHSET/.tar.xz/} @@ -250,6 +251,17 @@ PATCHES=( "${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch" ) +S="${WORKDIR}/${PN}-${MY_PV}" + +_check_reqs() { + CHECKREQS_MEMORY="512M" + if is-flagq "-g*" && ! is-flagq "-g*0" ; then + CHECKREQS_DISK_BUILD="22G" + else + CHECKREQS_DISK_BUILD="6G" + fi +} + pkg_pretend() { use java || \ ewarn "If you plan to use Base application you should enable java or you will get various crashes." @@ -261,12 +273,7 @@ pkg_pretend() { fi if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi + _check_reqs check-reqs_pkg_pretend fi } @@ -277,12 +284,7 @@ pkg_setup() { xdg_environment_reset if [[ ${MERGE_TYPE} != binary ]]; then - CHECKREQS_MEMORY="512M" - if is-flagq "-g*" && ! is-flagq "-g*0" ; then - CHECKREQS_DISK_BUILD="22G" - else - CHECKREQS_DISK_BUILD="6G" - fi + _check_reqs check-reqs_pkg_setup fi } @@ -290,12 +292,12 @@ pkg_setup() { src_unpack() { default - if [[ ${PV} = *9999* ]]; then + if [[ ${MY_PV} = *9999* ]]; then local base_uri branch mypv base_uri="https://anongit.freedesktop.org/git" branch="master" - mypv=${PV/.9999} - [[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}" + mypv=${MY_PV/.9999} + [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" git-r3_checkout "${base_uri}/${PN}/core" @@ -338,7 +340,7 @@ src_prepare() { if use branding; then # hack... - mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die + mv -v "${WORKDIR}/branding-intro.png" "icon-themes/galaxy/brand/intro.png" || die fi # Don't list pdfimport support in desktop when built with none, bug # 605464 @@ -431,9 +433,9 @@ src_configure() { $(use_enable gstreamer gstreamer-1-0) $(use_enable gtk gtk3) $(use_enable gtk2 gtk) - $(use_enable kde qt5) - $(use_enable kde kde5) $(use_enable kde gtk3-kde5) + $(use_enable kde kde5) + $(use_enable kde qt5) $(use_enable mysql ext-mariadb-connector) $(use_enable odk) $(use_enable pdfimport) @@ -553,10 +555,6 @@ src_install() { 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 -- cgit v1.2.3