From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E5045138334 for ; Thu, 15 Nov 2018 23:12:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DC26E094B; Thu, 15 Nov 2018 23:12:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62B3FE094B for ; Thu, 15 Nov 2018 23:12:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D1F40335C58 for ; Thu, 15 Nov 2018 23:12:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91A8046C for ; Thu, 15 Nov 2018 23:12:53 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1542323534.6adbb4a43eec0e8807686a7c16e2591f472d082e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/libreoffice-6.1.9999.ebuild app-office/libreoffice/libreoffice-9999.ebuild X-VCS-Directories: app-office/libreoffice/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 6adbb4a43eec0e8807686a7c16e2591f472d082e X-VCS-Branch: master Date: Thu, 15 Nov 2018 23:12:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4d942452-e55b-4dc6-a6dd-e49a52c0cb14 X-Archives-Hash: 2ac99d9f5ea4d8f02aa3612b1fb947cd commit: 6adbb4a43eec0e8807686a7c16e2591f472d082e Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Nov 15 19:52:16 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Nov 15 23:12:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6adbb4a4 app-office/libreoffice: Add COMMIT hash to BUILD_ID Package-Manager: Portage-2.3.51, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/libreoffice/libreoffice-6.1.9999.ebuild | 13 +++++++++---- app-office/libreoffice/libreoffice-9999.ebuild | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild index 6e4ffe4f026..94aaaa087d8 100644 --- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild +++ b/app-office/libreoffice/libreoffice-6.1.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" @@ -294,6 +293,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 @@ -365,6 +365,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 @@ -403,7 +408,7 @@ src_configure() { --disable-qt5 --disable-report-builder --with-alloc=system - --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" diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index fd88cadb857..4cf5eb3b938 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" @@ -297,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 @@ -368,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 @@ -404,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"