[gentoo-commits] repo/gentoo:master commit in: app-office/openoffice-bin/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/openoffice-bin/
Date: Sat,  6 Jan 2018 12:56:29 +0000 (UTC)	[thread overview]
Message-ID: <1515243339.871bc49b84d26598cbe3a3b8a792cea0cefc195d.ulm@gentoo> (raw)

commit:     871bc49b84d26598cbe3a3b8a792cea0cefc195d
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  6 12:54:26 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Jan  6 12:55:39 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=871bc49b

app-office/openoffice-bin: Migrate from LINGUAS to L10N.

Closes: https://bugs.gentoo.org/642794
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../openoffice-bin/openoffice-bin-4.1.4.ebuild     | 23 ++++++++++++----------
 .../openoffice-bin/openoffice-bin-4.1.5.ebuild     | 23 ++++++++++++----------
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild
index e0f27b38176..d1c65d191cd 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -30,13 +30,13 @@ SRC_URI="amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_install-rpm
 	x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )"
 
 # TODO: supports ca_XR (Valencian RACV) locale too
-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"
+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"
 
 for X in ${LANGS} ; do
-	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
-		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz )
-		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz ) )"
-	IUSE="${IUSE} linguas_${X}"
+	IUSE="${IUSE} l10n_${X}"
+	SRC_URI+=" l10n_${X}? (
+		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz )
+		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) )"
 done
 
 LICENSE="Apache-2.0"
@@ -97,10 +97,13 @@ src_unpack() {
 	done
 
 	# Localization
-	strip-linguas ${LANGS}
-	for l in ${LINGUAS}; do
-		m="${l/_/-}"
-		if [[ ${m} != "en" ]] ; then
+	for l in ${LANGS}; do
+		if use l10n_${l}; then
+			# Map ca-valencia to ca-XV used by upstream
+			case ${l} in
+				ca-valencia) m=ca-XV ;;
+				*) m=${l} ;;
+			esac
 			LANGDIR="${m}/RPMS/"
 			rpm_unpack "./${LANGDIR}/${NM}-${m}-${BVER}.${XARCH}.rpm"
 			rpm_unpack "./${LANGDIR}/${NM1}-${m}-${BVER}.${XARCH}.rpm"

diff --git a/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild b/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
index aafe4dbbad2..6f9e2d38cea 100644
--- a/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-4.1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -30,13 +30,13 @@ SRC_URI="amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_install-rpm
 	x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_install-rpm_en-US.tar.gz )"
 
 # TODO: supports ca_XR (Valencian RACV) locale too
-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"
+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"
 
 for X in ${LANGS} ; do
-	[[ ${X} != "en" ]] && SRC_URI="${SRC_URI} linguas_${X}? (
-		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/_/-}.tar.gz )
-		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/_/-}.tar.gz ) )"
-	IUSE="${IUSE} linguas_${X}"
+	IUSE="${IUSE} l10n_${X}"
+	SRC_URI+=" l10n_${X}? (
+		amd64? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86-64_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz )
+		x86? ( "${FILEPATH}"/Apache_OpenOffice_${PV}_Linux_x86_langpack-rpm_${X/ca-valencia/ca-XV}.tar.gz ) )"
 done
 
 LICENSE="Apache-2.0"
@@ -97,10 +97,13 @@ src_unpack() {
 	done
 
 	# Localization
-	strip-linguas ${LANGS}
-	for l in ${LINGUAS}; do
-		m="${l/_/-}"
-		if [[ ${m} != "en" ]] ; then
+	for l in ${LANGS}; do
+		if use l10n_${l}; then
+			# Map ca-valencia to ca-XV used by upstream
+			case ${l} in
+				ca-valencia) m=ca-XV ;;
+				*) m=${l} ;;
+			esac
 			LANGDIR="${m}/RPMS/"
 			rpm_unpack "./${LANGDIR}/${NM}-${m}-${BVER}.${XARCH}.rpm"
 			rpm_unpack "./${LANGDIR}/${NM1}-${m}-${BVER}.${XARCH}.rpm"

next             reply	other threads:[~2018-01-06 12:56 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-06 12:56 Ulrich Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-10-24  5:53 [gentoo-commits] repo/gentoo:master commit in: app-office/openoffice-bin/ Chí-Thanh Christopher Nguyễn
2019-10-21 12:31 Thomas Deutschmann
2019-10-21 12:14 Agostino Sarubbo
2019-10-18 11:55 Chí-Thanh Christopher Nguyễn
2019-10-01 19:14 Michał Górny
2019-08-30 14:30 Michał Górny
2019-08-29 11:39 David Seifert
2019-08-11 11:50 David Seifert
2019-02-15 19:36 Chí-Thanh Christopher Nguyễn
2019-02-15 18:21 Thomas Deutschmann
2019-02-06 11:51 Mikle Kolyada
2019-01-25 20:52 Chí-Thanh Christopher Nguyễn
2018-06-23 18:01 Mikle Kolyada
2017-12-31  0:42 Chí-Thanh Christopher Nguyễn
2017-12-26  2:57 Chí-Thanh Christopher Nguyễn
2017-12-20 13:09 Agostino Sarubbo
2017-12-14 13:51 Chí-Thanh Christopher Nguyễn
2017-03-10 11:13 Chí-Thanh Christopher Nguyễn
2017-03-10 10:59 Agostino Sarubbo
2017-03-10  9:09 Agostino Sarubbo
2017-03-06 15:07 Chí-Thanh Christopher Nguyễn
2016-11-04  7:54 Aaron Bauman
2015-11-11 15:01 Agostino Sarubbo
2015-11-11 15:00 Agostino Sarubbo
2015-11-06 16:19 Chí-Thanh Christopher Nguyễn

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:e0f27b3817 dfblob:d1c65d191c dfblob:aafe4dbbad
dfblob:6f9e2d38ce )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: app-office/openoffice-bin/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1515243339.871bc49b84d26598cbe3a3b8a792cea0cefc195d.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox