diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-18 09:38:27 +0000 |
commit | 536c3711867ec947c1738f2c4b96f22e4863322d (patch) | |
tree | 697733f5cb713908dcf378e13fd15a798a906a91 /app-office/libreoffice/libreoffice-9999.ebuild | |
parent | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff) |
gentoo resync : 18.11.2018
Diffstat (limited to 'app-office/libreoffice/libreoffice-9999.ebuild')
-rw-r--r-- | app-office/libreoffice/libreoffice-9999.ebuild | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index e78bc21416fe..4cf5eb3b938f 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -20,9 +20,8 @@ ADDONS_URI="https://dev-www.libreoffice.org/src/" BRANDING="${PN}-branding-gentoo-0.8.tar.xz" # PATCHSET="${P}-patchset-01.tar.xz" -[[ ${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 +[[ ${MY_PV} == *9999* ]] && inherit 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 DESCRIPTION="A full office productivity suite" HOMEPAGE="https://www.libreoffice.org" @@ -251,9 +250,6 @@ 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" ) S="${WORKDIR}/${PN}-${MY_PV}" @@ -300,6 +296,7 @@ src_unpack() { [[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" git-r3_checkout "${base_uri}/${PN}/core" + LOCOREGIT_VERSION=${EGIT_VERSION} git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help @@ -371,6 +368,11 @@ src_configure() { export MOC5="$(qt5_get_bindir)/moc" fi + local gentoo_buildid="Gentoo official package" + if [[ -n ${LOCOREGIT_VERSION} ]]; then + gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" + 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 @@ -407,7 +409,7 @@ src_configure() { --disable-openssl --disable-pdfium --disable-report-builder - --with-build-version="Gentoo official package" + --with-build-version="${gentoo_buildid}" --enable-extension-integration --with-external-dict-dir="${EPREFIX}/usr/share/myspell" --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" |