| 1 |
commit: 767b00d3906d234b1165258eb0c9c59dc73f7bb7 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Mar 3 17:32:21 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Mar 11 00:17:03 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=767b00d3 |
| 7 |
|
| 8 |
app-office/libreoffice: EAPI-7 bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
app-office/libreoffice/libreoffice-6.2.9999.ebuild | 10 +++++----- |
| 14 |
app-office/libreoffice/libreoffice-9999.ebuild | 10 +++++----- |
| 15 |
2 files changed, 10 insertions(+), 10 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/libreoffice/libreoffice-6.2.9999.ebuild b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 18 |
index 4b4ea02af44..a8c322b1441 100644 |
| 19 |
--- a/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 20 |
+++ b/app-office/libreoffice/libreoffice-6.2.9999.ebuild |
| 21 |
@@ -1,7 +1,7 @@ |
| 22 |
# Copyright 1999-2019 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=6 |
| 26 |
+EAPI=7 |
| 27 |
|
| 28 |
PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
| 29 |
PYTHON_REQ_USE="threads(+),xml" |
| 30 |
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
| 31 |
PATCHSET="${PN}-6.2.1.1-patchset-01.tar.xz" |
| 32 |
|
| 33 |
[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
| 34 |
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg |
| 35 |
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg |
| 36 |
|
| 37 |
DESCRIPTION="A full office productivity suite" |
| 38 |
HOMEPAGE="https://www.libreoffice.org" |
| 39 |
@@ -554,7 +554,7 @@ src_install() { |
| 40 |
insinto /usr/$(get_libdir)/${PN}/program |
| 41 |
newins "${WORKDIR}/branding-sofficerc" sofficerc |
| 42 |
dodir /etc/env.d |
| 43 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die |
| 44 |
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die |
| 45 |
fi |
| 46 |
|
| 47 |
# Hack for offlinehelp, this needs fixing upstream at some point. |
| 48 |
@@ -563,8 +563,8 @@ src_install() { |
| 49 |
insinto /usr/$(get_libdir)/libreoffice/help |
| 50 |
doins xmlhelp/util/*.xsl |
| 51 |
|
| 52 |
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 53 |
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 54 |
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 55 |
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 56 |
} |
| 57 |
|
| 58 |
pkg_preinst() { |
| 59 |
|
| 60 |
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild |
| 61 |
index 66452c403fb..375aca4c6b2 100644 |
| 62 |
--- a/app-office/libreoffice/libreoffice-9999.ebuild |
| 63 |
+++ b/app-office/libreoffice/libreoffice-9999.ebuild |
| 64 |
@@ -1,7 +1,7 @@ |
| 65 |
# Copyright 1999-2019 Gentoo Authors |
| 66 |
# Distributed under the terms of the GNU General Public License v2 |
| 67 |
|
| 68 |
-EAPI=6 |
| 69 |
+EAPI=7 |
| 70 |
|
| 71 |
PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
| 72 |
PYTHON_REQ_USE="threads(+),xml" |
| 73 |
@@ -21,7 +21,7 @@ BRANDING="${PN}-branding-gentoo-0.8.tar.xz" |
| 74 |
# PATCHSET="${P}-patchset-01.tar.xz" |
| 75 |
|
| 76 |
[[ ${MY_PV} == *9999* ]] && inherit git-r3 |
| 77 |
-inherit autotools bash-completion-r1 check-reqs eapi7-ver flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg |
| 78 |
+inherit autotools bash-completion-r1 check-reqs flag-o-matic java-pkg-opt-2 multiprocessing pax-utils python-single-r1 qmake-utils toolchain-funcs xdg |
| 79 |
|
| 80 |
DESCRIPTION="A full office productivity suite" |
| 81 |
HOMEPAGE="https://www.libreoffice.org" |
| 82 |
@@ -552,7 +552,7 @@ src_install() { |
| 83 |
insinto /usr/$(get_libdir)/${PN}/program |
| 84 |
newins "${WORKDIR}/branding-sofficerc" sofficerc |
| 85 |
dodir /etc/env.d |
| 86 |
- echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED%/}"/etc/env.d/99${PN} || die |
| 87 |
+ echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"/etc/env.d/99${PN} || die |
| 88 |
fi |
| 89 |
|
| 90 |
# Hack for offlinehelp, this needs fixing upstream at some point. |
| 91 |
@@ -561,8 +561,8 @@ src_install() { |
| 92 |
insinto /usr/$(get_libdir)/libreoffice/help |
| 93 |
doins xmlhelp/util/*.xsl |
| 94 |
|
| 95 |
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 96 |
- pax-mark -m "${ED%/}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 97 |
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin |
| 98 |
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin |
| 99 |
} |
| 100 |
|
| 101 |
pkg_preinst() { |
Archives