gentoo resync : 07.01.2018

3 files changed, 115 insertions, 14 deletions

diff --git a/media-gfx/valentina/Manifest b/media-gfx/valentina/Manifest
index 99af9ac75391..b26fa5b67768 100644
--- a/media-gfx/valentina/Manifest
+++ b/media-gfx/valentina/Manifest
@@ -1,6 +1,6 @@
 DIST valentina-0.5.0.zip 37175844 BLAKE2B 73cfb434c87e7d59efa76c303f4cc13dd9df08b9d5f61becd03943b78ce68e8735d192f2f2d5d5dfe25cda19ba998b0ea4a73bc3d0845bd4a065f7c5b4e66098 SHA512 3e69f965de1f8179850a8c6a5a0d3b5e87384158191b9c4a3647a5421d1efe567e98298bd8f47a8288eac358520469ae7979a4a61df64ccfbeb1a36fb231efcf
 DIST valentina-4798.patch 25302 BLAKE2B 153cc2ccc603703a520b5181e5192bac86410ab51eec305effe43463ce081dbbf3bb48eedb93e8ea5928f3f71351526a175c61a23a7005fda5bf4e14cc57403e SHA512 c3adbd2caa4cfb73960de850b29bee881fc408c9e4032e1fa2f29ba80b91abaa194738ff1cfb607657343990a166ad310387a66ceca546ffae0543d774bc53b4
 DIST valentina-4802.patch 6733 BLAKE2B b7e30b77aab75b45e7bfd06165586f8356cfa438e0f5f5fb708d818f04fe9be7fdd025b8098cb5ca1f45cceef0671abf7014c112ab11da8e6c9c1a640e412ab8 SHA512 5628599c1dd208ba9ea8ea5e518bf6aed5ef11aa750670335478e5af49d6e9f235901c79d6483b1897f8288259fd06b463462eddcd062c4920ff251430998ff4
-EBUILD valentina-0.5.0-r2.ebuild 1895 BLAKE2B 2ed6fe888c35590809a91f34a14c93cd1c48dd69a17aa0d3c23cf6b7717fe4011d47a2fd4c3d30d4130fff7c187b996a681ec895209a1df6f4239c484b6af0cf SHA512 a099c0f97f93dbfda53db352babb77ca7c3edb9f12b2cbc1a0ea19d388d817aa5eb41cd65a0c9e8f9e417cca223128e40f119322a892c51a51ddb7fb01e78cb0
-EBUILD valentina-9999.ebuild 1506 BLAKE2B 73258a0bc81ede8c2f29f77653e241f4d281df2dd0006b93dc4a6795f569a3ec7703ac4b843fd313723086c17437281365340c0510c83f9af526db0e982570c2 SHA512 579149341dc7c3003a7d8ff3758df7247f50d8cfeba02f0882a9fa0ee37451d7fa4dc6cf0a1f3fb61582c4a73e8c37028558d12787f8a68bdce54a68b6cd9ba7
+EBUILD valentina-0.5.0-r2.ebuild 2416 BLAKE2B 6ee92fb4cd2519d6ec2ced5f21377a89142c83f6e4e9f064c0e0bfc88119cf3d191e5d9f4558228fd6ab30ab3ea9c8ca793b42e2cef2cc249a651fb61ac6b810 SHA512 af345b22a261444419c41dda8815be026952861fdbac348a2cdb17ef9dd558b654b376f3d11afb1d9649b478f42f12f0c5b1b26911b07217c037fd79d8323346
+EBUILD valentina-9999.ebuild 2013 BLAKE2B e16d40f731acab6ef308b85440654a5c9c7f210d76211b395da68620018a1c9fa4feb6a7f8f557a766c8f5147b1b50d09739d72416330380c57288bd28a4ff99 SHA512 8ba73f6f9ddd1a193ef34a11f6bbae68c462ce89964358ef1af6d708f5fbb65fc4cf6a5c71257d408f326dddaedce4dea9c46aee63bb7d1da006de739df7f616
 MISC metadata.xml 334 BLAKE2B 7f146a505a30d4461165308b40383e2b78998411874c8af6113c3040142003868f397872ecd22b9b8f3ec6193c532fa934c8646ee04e8c49157464b58035de09 SHA512 d1264aa0d26ba75466c5572c37ca6fd384d4e6db392aca0e47d4b1d0bd3ef7e035fed51c460af1bb258c500d1cc9211ec2e85db3e3aa158d378fb1389a3ebf03
diff --git a/media-gfx/valentina/valentina-0.5.0-r2.ebuild b/media-gfx/valentina/valentina-0.5.0-r2.ebuild
index 3ba76fa3cd6b..9b5a7f5ea11e 100644
--- a/media-gfx/valentina/valentina-0.5.0-r2.ebuild
+++ b/media-gfx/valentina/valentina-0.5.0-r2.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=6
@@ -16,11 +16,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="gnome"
 
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE el_GR en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL pt_BR ro_RO ru_RU uk_UA zh_CN"
+LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
 
 for LANG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LANG}"
+	IUSE="${IUSE} l10n_${LANG}"
 done
 
 CDEPEND="
@@ -48,10 +47,62 @@ src_prepare() {
 
 src_configure() {
 	local locales=""
+	local locale
 
 	for LANG in ${LANGS}; do
-		if use linguas_${LANG}; then
-			locales="${locales} ${LANG}"
+		if use l10n_${LANG}; then
+			case ${LANG} in
+			"cs")
+				locale="cs_CZ"
+				;;
+			"de")
+				locale="de_DE"
+				;;
+			"el")
+				locale="el_GR"
+				;;
+			"en")
+				locale="en_CA en_IN en_US"
+				;;
+			"es")
+				locale="es_ES"
+				;;
+			"fi")
+				locale="fi_FI"
+				;;
+			"fr")
+				locale="fr_FR"
+				;;
+			"he")
+				locale="he_IL"
+				;;
+			"id")
+				locale="id_ID"
+				;;
+			"it")
+				locale="it_IT"
+				;;
+			"nl")
+				locale="nl_NL"
+				;;
+			"pt-BR")
+				locale="pt_BR"
+				;;
+			"ro")
+				locale="ro_RO"
+				;;
+			"ru")
+				locale="ru_RU"
+				;;
+			"uk")
+				locale="uk_UA"
+				;;
+			"zh-CN")
+				locale="zh_CN"
+				;;
+			esac
+
+			locales="${locales} ${locale}"
 		fi
 	done
 
diff --git a/media-gfx/valentina/valentina-9999.ebuild b/media-gfx/valentina/valentina-9999.ebuild
index 3c119be7617c..7e393108cc1a 100644
--- a/media-gfx/valentina/valentina-9999.ebuild
+++ b/media-gfx/valentina/valentina-9999.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=6
@@ -15,11 +15,10 @@ SLOT="0"
 KEYWORDS=""
 IUSE="gnome"
 
-# en_IN not supported in Gentoo so not added here
-LANGS="cs_CZ de_DE el_GR en_CA en_US es_ES fi_FI fr_FR he_IL id_ID it_IT nl_NL pt_BR ro_RO ru_RU uk_UA zh_CN"
+LANGS="cs de el en en es fi fr he id it nl pt-BR ro ru uk zh-CN"
 
 for LANG in ${LANGS}; do
-	IUSE="${IUSE} linguas_${LANG}"
+	IUSE="${IUSE} l10n_${LANG}"
 done
 
 CDEPEND="
@@ -39,8 +38,59 @@ src_configure() {
 	local locales=""
 
 	for LANG in ${LANGS}; do
-		if use linguas_${LANG}; then
-			locales="${locales} ${LANG}"
+		if use l10n_${LANG}; then
+			case ${LANG} in
+			"cs")
+				locale="cs_CZ"
+				;;
+			"de")
+				locale="de_DE"
+				;;
+			"el")
+				locale="el_GR"
+				;;
+			"en")
+				locale="en_CA en_IN en_US"
+				;;
+			"es")
+				locale="es_ES"
+				;;
+			"fi")
+				locale="fi_FI"
+				;;
+			"fr")
+				locale="fr_FR"
+				;;
+			"he")
+				locale="he_IL"
+				;;
+			"id")
+				locale="id_ID"
+				;;
+			"it")
+				locale="it_IT"
+				;;
+			"nl")
+				locale="nl_NL"
+				;;
+			"pt-BR")
+				locale="pt_BR"
+				;;
+			"ro")
+				locale="ro_RO"
+				;;
+			"ru")
+				locale="ru_RU"
+				;;
+			"uk")
+				locale="uk_UA"
+				;;
+			"zh-CN")
+				locale="zh_CN"
+				;;
+			esac
+
+			locales="${locales} ${locale}"
 		fi
 	done