| 1 |
commit: 6adbb4a43eec0e8807686a7c16e2591f472d082e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 15 19:52:16 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 15 23:12:14 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6adbb4a4 |
| 7 |
|
| 8 |
app-office/libreoffice: Add COMMIT hash to BUILD_ID |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/libreoffice-6.1.9999.ebuild | 13 +++++++++---- |
| 14 |
app-office/libreoffice/libreoffice-9999.ebuild | 13 +++++++++---- |
| 15 |
2 files changed, 18 insertions(+), 8 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/libreoffice/libreoffice-6.1.9999.ebuild b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 18 |
index 6e4ffe4f026..94aaaa087d8 100644 |
| 19 |
--- a/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 20 |
+++ b/app-office/libreoffice/libreoffice-6.1.9999.ebuild |
| 21 |
@@ -20,9 +20,8 @@ ADDONS_URI="https://dev-www.libreoffice.org/src/" |
| 22 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
| 23 |
# PATCHSET="${P}-patchset-01.tar.xz" |
| 24 |
|
| 25 |
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3" |
| 26 |
-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} |
| 27 |
-unset SCM_ECLASS |
| 28 |
+[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
| 29 |
+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 |
| 30 |
|
| 31 |
DESCRIPTION="A full office productivity suite" |
| 32 |
HOMEPAGE="https://www.libreoffice.org" |
| 33 |
@@ -294,6 +293,7 @@ src_unpack() { |
| 34 |
[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" |
| 35 |
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" |
| 36 |
git-r3_checkout "${base_uri}/${PN}/core" |
| 37 |
+ LOCOREGIT_VERSION=${EGIT_VERSION} |
| 38 |
|
| 39 |
git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" |
| 40 |
git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help |
| 41 |
@@ -365,6 +365,11 @@ src_configure() { |
| 42 |
export MOC5="$(qt5_get_bindir)/moc" |
| 43 |
fi |
| 44 |
|
| 45 |
+ local gentoo_buildid="Gentoo official package" |
| 46 |
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then |
| 47 |
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" |
| 48 |
+ fi |
| 49 |
+ |
| 50 |
# system headers/libs/...: enforce using system packages |
| 51 |
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad |
| 52 |
# --enable-cairo: ensure that cairo is always required |
| 53 |
@@ -403,7 +408,7 @@ src_configure() { |
| 54 |
--disable-qt5 |
| 55 |
--disable-report-builder |
| 56 |
--with-alloc=system |
| 57 |
- --with-build-version="Gentoo official package" |
| 58 |
+ --with-build-version="${gentoo_buildid}" |
| 59 |
--enable-extension-integration |
| 60 |
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" |
| 61 |
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" |
| 62 |
|
| 63 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 64 |
index fd88cadb857..4cf5eb3b938 100644 |
| 65 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 66 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 67 |
@@ -20,9 +20,8 @@ ADDONS_URI="https://dev-www.libreoffice.org/src/" |
| 68 |
BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
| 69 |
# PATCHSET="${P}-patchset-01.tar.xz" |
| 70 |
|
| 71 |
-[[ ${MY_PV} == *9999* ]] && SCM_ECLASS="git-r3" |
| 72 |
-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} |
| 73 |
-unset SCM_ECLASS |
| 74 |
+[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
| 75 |
+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 |
| 76 |
|
| 77 |
DESCRIPTION="A full office productivity suite" |
| 78 |
HOMEPAGE="https://www.libreoffice.org" |
| 79 |
@@ -297,6 +296,7 @@ src_unpack() { |
| 80 |
[[ ${mypv} != ${MY_PV} ]] && branch="${PN}-${mypv/./-}" |
| 81 |
git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}" |
| 82 |
git-r3_checkout "${base_uri}/${PN}/core" |
| 83 |
+ LOCOREGIT_VERSION=${EGIT_VERSION} |
| 84 |
|
| 85 |
git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master" |
| 86 |
git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help |
| 87 |
@@ -368,6 +368,11 @@ src_configure() { |
| 88 |
export MOC5="$(qt5_get_bindir)/moc" |
| 89 |
fi |
| 90 |
|
| 91 |
+ local gentoo_buildid="Gentoo official package" |
| 92 |
+ if [[ -n ${LOCOREGIT_VERSION} ]]; then |
| 93 |
+ gentoo_buildid+=" (from git: ${LOCOREGIT_VERSION})" |
| 94 |
+ fi |
| 95 |
+ |
| 96 |
# system headers/libs/...: enforce using system packages |
| 97 |
# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad |
| 98 |
# --enable-cairo: ensure that cairo is always required |
| 99 |
@@ -404,7 +409,7 @@ src_configure() { |
| 100 |
--disable-openssl |
| 101 |
--disable-pdfium |
| 102 |
--disable-report-builder |
| 103 |
- --with-build-version="Gentoo official package" |
| 104 |
+ --with-build-version="${gentoo_buildid}" |
| 105 |
--enable-extension-integration |
| 106 |
--with-external-dict-dir="${EPREFIX}/usr/share/myspell" |
| 107 |
--with-external-hyph-dir="${EPREFIX}/usr/share/myspell" |
Archives