| 1 |
commit: 871bc49b84d26598cbe3a3b8a792cea0cefc195d |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jan 6 12:54:26 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jan 6 12:55:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871bc49b |
| 7 |
|
| 8 |
app-office/openoffice-bin: Migrate from LINGUAS to L10N. |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/642794 |
| 11 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 12 |
|
| 13 |
.../openoffice-bin/openoffice-bin-4.1.4.ebuild | 23 ++++++++++++---------- |
| 14 |
.../openoffice-bin/openoffice-bin-4.1.5.ebuild | 23 ++++++++++++---------- |
| 15 |
2 files changed, 26 insertions(+), 20 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild |
| 18 |
index e0f27b38176..d1c65d191cd 100644 |
| 19 |
--- a/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild |
| 20 |
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI="5" |
| 27 |
@@ -30,13 +30,13 @@ SRC_URI="amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_install-rpm |
| 28 |
x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )" |
| 29 |
|
| 30 |
# TODO: supports ca_XR (Valencian RACV) locale too |
| 31 |
-LANGS="ast eu bg ca ca_XV zh_CN zh_TW cs da nl en_GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt_BR pt ru sr sk sl es sv ta th tr vi" |
| 32 |
+LANGS="ast eu bg ca ca-valencia zh-CN zh-TW cs da nl en-GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt-BR pt ru sr sk sl es sv ta th tr vi" |
| 33 |
|
| 34 |
for X in ${LANGS} ; do |
| 35 |
- [[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? ( |
| 36 |
- amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz ) |
| 37 |
- x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz ) )" |
| 38 |
- IUSE="${IUSE} linguas_${X}" |
| 39 |
+ IUSE="${IUSE} l10n_${X}" |
| 40 |
+ SRC_URI+=" l10n_${X}? ( |
| 41 |
+ amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) |
| 42 |
+ x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) )" |
| 43 |
done |
| 44 |
|
| 45 |
LICENSE="Apache-2.0" |
| 46 |
@@ -97,10 +97,13 @@ src_unpack() { |
| 47 |
done |
| 48 |
|
| 49 |
# Localization |
| 50 |
- strip-linguas ${LANGS} |
| 51 |
- for l in ${LINGUAS}; do |
| 52 |
- m="${l/_/-}" |
| 53 |
- if [[ ${m} != "en" ]] ; then |
| 54 |
+ for l in ${LANGS}; do |
| 55 |
+ if use l10n_${l}; then |
| 56 |
+ # Map ca-valencia to ca-XV used by upstream |
| 57 |
+ case ${l} in |
| 58 |
+ ca-valencia) m=ca-XV ;; |
| 59 |
+ *) m=${l} ;; |
| 60 |
+ esac |
| 61 |
LANGDIR="${m}/RPMS/" |
| 62 |
rpm_unpack "./${LANGDIR}/${NM}-${m}-${BVER}.${XARCH}.rpm" |
| 63 |
rpm_unpack "./${LANGDIR}/${NM1}-${m}-${BVER}.${XARCH}.rpm" |
| 64 |
|
| 65 |
diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild |
| 66 |
index aafe4dbbad2..6f9e2d38cea 100644 |
| 67 |
--- a/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild |
| 68 |
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild |
| 69 |
@@ -1,4 +1,4 @@ |
| 70 |
-# Copyright 1999-2017 Gentoo Foundation |
| 71 |
+# Copyright 1999-2018 Gentoo Foundation |
| 72 |
# Distributed under the terms of the GNU General Public License v2 |
| 73 |
|
| 74 |
EAPI="5" |
| 75 |
@@ -30,13 +30,13 @@ SRC_URI="amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_install-rpm |
| 76 |
x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )" |
| 77 |
|
| 78 |
# TODO: supports ca_XR (Valencian RACV) locale too |
| 79 |
-LANGS="ast eu bg ca ca_XV zh_CN zh_TW cs da nl en_GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt_BR pt ru sr sk sl es sv ta th tr vi" |
| 80 |
+LANGS="ast eu bg ca ca-valencia zh-CN zh-TW cs da nl en-GB fi fr gd gl de el he hi hu it ja km ko lt nb pl pt-BR pt ru sr sk sl es sv ta th tr vi" |
| 81 |
|
| 82 |
for X in ${LANGS} ; do |
| 83 |
- [[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? ( |
| 84 |
- amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz ) |
| 85 |
- x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz ) )" |
| 86 |
- IUSE="${IUSE} linguas_${X}" |
| 87 |
+ IUSE="${IUSE} l10n_${X}" |
| 88 |
+ SRC_URI+=" l10n_${X}? ( |
| 89 |
+ amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) |
| 90 |
+ x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) )" |
| 91 |
done |
| 92 |
|
| 93 |
LICENSE="Apache-2.0" |
| 94 |
@@ -97,10 +97,13 @@ src_unpack() { |
| 95 |
done |
| 96 |
|
| 97 |
# Localization |
| 98 |
- strip-linguas ${LANGS} |
| 99 |
- for l in ${LINGUAS}; do |
| 100 |
- m="${l/_/-}" |
| 101 |
- if [[ ${m} != "en" ]] ; then |
| 102 |
+ for l in ${LANGS}; do |
| 103 |
+ if use l10n_${l}; then |
| 104 |
+ # Map ca-valencia to ca-XV used by upstream |
| 105 |
+ case ${l} in |
| 106 |
+ ca-valencia) m=ca-XV ;; |
| 107 |
+ *) m=${l} ;; |
| 108 |
+ esac |
| 109 |
LANGDIR="${m}/RPMS/" |
| 110 |
rpm_unpack "./${LANGDIR}/${NM}-${m}-${BVER}.${XARCH}.rpm" |
| 111 |
rpm_unpack "./${LANGDIR}/${NM1}-${m}-${BVER}.${XARCH}.rpm" |
Archives