From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-996203-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 7F18B138330
for <garchives@archives.gentoo.org>; Sun, 7 Jan 2018 20:35:04 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E8B69E0841;
Sun, 7 Jan 2018 20:35:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id B9E5CE0841
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jan 2018 20:35:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AF01A340DE5
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jan 2018 20:35:02 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 72FA01A2
for <gentoo-commits@lists.gentoo.org>; Sun, 7 Jan 2018 20:35:01 +0000 (UTC)
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1515357287.9aa9a97bac12dfec6e47c5061812051deb1610d9.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ifc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/ifc/ifc-13.1.5.192.ebuild dev-lang/ifc/ifc-14.0.3.174.ebuild dev-lang/ifc/ifc-15.0.6.233.ebuild
X-VCS-Directories: dev-lang/ifc/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 9aa9a97bac12dfec6e47c5061812051deb1610d9
X-VCS-Branch: master
Date: Sun, 7 Jan 2018 20:35:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d9b731dd-171a-424a-bd08-c9f598afa5fc
X-Archives-Hash: cebc6d6420950b95465a6ea99fee724d
commit: 9aa9a97bac12dfec6e47c5061812051deb1610d9
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 7 20:30:23 2018 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 7 20:34:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9aa9a97b
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
dev-lang/ifc/ifc-13.1.5.192.ebuild | 10 +++++-----
dev-lang/ifc/ifc-14.0.3.174.ebuild | 10 +++++-----
dev-lang/ifc/ifc-15.0.6.233.ebuild | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/dev-lang/ifc/ifc-13.1.5.192.ebuild b/dev-lang/ifc/ifc-13.1.5.192.ebuild
index 7ff5dd0df06..4651e5c84c6 100644
--- 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 2fb00bb8a9b..ccac93c167c 100644
--- 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 818272839d4..fe1be6319ab 100644
--- 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