/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.97 Revision 1.264
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.97 2004/08/31 09:05:24 lv Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.264 2006/11/14 12:04:48 uberlord Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14
15DEPEND="!bootstrap? ( sys-devel/patch )"
16 13
17DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
18 15
19# This function simply returns the desired lib directory. With portage 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# 2.0.51, we now have support for installing libraries to lib32/lib64 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# to accomidate the needs of multilib systems. It's no longer a good idea 18# outputting to a terminal, don't wait. For compatability purposes, the argument
22# to assume all libraries will end up in lib. Replace any (sane) instances 19# must be an integer greater than zero.
23# where lib is named directly with $(get_libdir) if possible. 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24# 21epause() {
25# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
26get_libdir() {
27 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
28 # if there is an override, we want to use that... always.
29 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
30 elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
31 # and if there isnt an override, and we're using a version of
32 # portage without CONF_LIBDIR support, force the use of lib. dolib
33 # and friends from portage 2.0.50 wont be too happy otherwise.
34 CONF_LIBDIR="lib"
35 fi
36 # and of course, default to lib if CONF_LIBDIR isnt set
37 echo ${CONF_LIBDIR:=lib}
38} 23}
39 24
40# Sometimes you need to override the value returned by get_libdir. A good 25# Beep the specified number of times (defaults to five). If our output
41# example of this is xorg-x11, where lib32 isnt a supported configuration, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
42# and where lib64 -must- be used on amd64 (for applications that need lib 27# don't beep.
43# to be 32bit, such as adobe acrobat). Note that this override also bypasses 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
44# portage version sanity checking. 29ebeep() {
45# get_libdir_override expects one argument, the result get_libdir should 30 local n
46# return: 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
47# 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
48# get_libdir_override lib64 33 echo -ne "\a"
49# 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
50# Travis Tilley <lv@gentoo.org> (31 Aug 2004) 35 echo -ne "\a"
51get_libdir_override() { 36 sleep 1
52 CONF_LIBDIR="$1" 37 done
53 CONF_LIBDIR_OVERRIDE="$1" 38 fi
54} 39}
55 40
56# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
57# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
58# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
70# to point to the latest version of the library present. 55# to point to the latest version of the library present.
71# 56#
72# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
73# 58#
74gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
68 local lib libdir=$(get_libdir)
75 # Just make sure it exists 69 # Just make sure it exists
76 dodir /usr/$(get_libdir) 70 dodir /usr/${libdir}
77 71
72 for lib in "${@}" ; do
78 cat > ${D}/usr/$(get_libdir)/$1 <<"END_LDSCRIPT" 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
79/* GNU ld script 74 /* GNU ld script
80 Because Gentoo have critical dynamic libraries 75 Since Gentoo has critical dynamic libraries
81 in /lib, and the static versions in /usr/lib, we 76 in /lib, and the static versions in /usr/lib,
82 need to have a "fake" dynamic lib in /usr/lib, 77 we need to have a "fake" dynamic lib in /usr/lib,
83 otherwise we run into linking problems. 78 otherwise we run into linking problems.
84 See bug #4411 on http://bugs.gentoo.org/ for 79
85 more info. */ 80 See bug http://bugs.gentoo.org/4411 for more info.
81 */
82 GROUP ( /${libdir}/${lib} )
86END_LDSCRIPT 83 END_LDSCRIPT
87 84 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
88 echo "GROUP ( /$(get_libdir)/libxxx )" >> ${D}/usr/$(get_libdir)/$1
89 dosed "s:libxxx:$1:" /usr/$(get_libdir)/$1
90
91 return 0
92}
93
94# Simple function to draw a line consisting of '=' the same length as $*
95#
96# <azarah@gentoo.org> (11 Nov 2002)
97#
98draw_line() {
99 local i=0
100 local str_length=""
101
102 # Handle calls that do not have args, or wc not being installed ...
103 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
104 then
105 echo "==============================================================="
106 return 0
107 fi
108
109 # Get the length of $*
110 str_length="$(echo -n "$*" | wc -m)"
111
112 while [ "$i" -lt "${str_length}" ]
113 do
114 echo -n "="
115
116 i=$((i + 1))
117 done 85 done
118
119 echo
120
121 return 0
122} 86}
87
123 88
124# Default directory where patches are located 89# Default directory where patches are located
125EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
126# Default extension for patches 91# Default extension for patches
127EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
128# Default options for patch 93# Default options for patch
129# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
130EPATCH_OPTS="-g0" 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
96# Set -E to automatically remove empty files.
97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
131# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
132# and not the full path .. 99# and not the full path ..
133EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
134# Change the printed message for a single patch. 101# Change the printed message for a single patch.
135EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
103# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
136# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
137# 106#
138# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
139# 108#
140EPATCH_FORCE="no" 109EPATCH_FORCE="no"
171# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
172# 141#
173# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
174# 143#
175epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
176 local PIPE_CMD="" 150 local PIPE_CMD=""
177 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
178 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
179 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
180 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
181 local x="" 155 local x=""
182 156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
158
183 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
184 then 160 then
185 local m="" 161 local m=""
186 einfo "${#} patches to apply..."
187 for m in "$@" ; do 162 for m in "$@" ; do
188 epatch "${m}" 163 epatch "${m}"
189 done 164 done
190 return 0 165 return 0
191 fi 166 fi
205 local EPATCH_SOURCE="$1/*" 180 local EPATCH_SOURCE="$1/*"
206 else 181 else
207 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 182 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
208 fi 183 fi
209 else 184 else
210 if [ ! -d ${EPATCH_SOURCE} ] 185 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
211 then 186 then
212 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 187 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
213 then 188 then
214 EPATCH_SOURCE="$1" 189 EPATCH_SOURCE="$1"
215 fi 190 fi
216 191
217 echo 192 echo
218 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 193 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
219 eerror 194 eerror
220 eerror " ${EPATCH_SOURCE}" 195 eerror " ${EPATCH_SOURCE}"
196 eerror " ( ${EPATCH_SOURCE##*/} )"
221 echo 197 echo
222 die "Cannot find \$EPATCH_SOURCE!" 198 die "Cannot find \$EPATCH_SOURCE!"
223 fi 199 fi
224 200
225 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 201 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
244 ;; 220 ;;
245 esac 221 esac
246 222
247 if [ "${SINGLE_PATCH}" = "no" ] 223 if [ "${SINGLE_PATCH}" = "no" ]
248 then 224 then
249 einfo "Applying various patches (bugfixes/updates)..." 225 einfo "${EPATCH_MULTI_MSG}"
250 fi 226 fi
251 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
252 do 228 do
253 # New ARCH dependant patch naming scheme... 229 # New ARCH dependant patch naming scheme ...
254 # 230 #
255 # ???_arch_foo.patch 231 # ???_arch_foo.patch
256 # 232 #
257 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
258 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
259 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
260 then 236 then
261 local count=0 237 local count=0
262 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
239 local patchname=${x##*/}
263 240
264 if [ -n "${EPATCH_EXCLUDE}" ] 241 if [ -n "${EPATCH_EXCLUDE}" ]
265 then 242 then
266 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 243 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
267 then 244 then
268 continue 245 continue
269 fi 246 fi
270 fi 247 fi
271 248
273 then 250 then
274 if [ -n "${EPATCH_SINGLE_MSG}" ] 251 if [ -n "${EPATCH_SINGLE_MSG}" ]
275 then 252 then
276 einfo "${EPATCH_SINGLE_MSG}" 253 einfo "${EPATCH_SINGLE_MSG}"
277 else 254 else
278 einfo "Applying ${x##*/}..." 255 einfo "Applying ${patchname} ..."
279 fi 256 fi
280 else 257 else
281 einfo " ${x##*/}..." 258 einfo " ${patchname} ..."
282 fi 259 fi
283 260
284 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 263
287 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
288 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
289 do 266 do
290 # Generate some useful debug info ... 267 # Generate some useful debug info ...
291 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 270
294 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
295 then 272 then
296 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 else 275 else
299 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
300 fi 277 fi
301 278
302 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 281
305 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
306 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
307 284
308 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
309 then 286 then
310 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
311 then 288 then
312 echo 289 echo
313 eerror "Could not extract patch!" 290 eerror "Could not extract patch!"
314 #die "Could not extract patch!" 291 #die "Could not extract patch!"
315 count=5 292 count=5
316 break 293 break
317 fi 294 fi
318 fi 295 fi
319 296
320 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
321 then 298 then
322 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
326 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
327 304
328 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
329 307
330 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
331 then 309 then
332 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 echo 311 echo
334 eerror "A dry-run of patch command succeeded, but actually" 312 eerror "A dry-run of patch command succeeded, but actually"
335 eerror "applying the patch failed!" 313 eerror "applying the patch failed!"
336 #die "Real world sux compared to the dreamworld!" 314 #die "Real world sux compared to the dreamworld!"
337 count=5 315 count=5
338 fi 316 fi
339 317
340 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
341 319
342 break 320 break
343 fi 321 fi
344 322
345 count=$((count + 1)) 323 count=$((count + 1))
351 fi 329 fi
352 330
353 if [ "${count}" -eq 5 ] 331 if [ "${count}" -eq 5 ]
354 then 332 then
355 echo 333 echo
356 eerror "Failed Patch: ${x##*/}!" 334 eerror "Failed Patch: ${patchname} !"
335 eerror " ( ${PATCH_TARGET} )"
357 eerror 336 eerror
358 eerror "Include in your bugreport the contents of:" 337 eerror "Include in your bugreport the contents of:"
359 eerror 338 eerror
360 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 339 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
361 echo 340 echo
362 die "Failed Patch: ${x##*/}!" 341 die "Failed Patch: ${patchname}!"
363 fi 342 fi
364 343
365 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 344 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
366 345
367 eend 0 346 eend 0
368 fi 347 fi
369 done 348 done
370 if [ "${SINGLE_PATCH}" = "no" ] 349 if [ "${SINGLE_PATCH}" = "no" ]
371 then 350 then
372 einfo "Done with patching" 351 einfo "Done with patching"
373 fi 352 fi
374} 353}
375 354
376# This function return true if we are using the NPTL pthreads
377# implementation.
378#
379# <azarah@gentoo.org> (06 March 2003)
380#
381
382have_NPTL() {
383
384 cat > ${T}/test-nptl.c <<-"END"
385 #define _XOPEN_SOURCE
386 #include <unistd.h>
387 #include <stdio.h>
388
389 int main()
390 {
391 char buf[255];
392 char *str = buf;
393
394 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
395 if (NULL != str) {
396 printf("%s\n", str);
397 if (NULL != strstr(str, "NPTL"))
398 return 0;
399 }
400
401 return 1;
402 }
403 END
404
405 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
406 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
407 then
408 echo "yes"
409 einfon "Checking what PTHREADS implementation we have ... "
410 if ${T}/nptl
411 then
412 return 0
413 else
414 return 1
415 fi
416 else
417 echo "no"
418 fi
419
420 return 1
421}
422
423# This function check how many cpu's are present, and then set
424# -j in MAKEOPTS accordingly.
425#
426# Thanks to nall <nall@gentoo.org> for this.
427#
428get_number_of_jobs() {
429 local jobs=0
430
431 if [ ! -r /proc/cpuinfo ]
432 then
433 return 1
434 fi
435
436 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
437 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
438 then
439 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
440 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
441 ADMINPARAM="${ADMINPARAM/-j}"
442 fi
443
444 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
445
446 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
447 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
448 then
449 # these archs will always have "[Pp]rocessor"
450 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
451
452 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
453 then
454 # sparc always has "ncpus active"
455 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
456
457 elif [ "${ARCH}" = "alpha" ]
458 then
459 # alpha has "cpus active", but only when compiled with SMP
460 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
461 then
462 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
463 else
464 jobs=2
465 fi
466
467 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
468 then
469 # ppc has "processor", but only when compiled with SMP
470 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
471 then
472 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
473 else
474 jobs=2
475 fi
476 elif [ "${ARCH}" = "s390" ]
477 then
478 # s390 has "# processors : "
479 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
480 else
481 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
482 die "Unknown ARCH -- ${ARCH}!"
483 fi
484
485 # Make sure the number is valid ...
486 if [ "${jobs}" -lt 1 ]
487 then
488 jobs=1
489 fi
490
491 if [ -n "${ADMINPARAM}" ]
492 then
493 if [ "${jobs}" -gt "${ADMINPARAM}" ]
494 then
495 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
496 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
497 else
498 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
499 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
500 fi
501 fi
502}
503
504# Cheap replacement for when debianutils (and thus mktemp) 355# Cheap replacement for when debianutils (and thus mktemp)
505# does not exist on the users system 356# does not exist on the users system
506# vapier@gentoo.org 357# vapier@gentoo.org
507# 358#
508# Takes just 1 parameter (the directory to create tmpfile in) 359# Takes just 1 optional parameter (the directory to create tmpfile in)
509mymktemp() { 360emktemp() {
361 local exe="touch"
362 [[ $1 == -d ]] && exe="mkdir" && shift
510 local topdir="$1" 363 local topdir=$1
511 364
512 [ -z "${topdir}" ] && topdir=/tmp 365 if [[ -z ${topdir} ]] ; then
513 if [ "`which mktemp 2>/dev/null`" ] 366 [[ -z ${T} ]] \
514 then 367 && topdir="/tmp" \
515 mktemp -p ${topdir} 368 || topdir=${T}
369 fi
370
371 if [[ -z $(type -p mktemp) ]] ; then
372 local tmp=/
373 while [[ -e ${tmp} ]] ; do
374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
375 done
376 ${exe} "${tmp}" || ${exe} -p "${tmp}"
377 echo "${tmp}"
516 else 378 else
517 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 379 if [[ ${exe} == "touch" ]] ; then
518 touch ${tmp} 380 [[ ${USERLAND} == "GNU" ]] \
519 echo ${tmp} 381 && mktemp -p "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -t tmp
383 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp
520 fi 387 fi
388 fi
521} 389}
522 390
523# Small wrapper for getent (Linux) and nidump (Mac OS X) 391# Small wrapper for getent (Linux), nidump (Mac OS X),
524# used in enewuser()/enewgroup() 392# and pw (FreeBSD) used in enewuser()/enewgroup()
525# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 393# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
394# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
526# 395#
527# egetent(database, key) 396# egetent(database, key)
528egetent() { 397egetent() {
529 if [ "${ARCH}" == "macos" ] ; then 398 case ${CHOST} in
399 *-darwin*)
530 case "$2" in 400 case "$2" in
531 *[!0-9]*) # Non numeric 401 *[!0-9]*) # Non numeric
532 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 402 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
533 ;; 403 ;;
534 *) # Numeric 404 *) # Numeric
535 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 405 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
536 ;; 406 ;;
537 esac 407 esac
538 else 408 ;;
539 getent $1 $2 409 *-freebsd*|*-dragonfly*)
410 local opts action="user"
411 [[ $1 == "passwd" ]] || action="group"
412
413 # lookup by uid/gid
414 if [[ $2 == [[:digit:]]* ]] ; then
415 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
540 fi 416 fi
417
418 pw show ${action} ${opts} "$2" -q
419 ;;
420 *-netbsd*|*-openbsd*)
421 grep "$2:\*:" /etc/$1
422 ;;
423 *)
424 type -p nscd >& /dev/null && nscd -i "$1"
425 getent "$1" "$2"
426 ;;
427 esac
541} 428}
542 429
543# Simplify/standardize adding users to the system 430# Simplify/standardize adding users to the system
544# vapier@gentoo.org 431# vapier@gentoo.org
545# 432#
552# shell: /bin/false 439# shell: /bin/false
553# homedir: /dev/null 440# homedir: /dev/null
554# groups: none 441# groups: none
555# extra: comment of 'added by portage for ${PN}' 442# extra: comment of 'added by portage for ${PN}'
556enewuser() { 443enewuser() {
444 case ${EBUILD_PHASE} in
445 unpack|compile|test|install)
446 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
447 eerror "Package fails at QA and at life. Please file a bug."
448 die "Bad package! enewuser is only for use in pkg_* functions!"
449 esac
450
557 # get the username 451 # get the username
558 local euser="$1"; shift 452 local euser=$1; shift
559 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
560 then
561 eerror "No username specified !" 454 eerror "No username specified !"
562 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
563 fi 456 fi
564 457
565 # lets see if the username already exists 458 # lets see if the username already exists
566 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ -n $(egetent passwd "${euser}") ]] ; then
567 then
568 return 0 460 return 0
569 fi 461 fi
570 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
571 463
572 # options to pass to useradd 464 # options to pass to useradd
573 local opts= 465 local opts=
574 466
575 # handle uid 467 # handle uid
576 local euid="$1"; shift 468 local euid=$1; shift
577 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ -n ${euid} && ${euid} != -1 ]] ; then
578 then
579 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
580 then
581 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ -n $(egetent passwd ${euid}) ]] ; then
582 then
583 euid="next" 472 euid="next"
584 fi 473 fi
585 else 474 else
586 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
587 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
588 fi 477 fi
589 else 478 else
590 euid="next" 479 euid="next"
591 fi 480 fi
592 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
593 then 482 for ((euid = 101; euid <= 999; euid++)); do
594 local pwrange
595 if [ "${ARCH}" == "macos" ] ; then
596 pwrange="`jot 898 101`"
597 else
598 pwrange="`seq 101 999`"
599 fi
600 for euid in ${pwrange} ; do
601 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
602 done 484 done
603 fi 485 fi
604 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
605 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
606 488
607 # handle shell 489 # handle shell
608 local eshell="$1"; shift 490 local eshell=$1; shift
609 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
610 then 492 if [[ ! -e ${ROOT}${eshell} ]] ; then
611 if [ ! -e "${eshell}" ]
612 then
613 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
614 die "${eshell} does not exist" 494 die "${eshell} does not exist in ${ROOT}"
495 fi
496 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
497 eerror "Do not specify ${eshell} yourself, use -1"
498 die "Pass '-1' as the shell parameter"
615 fi 499 fi
616 else 500 else
501 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
502 [[ -x ${ROOT}${shell} ]] && break
503 done
504
505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use, proceeding with userland default."
507 case ${USERLAND} in
617 eshell="/bin/false" 508 GNU) shell="/bin/false" ;;
509 BSD) shell="/sbin/nologin" ;;
510 Darwin) shell="/usr/sbin/nologin" ;;
511 *) die "Unable to identify the default shell for userland ${USERLAND}"
512 esac
513 fi
514
515 eshell=${shell}
618 fi 516 fi
619 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
620 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
621 519
622 # handle homedir 520 # handle homedir
623 local ehome="$1"; shift 521 local ehome=$1; shift
624 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 522 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
625 then
626 ehome="/dev/null" 523 ehome="/dev/null"
627 fi 524 fi
628 einfo " - Home: ${ehome}" 525 einfo " - Home: ${ehome}"
629 opts="${opts} -d ${ehome}" 526 opts="${opts} -d ${ehome}"
630 527
631 # handle groups 528 # handle groups
632 local egroups="$1"; shift 529 local egroups=$1; shift
633 if [ ! -z "${egroups}" ] 530 if [[ ! -z ${egroups} ]] ; then
634 then
635 local oldifs="${IFS}" 531 local oldifs=${IFS}
532 local defgroup="" exgroups=""
533
636 export IFS="," 534 export IFS=","
637 for g in ${egroups} 535 for g in ${egroups} ; do
638 do 536 export IFS=${oldifs}
639 if [ -z "`egetent group \"${g}\"`" ] 537 if [[ -z $(egetent group "${g}") ]] ; then
640 then
641 eerror "You must add group ${g} to the system first" 538 eerror "You must add group ${g} to the system first"
642 die "${g} is not a valid GID" 539 die "${g} is not a valid GID"
643 fi 540 fi
541 if [[ -z ${defgroup} ]] ; then
542 defgroup=${g}
543 else
544 exgroups="${exgroups},${g}"
545 fi
546 export IFS=","
644 done 547 done
645 export IFS="${oldifs}" 548 export IFS=${oldifs}
549
646 opts="${opts} -g ${egroups}" 550 opts="${opts} -g ${defgroup}"
551 if [[ ! -z ${exgroups} ]] ; then
552 opts="${opts} -G ${exgroups:1}"
553 fi
647 else 554 else
648 egroups="(none)" 555 egroups="(none)"
649 fi 556 fi
650 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
651 558
652 # handle extra and add the user 559 # handle extra and add the user
653 local eextra="$@"
654 local oldsandbox="${SANDBOX_ON}" 560 local oldsandbox=${SANDBOX_ON}
655 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
656 if [ "${ARCH}" == "macos" ]; 562 case ${CHOST} in
657 then 563 *-darwin*)
658 ### Make the user 564 ### Make the user
659 if [ -z "${eextra}" ] 565 if [[ -z $@ ]] ; then
660 then
661 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
662 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
663 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
664 dscl . create /users/${euser} realname "added by portage for ${PN}" 569 dscl . create /users/${euser} realname "added by portage for ${PN}"
665 ### Add the user to the groups specified 570 ### Add the user to the groups specified
571 local oldifs=${IFS}
572 export IFS=","
666 for g in ${egroups} 573 for g in ${egroups} ; do
667 do
668 dscl . merge /groups/${g} users ${euser} 574 dscl . merge /groups/${g} users ${euser}
669 done 575 done
576 export IFS=${oldifs}
670 else 577 else
671 einfo "Extra options are not supported on macos yet" 578 einfo "Extra options are not supported on Darwin yet"
672 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
673 einfo "eextra: ${eextra}" 580 einfo "eextra: $@"
674 die "Required function missing" 581 die "Required function missing"
675 fi 582 fi
583 ;;
584 *-freebsd*|*-dragonfly*)
585 if [[ -z $@ ]] ; then
586 pw useradd ${euser} ${opts} \
587 -c "added by portage for ${PN}" \
588 die "enewuser failed"
676 else 589 else
677 if [ -z "${eextra}" ] 590 einfo " - Extra: $@"
678 then 591 pw useradd ${euser} ${opts} \
592 "$@" || die "enewuser failed"
593 fi
594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
599 else
600 einfo " - Extra: $@"
601 useradd ${opts} ${euser} "$@" || die "enewuser failed"
602 fi
603 ;;
604
605 *-openbsd*)
606 if [[ -z $@ ]] ; then
607 useradd -u ${euid} -s ${eshell} \
608 -d ${ehome} -c "Added by portage for ${PN}" \
609 -g ${egroups} ${euser} || die "enewuser failed"
610 else
611 einfo " - Extra: $@"
612 useradd -u ${euid} -s ${eshell} \
613 -d ${ehome} -c "Added by portage for ${PN}" \
614 -g ${egroups} ${euser} "$@" || die "enewuser failed"
615 fi
616 ;;
617
618 *)
619 if [[ -z $@ ]] ; then
679 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
680 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
681 || die "enewuser failed" 622 || die "enewuser failed"
682 else 623 else
683 einfo " - Extra: ${eextra}" 624 einfo " - Extra: $@"
684 useradd ${opts} ${euser} ${eextra} \ 625 useradd ${opts} ${euser} "$@" \
685 || die "enewuser failed" 626 || die "enewuser failed"
686 fi 627 fi
628 ;;
629 esac
630
631 if [[ ! -e ${ROOT}/${ehome} ]] ; then
632 einfo " - Creating ${ehome} in ${ROOT}"
633 mkdir -p "${ROOT}/${ehome}"
634 chown ${euser} "${ROOT}/${ehome}"
635 chmod 755 "${ROOT}/${ehome}"
687 fi 636 fi
637
688 export SANDBOX_ON="${oldsandbox}" 638 export SANDBOX_ON=${oldsandbox}
689
690 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
691 then
692 einfo " - Creating ${ehome} in ${D}"
693 dodir ${ehome}
694 fowners ${euser} ${ehome}
695 fperms 755 ${ehome}
696 fi
697} 639}
698 640
699# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
700# vapier@gentoo.org 642# vapier@gentoo.org
701# 643#
704# Default values if you do not specify any: 646# Default values if you do not specify any:
705# groupname: REQUIRED ! 647# groupname: REQUIRED !
706# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
707# extra: none 649# extra: none
708enewgroup() { 650enewgroup() {
651 case ${EBUILD_PHASE} in
652 unpack|compile|test|install)
653 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
654 eerror "Package fails at QA and at life. Please file a bug."
655 die "Bad package! enewgroup is only for use in pkg_* functions!"
656 esac
657
709 # get the group 658 # get the group
710 local egroup="$1"; shift 659 local egroup="$1"; shift
711 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
712 then 661 then
713 eerror "No group specified !" 662 eerror "No group specified !"
714 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
715 fi 664 fi
716 665
717 # see if group already exists 666 # see if group already exists
718 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
719 then
720 return 0 668 return 0
721 fi 669 fi
722 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
723 671
724 # options to pass to useradd 672 # options to pass to useradd
730 then 678 then
731 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
732 then 680 then
733 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
734 then 682 then
735 if [ "${ARCH}" == "macos" ] ; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
736 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
737 else 685 else
738 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
739 fi 687 fi
740 else 688 else
754 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
755 703
756 # add the group 704 # add the group
757 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
758 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
759 if [ "${ARCH}" == "macos" ]; 707 case ${CHOST} in
760 then 708 *-darwin*)
761 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
762 then 710 then
763 einfo "Extra options are not supported on macos yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
764 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
765 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
766 die "Required function missing" 714 die "Required function missing"
767 fi 715 fi
768 716
769 # If we need the next available 717 # If we need the next available
770 case ${egid} in 718 case ${egid} in
771 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
772 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
773 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
774 done 722 done
775 esac 723 esac
776 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
777 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
778 else 726 ;;
727
728 *-freebsd*|*-dragonfly*)
729 case ${egid} in
730 *[!0-9]*) # Non numeric
731 for ((egid = 101; egid <= 999; egid++)); do
732 [[ -z $(egetent group ${egid}) ]] && break
733 done
734 esac
735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
736 ;;
737
738 *-netbsd*)
739 case ${egid} in
740 *[!0-9]*) # Non numeric
741 for ((egid = 101; egid <= 999; egid++)); do
742 [[ -z $(egetent group ${egid}) ]] && break
743 done
744 esac
745 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
746 ;;
747
748 *)
779 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
780 fi 750 ;;
751 esac
781 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
782} 753}
783 754
784# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
785# vapier@gentoo.org 756# vapier@gentoo.org
786# 757#
787# edos2unix(file, <more files>...) 758# edos2unix(file, <more files> ...)
788edos2unix() { 759edos2unix() {
789 for f in "$@" 760 echo "$@" | xargs sed -i 's/\r$//'
790 do
791 cp "${f}" ${T}/edos2unix
792 sed 's/\r$//' ${T}/edos2unix > "${f}"
793 done
794} 761}
762
763
764##############################################################
765# START: Handle .desktop files and menu entries #
766# maybe this should be separated into a new eclass some time #
767# lanius@gentoo.org #
768##############################################################
795 769
796# Make a desktop file ! 770# Make a desktop file !
797# Great for making those icons in kde/gnome startmenu ! 771# Great for making those icons in kde/gnome startmenu !
798# Amaze your friends ! Get the women ! Join today ! 772# Amaze your friends ! Get the women ! Join today !
799# gnome2 /usr/share/applications
800# gnome1 /usr/share/gnome/apps/
801# KDE ${KDEDIR}/share/applnk /usr/share/applnk
802# 773#
803# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 774# make_desktop_entry(<command>, [name], [icon], [type], [path])
804# 775#
805# binary: what binary does the app run with ? 776# binary: what command does the app run with ?
806# name: the name that will show up in the menu 777# name: the name that will show up in the menu
807# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
808# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
809# a full path to an icon 780# a full path to an icon
810# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
811# http://www.freedesktop.org/standards/menu-spec/ 782# http://www.freedesktop.org/Standards/desktop-entry-spec
812# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
813make_desktop_entry() { 784make_desktop_entry() {
814 [ -z "$1" ] && eerror "You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
815 786
816 local exec="${1}" 787 local exec=${1}
817 local name="${2:-${PN}}" 788 local name=${2:-${PN}}
818 local icon="${3:-${PN}.png}" 789 local icon=${3:-${PN}.png}
819 local type="${4}" 790 local type=${4}
820 local subdir="${6}" 791 local path=${5}
821 local path="${5:-${GAMES_PREFIX}}" 792
822 if [ -z "${type}" ] 793 if [[ -z ${type} ]] ; then
823 then 794 local catmaj=${CATEGORY%%-*}
824 case ${CATEGORY} in 795 local catmin=${CATEGORY##*-}
825 "app-emulation") 796 case ${catmaj} in
826 type=Emulator 797 app)
827 subdir="Emulation" 798 case ${catmin} in
799 admin) type=System;;
800 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;;
802 editors) type=TextEditor;;
803 emacs) type=TextEditor;;
804 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;;
806 office) type=Office;;
807 vim) type=TextEditor;;
808 xemacs) type=TextEditor;;
809 *) type=;;
810 esac
828 ;; 811 ;;
829 "games-"*) 812
830 type=Game 813 dev)
831 subdir="Games" 814 type="Development"
832 ;; 815 ;;
833 "net-"*) 816
834 type=Network 817 games)
835 subdir="${type}" 818 case ${catmin} in
819 action) type=ActionGame;;
820 arcade) type=ArcadeGame;;
821 board) type=BoardGame;;
822 kids) type=KidsGame;;
823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;;
825 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;;
828 sports) type=SportsGame;;
829 strategy) type=StrategyGame;;
830 *) type=;;
831 esac
832 type="Game;${type}"
836 ;; 833 ;;
834
835 mail)
836 type="Network;Email"
837 ;;
838
839 media)
840 case ${catmin} in
841 gfx) type=Graphics;;
842 radio) type=Tuner;;
843 sound) type=Audio;;
844 tv) type=TV;;
845 video) type=Video;;
846 *) type=;;
847 esac
848 type="AudioVideo;${type}"
849 ;;
850
851 net)
852 case ${catmin} in
853 dialup) type=Dialup;;
854 ftp) type=FileTransfer;;
855 im) type=InstantMessaging;;
856 irc) type=IRCClient;;
857 mail) type=Email;;
858 news) type=News;;
859 nntp) type=News;;
860 p2p) type=FileTransfer;;
861 *) type=;;
862 esac
863 type="Network;${type}"
864 ;;
865
866 sci)
867 case ${catmin} in
868 astro*) type=Astronomy;;
869 bio*) type=Biology;;
870 calc*) type=Calculator;;
871 chem*) type=Chemistry;;
872 geo*) type=Geology;;
873 math*) type=Math;;
874 *) type=;;
875 esac
876 type="Science;${type}"
877 ;;
878
879 www)
880 case ${catmin} in
881 client) type=WebBrowser;;
882 *) type=;;
883 esac
884 type="Network"
885 ;;
886
837 *) 887 *)
838 type= 888 type=
839 subdir=
840 ;; 889 ;;
841 esac 890 esac
842 fi 891 fi
892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
843 local desktop="${T}/${exec}.desktop" 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
844 899
845echo "[Desktop Entry] 900echo "[Desktop Entry]
846Encoding=UTF-8 901Encoding=UTF-8
847Version=0.9.2 902Version=0.9.2
848Name=${name} 903Name=${name}
849Type=Application 904Type=Application
850Comment=${DESCRIPTION} 905Comment=${DESCRIPTION}
851Exec=${exec} 906Exec=${exec}
907TryExec=${exec%% *}
852Path=${path} 908Path=${path}
853Icon=${icon} 909Icon=${icon}
854Categories=Application;${type};" > ${desktop} 910Categories=Application;${type};" > "${desktop}"
855 911
856 if [ -d "/usr/share/applications" ] 912 (
857 then 913 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller
858 insinto /usr/share/applications 915 insinto /usr/share/applications
859 doins ${desktop} 916 doins "${desktop}"
860 fi 917 )
918}
861 919
862 #if [ -d "/usr/share/gnome/apps" ] 920# Make a GDM/KDM Session file
863 #then 921#
864 # insinto /usr/share/gnome/apps/Games 922# make_session_desktop(<title>, <command>)
865 # doins ${desktop} 923# title: File to execute to start the Window Manager
866 #fi 924# command: Name of the Window Manager
867 925
868 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] 926make_session_desktop() {
869 #then 927 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
870 # for ver in /usr/kde/* 928 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
871 # do
872 # insinto ${ver}/share/applnk/Games
873 # doins ${desktop}
874 # done
875 #fi
876 929
877 if [ -d "/usr/share/applnk" ] 930 local title=$1
878 then 931 local command=$2
879 insinto /usr/share/applnk/${subdir} 932 local desktop=${T}/${wm}.desktop
933
934echo "[Desktop Entry]
935Encoding=UTF-8
936Name=${title}
937Comment=This session logs you into ${title}
938Exec=${command}
939TryExec=${command}
940Type=Application" > "${desktop}"
941
942 insinto /usr/share/xsessions
880 doins ${desktop} 943 doins "${desktop}"
944}
945
946domenu() {
947 local i j
948 insinto /usr/share/applications
949 for i in "$@" ; do
950 if [[ -f ${i} ]] ; then
951 doins "${i}"
952 elif [[ -d ${i} ]] ; then
953 for j in "${i}"/*.desktop ; do
954 doins "${j}"
955 done
881 fi 956 fi
882 957 done
883 return 0
884} 958}
959newmenu() {
960 insinto /usr/share/applications
961 newins "$1" "$2"
962}
963
964doicon() {
965 local i j
966 insinto /usr/share/pixmaps
967 for i in "$@" ; do
968 if [[ -f ${i} ]] ; then
969 doins "${i}"
970 elif [[ -d ${i} ]] ; then
971 for j in "${i}"/*.png ; do
972 doins "${j}"
973 done
974 fi
975 done
976}
977newicon() {
978 insinto /usr/share/pixmaps
979 newins "$1" "$2"
980}
981
982##############################################################
983# END: Handle .desktop files and menu entries #
984##############################################################
985
885 986
886# for internal use only (unpack_pdv and unpack_makeself) 987# for internal use only (unpack_pdv and unpack_makeself)
887find_unpackable_file() { 988find_unpackable_file() {
888 local src="$1" 989 local src=$1
889 if [ -z "${src}" ] 990 if [[ -z ${src} ]] ; then
890 then
891 src="${DISTDIR}/${A}" 991 src=${DISTDIR}/${A}
892 else 992 else
893 if [ -e "${DISTDIR}/${src}" ] 993 if [[ -e ${DISTDIR}/${src} ]] ; then
894 then
895 src="${DISTDIR}/${src}" 994 src=${DISTDIR}/${src}
896 elif [ -e "${PWD}/${src}" ] 995 elif [[ -e ${PWD}/${src} ]] ; then
897 then
898 src="${PWD}/${src}" 996 src=${PWD}/${src}
899 elif [ -e "${src}" ] 997 elif [[ -e ${src} ]] ; then
900 then
901 src="${src}" 998 src=${src}
902 fi
903 fi 999 fi
904 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1000 fi
1001 [[ ! -e ${src} ]] && return 1
905 echo "${src}" 1002 echo "${src}"
906} 1003}
907 1004
908# Unpack those pesky pdv generated files ... 1005# Unpack those pesky pdv generated files ...
909# They're self-unpacking programs with the binary package stuffed in 1006# They're self-unpacking programs with the binary package stuffed in
924# lseek 1021# lseek
925# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
926# lseek(3, -4, SEEK_END) = 2981250 1023# lseek(3, -4, SEEK_END) = 2981250
927# thus we would pass in the value of '4' as the second parameter. 1024# thus we would pass in the value of '4' as the second parameter.
928unpack_pdv() { 1025unpack_pdv() {
929 local src="`find_unpackable_file $1`" 1026 local src=$(find_unpackable_file $1)
930 local sizeoff_t="$2" 1027 local sizeoff_t=$2
931 1028
1029 [[ -z ${src} ]] && die "Could not locate source for '$1'"
932 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1030 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
933 1031
934 local shrtsrc="`basename ${src}`" 1032 local shrtsrc=$(basename "${src}")
935 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
936 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
937 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1035 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
938 1036
939 # grab metadata for debug reasons 1037 # grab metadata for debug reasons
940 local metafile="`mymktemp ${T}`" 1038 local metafile="$(emktemp)"
941 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1039 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
942 1040
943 # rip out the final file name from the metadata 1041 # rip out the final file name from the metadata
944 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1042 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
945 datafile="`basename ${datafile}`" 1043 datafile="`basename ${datafile}`"
946 1044
947 # now lets uncompress/untar the file if need be 1045 # now lets uncompress/untar the file if need be
948 local tmpfile="`mymktemp ${T}`" 1046 local tmpfile="$(emktemp)"
949 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1047 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
950 1048
951 local iscompressed="`file -b ${tmpfile}`" 1049 local iscompressed="`file -b ${tmpfile}`"
952 if [ "${iscompressed:0:8}" == "compress" ] ; then 1050 if [ "${iscompressed:0:8}" == "compress" ] ; then
953 iscompressed=1 1051 iscompressed=1
998# Unpack those pesky makeself generated files ... 1096# Unpack those pesky makeself generated files ...
999# They're shell scripts with the binary package tagged onto 1097# They're shell scripts with the binary package tagged onto
1000# the end of the archive. Loki utilized the format as does 1098# the end of the archive. Loki utilized the format as does
1001# many other game companies. 1099# many other game companies.
1002# 1100#
1003# Usage: unpack_makeself [file to unpack] [offset] 1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1004# - If the file is not specified then unpack will utilize ${A}. 1102# - If the file is not specified then unpack will utilize ${A}.
1005# - If the offset is not specified then we will attempt to extract 1103# - If the offset is not specified then we will attempt to extract
1006# the proper offset from the script itself. 1104# the proper offset from the script itself.
1007unpack_makeself() { 1105unpack_makeself() {
1106 local src_input=${1:-${A}}
1008 local src="`find_unpackable_file $1`" 1107 local src=$(find_unpackable_file "${src_input}")
1009 local skip="$2" 1108 local skip=$2
1109 local exe=$3
1010 1110
1111 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1112
1011 local shrtsrc="`basename ${src}`" 1113 local shrtsrc=$(basename "${src}")
1012 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1114 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1013 if [ -z "${skip}" ] 1115 if [[ -z ${skip} ]] ; then
1014 then
1015 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1116 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1016 local skip=0 1117 local skip=0
1118 exe=tail
1017 case ${ver} in 1119 case ${ver} in
1018 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1120 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1019 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1121 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1020 ;; 1122 ;;
1021 2.0|2.0.1) 1123 2.0|2.0.1)
1022 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1124 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1023 ;; 1125 ;;
1024 2.1.1) 1126 2.1.1)
1025 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 1127 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1026 let skip="skip + 1" 1128 let skip="skip + 1"
1027 ;; 1129 ;;
1028 2.1.2) 1130 2.1.2)
1029 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` 1131 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1030 let skip="skip + 1" 1132 let skip="skip + 1"
1031 ;; 1133 ;;
1032 2.1.3) 1134 2.1.3)
1033 skip=`grep -a ^offset= ${src} | awk '{print $3}'` 1135 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1034 let skip="skip + 1" 1136 let skip="skip + 1"
1137 ;;
1138 2.1.4|2.1.5)
1139 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1140 skip=$(head -n ${skip} "${src}" | wc -c)
1141 exe="dd"
1035 ;; 1142 ;;
1036 *) 1143 *)
1037 eerror "I'm sorry, but I was unable to support the Makeself file." 1144 eerror "I'm sorry, but I was unable to support the Makeself file."
1038 eerror "The version I detected was '${ver}'." 1145 eerror "The version I detected was '${ver}'."
1039 eerror "Please file a bug about the file ${shrtsrc} at" 1146 eerror "Please file a bug about the file ${shrtsrc} at"
1041 die "makeself version '${ver}' not supported" 1148 die "makeself version '${ver}' not supported"
1042 ;; 1149 ;;
1043 esac 1150 esac
1044 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1151 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1045 fi 1152 fi
1153 case ${exe} in
1154 tail) exe="tail -n +${skip} '${src}'";;
1155 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1156 *) die "makeself cant handle exe '${exe}'"
1157 esac
1046 1158
1047 # lets grab the first few bytes of the file to figure out what kind of archive it is 1159 # lets grab the first few bytes of the file to figure out what kind of archive it is
1048 local tmpfile="`mymktemp ${T}`" 1160 local tmpfile="$(emktemp)"
1049 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1050 local filetype="`file -b ${tmpfile}`" 1162 local filetype="$(file -b "${tmpfile}")"
1051 case ${filetype} in 1163 case ${filetype} in
1052 *tar\ archive) 1164 *tar\ archive*)
1053 tail -n +${skip} ${src} | tar --no-same-owner -xf - 1165 eval ${exe} | tar --no-same-owner -xf -
1054 ;; 1166 ;;
1055 bzip2*) 1167 bzip2*)
1056 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1057 ;; 1169 ;;
1058 gzip*) 1170 gzip*)
1059 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1171 eval ${exe} | tar --no-same-owner -xzf -
1060 ;; 1172 ;;
1061 compress*) 1173 compress*)
1062 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf - 1174 eval ${exe} | gunzip | tar --no-same-owner -xf -
1063 ;; 1175 ;;
1064 *) 1176 *)
1065 eerror "Unknown filetype \"${filetype}\" ?" 1177 eerror "Unknown filetype \"${filetype}\" ?"
1066 false 1178 false
1067 ;; 1179 ;;
1076check_license() { 1188check_license() {
1077 local lic=$1 1189 local lic=$1
1078 if [ -z "${lic}" ] ; then 1190 if [ -z "${lic}" ] ; then
1079 lic="${PORTDIR}/licenses/${LICENSE}" 1191 lic="${PORTDIR}/licenses/${LICENSE}"
1080 else 1192 else
1081 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1193 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1082 lic="${PORTDIR}/licenses/${src}" 1194 lic="${PORTDIR}/licenses/${lic}"
1083 elif [ -e "${PWD}/${src}" ] ; then 1195 elif [ -e "${PWD}/${lic}" ] ; then
1084 lic="${PWD}/${src}" 1196 lic="${PWD}/${lic}"
1085 elif [ -e "${src}" ] ; then 1197 elif [ -e "${lic}" ] ; then
1086 lic="${src}" 1198 lic="${lic}"
1087 fi
1088 fi 1199 fi
1200 fi
1089 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1201 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1090 local l="`basename ${lic}`" 1202 local l="`basename ${lic}`"
1091 1203
1092 # here is where we check for the licenses the user already 1204 # here is where we check for the licenses the user already
1093 # accepted ... if we don't find a match, we make the user accept 1205 # accepted ... if we don't find a match, we make the user accept
1206 local shopts=$-
1094 local alic 1207 local alic
1208 set -o noglob #so that bash doesn't expand "*"
1095 for alic in "${ACCEPT_LICENSE}" ; do 1209 for alic in ${ACCEPT_LICENSE} ; do
1096 [ "${alic}" == "*" ] && return 0 1210 if [[ ${alic} == ${l} ]]; then
1097 [ "${alic}" == "${l}" ] && return 0 1211 set +o noglob; set -${shopts} #reset old shell opts
1212 return 0
1213 fi
1098 done 1214 done
1215 set +o noglob; set -$shopts #reset old shell opts
1099 1216
1100 local licmsg="`mymktemp ${T}`" 1217 local licmsg="$(emktemp)"
1101 cat << EOF > ${licmsg} 1218 cat << EOF > ${licmsg}
1102********************************************************** 1219**********************************************************
1103The following license outlines the terms of use of this 1220The following license outlines the terms of use of this
1104package. You MUST accept this license for installation to 1221package. You MUST accept this license for installation to
1105continue. When you are done viewing, hit 'q'. If you 1222continue. When you are done viewing, hit 'q'. If you
1131# and when the function returns, you can assume that the cd has been 1248# and when the function returns, you can assume that the cd has been
1132# found at CDROM_ROOT. 1249# found at CDROM_ROOT.
1133# 1250#
1134# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1251# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1135# etc... if you want to give the cds better names, then just export 1252# etc... if you want to give the cds better names, then just export
1136# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1137# 1258#
1138# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1259# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1139# 1260#
1140# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1261# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1141# - this will attempt to locate a cd based upon a file that is on 1262# - this will attempt to locate a cd based upon a file that is on
1145 # first we figure out how many cds we're dealing with by 1266 # first we figure out how many cds we're dealing with by
1146 # the # of files they gave us 1267 # the # of files they gave us
1147 local cdcnt=0 1268 local cdcnt=0
1148 local f= 1269 local f=
1149 for f in "$@" ; do 1270 for f in "$@" ; do
1150 cdcnt=$((cdcnt + 1)) 1271 ((++cdcnt))
1151 export CDROM_CHECK_${cdcnt}="$f" 1272 export CDROM_CHECK_${cdcnt}="$f"
1152 done 1273 done
1153 export CDROM_TOTAL_CDS=${cdcnt} 1274 export CDROM_TOTAL_CDS=${cdcnt}
1154 export CDROM_CURRENT_CD=1 1275 export CDROM_CURRENT_CD=1
1155 1276
1156 # now we see if the user gave use CD_ROOT ... 1277 # now we see if the user gave use CD_ROOT ...
1157 # if they did, let's just believe them that it's correct 1278 # if they did, let's just believe them that it's correct
1158 if [ ! -z "${CD_ROOT}" ] ; then 1279 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1159 export CDROM_ROOT="${CD_ROOT}"
1160 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1161 return
1162 fi
1163 # do the same for CD_ROOT_X
1164 if [ ! -z "${CD_ROOT_1}" ] ; then
1165 local var= 1280 local var=
1166 cdcnt=0 1281 cdcnt=0
1167 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1282 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1168 cdcnt=$((cdcnt + 1)) 1283 ((++cdcnt))
1169 var="CD_ROOT_${cdcnt}" 1284 var="CD_ROOT_${cdcnt}"
1285 [[ -z ${!var} ]] && var="CD_ROOT"
1170 if [ -z "${!var}" ] ; then 1286 if [[ -z ${!var} ]] ; then
1171 eerror "You must either use just the CD_ROOT" 1287 eerror "You must either use just the CD_ROOT"
1172 eerror "or specify ALL the CD_ROOT_X variables." 1288 eerror "or specify ALL the CD_ROOT_X variables."
1173 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1289 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1174 die "could not locate CD_ROOT_${cdcnt}" 1290 die "could not locate CD_ROOT_${cdcnt}"
1175 fi 1291 fi
1176 export CDROM_ROOTS_${cdcnt}="${!var}"
1177 done 1292 done
1178 export CDROM_ROOT=${CDROM_ROOTS_1} 1293 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1179 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1294 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1295 export CDROM_SET=-1
1296 for f in ${CDROM_CHECK_1//:/ } ; do
1297 ((++CDROM_SET))
1298 [[ -e ${CD_ROOT}/${f} ]] && break
1299 done
1300 export CDROM_MATCH=${f}
1180 return 1301 return
1181 fi 1302 fi
1182 1303
1304 # User didn't help us out so lets make sure they know they can
1305 # simplify the whole process ...
1183 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1306 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1184 einfon "This ebuild will need the " 1307 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1185 if [ -z "${CDROM_NAME}" ] ; then
1186 echo "cdrom for ${PN}."
1187 else
1188 echo "${CDROM_NAME}."
1189 fi
1190 echo 1308 echo
1191 einfo "If you do not have the CD, but have the data files" 1309 einfo "If you do not have the CD, but have the data files"
1192 einfo "mounted somewhere on your filesystem, just export" 1310 einfo "mounted somewhere on your filesystem, just export"
1193 einfo "the variable CD_ROOT so that it points to the" 1311 einfo "the variable CD_ROOT so that it points to the"
1194 einfo "directory containing the files." 1312 einfo "directory containing the files."
1195 echo 1313 echo
1314 einfo "For example:"
1315 einfo "export CD_ROOT=/mnt/cdrom"
1316 echo
1196 else 1317 else
1318 if [[ -n ${CDROM_NAME_SET} ]] ; then
1319 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1320 cdcnt=0
1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1322 ((++cdcnt))
1323 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1324 done
1325 fi
1326
1197 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1327 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1198 cdcnt=0 1328 cdcnt=0
1199 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1200 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1201 var="CDROM_NAME_${cdcnt}" 1331 var="CDROM_NAME_${cdcnt}"
1202 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1332 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1203 done 1333 done
1204 echo 1334 echo
1205 einfo "If you do not have the CDs, but have the data files" 1335 einfo "If you do not have the CDs, but have the data files"
1206 einfo "mounted somewhere on your filesystem, just export" 1336 einfo "mounted somewhere on your filesystem, just export"
1207 einfo "the following variables so they point to the right place:" 1337 einfo "the following variables so they point to the right place:"
1208 einfon "" 1338 einfon ""
1209 cdcnt=0 1339 cdcnt=0
1210 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1340 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1211 cdcnt=$((cdcnt + 1)) 1341 ((++cdcnt))
1212 echo -n " CD_ROOT_${cdcnt}" 1342 echo -n " CD_ROOT_${cdcnt}"
1213 done 1343 done
1214 echo 1344 echo
1215 einfo "Or, if you have all the files in the same place, or" 1345 einfo "Or, if you have all the files in the same place, or"
1216 einfo "you only have one cdrom, you can export CD_ROOT" 1346 einfo "you only have one cdrom, you can export CD_ROOT"
1217 einfo "and that place will be used as the same data source" 1347 einfo "and that place will be used as the same data source"
1218 einfo "for all the CDs." 1348 einfo "for all the CDs."
1219 echo 1349 echo
1350 einfo "For example:"
1351 einfo "export CD_ROOT_1=/mnt/cdrom"
1352 echo
1220 fi 1353 fi
1354
1355 export CDROM_SET=""
1221 export CDROM_CURRENT_CD=0 1356 export CDROM_CURRENT_CD=0
1222 cdrom_load_next_cd 1357 cdrom_load_next_cd
1223} 1358}
1224 1359
1225# this is only used when you need access to more than one cd. 1360# this is only used when you need access to more than one cd.
1226# when you have finished using the first cd, just call this function. 1361# when you have finished using the first cd, just call this function.
1227# when it returns, CDROM_ROOT will be pointing to the second cd. 1362# when it returns, CDROM_ROOT will be pointing to the second cd.
1228# remember, you can only go forward in the cd chain, you can't go back. 1363# remember, you can only go forward in the cd chain, you can't go back.
1229cdrom_load_next_cd() { 1364cdrom_load_next_cd() {
1230 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1231 local var= 1365 local var
1232 1366 ((++CDROM_CURRENT_CD))
1233 if [ ! -z "${CD_ROOT}" ] ; then
1234 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1235 return
1236 fi
1237 1367
1238 unset CDROM_ROOT 1368 unset CDROM_ROOT
1239 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1369 var=CD_ROOT_${CDROM_CURRENT_CD}
1370 [[ -z ${!var} ]] && var="CD_ROOT"
1240 if [ -z "${!var}" ] ; then 1371 if [[ -z ${!var} ]] ; then
1241 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1372 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1242 cdrom_locate_file_on_cd ${!var} 1373 _cdrom_locate_file_on_cd ${!var}
1243 else 1374 else
1244 export CDROM_ROOT="${!var}" 1375 export CDROM_ROOT=${!var}
1245 fi 1376 fi
1246 1377
1247 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1378 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1248} 1379}
1249 1380
1252# all it does is try to locate a give file on a cd ... if the cd isn't 1383# all it does is try to locate a give file on a cd ... if the cd isn't
1253# found, then a message asking for the user to insert the cdrom will be 1384# found, then a message asking for the user to insert the cdrom will be
1254# displayed and we'll hang out here until: 1385# displayed and we'll hang out here until:
1255# (1) the file is found on a mounted cdrom 1386# (1) the file is found on a mounted cdrom
1256# (2) the user hits CTRL+C 1387# (2) the user hits CTRL+C
1257cdrom_locate_file_on_cd() { 1388_cdrom_locate_file_on_cd() {
1258 while [ -z "${CDROM_ROOT}" ] ; do
1259 local dir="$(dirname ${@})"
1260 local file="$(basename ${@})"
1261 local mline="" 1389 local mline=""
1262 local showedmsg=0 1390 local showedmsg=0
1263 1391
1264 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1392 while [[ -z ${CDROM_ROOT} ]] ; do
1265 [ -d "${mline}/${dir}" ] || continue 1393 local i=0
1266 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1394 local -a cdset=(${*//:/ })
1395 if [[ -n ${CDROM_SET} ]] ; then
1396 cdset=(${cdset[${CDROM_SET}]})
1397 fi
1398
1399 while [[ -n ${cdset[${i}]} ]] ; do
1400 local dir=$(dirname ${cdset[${i}]})
1401 local file=$(basename ${cdset[${i}]})
1402
1403 local point= node= fs= foo=
1404 while read point node fs foo ; do
1405 [[ " cd9660 iso9660 " != *" ${fs} "* ]] && \
1406 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1407 && continue
1408 point=${point//\040/ }
1409 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1267 && export CDROM_ROOT=${mline} 1410 export CDROM_ROOT=${point}
1411 export CDROM_SET=${i}
1412 export CDROM_MATCH=${cdset[${i}]}
1413 return
1414 done <<< "$(get_mounts)"
1415
1416 ((++i))
1268 done 1417 done
1269 1418
1270 if [ -z "${CDROM_ROOT}" ] ; then
1271 echo 1419 echo
1272 if [ ${showedmsg} -eq 0 ] ; then 1420 if [[ ${showedmsg} -eq 0 ]] ; then
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1421 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1274 if [ -z "${CDROM_NAME}" ] ; then 1422 if [[ -z ${CDROM_NAME} ]] ; then
1275 einfo "Please insert the cdrom for ${PN} now !" 1423 einfo "Please insert+mount the cdrom for ${PN} now !"
1276 else
1277 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1278 fi
1279 else 1424 else
1280 if [ -z "${CDROM_NAME_1}" ] ; then
1281 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1282 else
1283 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1284 einfo "Please insert+mount the ${!var} cdrom now !" 1425 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1285 fi
1286 fi 1426 fi
1287 showedmsg=1 1427 else
1428 if [[ -z ${CDROM_NAME_1} ]] ; then
1429 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1430 else
1431 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1432 einfo "Please insert+mount the ${!var} cdrom now !"
1433 fi
1288 fi 1434 fi
1435 showedmsg=1
1436 fi
1289 einfo "Press return to scan for the cd again" 1437 einfo "Press return to scan for the cd again"
1290 einfo "or hit CTRL+C to abort the emerge." 1438 einfo "or hit CTRL+C to abort the emerge."
1291 read 1439 echo
1292 fi 1440 einfo "If you are having trouble with the detection"
1441 einfo "of your CD, it is possible that you do not have"
1442 einfo "Joliet support enabled in your kernel. Please"
1443 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1444 read || die "something is screwed with your system"
1293 done 1445 done
1294} 1446}
1295 1447
1296# Make sure that LINGUAS only contains languages that 1448# Make sure that LINGUAS only contains languages that
1297# a package can support 1449# a package can support
1298# 1450#
1299# usage: strip-linguas <allow LINGUAS> 1451# usage: strip-linguas <allow LINGUAS>
1300# strip-linguas -i <directories of .po files> 1452# strip-linguas -i <directories of .po files>
1301# strip-linguas -u <directories of .po files> 1453# strip-linguas -u <directories of .po files>
1302# 1454#
1303# The first form allows you to specify a list of LINGUAS. 1455# The first form allows you to specify a list of LINGUAS.
1304# The -i builds a list of po files found in all the 1456# The -i builds a list of po files found in all the
1305# directories and uses the intersection of the lists. 1457# directories and uses the intersection of the lists.
1306# The -u builds a list of po files found in all the 1458# The -u builds a list of po files found in all the
1307# directories and uses the union of the lists. 1459# directories and uses the union of the lists.
1308strip-linguas() { 1460strip-linguas() {
1309 local ls newls 1461 local ls newls nols
1310 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1462 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1311 local op="$1"; shift 1463 local op=$1; shift
1312 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1464 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1313 local d f 1465 local d f
1314 for d in "$@" ; do 1466 for d in "$@" ; do
1315 if [ "${op}" == "-u" ] ; then 1467 if [[ ${op} == "-u" ]] ; then
1316 newls="${ls}" 1468 newls=${ls}
1317 else 1469 else
1318 newls="" 1470 newls=""
1319 fi 1471 fi
1320 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1472 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1321 if [ "${op}" == "-i" ] ; then 1473 if [[ ${op} == "-i" ]] ; then
1322 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1474 hasq ${f} ${ls} && newls="${newls} ${f}"
1323 else 1475 else
1324 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1476 hasq ${f} ${ls} || newls="${newls} ${f}"
1325 fi 1477 fi
1326 done 1478 done
1327 ls="${newls}" 1479 ls=${newls}
1328 done 1480 done
1329 ls="${ls//.po}"
1330 else 1481 else
1331 ls="$@" 1482 ls="$@"
1332 fi 1483 fi
1333 1484
1334 ls=" ${ls} " 1485 nols=""
1335 newls="" 1486 newls=""
1336 for f in ${LINGUAS} ; do 1487 for f in ${LINGUAS} ; do
1337 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1488 if hasq ${f} ${ls} ; then
1338 nl="${newls} ${f}" 1489 newls="${newls} ${f}"
1339 else 1490 else
1340 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1491 nols="${nols} ${f}"
1341 fi 1492 fi
1342 done 1493 done
1494 [[ -n ${nols} ]] \
1495 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1496 export LINGUAS=${newls:1}
1497}
1498
1499# moved from kernel.eclass since they are generally useful outside of
1500# kernel.eclass -iggy (20041002)
1501
1502# the following functions are useful in kernel module ebuilds, etc.
1503# for an example see ivtv or drbd ebuilds
1504
1505# set's ARCH to match what the kernel expects
1506set_arch_to_kernel() {
1507 i=10
1508 while ((i--)) ; do
1509 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1510 done
1511 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1512 case ${ARCH} in
1513 x86) export ARCH="i386";;
1514 amd64) export ARCH="x86_64";;
1515 hppa) export ARCH="parisc";;
1516 mips) export ARCH="mips";;
1517 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1518 *) export ARCH="${ARCH}";;
1519 esac
1520}
1521
1522# set's ARCH back to what portage expects
1523set_arch_to_portage() {
1524 i=10
1525 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done
1528 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1529}
1530
1531# Jeremy Huddleston <eradicator@gentoo.org>:
1532# preserve_old_lib /path/to/libblah.so.0
1533# preserve_old_lib_notify /path/to/libblah.so.0
1534#
1535# These functions are useful when a lib in your package changes --library. Such
1536# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1537# would break packages that link against it. Most people get around this
1538# by using the portage SLOT mechanism, but that is not always a relevant
1539# solution, so instead you can add the following to your ebuilds:
1540#
1541# src_install() {
1542# ...
1543# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1544# ...
1545# }
1546#
1547# pkg_postinst() {
1548# ...
1549# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1550# ...
1551# }
1552
1553preserve_old_lib() {
1554 LIB=$1
1555
1556 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1557 SONAME=`basename ${LIB}`
1558 DIRNAME=`dirname ${LIB}`
1559
1560 dodir ${DIRNAME}
1561 cp ${ROOT}${LIB} ${D}${DIRNAME}
1562 touch ${D}${LIB}
1563 fi
1564}
1565
1566preserve_old_lib_notify() {
1567 LIB=$1
1568
1569 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1570 SONAME=`basename ${LIB}`
1571
1572 ewarn "An old version of an installed library was detected on your system."
1573 ewarn "In order to avoid breaking packages that link against it, this older version"
1574 ewarn "is not being removed. In order to make full use of this newer version,"
1575 ewarn "you will need to execute the following command:"
1576 ewarn " revdep-rebuild --library ${SONAME}"
1577 ewarn
1578 ewarn "After doing that, you can safely remove ${LIB}"
1579 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1580 fi
1581}
1582
1583# Hack for people to figure out if a package was built with
1584# certain USE flags
1585#
1586# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1587# ex: built_with_use xchat gtk2
1588#
1589# Flags: -a all USE flags should be utilized
1590# -o at least one USE flag should be utilized
1591# Note: the default flag is '-a'
1592built_with_use() {
1593 local opt=$1
1594 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1595
1596 local PKG=$(best_version $1)
1597 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1598 shift
1599
1600 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1601 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1602
1603 # if the USE file doesnt exist, assume the $PKG is either
1604 # injected or package.provided
1605 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with"
1606
1607 local IUSE_BUILT=$(<${IUSEFILE})
1608 # Don't check USE_EXPAND #147237
1609 local expand
1610 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1611 if [[ $1 == ${expand}_* ]] ; then
1612 expand=""
1613 break
1614 fi
1615 done
1616 if [[ -n ${expand} ]] ; then
1617 has $1 ${IUSE_BUILT} || die "$PKG does not actually support the $1 USE flag!"
1618 fi
1619
1620 local USE_BUILT=$(<${USEFILE})
1621 while [[ $# -gt 0 ]] ; do
1622 if [[ ${opt} = "-o" ]] ; then
1623 has $1 ${USE_BUILT} && return 0
1624 else
1625 has $1 ${USE_BUILT} || return 1
1626 fi
1627 shift
1628 done
1629 [[ ${opt} = "-a" ]]
1630}
1631
1632# Many configure scripts wrongly bail when a C++ compiler
1633# could not be detected. #73450
1634epunt_cxx() {
1635 local dir=$1
1636 [[ -z ${dir} ]] && dir=${S}
1637 ebegin "Removing useless C++ checks"
1638 local f
1639 for f in $(find ${dir} -name configure) ; do
1640 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1641 done
1642 eend 0
1643}
1644
1645# dopamd <file> [more files]
1646#
1647# Install pam auth config file in /etc/pam.d
1648dopamd() {
1649 [[ -z $1 ]] && die "dopamd requires at least one argument"
1650
1651 use pam || return 0
1652
1653 INSDESTTREE=/etc/pam.d \
1654 doins "$@" || die "failed to install $@"
1655}
1656# newpamd <old name> <new name>
1657#
1658# Install pam file <old name> as <new name> in /etc/pam.d
1659newpamd() {
1660 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1661
1662 use pam || return 0
1663
1664 INSDESTTREE=/etc/pam.d \
1665 newins "$1" "$2" || die "failed to install $1 as $2"
1666}
1667
1668# make a wrapper script ...
1669# NOTE: this was originally games_make_wrapper, but I noticed other places where
1670# this could be used, so I have moved it here and made it not games-specific
1671# -- wolf31o2
1672# $1 == wrapper name
1673# $2 == binary to run
1674# $3 == directory to chdir before running binary
1675# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1676# $5 == path for wrapper
1677make_wrapper() {
1678 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1679 local tmpwrapper=$(emktemp)
1680 # We don't want to quote ${bin} so that people can pass complex
1681 # things as $bin ... "./someprog --args"
1682 cat << EOF > "${tmpwrapper}"
1683#!/bin/sh
1684cd "${chdir:-.}"
1343 if [ -z "${newls}" ] ; then 1685if [ -n "${libdir}" ] ; then
1344 unset LINGUAS 1686 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1687 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1345 else 1688 else
1346 export LINGUAS="${newls}" 1689 export LD_LIBRARY_PATH="${libdir}"
1690 fi
1347 fi 1691fi
1692exec ${bin} "\$@"
1693EOF
1694 chmod go+rx "${tmpwrapper}"
1695 if [[ -n ${path} ]] ; then
1696 exeinto "${path}"
1697 newexe "${tmpwrapper}" "${wrapper}"
1698 else
1699 newbin "${tmpwrapper}" "${wrapper}"
1700 fi
1348} 1701}

Legend:
Removed from v.1.97  
changed lines
  Added in v.1.264

  ViewVC Help
Powered by ViewVC 1.1.20