[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-l10n/ - gentoo-commits

From:	"Ulrich Müller" <ulm@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice-l10n/
Date:	Sun, 26 Jun 2016 15:31:26
Message-Id:	`1466955038.043073aac93055f0c37cfbd63b52d69d838b1e95.ulm@gentoo`

1

commit:     043073aac93055f0c37cfbd63b52d69d838b1e95

2

Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>

3

AuthorDate: Sun Jun 26 07:10:33 2016 +0000

4

Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>

5

CommitDate: Sun Jun 26 15:30:38 2016 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043073aa

7

8

app-office/libreoffice-l10n: Migrate from LINGUAS to L10N.

9

10

Bug: 587114

11

12

Package-Manager: portage-2.3.0

13

14

 .../libreoffice-l10n-5.0.5.2.ebuild                | 34 ++++++++++------------

15

 .../libreoffice-l10n-5.1.2.2.ebuild                | 34 ++++++++++------------

16

 .../libreoffice-l10n-5.1.3.2.ebuild                | 34 ++++++++++------------

17

 app-office/libreoffice-l10n/metadata.xml           |  4 ---

18

 4 files changed, 48 insertions(+), 58 deletions(-)

19

20

diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild

21

index d44da2e..4d5bced 100644

22

--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild

23

+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild

24

@@ -21,23 +21,22 @@ IUSE="offlinehelp"

25

#

26

 # when changing the language lists, please be careful to preserve the spaces (bug 491728)

27

#

28

-LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "

29

-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "

30

+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.

31

+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "

32

+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "

33

34

 for lang in ${LANGUAGES_HELP}; do

35

-	helppack=""

36

-	[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}

37

-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz  ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"

38

-	SRC_URI+=" linguas_${lang}? ( ${helppack} )"

39

+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"

40

+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"

41

 done

42

 for lang in ${LANGUAGES}; do

43

-	langpack=""

44

-	[[ ${lang} == en ]] \

45

-		|| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz   ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"

46

-	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"

47

-	IUSE+=" linguas_${lang}"

48

+	if [[ ${lang%:*} != en ]]; then

49

+		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"

50

+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"

51

+	fi

52

+	IUSE+=" l10n_${lang%:*}"

53

 done

54

-unset lang helppack langpack lang2

55

+unset lang helppack langpack

56

57

 RDEPEND+="app-text/hunspell"

58

59

@@ -52,19 +51,18 @@ src_prepare() {

60

 	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"

61

62

 	for lang in ${LANGUAGES}; do

63

-		# break away if not enabled; paludis support

64

-		use_if_iuse linguas_${lang} || continue

65

+		# break away if not enabled

66

+		use l10n_${lang%:*} || continue

67

68

-		dir=${lang/_/-}

69

+		dir=${lang#*:}

70

71

 		# for english we provide just helppack, as translation is always there

72

-		if [[ ${lang} != en ]]; then

73

+		if [[ ${lang%:*} != en ]]; then

74

 			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"

75

 			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"

76

 			rpm_unpack ./${rpmdir}/*.rpm

77

fi

78

 		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then

79

-			[[ ${lang} == en ]] && dir="en-US"

80

 			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"

81

 			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"

82

 			rpm_unpack ./${rpmdir}/*.rpm

83

@@ -77,7 +75,7 @@ src_compile() { :; }

84

85

 src_install() {

86

 	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/

87

-	# Condition required for people that do not install anything eg no linguas

88

+	# Condition required for people that do not install anything eg no l10n

89

 	# or just english with no offlinehelp.

90

 	if [[ -d "${dir}" ]] ; then

91

 		insinto /usr/$(get_libdir)/${PN/-l10n/}/

92

93

diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.2.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.2.2.ebuild

94

index b0148fc..5585b5d 100644

95

--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.2.2.ebuild

96

+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.2.2.ebuild

97

@@ -21,23 +21,22 @@ IUSE="offlinehelp"

98

#

99

 # when changing the language lists, please be careful to preserve the spaces (bug 491728)

100

#

101

-LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "

102

-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "

103

+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.

104

+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "

105

+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "

106

107

 for lang in ${LANGUAGES_HELP}; do

108

-	helppack=""

109

-	[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}

110

-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz  ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"

111

-	SRC_URI+=" linguas_${lang}? ( ${helppack} )"

112

+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"

113

+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"

114

 done

115

 for lang in ${LANGUAGES}; do

116

-	langpack=""

117

-	[[ ${lang} == en ]] \

118

-		|| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz   ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"

119

-	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"

120

-	IUSE+=" linguas_${lang}"

121

+	if [[ ${lang%:*} != en ]]; then

122

+		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"

123

+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"

124

+	fi

125

+	IUSE+=" l10n_${lang%:*}"

126

 done

127

-unset lang helppack langpack lang2

128

+unset lang helppack langpack

129

130

 RDEPEND+="app-text/hunspell"

131

132

@@ -54,19 +53,18 @@ src_prepare() {

133

 	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"

134

135

 	for lang in ${LANGUAGES}; do

136

-		# break away if not enabled; paludis support

137

-		use_if_iuse linguas_${lang} || continue

138

+		# break away if not enabled

139

+		use l10n_${lang%:*} || continue

140

141

-		dir=${lang/_/-}

142

+		dir=${lang#*:}

143

144

 		# for english we provide just helppack, as translation is always there

145

-		if [[ ${lang} != en ]]; then

146

+		if [[ ${lang%:*} != en ]]; then

147

 			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"

148

 			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"

149

 			rpm_unpack ./${rpmdir}/*.rpm

150

fi

151

 		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then

152

-			[[ ${lang} == en ]] && dir="en-US"

153

 			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"

154

 			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"

155

 			rpm_unpack ./${rpmdir}/*.rpm

156

@@ -79,7 +77,7 @@ src_compile() { :; }

157

158

 src_install() {

159

 	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/

160

-	# Condition required for people that do not install anything eg no linguas

161

+	# Condition required for people that do not install anything eg no l10n

162

 	# or just english with no offlinehelp.

163

 	if [[ -d "${dir}" ]] ; then

164

 		insinto /usr/$(get_libdir)/${PN/-l10n/}/

165

166

diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.3.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.3.2.ebuild

167

index 875cd6b..181b66b 100644

168

--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.3.2.ebuild

169

+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.3.2.ebuild

170

@@ -21,23 +21,22 @@ IUSE="offlinehelp"

171

#

172

 # when changing the language lists, please be careful to preserve the spaces (bug 491728)

173

#

174

-LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "

175

-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "

176

+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.

177

+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "

178

+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "

179

180

 for lang in ${LANGUAGES_HELP}; do

181

-	helppack=""

182

-	[[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang}

183

-	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz  ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"

184

-	SRC_URI+=" linguas_${lang}? ( ${helppack} )"

185

+	helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"

186

+	SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"

187

 done

188

 for lang in ${LANGUAGES}; do

189

-	langpack=""

190

-	[[ ${lang} == en ]] \

191

-		|| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz   ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"

192

-	[[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )"

193

-	IUSE+=" linguas_${lang}"

194

+	if [[ ${lang%:*} != en ]]; then

195

+		langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"

196

+		SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"

197

+	fi

198

+	IUSE+=" l10n_${lang%:*}"

199

 done

200

-unset lang helppack langpack lang2

201

+unset lang helppack langpack

202

203

 RDEPEND+="app-text/hunspell"

204

205

@@ -54,19 +53,18 @@ src_prepare() {

206

 	find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries"

207

208

 	for lang in ${LANGUAGES}; do

209

-		# break away if not enabled; paludis support

210

-		use_if_iuse linguas_${lang} || continue

211

+		# break away if not enabled

212

+		use l10n_${lang%:*} || continue

213

214

-		dir=${lang/_/-}

215

+		dir=${lang#*:}

216

217

 		# for english we provide just helppack, as translation is always there

218

-		if [[ ${lang} != en ]]; then

219

+		if [[ ${lang%:*} != en ]]; then

220

 			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"

221

 			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"

222

 			rpm_unpack ./${rpmdir}/*.rpm

223

fi

224

 		if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then

225

-			[[ ${lang} == en ]] && dir="en-US"

226

 			rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"

227

 			[[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}"

228

 			rpm_unpack ./${rpmdir}/*.rpm

229

@@ -79,7 +77,7 @@ src_compile() { :; }

230

231

 src_install() {

232

 	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/

233

-	# Condition required for people that do not install anything eg no linguas

234

+	# Condition required for people that do not install anything eg no l10n

235

 	# or just english with no offlinehelp.

236

 	if [[ -d "${dir}" ]] ; then

237

 		insinto /usr/$(get_libdir)/${PN/-l10n/}/

238

239

diff --git a/app-office/libreoffice-l10n/metadata.xml b/app-office/libreoffice-l10n/metadata.xml

240

index 510d839..4dee5db 100644

241

--- a/app-office/libreoffice-l10n/metadata.xml

242

+++ b/app-office/libreoffice-l10n/metadata.xml

243

@@ -7,9 +7,5 @@

244

 	</maintainer>

245

 	<use>

246

 		<flag name="offlinehelp">Install help files locally instead of using the LibreOffice Wiki</flag>

247

-		<flag name="linguas_ca_valencia">Catalan locale (Valencia)</flag>

248

-		<flag name="linguas_kmr_Latn">kmr_Latn localization</flag>

249

-		<flag name="linguas_sid">sid localization</flag>

250

-		<flag name="linguas_sr_Latn">Serbian (Latin) locale</flag>

251

 	</use>

252

 </pkgmetadata>

1	commit: 043073aac93055f0c37cfbd63b52d69d838b1e95
2	Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
3	AuthorDate: Sun Jun 26 07:10:33 2016 +0000
4	Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
5	CommitDate: Sun Jun 26 15:30:38 2016 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=043073aa
7
8	app-office/libreoffice-l10n: Migrate from LINGUAS to L10N.
9
10	Bug: 587114
11
12	Package-Manager: portage-2.3.0
13
14	.../libreoffice-l10n-5.0.5.2.ebuild \| 34 ++++++++++------------
15	.../libreoffice-l10n-5.1.2.2.ebuild \| 34 ++++++++++------------
16	.../libreoffice-l10n-5.1.3.2.ebuild \| 34 ++++++++++------------
17	app-office/libreoffice-l10n/metadata.xml \| 4 ---
18	4 files changed, 48 insertions(+), 58 deletions(-)
19
20	diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild
21	index d44da2e..4d5bced 100644
22	--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild
23	+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.0.5.2.ebuild
24	@@ -21,23 +21,22 @@ IUSE="offlinehelp"
25	#
26	# when changing the language lists, please be careful to preserve the spaces (bug 491728)
27	#
28	-LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
29	-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
30	+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
31	+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
32	+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
33
34	for lang in ${LANGUAGES_HELP}; do
35	- helppack=""
36	- [[ ${lang} == en ]] && lang2=${lang/en/en_US} \|\| lang2=${lang}
37	- helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
38	- SRC_URI+=" linguas_${lang}? ( ${helppack} )"
39	+ helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
40	+ SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
41	done
42	for lang in ${LANGUAGES}; do
43	- langpack=""
44	- [[ ${lang} == en ]] \
45	- \|\| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
46	- [[ -z ${langpack} ]] \|\| SRC_URI+=" linguas_${lang}? ( ${langpack} )"
47	- IUSE+=" linguas_${lang}"
48	+ if [[ ${lang%:*} != en ]]; then
49	+ langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
50	+ SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
51	+ fi
52	+ IUSE+=" l10n_${lang%:*}"
53	done
54	-unset lang helppack langpack lang2
55	+unset lang helppack langpack
56
57	RDEPEND+="app-text/hunspell"
58
59	@@ -52,19 +51,18 @@ src_prepare() {
60	find "${S}" -name dict.rpm -delete \|\| die "Failed to remove dictionaries"
61
62	for lang in ${LANGUAGES}; do
63	- # break away if not enabled; paludis support
64	- use_if_iuse linguas_${lang} \|\| continue
65	+ # break away if not enabled
66	+ use l10n_${lang%:*} \|\| continue
67
68	- dir=${lang/_/-}
69	+ dir=${lang#*:}
70
71	# for english we provide just helppack, as translation is always there
72	- if [[ ${lang} != en ]]; then
73	+ if [[ ${lang%:*} != en ]]; then
74	rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
75	[[ -d ${rpmdir} ]] \|\| die "Missing directory: ${rpmdir}"
76	rpm_unpack ./${rpmdir}/*.rpm
77	fi
78	if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
79	- [[ ${lang} == en ]] && dir="en-US"
80	rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
81	[[ -d ${rpmdir} ]] \|\| die "Missing directory: ${rpmdir}"
82	rpm_unpack ./${rpmdir}/*.rpm
83	@@ -77,7 +75,7 @@ src_compile() { :; }
84
85	src_install() {
86	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
87	- # Condition required for people that do not install anything eg no linguas
88	+ # Condition required for people that do not install anything eg no l10n
89	# or just english with no offlinehelp.
90	if [[ -d "${dir}" ]] ; then
91	insinto /usr/$(get_libdir)/${PN/-l10n/}/
92
93	diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.2.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.2.2.ebuild
94	index b0148fc..5585b5d 100644
95	--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.2.2.ebuild
96	+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.2.2.ebuild
97	@@ -21,23 +21,22 @@ IUSE="offlinehelp"
98	#
99	# when changing the language lists, please be careful to preserve the spaces (bug 491728)
100	#
101	-LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
102	-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
103	+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
104	+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
105	+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
106
107	for lang in ${LANGUAGES_HELP}; do
108	- helppack=""
109	- [[ ${lang} == en ]] && lang2=${lang/en/en_US} \|\| lang2=${lang}
110	- helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
111	- SRC_URI+=" linguas_${lang}? ( ${helppack} )"
112	+ helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
113	+ SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
114	done
115	for lang in ${LANGUAGES}; do
116	- langpack=""
117	- [[ ${lang} == en ]] \
118	- \|\| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
119	- [[ -z ${langpack} ]] \|\| SRC_URI+=" linguas_${lang}? ( ${langpack} )"
120	- IUSE+=" linguas_${lang}"
121	+ if [[ ${lang%:*} != en ]]; then
122	+ langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
123	+ SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
124	+ fi
125	+ IUSE+=" l10n_${lang%:*}"
126	done
127	-unset lang helppack langpack lang2
128	+unset lang helppack langpack
129
130	RDEPEND+="app-text/hunspell"
131
132	@@ -54,19 +53,18 @@ src_prepare() {
133	find "${S}" -name dict.rpm -delete \|\| die "Failed to remove dictionaries"
134
135	for lang in ${LANGUAGES}; do
136	- # break away if not enabled; paludis support
137	- use_if_iuse linguas_${lang} \|\| continue
138	+ # break away if not enabled
139	+ use l10n_${lang%:*} \|\| continue
140
141	- dir=${lang/_/-}
142	+ dir=${lang#*:}
143
144	# for english we provide just helppack, as translation is always there
145	- if [[ ${lang} != en ]]; then
146	+ if [[ ${lang%:*} != en ]]; then
147	rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
148	[[ -d ${rpmdir} ]] \|\| die "Missing directory: ${rpmdir}"
149	rpm_unpack ./${rpmdir}/*.rpm
150	fi
151	if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
152	- [[ ${lang} == en ]] && dir="en-US"
153	rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
154	[[ -d ${rpmdir} ]] \|\| die "Missing directory: ${rpmdir}"
155	rpm_unpack ./${rpmdir}/*.rpm
156	@@ -79,7 +77,7 @@ src_compile() { :; }
157
158	src_install() {
159	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
160	- # Condition required for people that do not install anything eg no linguas
161	+ # Condition required for people that do not install anything eg no l10n
162	# or just english with no offlinehelp.
163	if [[ -d "${dir}" ]] ; then
164	insinto /usr/$(get_libdir)/${PN/-l10n/}/
165
166	diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.3.2.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.3.2.ebuild
167	index 875cd6b..181b66b 100644
168	--- a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.3.2.ebuild
169	+++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.3.2.ebuild
170	@@ -21,23 +21,22 @@ IUSE="offlinehelp"
171	#
172	# when changing the language lists, please be careful to preserve the spaces (bug 491728)
173	#
174	-LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW "
175	-LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu "
176	+# "en:en-US" for mapping from Gentoo "en" to upstream "en-US" etc.
177	+LANGUAGES_HELP=" am ast bg bn-IN bn bo bs ca-valencia ca cs da de dz el en-GB en:en-US en-ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt-BR pt ru si sk sl sq sv tg tr ug uk vi zh-CN zh-TW "
178	+LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr-Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa:pa-IN ro rw sa:sa-IN sat sd sid sr-Latn sr ss st sw-TZ ta te th tn ts tt uz ve xh zu "
179
180	for lang in ${LANGUAGES_HELP}; do
181	- helppack=""
182	- [[ ${lang} == en ]] && lang2=${lang/en/en_US} \|\| lang2=${lang}
183	- helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )"
184	- SRC_URI+=" linguas_${lang}? ( ${helppack} )"
185	+ helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang#:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang#*:}.tar.gz )"
186	+ SRC_URI+=" l10n_${lang%:*}? ( ${helppack} )"
187	done
188	for lang in ${LANGUAGES}; do
189	- langpack=""
190	- [[ ${lang} == en ]] \
191	- \|\| langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz"
192	- [[ -z ${langpack} ]] \|\| SRC_URI+=" linguas_${lang}? ( ${langpack} )"
193	- IUSE+=" linguas_${lang}"
194	+ if [[ ${lang%:*} != en ]]; then
195	+ langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang#:}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#:}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang#*:}.tar.gz"
196	+ SRC_URI+=" l10n_${lang%:*}? ( ${langpack} )"
197	+ fi
198	+ IUSE+=" l10n_${lang%:*}"
199	done
200	-unset lang helppack langpack lang2
201	+unset lang helppack langpack
202
203	RDEPEND+="app-text/hunspell"
204
205	@@ -54,19 +53,18 @@ src_prepare() {
206	find "${S}" -name dict.rpm -delete \|\| die "Failed to remove dictionaries"
207
208	for lang in ${LANGUAGES}; do
209	- # break away if not enabled; paludis support
210	- use_if_iuse linguas_${lang} \|\| continue
211	+ # break away if not enabled
212	+ use l10n_${lang%:*} \|\| continue
213
214	- dir=${lang/_/-}
215	+ dir=${lang#*:}
216
217	# for english we provide just helppack, as translation is always there
218	- if [[ ${lang} != en ]]; then
219	+ if [[ ${lang%:*} != en ]]; then
220	rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/"
221	[[ -d ${rpmdir} ]] \|\| die "Missing directory: ${rpmdir}"
222	rpm_unpack ./${rpmdir}/*.rpm
223	fi
224	if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then
225	- [[ ${lang} == en ]] && dir="en-US"
226	rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/"
227	[[ -d ${rpmdir} ]] \|\| die "Missing directory: ${rpmdir}"
228	rpm_unpack ./${rpmdir}/*.rpm
229	@@ -79,7 +77,7 @@ src_compile() { :; }
230
231	src_install() {
232	local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/
233	- # Condition required for people that do not install anything eg no linguas
234	+ # Condition required for people that do not install anything eg no l10n
235	# or just english with no offlinehelp.
236	if [[ -d "${dir}" ]] ; then
237	insinto /usr/$(get_libdir)/${PN/-l10n/}/
238
239	diff --git a/app-office/libreoffice-l10n/metadata.xml b/app-office/libreoffice-l10n/metadata.xml
240	index 510d839..4dee5db 100644
241	--- a/app-office/libreoffice-l10n/metadata.xml
242	+++ b/app-office/libreoffice-l10n/metadata.xml
243	@@ -7,9 +7,5 @@
244	</maintainer>
245	<use>
246	<flag name="offlinehelp">Install help files locally instead of using the LibreOffice Wiki</flag>
247	- <flag name="linguas_ca_valencia">Catalan locale (Valencia)</flag>
248	- <flag name="linguas_kmr_Latn">kmr_Latn localization</flag>
249	- <flag name="linguas_sid">sid localization</flag>
250	- <flag name="linguas_sr_Latn">Serbian (Latin) locale</flag>
251	</use>
252	</pkgmetadata>

Gentoo Archives: gentoo-commits