commit: 219b6892d36fc266ac6e8c2c960fb33d86ed7743 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Fri Jan 5 14:24:13 2018 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Fri Jan 5 15:38:31 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=219b6892
dev-qt/qt-creator: Migrate from LINGUAS to L10N. Package-Manager: Portage-2.3.19, Repoman-2.3.6 dev-qt/qt-creator/qt-creator-4.3.1.ebuild | 15 ++++++++++----- dev-qt/qt-creator/qt-creator-4.4.1.ebuild | 15 ++++++++++----- dev-qt/qt-creator/qt-creator-9999.ebuild | 15 ++++++++++----- 3 files changed, 30 insertions(+), 15 deletions(-) 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 5be7d95dd51..8e8a0f9cca3 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 322f20850b8..38641edea7d 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 322f20850b8..38641edea7d 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
