| 1 |
commit: f64d9b08d20674815f5e80adca327f0a98bc0af0 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 17 22:04:23 2023 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 17 22:04:23 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f64d9b08 |
| 7 |
|
| 8 |
office-ext-r1.eclass: remove EAPI 5 |
| 9 |
|
| 10 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 11 |
|
| 12 |
eclass/office-ext-r1.eclass | 22 +++++++++++++--------- |
| 13 |
1 file changed, 13 insertions(+), 9 deletions(-) |
| 14 |
|
| 15 |
diff --git a/eclass/office-ext-r1.eclass b/eclass/office-ext-r1.eclass |
| 16 |
index 8cf472fe5bcc..abc0cabaa310 100644 |
| 17 |
--- a/eclass/office-ext-r1.eclass |
| 18 |
+++ b/eclass/office-ext-r1.eclass |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2021 Gentoo Authors |
| 21 |
+# Copyright 1999-2023 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
# @ECLASS: office-ext-r1.eclass |
| 25 |
@@ -6,18 +6,18 @@ |
| 26 |
# The office team <office@g.o> |
| 27 |
# @AUTHOR: |
| 28 |
# Tomáš Chvátal <scarabeus@g.o> |
| 29 |
-# @SUPPORTED_EAPIS: 5 7 |
| 30 |
+# @SUPPORTED_EAPIS: 7 |
| 31 |
# @BLURB: Eclass for installing libreoffice extensions |
| 32 |
# @DESCRIPTION: |
| 33 |
# Eclass for easing maintenance of libreoffice extensions. |
| 34 |
|
| 35 |
-case "${EAPI:-0}" in |
| 36 |
- 5) inherit eutils multilib ;; |
| 37 |
- 7) inherit eutils ;; |
| 38 |
- *) die "EAPI=${EAPI} is not supported" ;; |
| 39 |
+case ${EAPI} in |
| 40 |
+ 7) ;; |
| 41 |
+ *) die "${ECLASS}: EAPI ${EAPI:-0} not supported" ;; |
| 42 |
esac |
| 43 |
|
| 44 |
-EXPORT_FUNCTIONS src_unpack src_install |
| 45 |
+if [[ -z ${_OFFICE_EXT_R1_ECLASS} ]]; then |
| 46 |
+_OFFICE_EXT_R1_ECLASS=1 |
| 47 |
|
| 48 |
# @ECLASS_VARIABLE: OFFICE_REQ_USE |
| 49 |
# @PRE_INHERIT |
| 50 |
@@ -112,7 +112,7 @@ office-ext-r1_src_unpack() { |
| 51 |
for i in ${OFFICE_EXTENSIONS[@]}; do |
| 52 |
# Unpack the extensions where required and add case for oxt |
| 53 |
# which should be most common case for the extensions. |
| 54 |
- if [[ -f "${OFFICE_EXTENSIONS_LOCATION}/${i}" ]] ; then |
| 55 |
+ if [[ -f ${OFFICE_EXTENSIONS_LOCATION}/${i} ]] ; then |
| 56 |
case ${i} in |
| 57 |
*.oxt) |
| 58 |
mkdir -p "${WORKDIR}/${i}/" || die |
| 59 |
@@ -142,9 +142,13 @@ office-ext-r1_src_install() { |
| 60 |
for j in ${OFFICE_EXTENSIONS[@]}; do |
| 61 |
pushd "${WORKDIR}/${j}/" > /dev/null || die |
| 62 |
insinto /usr/$(get_libdir)/${i}/share/extensions/${j/.oxt/} |
| 63 |
- doins -r * |
| 64 |
+ doins -r . |
| 65 |
popd > /dev/null || die |
| 66 |
done |
| 67 |
fi |
| 68 |
done |
| 69 |
} |
| 70 |
+ |
| 71 |
+fi |
| 72 |
+ |
| 73 |
+EXPORT_FUNCTIONS src_unpack src_install |
Archives