1 |
bicatali 09/01/27 16:11:37 |
2 |
|
3 |
Modified: ChangeLog ipp-6.0.0.063.ebuild |
4 |
Added: ipp-6.0.1.071.ebuild |
5 |
Log: |
6 |
Version bump and re-define the extracting tool with upstream change of license management (for 6.0.0.063 too). |
7 |
(Portage version: 2.2_rc23/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.6 sci-libs/ipp/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ChangeLog?rev=1.6&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ChangeLog?rev=1.6&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ChangeLog?r1=1.5&r2=1.6 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/ipp/ChangeLog,v |
19 |
retrieving revision 1.5 |
20 |
retrieving revision 1.6 |
21 |
diff -u -r1.5 -r1.6 |
22 |
--- ChangeLog 19 Jan 2009 22:58:10 -0000 1.5 |
23 |
+++ ChangeLog 27 Jan 2009 16:11:37 -0000 1.6 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for sci-libs/ipp |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ChangeLog,v 1.5 2009/01/19 22:58:10 bicatali Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ChangeLog,v 1.6 2009/01/27 16:11:37 bicatali Exp $ |
29 |
+ |
30 |
+*ipp-6.0.1.071 (27 Jan 2009) |
31 |
+ |
32 |
+ 27 Jan 2009; Sébastien Fabbro <bicatali@g.o> ipp-6.0.0.063.ebuild, |
33 |
+ +ipp-6.0.1.071.ebuild: |
34 |
+ Version bump and re-define the extracting tool with upstream change of |
35 |
+ license management (for 6.0.0.063 too). |
36 |
|
37 |
*ipp-6.0.0.063 (19 Jan 2009) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.2 sci-libs/ipp/ipp-6.0.0.063.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild?rev=1.2&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild?rev=1.2&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild?r1=1.1&r2=1.2 |
47 |
|
48 |
Index: ipp-6.0.0.063.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild,v |
51 |
retrieving revision 1.1 |
52 |
retrieving revision 1.2 |
53 |
diff -u -r1.1 -r1.2 |
54 |
--- ipp-6.0.0.063.ebuild 19 Jan 2009 22:58:10 -0000 1.1 |
55 |
+++ ipp-6.0.0.063.ebuild 27 Jan 2009 16:11:37 -0000 1.2 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2009 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild,v 1.1 2009/01/19 22:58:10 bicatali Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-6.0.0.063.ebuild,v 1.2 2009/01/27 16:11:37 bicatali Exp $ |
61 |
|
62 |
inherit check-reqs |
63 |
|
64 |
@@ -15,7 +15,7 @@ |
65 |
x86? ( ${COM_URI}/l_${PB}_ia32_p_${PV}.tar.gz ) |
66 |
ia64? ( ${COM_URI}/l_${PB}_itanium_p_${PV}.tar.gz )" |
67 |
|
68 |
-SLOT=0 |
69 |
+SLOT="0" |
70 |
LICENSE="Intel-SDP" |
71 |
|
72 |
IUSE="" |
73 |
@@ -59,33 +59,28 @@ |
74 |
} |
75 |
|
76 |
src_unpack() { |
77 |
- |
78 |
- ewarn |
79 |
- ewarn "Intel ${PN} requires at least 300Mb of disk space" |
80 |
- ewarn "Make sure you have enough in ${PORTAGE_TMPDIR}, /tmp and in /opt" |
81 |
- ewarn |
82 |
unpack ${A} |
83 |
+ cd l_${PB}_*_${PV} |
84 |
|
85 |
- cd l_${PB}_*_${PV}/install |
86 |
# need to make a file to install non-interactively. |
87 |
# to produce such a file, first do it interactively |
88 |
# tar xf l_*; ./install.sh --duplicate ipp.ini; |
89 |
- # the file will be instman/ipp.ini |
90 |
- # binary blob extractor installs crap in /opt/intel |
91 |
- addwrite /opt/intel |
92 |
+ |
93 |
+ # binary blob extractor uses stupid directory |
94 |
+ addwrite /usr/local/share/macrovision |
95 |
+ |
96 |
cp ${IPP_LICENSE} "${WORKDIR}"/ |
97 |
- IPP_TMP_LICENSE="$(basename ${IPP_LICENSE})" |
98 |
cat > ipp.ini <<- EOF |
99 |
- [IPP_${IPP_ARCH}] |
100 |
- EULA_ACCEPT_REJECT=ACCEPT |
101 |
+ ACTIVATION=license_file |
102 |
+ CONTINUE_WITH_OPTIONAL_ERROR=yes |
103 |
+ PSET_INSTALL_DIR=${S} |
104 |
+ PSET_LICENSE_FILE=${IPP_LICENSE} |
105 |
+ INSTALL_MODE=NONRPM |
106 |
+ ACCEPT_EULA=accept |
107 |
EOF |
108 |
+ |
109 |
einfo "Extracting ..." |
110 |
- ./install \ |
111 |
- --silent ${PWD}/ipp.ini \ |
112 |
- --nonrpm \ |
113 |
- --licensepath "${WORKDIR}"/${IPP_TMP_LICENSE} \ |
114 |
- --installpath "${S}" \ |
115 |
- --log log.txt &> /dev/null |
116 |
+ ./install.sh --silent ${PWD}/ipp.ini &> log.txt |
117 |
|
118 |
# This check is arbitrary to say the least... |
119 |
# We used to look for a specific library (ie: libippmmx.so) but that |
120 |
@@ -98,11 +93,12 @@ |
121 |
die "extracting failed" |
122 |
fi |
123 |
|
124 |
+ # clean up |
125 |
+ cd "${S}" |
126 |
+ find . -type d -print0 | xargs --null chmod 755 |
127 |
+ rm -rf tmp* uninstall.sh |
128 |
rm -rf "${WORKDIR}"/l_* |
129 |
-} |
130 |
- |
131 |
-src_compile() { |
132 |
- einfo "Binary package, nothing to compile" |
133 |
+ rm -rf /usr/local/share/macrovision |
134 |
} |
135 |
|
136 |
src_install() { |
137 |
@@ -110,9 +106,9 @@ |
138 |
dodir ${instdir} |
139 |
|
140 |
# install license file |
141 |
- if [[ ! -f ${INTEL_LIC_DIR}/${IPP_TMP_LICENSE} ]]; then |
142 |
+ if [[ ! -f ${INTEL_LIC_DIR}/$(basename ${IPP_LICENSE}) ]]; then |
143 |
insinto ${INTEL_LIC_DIR} |
144 |
- doins "${WORKDIR}"/${IPP_TMP_LICENSE} |
145 |
+ doins ${IPP_LICENSE} |
146 |
fi |
147 |
|
148 |
# cp quicker than doins |
149 |
|
150 |
|
151 |
|
152 |
1.1 sci-libs/ipp/ipp-6.0.1.071.ebuild |
153 |
|
154 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.1.071.ebuild?rev=1.1&view=markup |
155 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/ipp/ipp-6.0.1.071.ebuild?rev=1.1&content-type=text/plain |
156 |
|
157 |
Index: ipp-6.0.1.071.ebuild |
158 |
=================================================================== |
159 |
# Copyright 1999-2009 Gentoo Foundation |
160 |
# Distributed under the terms of the GNU General Public License v2 |
161 |
# $Header: /var/cvsroot/gentoo-x86/sci-libs/ipp/ipp-6.0.1.071.ebuild,v 1.1 2009/01/27 16:11:37 bicatali Exp $ |
162 |
|
163 |
inherit check-reqs |
164 |
|
165 |
PID=1326 |
166 |
PB=${PN} |
167 |
DESCRIPTION="Intel(R) Integrated Performance Primitive library for multimedia and data processing" |
168 |
HOMEPAGE="http://developer.intel.com/software/products/ipp/" |
169 |
|
170 |
KEYWORDS="~amd64 ~x86 ~ia64" |
171 |
COM_URI="http://registrationcenter-download.intel.com/irc_nas/${PID}" |
172 |
SRC_URI="amd64? ( ${COM_URI}/l_${PB}_em64t_p_${PV}.tar.gz ) |
173 |
x86? ( ${COM_URI}/l_${PB}_ia32_p_${PV}.tar.gz ) |
174 |
ia64? ( ${COM_URI}/l_${PB}_itanium_p_${PV}.tar.gz )" |
175 |
|
176 |
SLOT="0" |
177 |
LICENSE="Intel-SDP" |
178 |
|
179 |
IUSE="" |
180 |
RESTRICT="strip mirror binchecks" |
181 |
|
182 |
INTEL_LIC_DIR=/opt/intel/licenses |
183 |
|
184 |
pkg_setup() { |
185 |
# Check the license |
186 |
if [[ -z ${IPP_LICENSE} ]]; then |
187 |
IPP_LICENSE="$(grep -ls PerfPrim ${ROOT}${INTEL_LIC_DIR}/* | tail -n 1)" |
188 |
IPP_LICENSE=${IPP_LICENSE/${ROOT}/} |
189 |
fi |
190 |
if [[ -z ${IPP_LICENSE} ]]; then |
191 |
eerror "Did not find any valid ipp license." |
192 |
eerror "Register at ${HOMEPAGE} to receive a license" |
193 |
eerror "and place it in ${INTEL_LIC_DIR} or run:" |
194 |
eerror "export IPP_LICENSE=/my/license/file emerge ipp" |
195 |
die "license setup failed" |
196 |
fi |
197 |
|
198 |
local disq_req |
199 |
IPP_ARCH= |
200 |
if use amd64; then |
201 |
IPP_ARCH="em64t" |
202 |
disk_req="800" |
203 |
elif use x86; then |
204 |
IPP_ARCH="ia32" |
205 |
disk_req="600" |
206 |
elif use ia64; then |
207 |
IPP_ARCH="ia64" |
208 |
disk_req="700" |
209 |
fi |
210 |
einfo "IPP_LICENSE=${IPP_LICENSE}" |
211 |
einfo "IPP_ARCH=${IPP_ARCH}" |
212 |
|
213 |
# Check if we have enough RAM and free diskspace |
214 |
CHECKREQS_MEMORY="512" |
215 |
CHECKREQS_DISK_BUILD=${disk_req} |
216 |
check_reqs |
217 |
} |
218 |
|
219 |
src_unpack() { |
220 |
unpack ${A} |
221 |
cd l_${PB}_*_${PV} |
222 |
|
223 |
# need to make a file to install non-interactively. |
224 |
# to produce such a file, first do it interactively |
225 |
# tar xf l_*; ./install.sh --duplicate ipp.ini; |
226 |
|
227 |
# binary blob extractor uses stupid directory |
228 |
addwrite /usr/local/share/macrovision |
229 |
|
230 |
cp ${IPP_LICENSE} "${WORKDIR}"/ |
231 |
cat > ipp.ini <<- EOF |
232 |
ACTIVATION=license_file |
233 |
CONTINUE_WITH_OPTIONAL_ERROR=yes |
234 |
PSET_INSTALL_DIR=${S} |
235 |
PSET_LICENSE_FILE=${IPP_LICENSE} |
236 |
INSTALL_MODE=NONRPM |
237 |
ACCEPT_EULA=accept |
238 |
EOF |
239 |
|
240 |
einfo "Extracting ..." |
241 |
./install.sh --silent ${PWD}/ipp.ini &> log.txt |
242 |
|
243 |
# This check is arbitrary to say the least... |
244 |
# We used to look for a specific library (ie: libippmmx.so) but that |
245 |
# is unreliable as they are moving targets and may not be there on |
246 |
# the next release. ippEULA.txt is more likely to remain there at |
247 |
# the next release. |
248 |
if [[ -z $(find "${S}" -name ippEULA.txt) ]]; then |
249 |
eerror "could not find extracted files" |
250 |
eerror "see ${PWD}/log.txt to see why" |
251 |
die "extracting failed" |
252 |
fi |
253 |
|
254 |
# clean up |
255 |
cd "${S}" |
256 |
find . -type d -print0 | xargs --null chmod 755 |
257 |
rm -rf tmp* uninstall.sh |
258 |
rm -rf "${WORKDIR}"/l_* |
259 |
rm -rf /usr/local/share/macrovision |
260 |
} |
261 |
|
262 |
src_install() { |
263 |
local instdir=/opt/intel/${PN}/${PV}/${IPP_ARCH} |
264 |
dodir ${instdir} |
265 |
|
266 |
# install license file |
267 |
if [[ ! -f ${INTEL_LIC_DIR}/$(basename ${IPP_LICENSE}) ]]; then |
268 |
insinto ${INTEL_LIC_DIR} |
269 |
doins ${IPP_LICENSE} |
270 |
fi |
271 |
|
272 |
# cp quicker than doins |
273 |
einfo "Copying all files" |
274 |
cp -pPR "${S}"/* "${D}"${instdir} || \ |
275 |
die "copying files failed" |
276 |
|
277 |
local env_file=36ipp |
278 |
echo "LDPATH=${instdir}/sharedlib" > ${env_file} |
279 |
doenvd ${env_file} || die "doenvd ${env_file} failed" |
280 |
} |