1 |
commit: 7a55959f98fe51f8455297218cf17bc6872ba700 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 27 10:58:03 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 10:58:03 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=7a55959f |
7 |
|
8 |
intel-sdp.eclass: Import latest tree changes |
9 |
|
10 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
11 |
|
12 |
eclass/intel-sdp.eclass | 35 +++++++++++++++++++++-------------- |
13 |
1 file changed, 21 insertions(+), 14 deletions(-) |
14 |
|
15 |
diff --git a/eclass/intel-sdp.eclass b/eclass/intel-sdp.eclass |
16 |
index 5761973..95e711f 100644 |
17 |
--- a/eclass/intel-sdp.eclass |
18 |
+++ b/eclass/intel-sdp.eclass |
19 |
@@ -1,4 +1,4 @@ |
20 |
-# Copyright 1999-2014 Gentoo Foundation |
21 |
+# Copyright 1999-2015 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
# $Id$ |
24 |
|
25 |
@@ -122,7 +122,7 @@ |
26 |
# Full path to intel registry db |
27 |
INTEL_SDP_DB="${EROOT%/}"/opt/intel/intel-sdp-products.db |
28 |
|
29 |
-inherit check-reqs multilib versionator |
30 |
+inherit check-reqs eutils multilib versionator |
31 |
|
32 |
_INTEL_PV1=$(get_version_component_range 1) |
33 |
_INTEL_PV2=$(get_version_component_range 2) |
34 |
@@ -190,7 +190,7 @@ QA_PREBUILT="${INTEL_SDP_DIR}/*" |
35 |
# Creating necessary links to use intel compiler with eclipse |
36 |
_isdp_link_eclipse_plugins() { |
37 |
local c f |
38 |
- pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null |
39 |
+ pushd ${INTEL_SDP_DIR}/eclipse_support > /dev/null || die |
40 |
for c in cdt*; do |
41 |
local cv=${c#cdt} ev=3.$(( ${cv:0:1} - 1)) |
42 |
if has_version "dev-util/eclipse-sdk:${ev}"; then |
43 |
@@ -207,7 +207,7 @@ _isdp_link_eclipse_plugins() { |
44 |
done |
45 |
fi |
46 |
done |
47 |
- popd > /dev/null |
48 |
+ popd > /dev/null || die |
49 |
} |
50 |
|
51 |
# @FUNCTION: _isdp_big-warning |
52 |
@@ -230,9 +230,9 @@ _isdp_big-warning() { |
53 |
esac |
54 |
|
55 |
echo "" |
56 |
- ewarn "Make sure you have recieved the an Intel license." |
57 |
+ ewarn "Make sure you have received an Intel license." |
58 |
ewarn "To receive a non-commercial license, you need to register at:" |
59 |
- ewarn "http://software.intel.com/en-us/articles/non-commercial-software-development/" |
60 |
+ ewarn "https://software.intel.com/en-us/qualify-for-free-software" |
61 |
ewarn "Install the license file into ${INTEL_SDP_EDIR}/licenses/" |
62 |
|
63 |
case ${1} in |
64 |
@@ -461,7 +461,13 @@ intel-sdp_src_unpack() { |
65 |
# @DESCRIPTION: |
66 |
# Install everything |
67 |
intel-sdp_src_install() { |
68 |
- if [[ -d "${INTEL_SDP_DIR}"/Documentation ]]; then |
69 |
+ if path_exists "${INTEL_SDP_DIR}"/uninstall*; then |
70 |
+ ebegin "Cleaning out uninstall information" |
71 |
+ find "${INTEL_SDP_DIR}"/uninstall* -delete || die |
72 |
+ eend |
73 |
+ fi |
74 |
+ |
75 |
+ if path_exists "${INTEL_SDP_DIR}"/Documentation; then |
76 |
dodoc -r "${INTEL_SDP_DIR}"/Documentation/* |
77 |
|
78 |
ebegin "Cleaning out documentation" |
79 |
@@ -469,7 +475,7 @@ intel-sdp_src_install() { |
80 |
eend |
81 |
fi |
82 |
|
83 |
- if [[ -d "${INTEL_SDP_DIR}"/Samples ]]; then |
84 |
+ if path_exists "${INTEL_SDP_DIR}"/Samples; then |
85 |
if use examples ; then |
86 |
insinto /usr/share/${P}/examples/ |
87 |
doins -r "${INTEL_SDP_DIR}"/Samples/* |
88 |
@@ -479,7 +485,7 @@ intel-sdp_src_install() { |
89 |
eend |
90 |
fi |
91 |
|
92 |
- if [[ -d "${INTEL_SDP_DIR}"/eclipse_support ]]; then |
93 |
+ if path_exists "${INTEL_SDP_DIR}"/eclipse_support; then |
94 |
if has eclipse ${IUSE} && use eclipse; then |
95 |
_isdp_link_eclipse_plugins |
96 |
else |
97 |
@@ -489,12 +495,13 @@ intel-sdp_src_install() { |
98 |
fi |
99 |
fi |
100 |
|
101 |
- if [[ -d "${INTEL_SDP_DIR}"/man ]]; then |
102 |
- nonfatal doman "${INTEL_SDP_DIR}"/man/en_US/man1/* |
103 |
- nonfatal doman "${INTEL_SDP_DIR}"/man/man1/* |
104 |
- if has linguas_ja ${IUSE} && use linguas_ja; then |
105 |
+ if path_exists "${INTEL_SDP_DIR}"/man; then |
106 |
+ path_exists "${INTEL_SDP_DIR}"/man/en_US/man1/* && \ |
107 |
+ doman "${INTEL_SDP_DIR}"/man/en_US/man1/* |
108 |
+ path_exists "${INTEL_SDP_DIR}"/man/man1/* && \ |
109 |
+ doman "${INTEL_SDP_DIR}"/man/man1/* |
110 |
+ has linguas_ja ${IUSE} && use linguas_ja && \ |
111 |
doman -i18n=ja_JP "${INTEL_SDP_DIR}"/man/ja_JP/man1/* |
112 |
- fi |
113 |
|
114 |
find "${INTEL_SDP_DIR}"/man -delete || die |
115 |
fi |