gentoo resync : 05.01.2018

5 files changed, 33 insertions, 18 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 5049eca1932f..c6435a075fff 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qt-creator/Manifest b/dev-qt/qt-creator/Manifest
index 9b80fd54e521..2dbf16a8dbb9 100644
--- a/dev-qt/qt-creator/Manifest
+++ b/dev-qt/qt-creator/Manifest
@@ -1,6 +1,6 @@
 DIST qt-creator-opensource-src-4.3.1.tar.xz 17298892 BLAKE2B a15d4c78ee65230d587cc469881d9ff350b61a1b5b3671691924a9383bb04cecd916b72e92abb4dad933a4dd42087c3460d70af289ef9ff1e77138d3a82d4a4e SHA512 9fd89cee4a3b17662ac83bd63065f66f6b446774eb28ab4e56b85b82dc8c6b9b7be512014e5096dd343d913688700c3297b49bf4abe920429ca72cc665c95226
 DIST qt-creator-opensource-src-4.4.1.tar.xz 20822304 BLAKE2B 23c05b5e86fcbc3387cd9e8a82fb97e3b4e20182b41e2b24de7801126b0d5bbd708ca842ddcd828536fb279b6d2e4954909b8c40bfe14e050baa109095889e6d SHA512 f0e836fd2106f909cb405f75457e0d4158ecdd134ec5cfa97b373e5818b5f715245ac8454a657801251302ef817c1de66580f2e45b12b3e23d3107ccf3985336
-EBUILD qt-creator-4.3.1.ebuild 5607 BLAKE2B 5a05cf51b339c0e25bbd3bc3dafa8775a7e6b87bf890b0e308ecf45775b45fe308ff986752f51c67799a7b8a865eb0f29d92890dee49ab268c1156d6f9d825b7 SHA512 aafadf415b1bb010069147f89d84e210ac67187bc3ef8c2e0c904322ca16530955497c3763cd02155e9dcaae42ae57285367f71d71bc6dd4a5a3c8e3f9d54aff
-EBUILD qt-creator-4.4.1.ebuild 5549 BLAKE2B 3019d2666353503f7a5616d0fddb3c2d1f16169a71523f49d887f347ddb73eeaa6b2140d18026f6513a9d3702c92fa99220de70c1d1c46019122a2e9ed165765 SHA512 ccb9a187bba3021dff34ab3275fdee5d311d38ecb7701549a3799c8bc41ec54c4dc5d5af531ed03913425ee6fdedc7f21b3b1bad113853da37610e7fe44b6f11
-EBUILD qt-creator-9999.ebuild 5549 BLAKE2B 3019d2666353503f7a5616d0fddb3c2d1f16169a71523f49d887f347ddb73eeaa6b2140d18026f6513a9d3702c92fa99220de70c1d1c46019122a2e9ed165765 SHA512 ccb9a187bba3021dff34ab3275fdee5d311d38ecb7701549a3799c8bc41ec54c4dc5d5af531ed03913425ee6fdedc7f21b3b1bad113853da37610e7fe44b6f11
+EBUILD qt-creator-4.3.1.ebuild 5717 BLAKE2B 3729dfb06431c823e75f088d35eb8623ad7c1890644cc75be8f72690bcdeff7327deca4da8b914e12559b2ab188e79cca342c75331b28bfa1aa3d321df6e629f SHA512 73c9bba22675075fc21bd655b952bab2396c13510216eff9c430a18b338e1dbb293db6b97db215c78702a5363baca49170fffc9558f2f7cb0f378366c2c5a43c
+EBUILD qt-creator-4.4.1.ebuild 5659 BLAKE2B 862c67019cb1bc366e5a4ace004b14da8265d2559aa44fe005a5107b599a3d3a521d7ee63806e9659d8a6256a229135dcb7bf1a21e3b9d23d2bcaed09c9e5284 SHA512 d2a9d79d4fb736f434965b036d37d7440d4177e1370a2e8e41ae2df9c34ed33b7cb87a64ff55f9d7a277e27bf12440b96a31da9995fa44dd79cc0259ac27f1d2
+EBUILD qt-creator-9999.ebuild 5659 BLAKE2B 862c67019cb1bc366e5a4ace004b14da8265d2559aa44fe005a5107b599a3d3a521d7ee63806e9659d8a6256a229135dcb7bf1a21e3b9d23d2bcaed09c9e5284 SHA512 d2a9d79d4fb736f434965b036d37d7440d4177e1370a2e8e41ae2df9c34ed33b7cb87a64ff55f9d7a277e27bf12440b96a31da9995fa44dd79cc0259ac27f1d2
 MISC metadata.xml 2247 BLAKE2B 4cc94d6484cfccef9fd7ffa81afd642603842cc0a840bf1a710e2dba85258d7d116b3201391d62d9e974e44fc18033cae1b4d9d242bb1aa43dfdb1364e782bcc SHA512 d3e92111e1ec61fc5ea8904066eaf205000de8a4e64ccb4b8d6ba349735466c4f851bec8154f30fc8ff21756d27ec07249892136ca56bdcc12ee4e3200616368
diff --git a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
index 5be7d95dd51e..8e8a0f9cca3c 100644
--- a/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 LLVM_MAX_SLOT=4
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
 
-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/"
@@ -88,7 +88,8 @@ RDEPEND="${CDEPEND}
 "
 # qt translations must also be installed or qt-creator translations won't be loaded
 for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
 done
 unset x
 
@@ -151,7 +152,11 @@ src_prepare() {
 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
 
 	# fix translations
-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
 	# remove bundled qbs
 	rm -rf src/shared/qbs || die
diff --git a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
index 322f20850b87..38641edea7de 100644
--- a/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
+++ b/dev-qt/qt-creator/qt-creator-4.4.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
 
-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/"
@@ -81,7 +81,8 @@ RDEPEND="${CDEPEND}
 "
 # qt translations must also be installed or qt-creator translations won't be loaded
 for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
 done
 unset x
 
@@ -145,7 +146,11 @@ src_prepare() {
 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
 
 	# fix translations
-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
 	# remove bundled qbs
 	rm -rf src/shared/qbs || die
diff --git a/dev-qt/qt-creator/qt-creator-9999.ebuild b/dev-qt/qt-creator/qt-creator-9999.ebuild
index 322f20850b87..38641edea7de 100644
--- a/dev-qt/qt-creator/qt-creator-9999.ebuild
+++ b/dev-qt/qt-creator/qt-creator-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PLOCALES="cs de fr ja pl ru sl uk zh_CN zh_TW"
+PLOCALES="cs de fr ja pl ru sl uk zh-CN zh-TW"
 
-inherit l10n llvm qmake-utils toolchain-funcs virtualx xdg
+inherit llvm qmake-utils toolchain-funcs virtualx xdg
 
 DESCRIPTION="Lightweight IDE for C++/QML development centering around Qt"
 HOMEPAGE="https://doc.qt.io/qtcreator/"
@@ -81,7 +81,8 @@ RDEPEND="${CDEPEND}
 "
 # qt translations must also be installed or qt-creator translations won't be loaded
 for x in ${PLOCALES}; do
-	RDEPEND+=" linguas_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
+	IUSE+=" l10n_${x}"
+	RDEPEND+=" l10n_${x}? ( >=dev-qt/qttranslations-${QT_PV} )"
 done
 unset x
 
@@ -145,7 +146,11 @@ src_prepare() {
 	sed -i -e "/^CLANG_RESOURCE_DIR\s*=/ s:\$\${LLVM_LIBDIR}:${EPREFIX}/usr/lib:" src/shared/clang/clang_defines.pri || die
 
 	# fix translations
-	sed -i -e "/^LANGUAGES\s*=/ s:=.*:= $(l10n_get_locales):" share/qtcreator/translations/translations.pro || die
+	local lang languages=
+	for lang in ${PLOCALES}; do
+		use l10n_${lang} && languages+=" ${lang/-/_}"
+	done
+	sed -i -e "/^LANGUAGES\s*=/ s:=.*:=${languages}:" share/qtcreator/translations/translations.pro || die
 
 	# remove bundled qbs
 	rm -rf src/shared/qbs || die