dev-lang/icc: Migrate from LINGUAS to L10N.

Update blocker against ifc, it needs to block only when l10n_ja is enabled for both packages. Bug: https://bugs.gentoo.org/476330 Package-Manager: Portage-2.3.19, Repoman-2.3.6
johu · Jan 7, 2018 · d0299e3 · d0299e3
1 parent efee0d8
commit d0299e3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/dev-lang/icc/icc-13.1.5.192.ebuild b/dev-lang/icc/icc-13.1.5.192.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,11 +13,11 @@ inherit intel-sdp
 DESCRIPTION="Intel C/C++ Compiler"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
 
-IUSE="linguas_ja"
+IUSE="l10n_ja"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="!dev-lang/ifc[linguas_ja]"
-RDEPEND="${DEPEND}
+# avoid file collision with ifc #476330
+RDEPEND="l10n_ja? ( !dev-lang/ifc[l10n_ja(-)] !dev-lang/ifc[linguas_ja(-)] )
 	~dev-libs/intel-common-${PV}[compiler,multilib=]"
 
 INTEL_BIN_RPMS="compilerproc compilerproc-devel"
@@ -26,7 +26,7 @@ INTEL_DAT_RPMS="compilerproc-common"
 CHECKREQS_DISK_BUILD=325M
 
 src_install() {
-	if ! use linguas_ja; then
+	if ! use l10n_ja; then
 		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
 	fi
 	intel-sdp_src_install

diff --git a/dev-lang/icc/icc-14.0.3.174.ebuild b/dev-lang/icc/icc-14.0.3.174.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,11 +14,11 @@ inherit intel-sdp
 DESCRIPTION="Intel C/C++ Compiler"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
 
-IUSE="linguas_ja"
+IUSE="l10n_ja"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="!dev-lang/ifc[linguas_ja]"
-RDEPEND="${DEPEND}
+# avoid file collision with ifc #476330
+RDEPEND="l10n_ja? ( !dev-lang/ifc[l10n_ja(-)] !dev-lang/ifc[linguas_ja(-)] )
 	~dev-libs/intel-common-${PV}[compiler,multilib=]"
 
 INTEL_BIN_RPMS="compilerproc compilerproc-devel"
@@ -27,7 +27,7 @@ INTEL_DAT_RPMS="compilerproc-common"
 CHECKREQS_DISK_BUILD=325M
 
 src_install() {
-	if ! use linguas_ja; then
+	if ! use l10n_ja; then
 		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
 	fi
 	intel-sdp_src_install

diff --git a/dev-lang/icc/icc-15.0.6.233.ebuild b/dev-lang/icc/icc-15.0.6.233.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,11 +14,11 @@ inherit intel-sdp
 DESCRIPTION="Intel C/C++ Compiler"
 HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
 
-IUSE="linguas_ja"
+IUSE="l10n_ja"
 KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
 
-DEPEND="!dev-lang/ifc[linguas_ja]"
-RDEPEND="${DEPEND}
+# avoid file collision with ifc #476330
+RDEPEND="l10n_ja? ( !dev-lang/ifc[l10n_ja(-)] !dev-lang/ifc[linguas_ja(-)] )
 	~dev-libs/intel-common-${PV}[compiler,multilib=]"
 
 INTEL_BIN_RPMS="compilerproc compilerproc-devel"
@@ -27,7 +27,7 @@ INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
 CHECKREQS_DISK_BUILD=325M
 
 src_install() {
-	if ! use linguas_ja; then
+	if ! use l10n_ja; then
 		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
 	fi
 	intel-sdp_src_install