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

Update blocker against icc, it needs to block only when l10n_ja is
enabled for both packages. (Also, the blocker was wrong before, as it
was against ifc itself.)

Bug: https://bugs.gentoo.org/476330
Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/dev-lang/ifc/ifc-13.1.5.192.ebuild b/dev-lang/ifc/ifc-13.1.5.192.ebuild
index 7ff5dd0df06d441e2ae70c9345e9500a7df1c00a..4651e5c84c653c2ddfbbd01596257be2c6d0772c 100644 (file)
--- a/dev-lang/ifc/ifc-13.1.5.192.ebuild
+++ b/dev-lang/ifc/ifc-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 FORTRAN 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_jp]"
-RDEPEND="${DEPEND}
+# avoid file collision with icc #476330
+RDEPEND="l10n_ja? ( !dev-lang/icc[l10n_ja(-)] !dev-lang/icc[linguas_ja(-)] )
        ~dev-libs/intel-common-${PV}[compiler,multilib=]"
 
 INTEL_BIN_RPMS="compilerprof compilerprof-devel"
@@ -26,7 +26,7 @@ INTEL_DAT_RPMS="compilerprof-common"
 CHECKREQS_DISK_BUILD=375M
 
 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/ifc/ifc-14.0.3.174.ebuild b/dev-lang/ifc/ifc-14.0.3.174.ebuild
index 2fb00bb8a9b944ff37b75d3056262f17739babd0..ccac93c167cbc321bbc59db37d142c6eef6c4ce2 100644 (file)
--- a/dev-lang/ifc/ifc-14.0.3.174.ebuild
+++ b/dev-lang/ifc/ifc-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 FORTRAN 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_jp]"
-RDEPEND="${DEPEND}
+# avoid file collision with icc #476330
+RDEPEND="l10n_ja? ( !dev-lang/icc[l10n_ja(-)] !dev-lang/icc[linguas_ja(-)] )
        ~dev-libs/intel-common-${PV}[compiler,multilib=]"
 
 INTEL_BIN_RPMS="compilerprof compilerprof-devel"
@@ -27,7 +27,7 @@ INTEL_DAT_RPMS="compilerprof-common"
 CHECKREQS_DISK_BUILD=375M
 
 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/ifc/ifc-15.0.6.233.ebuild b/dev-lang/ifc/ifc-15.0.6.233.ebuild
index 818272839d41329e844615abf6bcc8d6c592f271..fe1be6319ab0631aa9d3d5101db374828a5c5f01 100644 (file)
--- a/dev-lang/ifc/ifc-15.0.6.233.ebuild
+++ b/dev-lang/ifc/ifc-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 FORTRAN 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_jp]"
-RDEPEND="${DEPEND}
+# avoid file collision with icc #476330
+RDEPEND="l10n_ja? ( !dev-lang/icc[l10n_ja(-)] !dev-lang/icc[linguas_ja(-)] )
        ~dev-libs/intel-common-${PV}[compiler,multilib=]"
 
 INTEL_BIN_RPMS="compilerprof compilerprof-devel"
@@ -27,7 +27,7 @@ INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
 CHECKREQS_DISK_BUILD=375M
 
 src_install() {
-       if ! use linguas_ja; then
+       if ! use l10n_ja; then
                find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
        fi