| 1 |
commit: d0299e3ed49a007f1522ef261ee9e071edc906e8 |
| 2 |
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 7 20:28:09 2018 +0000 |
| 4 |
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 7 20:34:47 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0299e3e |
| 7 |
|
| 8 |
dev-lang/icc: Migrate from LINGUAS to L10N. |
| 9 |
|
| 10 |
Update blocker against ifc, it needs to block only when l10n_ja is |
| 11 |
enabled for both packages. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/476330 |
| 14 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
| 15 |
|
| 16 |
dev-lang/icc/icc-13.1.5.192.ebuild | 10 +++++----- |
| 17 |
dev-lang/icc/icc-14.0.3.174.ebuild | 10 +++++----- |
| 18 |
dev-lang/icc/icc-15.0.6.233.ebuild | 10 +++++----- |
| 19 |
3 files changed, 15 insertions(+), 15 deletions(-) |
| 20 |
|
| 21 |
diff --git a/dev-lang/icc/icc-13.1.5.192.ebuild b/dev-lang/icc/icc-13.1.5.192.ebuild |
| 22 |
index 5abb6c4a24f..1d92c2151e1 100644 |
| 23 |
--- a/dev-lang/icc/icc-13.1.5.192.ebuild |
| 24 |
+++ b/dev-lang/icc/icc-13.1.5.192.ebuild |
| 25 |
@@ -1,4 +1,4 @@ |
| 26 |
-# Copyright 1999-2014 Gentoo Foundation |
| 27 |
+# Copyright 1999-2018 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
@@ -13,11 +13,11 @@ inherit intel-sdp |
| 32 |
DESCRIPTION="Intel C/C++ Compiler" |
| 33 |
HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/" |
| 34 |
|
| 35 |
-IUSE="linguas_ja" |
| 36 |
+IUSE="l10n_ja" |
| 37 |
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 38 |
|
| 39 |
-DEPEND="!dev-lang/ifc[linguas_ja]" |
| 40 |
-RDEPEND="${DEPEND} |
| 41 |
+# avoid file collision with ifc #476330 |
| 42 |
+RDEPEND="l10n_ja? ( !dev-lang/ifc[l10n_ja(-)] !dev-lang/ifc[linguas_ja(-)] ) |
| 43 |
~dev-libs/intel-common-${PV}[compiler,multilib=]" |
| 44 |
|
| 45 |
INTEL_BIN_RPMS="compilerproc compilerproc-devel" |
| 46 |
@@ -26,7 +26,7 @@ INTEL_DAT_RPMS="compilerproc-common" |
| 47 |
CHECKREQS_DISK_BUILD=325M |
| 48 |
|
| 49 |
src_install() { |
| 50 |
- if ! use linguas_ja; then |
| 51 |
+ if ! use l10n_ja; then |
| 52 |
find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die |
| 53 |
fi |
| 54 |
intel-sdp_src_install |
| 55 |
|
| 56 |
diff --git a/dev-lang/icc/icc-14.0.3.174.ebuild b/dev-lang/icc/icc-14.0.3.174.ebuild |
| 57 |
index caffde47dfe..3947fc7f2e9 100644 |
| 58 |
--- a/dev-lang/icc/icc-14.0.3.174.ebuild |
| 59 |
+++ b/dev-lang/icc/icc-14.0.3.174.ebuild |
| 60 |
@@ -1,4 +1,4 @@ |
| 61 |
-# Copyright 1999-2014 Gentoo Foundation |
| 62 |
+# Copyright 1999-2018 Gentoo Foundation |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
|
| 65 |
EAPI=5 |
| 66 |
@@ -14,11 +14,11 @@ inherit intel-sdp |
| 67 |
DESCRIPTION="Intel C/C++ Compiler" |
| 68 |
HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/" |
| 69 |
|
| 70 |
-IUSE="linguas_ja" |
| 71 |
+IUSE="l10n_ja" |
| 72 |
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 73 |
|
| 74 |
-DEPEND="!dev-lang/ifc[linguas_ja]" |
| 75 |
-RDEPEND="${DEPEND} |
| 76 |
+# avoid file collision with ifc #476330 |
| 77 |
+RDEPEND="l10n_ja? ( !dev-lang/ifc[l10n_ja(-)] !dev-lang/ifc[linguas_ja(-)] ) |
| 78 |
~dev-libs/intel-common-${PV}[compiler,multilib=]" |
| 79 |
|
| 80 |
INTEL_BIN_RPMS="compilerproc compilerproc-devel" |
| 81 |
@@ -27,7 +27,7 @@ INTEL_DAT_RPMS="compilerproc-common" |
| 82 |
CHECKREQS_DISK_BUILD=325M |
| 83 |
|
| 84 |
src_install() { |
| 85 |
- if ! use linguas_ja; then |
| 86 |
+ if ! use l10n_ja; then |
| 87 |
find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die |
| 88 |
fi |
| 89 |
intel-sdp_src_install |
| 90 |
|
| 91 |
diff --git a/dev-lang/icc/icc-15.0.6.233.ebuild b/dev-lang/icc/icc-15.0.6.233.ebuild |
| 92 |
index 334b4b692b0..781b103b1bb 100644 |
| 93 |
--- a/dev-lang/icc/icc-15.0.6.233.ebuild |
| 94 |
+++ b/dev-lang/icc/icc-15.0.6.233.ebuild |
| 95 |
@@ -1,4 +1,4 @@ |
| 96 |
-# Copyright 1999-2016 Gentoo Foundation |
| 97 |
+# Copyright 1999-2018 Gentoo Foundation |
| 98 |
# Distributed under the terms of the GNU General Public License v2 |
| 99 |
|
| 100 |
EAPI=5 |
| 101 |
@@ -14,11 +14,11 @@ inherit intel-sdp |
| 102 |
DESCRIPTION="Intel C/C++ Compiler" |
| 103 |
HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/" |
| 104 |
|
| 105 |
-IUSE="linguas_ja" |
| 106 |
+IUSE="l10n_ja" |
| 107 |
KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 108 |
|
| 109 |
-DEPEND="!dev-lang/ifc[linguas_ja]" |
| 110 |
-RDEPEND="${DEPEND} |
| 111 |
+# avoid file collision with ifc #476330 |
| 112 |
+RDEPEND="l10n_ja? ( !dev-lang/ifc[l10n_ja(-)] !dev-lang/ifc[linguas_ja(-)] ) |
| 113 |
~dev-libs/intel-common-${PV}[compiler,multilib=]" |
| 114 |
|
| 115 |
INTEL_BIN_RPMS="compilerproc compilerproc-devel" |
| 116 |
@@ -27,7 +27,7 @@ INTEL_DAT_RPMS="compilerproc-common compilerproc-vars" |
| 117 |
CHECKREQS_DISK_BUILD=325M |
| 118 |
|
| 119 |
src_install() { |
| 120 |
- if ! use linguas_ja; then |
| 121 |
+ if ! use l10n_ja; then |
| 122 |
find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die |
| 123 |
fi |
| 124 |
intel-sdp_src_install |
Archives