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