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

Diff of /eclass/eutils.eclass

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

Revision 1.139 Revision 1.212
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 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.139 2005/01/10 02:40:00 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.212 2005/10/22 02:32:48 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do
69 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
70/* GNU ld script 71 /* GNU ld script
71 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
72 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
73 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
74 otherwise we run into linking problems. 75 otherwise we run into linking problems.
75 See bug #4411 on http://bugs.gentoo.org/ for 76
76 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
77GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
78END_LDSCRIPT 80 END_LDSCRIPT
79 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
80} 83}
81 84
82# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
83# 87#
84# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
85# 89#
86draw_line() { 90draw_line() {
87 local i=0 91 local i=0
113EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
114# Default extension for patches 118# Default extension for patches
115EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
116# Default options for patch 120# Default options for patch
117# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
118EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
119# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
120# and not the full path .. 125# and not the full path ..
121EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
122# Change the printed message for a single patch. 127# Change the printed message for a single patch.
123EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
124# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
125# 132#
126# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
127# 134#
128EPATCH_FORCE="no" 135EPATCH_FORCE="no"
159# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
160# 167#
161# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
162# 169#
163epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
164 local PIPE_CMD="" 172 local PIPE_CMD=""
165 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
166 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
167 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
168 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
169 local x="" 177 local x=""
170 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
171 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
172 then 182 then
173 local m="" 183 local m=""
174 einfo "${#} patches to apply ..."
175 for m in "$@" ; do 184 for m in "$@" ; do
176 epatch "${m}" 185 epatch "${m}"
177 done 186 done
178 return 0 187 return 0
179 fi 188 fi
233 ;; 242 ;;
234 esac 243 esac
235 244
236 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
237 then 246 then
238 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
239 fi 248 fi
240 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
241 do 250 do
242 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
243 # 252 #
244 # ???_arch_foo.patch 253 # ???_arch_foo.patch
245 # 254 #
246 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
247 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
248 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
249 then 258 then
250 local count=0 259 local count=0
251 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/}
252 262
253 if [ -n "${EPATCH_EXCLUDE}" ] 263 if [ -n "${EPATCH_EXCLUDE}" ]
254 then 264 then
255 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 265 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
256 then 266 then
257 continue 267 continue
258 fi 268 fi
259 fi 269 fi
260 270
262 then 272 then
263 if [ -n "${EPATCH_SINGLE_MSG}" ] 273 if [ -n "${EPATCH_SINGLE_MSG}" ]
264 then 274 then
265 einfo "${EPATCH_SINGLE_MSG}" 275 einfo "${EPATCH_SINGLE_MSG}"
266 else 276 else
267 einfo "Applying ${x##*/} ..." 277 einfo "Applying ${patchname} ..."
268 fi 278 fi
269 else 279 else
270 einfo " ${x##*/} ..." 280 einfo " ${patchname} ..."
271 fi 281 fi
272 282
273 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 284 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 285
276 # Allow for prefix to differ ... im lazy, so shoot me :/ 286 # Allow for prefix to differ ... im lazy, so shoot me :/
277 while [ "${count}" -lt 5 ] 287 while [ "${count}" -lt 5 ]
278 do 288 do
279 # Generate some useful debug info ... 289 # Generate some useful debug info ...
280 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 292
283 if [ "${PATCH_SUFFIX}" != "patch" ] 293 if [ "${PATCH_SUFFIX}" != "patch" ]
284 then 294 then
285 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 else 297 else
288 PATCH_TARGET="${x}" 298 PATCH_TARGET="${x}"
289 fi 299 fi
290 300
291 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 303
294 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 306
297 if [ "${PATCH_SUFFIX}" != "patch" ] 307 if [ "${PATCH_SUFFIX}" != "patch" ]
298 then 308 then
299 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
300 then 310 then
301 echo 311 echo
302 eerror "Could not extract patch!" 312 eerror "Could not extract patch!"
303 #die "Could not extract patch!" 313 #die "Could not extract patch!"
304 count=5 314 count=5
305 break 315 break
306 fi 316 fi
307 fi 317 fi
308 318
309 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 320 then
311 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
312 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 326
317 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
318 329
319 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
320 then 331 then
321 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
322 echo 333 echo
323 eerror "A dry-run of patch command succeeded, but actually" 334 eerror "A dry-run of patch command succeeded, but actually"
324 eerror "applying the patch failed!" 335 eerror "applying the patch failed!"
325 #die "Real world sux compared to the dreamworld!" 336 #die "Real world sux compared to the dreamworld!"
326 count=5 337 count=5
327 fi 338 fi
328 339
329 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
330 341
331 break 342 break
332 fi 343 fi
333 344
334 count=$((count + 1)) 345 count=$((count + 1))
340 fi 351 fi
341 352
342 if [ "${count}" -eq 5 ] 353 if [ "${count}" -eq 5 ]
343 then 354 then
344 echo 355 echo
345 eerror "Failed Patch: ${x##*/}!" 356 eerror "Failed Patch: ${patchname} !"
357 eerror " ( ${PATCH_TARGET} )"
346 eerror 358 eerror
347 eerror "Include in your bugreport the contents of:" 359 eerror "Include in your bugreport the contents of:"
348 eerror 360 eerror
349 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 361 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
350 echo 362 echo
351 die "Failed Patch: ${x##*/}!" 363 die "Failed Patch: ${patchname}!"
352 fi 364 fi
353 365
354 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 366 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 367
356 eend 0 368 eend 0
357 fi 369 fi
358 done 370 done
359 if [ "${SINGLE_PATCH}" = "no" ] 371 if [ "${SINGLE_PATCH}" = "no" ]
360 then 372 then
361 einfo "Done with patching" 373 einfo "Done with patching"
362 fi 374 fi
363} 375}
364 376
365# This function return true if we are using the NPTL pthreads
366# implementation.
367#
368# <azarah@gentoo.org> (06 March 2003)
369#
370have_NPTL() {
371 cat > ${T}/test-nptl.c <<-"END"
372 #define _XOPEN_SOURCE
373 #include <unistd.h>
374 #include <stdio.h>
375
376 int main()
377 {
378 char buf[255];
379 char *str = buf;
380
381 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
382 if (NULL != str) {
383 printf("%s\n", str);
384 if (NULL != strstr(str, "NPTL"))
385 return 0;
386 }
387
388 return 1;
389 }
390 END
391
392 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
393 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
394 then
395 echo "yes"
396 einfon "Checking what PTHREADS implementation we have ..."
397 if ${T}/nptl
398 then
399 return 0
400 else
401 return 1
402 fi
403 else
404 echo "no"
405 fi
406
407 return 1
408}
409
410# This function check how many cpu's are present, and then set
411# -j in MAKEOPTS accordingly.
412#
413# Thanks to nall <nall@gentoo.org> for this.
414#
415get_number_of_jobs() {
416 local jobs=0
417
418 if [ ! -r /proc/cpuinfo ]
419 then
420 return 1
421 fi
422
423 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
424 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
425 then
426 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
427 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
428 ADMINPARAM="${ADMINPARAM/-j}"
429 fi
430
431 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
432
433 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
434 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
435 then
436 # these archs will always have "[Pp]rocessor"
437 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
438
439 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
440 then
441 # sparc always has "ncpus active"
442 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
443
444 elif [ "${ARCH}" = "alpha" ]
445 then
446 # alpha has "cpus active", but only when compiled with SMP
447 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
448 then
449 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
450 else
451 jobs=2
452 fi
453
454 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
455 then
456 # ppc has "processor", but only when compiled with SMP
457 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
458 then
459 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
460 else
461 jobs=2
462 fi
463 elif [ "${ARCH}" = "s390" ]
464 then
465 # s390 has "# processors : "
466 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
467 else
468 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
469 die "Unknown ARCH -- ${ARCH}!"
470 fi
471
472 # Make sure the number is valid ...
473 if [ "${jobs}" -lt 1 ]
474 then
475 jobs=1
476 fi
477
478 if [ -n "${ADMINPARAM}" ]
479 then
480 if [ "${jobs}" -gt "${ADMINPARAM}" ]
481 then
482 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
483 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
484 else
485 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
486 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
487 fi
488 fi
489}
490
491# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
492# does not exist on the users system 378# does not exist on the users system
493# vapier@gentoo.org 379# vapier@gentoo.org
494# 380#
495# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
496emktemp() { 382emktemp() {
497 local exe="touch" 383 local exe="touch"
498 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
499 local topdir="$1" 385 local topdir=$1
500 386
501 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
502 then
503 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
504 && topdir="/tmp" \ 389 && topdir="/tmp" \
505 || topdir="${T}" 390 || topdir=${T}
506 fi 391 fi
507 392
508 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
509 then
510 local tmp=/ 394 local tmp=/
511 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
512 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
513 done 397 done
514 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
515 echo "${tmp}" 399 echo "${tmp}"
516 else 400 else
517 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
518 && exe="-p" \ 402 && exe="-p" \
519 || exe="-d" 403 || exe="-d"
520 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
521 fi 405 fi
522} 406}
526# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
527# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
528# 412#
529# egetent(database, key) 413# egetent(database, key)
530egetent() { 414egetent() {
531 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
532 case "$2" in 417 case "$2" in
533 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
534 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
535 ;; 420 ;;
536 *) # Numeric 421 *) # Numeric
537 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
538 ;; 423 ;;
539 esac 424 esac
540 elif useq x86-fbsd ; then 425 ;;
541 local action 426 *-freebsd*)
542 if [ "$1" == "passwd" ] 427 local opts action="user"
543 then 428 [[ $1 == "passwd" ]] || action="group"
544 action="user" 429
545 else 430 # lookup by uid/gid
546 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
547 fi 433 fi
434
548 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
549 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
550 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
551 getent "$1" "$2" 442 getent "$1" "$2"
552 fi 443 ;;
444 esac
553} 445}
554 446
555# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
556# vapier@gentoo.org 448# vapier@gentoo.org
557# 449#
565# homedir: /dev/null 457# homedir: /dev/null
566# groups: none 458# groups: none
567# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
568enewuser() { 460enewuser() {
569 # get the username 461 # get the username
570 local euser="$1"; shift 462 local euser=$1; shift
571 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
572 then
573 eerror "No username specified !" 464 eerror "No username specified !"
574 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
575 fi 466 fi
576 467
577 # lets see if the username already exists 468 # lets see if the username already exists
578 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
579 then
580 return 0 470 return 0
581 fi 471 fi
582 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
583 473
584 # options to pass to useradd 474 # options to pass to useradd
585 local opts= 475 local opts=
586 476
587 # handle uid 477 # handle uid
588 local euid="$1"; shift 478 local euid=$1; shift
589 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
590 then
591 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
592 then
593 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
594 then
595 euid="next" 482 euid="next"
596 fi 483 fi
597 else 484 else
598 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
599 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
600 fi 487 fi
601 else 488 else
602 euid="next" 489 euid="next"
603 fi 490 fi
604 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
605 then 492 for euid in $(seq 101 999) ; do
606 local pwrange
607 if [ "${USERLAND}" == "BSD" ] ; then
608 pwrange="`jot 898 101`"
609 else
610 pwrange="`seq 101 999`"
611 fi
612 for euid in ${pwrange} ; do
613 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
614 done 494 done
615 fi 495 fi
616 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
617 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
618 498
619 # handle shell 499 # handle shell
620 local eshell="$1"; shift 500 local eshell=$1; shift
621 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
622 then
623 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
624 then
625 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
626 die "${eshell} does not exist" 504 die "${eshell} does not exist"
627 fi 505 fi
628 else 506 else
629 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
630 then 508 [[ -x ${ROOT}${shell} ]] && break
631 eshell="/usr/bin/false" 509 done
632 else 510
633 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
634 fi 514 fi
515
516 eshell=${shell}
635 fi 517 fi
636 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
637 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
638 520
639 # handle homedir 521 # handle homedir
640 local ehome="$1"; shift 522 local ehome=$1; shift
641 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
642 then
643 ehome="/dev/null" 524 ehome="/dev/null"
644 fi 525 fi
645 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
646 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
647 528
648 # handle groups 529 # handle groups
649 local egroups="$1"; shift 530 local egroups=$1; shift
650 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
651 then
652 local oldifs="${IFS}" 532 local oldifs=${IFS}
653 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
654 534
655 export IFS="," 535 export IFS=","
656 for g in ${egroups} 536 for g in ${egroups} ; do
657 do
658 export IFS="${oldifs}" 537 export IFS=${oldifs}
659 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
660 then
661 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
662 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
663 fi 541 fi
664 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
665 then
666 defgroup="${g}" 543 defgroup=${g}
667 else 544 else
668 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
669 fi 546 fi
670 export IFS="," 547 export IFS=","
671 done 548 done
672 export IFS="${oldifs}" 549 export IFS=${oldifs}
673 550
674 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
675 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
676 then
677 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
678 fi 554 fi
679 else 555 else
680 egroups="(none)" 556 egroups="(none)"
681 fi 557 fi
682 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
683 559
684 # handle extra and add the user 560 # handle extra and add the user
685 local eextra="$@"
686 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
687 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
688 if useq ppc-macos 563 case ${CHOST} in
689 then 564 *-darwin*)
690 ### Make the user 565 ### Make the user
691 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
692 then
693 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
694 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
695 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
696 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
697 ### Add the user to the groups specified 571 ### Add the user to the groups specified
698 local oldifs="${IFS}" 572 local oldifs=${IFS}
699 export IFS="," 573 export IFS=","
700 for g in ${egroups} 574 for g in ${egroups} ; do
701 do
702 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
703 done 576 done
704 export IFS="${oldifs}" 577 export IFS=${oldifs}
705 else 578 else
706 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
707 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
708 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
709 die "Required function missing" 582 die "Required function missing"
710 fi 583 fi
711 elif use x86-fbsd ; then 584 ;;
712 if [ -z "${eextra}" ] 585 *-freebsd*)
713 then 586 if [[ -z $@ ]] ; then
714 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
715 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
716 die "enewuser failed" 589 die "enewuser failed"
717 else 590 else
718 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
719 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
720 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
721 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
722 else 600 else
723 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
724 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
725 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
726 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
727 || die "enewuser failed" 609 || die "enewuser failed"
728 else 610 else
729 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
730 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
731 || die "enewuser failed" 613 || die "enewuser failed"
732 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
733 fi 623 fi
624
734 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
735
736 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
737 then
738 einfo " - Creating ${ehome} in ${D}"
739 dodir ${ehome}
740 fowners ${euser} ${ehome}
741 fperms 755 ${ehome}
742 fi
743} 626}
744 627
745# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
746# vapier@gentoo.org 629# vapier@gentoo.org
747# 630#
776 then 659 then
777 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
778 then 661 then
779 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
780 then 663 then
781 if useq ppc-macos ; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
782 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
783 else 666 else
784 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
785 fi 668 fi
786 else 669 else
800 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
801 684
802 # add the group 685 # add the group
803 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
804 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
805 if useq ppc-macos ; then 688 case ${CHOST} in
689 *-darwin*)
806 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
807 then 691 then
808 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
809 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
810 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
811 die "Required function missing" 695 die "Required function missing"
812 fi 696 fi
813 697
814 # If we need the next available 698 # If we need the next available
815 case ${egid} in 699 case ${egid} in
816 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
817 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
818 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
819 done 703 done
820 esac 704 esac
821 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
822 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
823 elif use x86-fbsd ; then 707 ;;
708
709 *-freebsd*)
824 case ${egid} in 710 case ${egid} in
825 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
826 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
827 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
828 done 714 done
829 esac 715 esac
830 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
831 else 717 ;;
718
719 *-netbsd*)
720 case ${egid} in
721 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do
723 [ -z "`egetent group ${egid}`" ] && break
724 done
725 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;;
728
729 *)
832 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
833 fi 731 ;;
732 esac
834 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
835} 734}
836 735
837# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
838# vapier@gentoo.org 737# vapier@gentoo.org
863# name: the name that will show up in the menu 762# name: the name that will show up in the menu
864# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
865# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
866# a full path to an icon 765# a full path to an icon
867# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
868# http://www.freedesktop.org/standards/menu-spec/ 767# http://www.freedesktop.org/Standards/desktop-entry-spec
869# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
870make_desktop_entry() { 769make_desktop_entry() {
871 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 770 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
872 771
873 local exec="${1}" 772 local exec=${1}
874 local name="${2:-${PN}}" 773 local name=${2:-${PN}}
875 local icon="${3:-${PN}.png}" 774 local icon=${3:-${PN}.png}
876 local type="${4}" 775 local type=${4}
877 local subdir="${6}" 776 local path=${5}
878 local path="${5:-${GAMES_BINDIR}}" 777
879 if [ -z "${type}" ] 778 if [[ -z ${type} ]] ; then
880 then 779 local catmaj=${CATEGORY%%-*}
881 case ${CATEGORY} in 780 local catmin=${CATEGORY##*-}
882 "app-emulation") 781 case ${catmaj} in
883 type=Emulator 782 app)
884 subdir="Emulation" 783 case ${catmin} in
784 admin) type=System;;
785 cdr) type=DiscBurning;;
786 dicts) type=Dictionary;;
787 editors) type=TextEditor;;
788 emacs) type=TextEditor;;
789 emulation) type=Emulator;;
790 laptop) type=HardwareSettings;;
791 office) type=Office;;
792 vim) type=TextEditor;;
793 xemacs) type=TextEditor;;
794 *) type=;;
795 esac
885 ;; 796 ;;
886 "games-"*) 797
887 type=Game 798 dev)
888 subdir="Games" 799 type="Development"
889 ;; 800 ;;
890 "net-"*) 801
891 type=Network 802 games)
892 subdir="${type}" 803 case ${catmin} in
804 action) type=ActionGame;;
805 arcade) type=ArcadeGame;;
806 board) type=BoardGame;;
807 kid) type=KidsGame;;
808 emulation) type=Emulator;;
809 puzzle) type=LogicGame;;
810 rpg) type=RolePlaying;;
811 roguelike) type=RolePlaying;;
812 simulation) type=Simulation;;
813 sports) type=SportsGame;;
814 strategy) type=StrategyGame;;
815 *) type=;;
816 esac
817 type="Game;${type}"
893 ;; 818 ;;
819
820 mail)
821 type="Network;Email"
822 ;;
823
824 media)
825 case ${catmin} in
826 gfx) type=Graphics;;
827 radio) type=Tuner;;
828 sound) type=Audio;;
829 tv) type=TV;;
830 video) type=Video;;
831 *) type=;;
832 esac
833 type="AudioVideo;${type}"
834 ;;
835
836 net)
837 case ${catmin} in
838 dialup) type=Dialup;;
839 ftp) type=FileTransfer;;
840 im) type=InstantMessaging;;
841 irc) type=IRCClient;;
842 mail) type=Email;;
843 news) type=News;;
844 nntp) type=News;;
845 p2p) type=FileTransfer;;
846 *) type=;;
847 esac
848 type="Network;${type}"
849 ;;
850
851 sci)
852 case ${catmin} in
853 astro*) type=Astronomoy;;
854 bio*) type=Biology;;
855 calc*) type=Calculator;;
856 chem*) type=Chemistry;;
857 geo*) type=Geology;;
858 math*) type=Math;;
859 *) type=;;
860 esac
861 type="Science;${type}"
862 ;;
863
864 www)
865 case ${catmin} in
866 client) type=WebBrowser;;
867 *) type=;;
868 esac
869 type="Network"
870 ;;
871
894 *) 872 *)
895 type= 873 type=
896 subdir=
897 ;; 874 ;;
898 esac 875 esac
899 fi 876 fi
877 if [ "${SLOT}" == "0" ] ; then
878 local desktop_name="${PN}"
879 else
880 local desktop_name="${PN}-${SLOT}"
881 fi
900 local desktop="${T}/${exec}.desktop" 882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
901 883
902echo "[Desktop Entry] 884echo "[Desktop Entry]
903Encoding=UTF-8 885Encoding=UTF-8
904Version=0.9.2 886Version=0.9.2
905Name=${name} 887Name=${name}
908Exec=${exec} 890Exec=${exec}
909Path=${path} 891Path=${path}
910Icon=${icon} 892Icon=${icon}
911Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
912 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
913 insinto /usr/share/applications 898 insinto /usr/share/applications
914 doins "${desktop}" 899 doins "${desktop}"
915 900 )
916 return 0
917} 901}
918 902
919# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
920# 904#
921# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
922# title: File to execute to start the Window Manager 906# title: File to execute to start the Window Manager
923# command: Name of the Window Manager 907# command: Name of the Window Manager
924 908
925make_session_desktop() { 909make_session_desktop() {
926
927 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 910 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
928 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 911 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
929 912
930 local title="${1}" 913 local title=$1
931 local command="${2}" 914 local command=$2
932 local desktop="${T}/${wm}.desktop" 915 local desktop=${T}/${wm}.desktop
933 916
934echo "[Desktop Entry] 917echo "[Desktop Entry]
935Encoding=UTF-8 918Encoding=UTF-8
936Name=${title} 919Name=${title}
937Comment=This session logs you into ${title} 920Comment=This session logs you into ${title}
939TryExec=${command} 922TryExec=${command}
940Type=Application" > "${desktop}" 923Type=Application" > "${desktop}"
941 924
942 insinto /usr/share/xsessions 925 insinto /usr/share/xsessions
943 doins "${desktop}" 926 doins "${desktop}"
944
945 return 0
946} 927}
947 928
948domenu() { 929domenu() {
949 local i 930 local i j
950 local j
951 insinto /usr/share/applications 931 insinto /usr/share/applications
952 for i in ${@} 932 for i in "$@" ; do
953 do
954 if [ -f "${i}" ]; 933 if [[ -f ${i} ]] ; then
955 then
956 doins ${i} 934 doins "${i}"
957 elif [ -d "${i}" ]; 935 elif [[ -d ${i} ]] ; then
958 then
959 for j in ${i}/*.desktop 936 for j in "${i}"/*.desktop ; do
960 do
961 doins ${j} 937 doins "${j}"
962 done 938 done
963 fi 939 fi
964 done 940 done
965} 941}
942newmenu() {
943 insinto /usr/share/applications
944 newins "$1" "$2"
945}
966 946
967doicon() { 947doicon() {
968 local i 948 local i j
969 local j
970 insinto /usr/share/pixmaps 949 insinto /usr/share/pixmaps
971 for i in ${@} 950 for i in "$@" ; do
972 do
973 if [ -f "${i}" ]; 951 if [[ -f ${i} ]] ; then
974 then
975 doins ${i} 952 doins "${i}"
976 elif [ -d "${i}" ]; 953 elif [[ -d ${i} ]] ; then
977 then
978 for j in ${i}/*.png 954 for j in "${i}"/*.png ; do
979 do
980 doins ${j} 955 doins "${j}"
981 done 956 done
982 fi 957 fi
983 done 958 done
959}
960newicon() {
961 insinto /usr/share/pixmaps
962 newins "$1" "$2"
984} 963}
985 964
986############################################################## 965##############################################################
987# END: Handle .desktop files and menu entries # 966# END: Handle .desktop files and menu entries #
988############################################################## 967##############################################################
989 968
990 969
991# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
992find_unpackable_file() { 971find_unpackable_file() {
993 local src="$1" 972 local src=$1
994 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
995 then
996 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
997 else 975 else
998 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
999 then
1000 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
1001 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
1002 then
1003 src="${PWD}/${src}" 979 src=${PWD}/${src}
1004 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
1005 then
1006 src="${src}" 981 src=${src}
1007 fi
1008 fi 982 fi
1009 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
1010 echo "${src}" 985 echo "${src}"
1011} 986}
1012 987
1013# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
1014# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
1029# lseek 1004# lseek
1030# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1031# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
1032# thus we would pass in the value of '4' as the second parameter. 1007# thus we would pass in the value of '4' as the second parameter.
1033unpack_pdv() { 1008unpack_pdv() {
1034 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
1035 local sizeoff_t="$2" 1010 local sizeoff_t=$2
1036 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1037 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1038 1014
1039 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
1040 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1041 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1042 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1043 1019
1044 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1108# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1109# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1110# - If the offset is not specified then we will attempt to extract 1086# - If the offset is not specified then we will attempt to extract
1111# the proper offset from the script itself. 1087# the proper offset from the script itself.
1112unpack_makeself() { 1088unpack_makeself() {
1113 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1114 local skip="$2" 1090 local skip=$2
1115 local exe="$3" 1091 local exe=$3
1116 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1117 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1118 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1119 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1120 then
1121 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1122 local skip=0 1099 local skip=0
1123 exe=tail 1100 exe=tail
1124 case ${ver} in 1101 case ${ver} in
1125 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1126 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1138 ;; 1115 ;;
1139 2.1.3) 1116 2.1.3)
1140 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1141 let skip="skip + 1" 1118 let skip="skip + 1"
1142 ;; 1119 ;;
1143 2.1.4) 1120 2.1.4|2.1.5)
1144 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1121 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1145 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1146 exe="dd" 1123 exe="dd"
1147 ;; 1124 ;;
1148 *) 1125 *)
1193check_license() { 1170check_license() {
1194 local lic=$1 1171 local lic=$1
1195 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1196 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1197 else 1174 else
1198 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1199 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1200 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1201 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1202 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1203 lic="${src}" 1180 lic="${lic}"
1204 fi
1205 fi 1181 fi
1182 fi
1206 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1207 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1208 1185
1209 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1210 # accepted ... if we don't find a match, we make the user accept 1187 # accepted ... if we don't find a match, we make the user accept
1211 local shopts=$- 1188 local shopts=$-
1382# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1383# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1384# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1385cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1386 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1387 local dir="$(dirname ${@})" 1364 local dir=$(dirname "$*")
1388 local file="$(basename ${@})" 1365 local file=$(basename "$*")
1389 local mline="" 1366 local mline=""
1390 local showedmsg=0 1367 local showedmsg=0
1391 1368
1392 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1369 for mline in $(mount | egrep -e '(iso|cdrom|fs=cdfss)' | awk '{print $3}') ; do
1393 [[ -d ${mline}/${dir} ]] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1394 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1395 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1396 done 1373 done
1397 1374
1398 if [[ -z ${CDROM_ROOT} ]] ; then 1375 if [[ -z ${CDROM_ROOT} ]] ; then
1399 echo 1376 echo
1414 fi 1391 fi
1415 showedmsg=1 1392 showedmsg=1
1416 fi 1393 fi
1417 einfo "Press return to scan for the cd again" 1394 einfo "Press return to scan for the cd again"
1418 einfo "or hit CTRL+C to abort the emerge." 1395 einfo "or hit CTRL+C to abort the emerge."
1396 echo
1397 einfo "If you are having trouble with the detection"
1398 einfo "of your CD, it is possible that you do not have"
1399 einfo "Joliet support enabled in your kernel. Please"
1400 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1419 read 1401 read
1420 fi 1402 fi
1421 done 1403 done
1422} 1404}
1423 1405
1433# directories and uses the intersection of the lists. 1415# directories and uses the intersection of the lists.
1434# The -u builds a list of po files found in all the 1416# The -u builds a list of po files found in all the
1435# directories and uses the union of the lists. 1417# directories and uses the union of the lists.
1436strip-linguas() { 1418strip-linguas() {
1437 local ls newls 1419 local ls newls
1438 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1420 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1439 local op="$1"; shift 1421 local op=$1; shift
1440 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1422 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1441 local d f 1423 local d f
1442 for d in "$@" ; do 1424 for d in "$@" ; do
1443 if [ "${op}" == "-u" ] ; then 1425 if [[ ${op} == "-u" ]] ; then
1444 newls="${ls}" 1426 newls=${ls}
1445 else 1427 else
1446 newls="" 1428 newls=""
1447 fi 1429 fi
1448 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1430 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1449 if [ "${op}" == "-i" ] ; then 1431 if [[ ${op} == "-i" ]] ; then
1450 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1432 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1451 else 1433 else
1452 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1434 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1453 fi 1435 fi
1454 done 1436 done
1455 ls="${newls}" 1437 ls=${newls}
1456 done 1438 done
1457 ls="${ls//.po}" 1439 ls=${ls//.po}
1458 else 1440 else
1459 ls="$@" 1441 ls=$@
1460 fi 1442 fi
1461 1443
1462 ls=" ${ls} " 1444 ls=" ${ls} "
1463 newls="" 1445 newls=""
1464 for f in ${LINGUAS} ; do 1446 for f in ${LINGUAS} ; do
1465 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1447 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1466 newls="${newls} ${f}" 1448 newls="${newls} ${f}"
1467 else 1449 else
1468 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1450 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1469 fi 1451 fi
1470 done 1452 done
1471 if [ -z "${newls}" ] ; then 1453 if [[ -z ${newls} ]] ; then
1472 unset LINGUAS 1454 export LINGUAS=""
1473 else 1455 else
1474 export LINGUAS="${newls}" 1456 export LINGUAS=${newls:1}
1475 fi 1457 fi
1476} 1458}
1477 1459
1478# moved from kernel.eclass since they are generally useful outside of 1460# moved from kernel.eclass since they are generally useful outside of
1479# kernel.eclass -iggy (20041002) 1461# kernel.eclass -iggy (20041002)
1481# the following functions are useful in kernel module ebuilds, etc. 1463# the following functions are useful in kernel module ebuilds, etc.
1482# for an example see ivtv or drbd ebuilds 1464# for an example see ivtv or drbd ebuilds
1483 1465
1484# set's ARCH to match what the kernel expects 1466# set's ARCH to match what the kernel expects
1485set_arch_to_kernel() { 1467set_arch_to_kernel() {
1468 i=10
1469 while ((i--)) ; do
1470 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1471 done
1486 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1472 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1487 case ${ARCH} in 1473 case ${ARCH} in
1488 x86) export ARCH="i386";; 1474 x86) export ARCH="i386";;
1489 amd64) export ARCH="x86_64";; 1475 amd64) export ARCH="x86_64";;
1490 hppa) export ARCH="parisc";; 1476 hppa) export ARCH="parisc";;
1491 mips) export ARCH="mips";; 1477 mips) export ARCH="mips";;
1478 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!
1492 *) export ARCH="${ARCH}";; 1479 *) export ARCH="${ARCH}";;
1493 esac 1480 esac
1494} 1481}
1495 1482
1496# set's ARCH back to what portage expects 1483# set's ARCH back to what portage expects
1497set_arch_to_portage() { 1484set_arch_to_portage() {
1485 i=10
1486 while ((i--)) ; do
1487 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1488 done
1498 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1489 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1499} 1490}
1500 1491
1501# Jeremy Huddleston <eradicator@gentoo.org>: 1492# Jeremy Huddleston <eradicator@gentoo.org>:
1502# preserve_old_lib /path/to/libblah.so.0 1493# preserve_old_lib /path/to/libblah.so.0
1537 LIB=$1 1528 LIB=$1
1538 1529
1539 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1530 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1540 SONAME=`basename ${LIB}` 1531 SONAME=`basename ${LIB}`
1541 1532
1542 einfo "An old version of an installed library was detected on your system." 1533 ewarn "An old version of an installed library was detected on your system."
1543 einfo "In order to avoid breaking packages that link against is, this older version" 1534 ewarn "In order to avoid breaking packages that link against it, this older version"
1544 einfo "is not being removed. In order to make full use of this newer version," 1535 ewarn "is not being removed. In order to make full use of this newer version,"
1545 einfo "you will need to execute the following command:" 1536 ewarn "you will need to execute the following command:"
1546 einfo " revdep-rebuild --soname ${SONAME}" 1537 ewarn " revdep-rebuild --soname ${SONAME}"
1547 einfo 1538 ewarn
1548 einfo "After doing that, you can safely remove ${LIB}" 1539 ewarn "After doing that, you can safely remove ${LIB}"
1549 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1550 fi 1541 fi
1551} 1542}
1552 1543
1553# Hack for people to figure out if a package was built with 1544# Hack for people to figure out if a package was built with
1554# certain USE flags 1545# certain USE flags
1555# 1546#
1556# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1547# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1557# ex: built_with_use xchat gtk2 1548# ex: built_with_use xchat gtk2
1558# 1549#
1579 shift 1570 shift
1580 done 1571 done
1581 [[ ${opt} = "-a" ]] 1572 [[ ${opt} = "-a" ]]
1582} 1573}
1583 1574
1584# Many configure scripts wrongly bail when a C++ compiler 1575# Many configure scripts wrongly bail when a C++ compiler
1585# could not be detected. #73450 1576# could not be detected. #73450
1586epunt_cxx() { 1577epunt_cxx() {
1587 local dir=$1 1578 local dir=$1
1588 [[ -z ${dir} ]] && dir=${S} 1579 [[ -z ${dir} ]] && dir=${S}
1589 ebegin "Removing useless C++ checks" 1580 ebegin "Removing useless C++ checks"
1592 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1583 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1593 done 1584 done
1594 eend 0 1585 eend 0
1595} 1586}
1596 1587
1597# This function simply returns the desired lib directory. With portage 1588# dopamd <file> [more files]
1598# 2.0.51, we now have support for installing libraries to lib32/lib64
1599# to accomidate the needs of multilib systems. It's no longer a good idea
1600# to assume all libraries will end up in lib. Replace any (sane) instances
1601# where lib is named directly with $(get_libdir) if possible.
1602# 1589#
1603# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 1590# Install pam auth config file in /etc/pam.d
1591dopamd() {
1592 [[ -z $1 ]] && die "dopamd requires at least one argument"
1593
1594 use pam || return 0
1595
1596 INSDESTTREE=/etc/pam.d \
1597 doins "$@" || die "failed to install $@"
1598}
1599# newpamd <old name> <new name>
1604# 1600#
1605# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 1601# Install pam file <old name> as <new name> in /etc/pam.d
1606# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 1602newpamd() {
1607# fall back on old behavior. Any profile that has these set should also 1603 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1608# depend on a newer version of portage (not yet released) which uses these 1604
1609# over CONF_LIBDIR in econf, dolib, etc... 1605 use pam || return 0
1610get_libdir() { 1606
1611 LIBDIR_TEST=$(type econf) 1607 INSDESTTREE=/etc/pam.d \
1612 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 1608 newins "$1" "$2" || die "failed to install $1 as $2"
1613 # if there is an override, we want to use that... always. 1609}
1614 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 1610
1615 # We don't need to know the verison of portage. We only need to know 1611# make a wrapper script ...
1616 # if there is support for CONF_LIBDIR in econf and co. 1612# NOTE: this was originally games_make_wrapper, but I noticed other places where
1617 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 1613# this could be used, so I have moved it here and made it not games-specific
1618 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then 1614# -- wolf31o2
1619 # # and if there isnt an override, and we're using a version of 1615# $1 == wrapper name
1620 # # portage without CONF_LIBDIR support, force the use of lib. dolib 1616# $2 == binary to run
1621 # # and friends from portage 2.0.50 wont be too happy otherwise. 1617# $3 == directory to chdir before running binary
1622 # CONF_LIBDIR="lib" 1618# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1619# $5 == path for wrapper
1620make_wrapper() {
1621 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1622 local tmpwrapper=$(emktemp)
1623 # We don't want to quote ${bin} so that people can pass complex
1624 # things as $bin ... "./someprog --args"
1625 cat << EOF > "${tmpwrapper}"
1626#!/bin/sh
1627cd "${chdir:-.}"
1628if [ -n "${libdir}" ] ; then
1629 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1631 else
1632 export LD_LIBRARY_PATH="${libdir}"
1623 #fi 1633 fi
1624 elif [ -n "$(get_abi_LIBDIR)" ]; then # Using eradicator's LIBDIR_<abi> approach...
1625 CONF_LIBDIR="$(get_abi_LIBDIR)"
1626 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
1627 # will be <portage-2.0.51_pre20
1628 CONF_LIBDIR="lib"
1629 fi 1634fi
1630 # and of course, default to lib if CONF_LIBDIR isnt set 1635exec ${bin} "\$@"
1631 echo ${CONF_LIBDIR:=lib} 1636EOF
1632 unset LIBDIR_TEST 1637 chmod go+rx "${tmpwrapper}"
1633} 1638 if [[ -n ${path} ]] ; then
1634 1639 exeinto "${path}"
1635get_multilibdir() { 1640 newexe "${tmpwrapper}" "${wrapper}"
1636 if [ -n "$(get_abi_LIBDIR)" ]; then
1637 eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
1638 exit 1
1639 fi
1640 echo ${CONF_MULTILIBDIR:=lib32}
1641}
1642
1643# Sometimes you need to override the value returned by get_libdir. A good
1644# example of this is xorg-x11, where lib32 isnt a supported configuration,
1645# and where lib64 -must- be used on amd64 (for applications that need lib
1646# to be 32bit, such as adobe acrobat). Note that this override also bypasses
1647# portage version sanity checking.
1648# get_libdir_override expects one argument, the result get_libdir should
1649# return:
1650#
1651# get_libdir_override lib64
1652#
1653# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
1654get_libdir_override() {
1655 if [ -n "$(get_abi_LIBDIR)" ]; then
1656 eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
1657 exit 1
1658 fi
1659 CONF_LIBDIR="$1"
1660 CONF_LIBDIR_OVERRIDE="$1"
1661}
1662
1663# get_abi_var <VAR> [<ABI>]
1664# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1665#
1666# ex:
1667# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1668#
1669# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1670# This will hopefully be added to portage soon...
1671#
1672# If <ABI> is not specified, ${ABI} is used.
1673# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1674# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1675#
1676# Jeremy Huddleston <eradicator@gentoo.org>
1677get_abi_var() {
1678 local flag=${1}
1679 local abi
1680 if [ $# -gt 1 ]; then
1681 abi=${2}
1682 elif [ -n "${ABI}" ]; then
1683 abi=${ABI}
1684 elif [ -n "${DEFAULT_ABI}" ]; then
1685 abi=${DEFAULT_ABI}
1686 else 1641 else
1687 return 1 1642 newbin "${tmpwrapper}" "${wrapper}"
1688 fi 1643 fi
1689
1690 local var="${flag}_${abi}"
1691 echo ${!var}
1692} 1644}
1693
1694get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
1695get_abi_CXXFLAGS() { get_abi_var CXXFLAGS ${@}; }
1696get_abi_ASFLAGS() { get_abi_var ASFLAGS ${@}; }
1697get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
1698
1699# get_all_libdir()
1700# Returns a list of all the libdirs used by this profile
1701get_all_libdirs() {
1702 local libdirs
1703 if [ -n "${MULTILIB_ABIS}" ]; then
1704 for abi in ${MULTILIB_ABIS}; do
1705 libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
1706 done
1707 libdirs="${libdirs:1}"
1708 elif [ -n "${CONF_LIBDIR}" ]; then
1709 libdirs="${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}"
1710 else
1711 libdirs="lib"
1712 fi
1713
1714 echo "${libdirs}"
1715}

Legend:
Removed from v.1.139  
changed lines
  Added in v.1.212

  ViewVC Help
Powered by ViewVC 1.1.20