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

Diff of /eclass/eutils.eclass

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

Revision 1.167 Revision 1.212
1# Copyright 1999-2005 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.167 2005/04/16 07:05:45 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
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# 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
21# 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
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
70 for lib in "${@}" ; do 69 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 71 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 73 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 75 otherwise we run into linking problems.
77 76
78 See bug http://bugs.gentoo.org/4411 for more info. 77 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 78 */
80 GROUP ( /${libdir}/${lib} ) 79 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 80 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 81 fperms a+x "/usr/${libdir}/${lib}"
118EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 118# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 120# Default options for patch
122# 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
123EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
124# 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,
125# and not the full path .. 125# and not the full path ..
126EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 127# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
129# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
130# 132#
131# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
132# 134#
133EPATCH_FORCE="no" 135EPATCH_FORCE="no"
164# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
165# 167#
166# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
167# 169#
168epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
169 local PIPE_CMD="" 172 local PIPE_CMD=""
170 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
171 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
172 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
173 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
174 local x="" 177 local x=""
175 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
176 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
177 then 182 then
178 local m="" 183 local m=""
179 einfo "${#} patches to apply ..."
180 for m in "$@" ; do 184 for m in "$@" ; do
181 epatch "${m}" 185 epatch "${m}"
182 done 186 done
183 return 0 187 return 0
184 fi 188 fi
238 ;; 242 ;;
239 esac 243 esac
240 244
241 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
242 then 246 then
243 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
244 fi 248 fi
245 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
246 do 250 do
247 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
248 # 252 #
249 # ???_arch_foo.patch 253 # ???_arch_foo.patch
250 # 254 #
251 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
252 ([ "${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}" ] || \
253 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
254 then 258 then
255 local count=0 259 local count=0
256 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
257 local patchname=${x##*/} 261 local patchname=${x##*/}
310 count=5 314 count=5
311 break 315 break
312 fi 316 fi
313 fi 317 fi
314 318
315 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${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
316 then 320 then
317 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
318 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 326
323 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
324 329
325 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
326 then 331 then
327 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 echo 333 echo
367 then 372 then
368 einfo "Done with patching" 373 einfo "Done with patching"
369 fi 374 fi
370} 375}
371 376
372# This function return true if we are using the NPTL pthreads
373# implementation.
374#
375# <azarah@gentoo.org> (06 March 2003)
376#
377have_NPTL() {
378 cat > ${T}/test-nptl.c <<-"END"
379 #define _XOPEN_SOURCE
380 #include <unistd.h>
381 #include <stdio.h>
382
383 int main()
384 {
385 char buf[255];
386 char *str = buf;
387
388 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
389 if (NULL != str) {
390 printf("%s\n", str);
391 if (NULL != strstr(str, "NPTL"))
392 return 0;
393 }
394
395 return 1;
396 }
397 END
398
399 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
400 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
401 then
402 echo "yes"
403 einfon "Checking what PTHREADS implementation we have ..."
404 if ${T}/nptl
405 then
406 return 0
407 else
408 return 1
409 fi
410 else
411 echo "no"
412 fi
413
414 return 1
415}
416
417# This function check how many cpu's are present, and then set
418# -j in MAKEOPTS accordingly.
419#
420# Thanks to nall <nall@gentoo.org> for this.
421#
422get_number_of_jobs() {
423 local jobs=0
424
425 if [ ! -r /proc/cpuinfo ]
426 then
427 return 1
428 fi
429
430 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
431 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
432 then
433 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
434 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
435 ADMINPARAM="${ADMINPARAM/-j}"
436 fi
437
438 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
439
440 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
441 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
442 then
443 # these archs will always have "[Pp]rocessor"
444 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
445
446 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
447 then
448 # sparc always has "ncpus active"
449 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
450
451 elif [ "${ARCH}" = "alpha" ]
452 then
453 # alpha has "cpus active", but only when compiled with SMP
454 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
455 then
456 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
457 else
458 jobs=2
459 fi
460
461 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
462 then
463 # ppc has "processor", but only when compiled with SMP
464 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
465 then
466 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
467 else
468 jobs=2
469 fi
470 elif [ "${ARCH}" = "s390" ]
471 then
472 # s390 has "# processors : "
473 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
474 else
475 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
476 die "Unknown ARCH -- ${ARCH}!"
477 fi
478
479 # Make sure the number is valid ...
480 if [ "${jobs}" -lt 1 ]
481 then
482 jobs=1
483 fi
484
485 if [ -n "${ADMINPARAM}" ]
486 then
487 if [ "${jobs}" -gt "${ADMINPARAM}" ]
488 then
489 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
490 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
491 else
492 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
493 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
494 fi
495 fi
496}
497
498# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
499# does not exist on the users system 378# does not exist on the users system
500# vapier@gentoo.org 379# vapier@gentoo.org
501# 380#
502# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
503emktemp() { 382emktemp() {
504 local exe="touch" 383 local exe="touch"
505 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
506 local topdir="$1" 385 local topdir=$1
507 386
508 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
509 then
510 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
511 && topdir="/tmp" \ 389 && topdir="/tmp" \
512 || topdir="${T}" 390 || topdir=${T}
513 fi 391 fi
514 392
515 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
516 then
517 local tmp=/ 394 local tmp=/
518 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
519 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
520 done 397 done
521 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
522 echo "${tmp}" 399 echo "${tmp}"
523 else 400 else
524 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
525 && exe="-p" \ 402 && exe="-p" \
526 || exe="-d" 403 || exe="-d"
527 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
528 fi 405 fi
529} 406}
533# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
534# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
535# 412#
536# egetent(database, key) 413# egetent(database, key)
537egetent() { 414egetent() {
538 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
539 case "$2" in 417 case "$2" in
540 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
541 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
542 ;; 420 ;;
543 *) # Numeric 421 *) # Numeric
544 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
545 ;; 423 ;;
546 esac 424 esac
547 elif useq x86-fbsd ; then 425 ;;
548 local action 426 *-freebsd*)
549 if [ "$1" == "passwd" ] 427 local opts action="user"
550 then 428 [[ $1 == "passwd" ]] || action="group"
551 action="user" 429
552 else 430 # lookup by uid/gid
553 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
554 fi 433 fi
434
555 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
556 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
557 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
558 getent "$1" "$2" 442 getent "$1" "$2"
559 fi 443 ;;
444 esac
560} 445}
561 446
562# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
563# vapier@gentoo.org 448# vapier@gentoo.org
564# 449#
572# homedir: /dev/null 457# homedir: /dev/null
573# groups: none 458# groups: none
574# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
575enewuser() { 460enewuser() {
576 # get the username 461 # get the username
577 local euser="$1"; shift 462 local euser=$1; shift
578 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
579 then
580 eerror "No username specified !" 464 eerror "No username specified !"
581 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
582 fi 466 fi
583 467
584 # lets see if the username already exists 468 # lets see if the username already exists
585 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
586 then
587 return 0 470 return 0
588 fi 471 fi
589 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
590 473
591 # options to pass to useradd 474 # options to pass to useradd
592 local opts= 475 local opts=
593 476
594 # handle uid 477 # handle uid
595 local euid="$1"; shift 478 local euid=$1; shift
596 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
597 then
598 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
599 then
600 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
601 then
602 euid="next" 482 euid="next"
603 fi 483 fi
604 else 484 else
605 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
606 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
607 fi 487 fi
608 else 488 else
609 euid="next" 489 euid="next"
610 fi 490 fi
611 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
612 then 492 for euid in $(seq 101 999) ; do
613 local pwrange
614 if [ "${USERLAND}" == "BSD" ] ; then
615 pwrange="`jot 898 101`"
616 else
617 pwrange="`seq 101 999`"
618 fi
619 for euid in ${pwrange} ; do
620 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
621 done 494 done
622 fi 495 fi
623 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
624 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
625 498
626 # handle shell 499 # handle shell
627 local eshell="$1"; shift 500 local eshell=$1; shift
628 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
629 then
630 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
631 then
632 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
633 die "${eshell} does not exist" 504 die "${eshell} does not exist"
634 fi 505 fi
635 else 506 else
636 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
637 then 508 [[ -x ${ROOT}${shell} ]] && break
638 eshell="/usr/bin/false" 509 done
639 else 510
640 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"
641 fi 514 fi
515
516 eshell=${shell}
642 fi 517 fi
643 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
644 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
645 520
646 # handle homedir 521 # handle homedir
647 local ehome="$1"; shift 522 local ehome=$1; shift
648 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
649 then
650 ehome="/dev/null" 524 ehome="/dev/null"
651 fi 525 fi
652 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
653 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
654 528
655 # handle groups 529 # handle groups
656 local egroups="$1"; shift 530 local egroups=$1; shift
657 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
658 then
659 local oldifs="${IFS}" 532 local oldifs=${IFS}
660 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
661 534
662 export IFS="," 535 export IFS=","
663 for g in ${egroups} 536 for g in ${egroups} ; do
664 do
665 export IFS="${oldifs}" 537 export IFS=${oldifs}
666 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
667 then
668 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
669 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
670 fi 541 fi
671 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
672 then
673 defgroup="${g}" 543 defgroup=${g}
674 else 544 else
675 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
676 fi 546 fi
677 export IFS="," 547 export IFS=","
678 done 548 done
679 export IFS="${oldifs}" 549 export IFS=${oldifs}
680 550
681 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
682 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
683 then
684 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
685 fi 554 fi
686 else 555 else
687 egroups="(none)" 556 egroups="(none)"
688 fi 557 fi
689 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
690 559
691 # handle extra and add the user 560 # handle extra and add the user
692 local eextra="$@"
693 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
694 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
695 if useq ppc-macos 563 case ${CHOST} in
696 then 564 *-darwin*)
697 ### Make the user 565 ### Make the user
698 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
699 then
700 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
701 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
702 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
703 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
704 ### Add the user to the groups specified 571 ### Add the user to the groups specified
705 local oldifs="${IFS}" 572 local oldifs=${IFS}
706 export IFS="," 573 export IFS=","
707 for g in ${egroups} 574 for g in ${egroups} ; do
708 do
709 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
710 done 576 done
711 export IFS="${oldifs}" 577 export IFS=${oldifs}
712 else 578 else
713 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
714 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
715 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
716 die "Required function missing" 582 die "Required function missing"
717 fi 583 fi
718 elif use x86-fbsd ; then 584 ;;
719 if [ -z "${eextra}" ] 585 *-freebsd*)
720 then 586 if [[ -z $@ ]] ; then
721 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
722 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
723 die "enewuser failed" 589 die "enewuser failed"
724 else 590 else
725 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
726 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
727 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
728 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
729 else 600 else
730 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
731 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
732 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
733 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
734 || die "enewuser failed" 609 || die "enewuser failed"
735 else 610 else
736 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
737 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
738 || die "enewuser failed" 613 || die "enewuser failed"
739 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}"
740 fi 623 fi
624
741 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
742
743 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
744 then
745 einfo " - Creating ${ehome} in ${D}"
746 dodir ${ehome}
747 fowners ${euser} ${ehome}
748 fperms 755 ${ehome}
749 fi
750} 626}
751 627
752# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
753# vapier@gentoo.org 629# vapier@gentoo.org
754# 630#
783 then 659 then
784 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
785 then 661 then
786 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
787 then 663 then
788 if useq ppc-macos ; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
789 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
790 else 666 else
791 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
792 fi 668 fi
793 else 669 else
807 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
808 684
809 # add the group 685 # add the group
810 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
811 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
812 if useq ppc-macos ; then 688 case ${CHOST} in
689 *-darwin*)
813 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
814 then 691 then
815 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
816 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
817 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
818 die "Required function missing" 695 die "Required function missing"
819 fi 696 fi
820 697
821 # If we need the next available 698 # If we need the next available
822 case ${egid} in 699 case ${egid} in
823 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
824 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
825 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
826 done 703 done
827 esac 704 esac
828 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
829 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
830 elif use x86-fbsd ; then 707 ;;
708
709 *-freebsd*)
831 case ${egid} in 710 case ${egid} in
832 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
833 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
834 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
835 done 714 done
836 esac 715 esac
837 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
838 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 *)
839 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
840 fi 731 ;;
732 esac
841 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
842} 734}
843 735
844# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
845# vapier@gentoo.org 737# vapier@gentoo.org
870# name: the name that will show up in the menu 762# name: the name that will show up in the menu
871# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
872# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
873# a full path to an icon 765# a full path to an icon
874# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
875# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 767# http://www.freedesktop.org/Standards/desktop-entry-spec
876# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
877make_desktop_entry() { 769make_desktop_entry() {
878 [[ -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
879 771
880 local exec=${1} 772 local exec=${1}
906 dev) 798 dev)
907 type="Development" 799 type="Development"
908 ;; 800 ;;
909 801
910 games) 802 games)
911 [[ -z ${path} ]] && path=${GAMES_BINDIR}
912
913 case ${catmin} in 803 case ${catmin} in
914 action) type=ActionGame;; 804 action) type=ActionGame;;
915 arcade) type=ArcadeGame;; 805 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 806 board) type=BoardGame;;
917 kid) type=KidsGame;; 807 kid) type=KidsGame;;
982 *) 872 *)
983 type= 873 type=
984 ;; 874 ;;
985 esac 875 esac
986 fi 876 fi
987 877 if [ "${SLOT}" == "0" ] ; then
878 local desktop_name="${PN}"
879 else
880 local desktop_name="${PN}-${SLOT}"
881 fi
988 local desktop=${T}/${exec%% *}-${P}.desktop 882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
989 883
990echo "[Desktop Entry] 884echo "[Desktop Entry]
991Encoding=UTF-8 885Encoding=UTF-8
992Version=0.9.2 886Version=0.9.2
993Name=${name} 887Name=${name}
996Exec=${exec} 890Exec=${exec}
997Path=${path} 891Path=${path}
998Icon=${icon} 892Icon=${icon}
999Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
1000 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
1001 insinto /usr/share/applications 898 insinto /usr/share/applications
1002 doins "${desktop}" 899 doins "${desktop}"
1003 900 )
1004 return 0
1005} 901}
1006 902
1007# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
1008# 904#
1009# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
1038 doins "${i}" 934 doins "${i}"
1039 elif [[ -d ${i} ]] ; then 935 elif [[ -d ${i} ]] ; then
1040 for j in "${i}"/*.desktop ; do 936 for j in "${i}"/*.desktop ; do
1041 doins "${j}" 937 doins "${j}"
1042 done 938 done
1043 fi 939 fi
1044 done 940 done
1045} 941}
1046newmenu() { 942newmenu() {
1047 insinto /usr/share/applications 943 insinto /usr/share/applications
1048 newins "$1" "$2" 944 newins "$1" "$2"
1056 doins "${i}" 952 doins "${i}"
1057 elif [[ -d ${i} ]] ; then 953 elif [[ -d ${i} ]] ; then
1058 for j in "${i}"/*.png ; do 954 for j in "${i}"/*.png ; do
1059 doins "${j}" 955 doins "${j}"
1060 done 956 done
1061 fi 957 fi
1062 done 958 done
1063} 959}
1064newicon() { 960newicon() {
1065 insinto /usr/share/pixmaps 961 insinto /usr/share/pixmaps
1066 newins "$1" "$2" 962 newins "$1" "$2"
1071############################################################## 967##############################################################
1072 968
1073 969
1074# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
1075find_unpackable_file() { 971find_unpackable_file() {
1076 local src="$1" 972 local src=$1
1077 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
1078 then
1079 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
1080 else 975 else
1081 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
1082 then
1083 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
1084 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
1085 then
1086 src="${PWD}/${src}" 979 src=${PWD}/${src}
1087 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
1088 then
1089 src="${src}" 981 src=${src}
1090 fi
1091 fi 982 fi
1092 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
1093 echo "${src}" 985 echo "${src}"
1094} 986}
1095 987
1096# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
1097# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
1112# lseek 1004# lseek
1113# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1114# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
1115# 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.
1116unpack_pdv() { 1008unpack_pdv() {
1117 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
1118 local sizeoff_t="$2" 1010 local sizeoff_t=$2
1119 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1120 [ -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 :("
1121 1014
1122 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
1123 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1124 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1125 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\"`
1126 1019
1127 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1191# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1192# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1193# - 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
1194# the proper offset from the script itself. 1087# the proper offset from the script itself.
1195unpack_makeself() { 1088unpack_makeself() {
1196 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1197 local skip="$2" 1090 local skip=$2
1198 local exe="$3" 1091 local exe=$3
1199 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1200 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1201 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1202 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1203 then
1204 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1205 local skip=0 1099 local skip=0
1206 exe=tail 1100 exe=tail
1207 case ${ver} in 1101 case ${ver} in
1208 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
1209 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1221 ;; 1115 ;;
1222 2.1.3) 1116 2.1.3)
1223 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1224 let skip="skip + 1" 1118 let skip="skip + 1"
1225 ;; 1119 ;;
1226 2.1.4) 1120 2.1.4|2.1.5)
1227 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)
1228 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1229 exe="dd" 1123 exe="dd"
1230 ;; 1124 ;;
1231 *) 1125 *)
1276check_license() { 1170check_license() {
1277 local lic=$1 1171 local lic=$1
1278 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1279 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1280 else 1174 else
1281 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1282 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1283 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1284 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1285 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1286 lic="${src}" 1180 lic="${lic}"
1287 fi
1288 fi 1181 fi
1182 fi
1289 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1290 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1291 1185
1292 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1293 # 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
1294 local shopts=$- 1188 local shopts=$-
1465# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1466# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1467# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1468cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1469 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1470 local dir="$(dirname ${@})" 1364 local dir=$(dirname "$*")
1471 local file="$(basename ${@})" 1365 local file=$(basename "$*")
1472 local mline="" 1366 local mline=""
1473 local showedmsg=0 1367 local showedmsg=0
1474 1368
1475 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
1476 [[ -d ${mline}/${dir} ]] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1477 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1478 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1479 done 1373 done
1480 1374
1481 if [[ -z ${CDROM_ROOT} ]] ; then 1375 if [[ -z ${CDROM_ROOT} ]] ; then
1482 echo 1376 echo
1497 fi 1391 fi
1498 showedmsg=1 1392 showedmsg=1
1499 fi 1393 fi
1500 einfo "Press return to scan for the cd again" 1394 einfo "Press return to scan for the cd again"
1501 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."
1502 read 1401 read
1503 fi 1402 fi
1504 done 1403 done
1505} 1404}
1506 1405
1570 while ((i--)) ; do 1469 while ((i--)) ; do
1571 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1470 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1572 done 1471 done
1573 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1472 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1574 case ${ARCH} in 1473 case ${ARCH} in
1575 x86) export ARCH="i386";; 1474 x86) export ARCH="i386";;
1576 amd64) export ARCH="x86_64";; 1475 amd64) export ARCH="x86_64";;
1577 hppa) export ARCH="parisc";; 1476 hppa) export ARCH="parisc";;
1578 mips) export ARCH="mips";; 1477 mips) export ARCH="mips";;
1579 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! 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!
1580 *) export ARCH="${ARCH}";; 1479 *) export ARCH="${ARCH}";;
1581 esac 1480 esac
1582} 1481}
1583 1482
1584# set's ARCH back to what portage expects 1483# set's ARCH back to what portage expects
1585set_arch_to_portage() { 1484set_arch_to_portage() {
1629 LIB=$1 1528 LIB=$1
1630 1529
1631 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1530 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1632 SONAME=`basename ${LIB}` 1531 SONAME=`basename ${LIB}`
1633 1532
1634 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."
1635 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"
1636 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,"
1637 einfo "you will need to execute the following command:" 1536 ewarn "you will need to execute the following command:"
1638 einfo " revdep-rebuild --soname ${SONAME}" 1537 ewarn " revdep-rebuild --soname ${SONAME}"
1639 einfo 1538 ewarn
1640 einfo "After doing that, you can safely remove ${LIB}" 1539 ewarn "After doing that, you can safely remove ${LIB}"
1641 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1642 fi 1541 fi
1643} 1542}
1644 1543
1645# 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
1646# certain USE flags 1545# certain USE flags
1692dopamd() { 1591dopamd() {
1693 [[ -z $1 ]] && die "dopamd requires at least one argument" 1592 [[ -z $1 ]] && die "dopamd requires at least one argument"
1694 1593
1695 use pam || return 0 1594 use pam || return 0
1696 1595
1697 insinto /etc/pam.d 1596 INSDESTTREE=/etc/pam.d \
1698 doins "$@" || die "failed to install $@" 1597 doins "$@" || die "failed to install $@"
1699} 1598}
1700# newpamd <old name> <new name> 1599# newpamd <old name> <new name>
1701# 1600#
1702# Install pam file <old name> as <new name> in /etc/pam.d 1601# Install pam file <old name> as <new name> in /etc/pam.d
1703newpamd() { 1602newpamd() {
1704 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1603 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1705 1604
1706 use pam || return 0 1605 use pam || return 0
1707 1606
1708 insinto /etc/pam.d 1607 INSDESTTREE=/etc/pam.d \
1709 newins "$1" "$2" || die "failed to install $1 as $2" 1608 newins "$1" "$2" || die "failed to install $1 as $2"
1710} 1609}
1711 1610
1712# make a wrapper script ... 1611# make a wrapper script ...
1713# NOTE: this was originally games_make_wrapper, but I noticed other places where 1612# NOTE: this was originally games_make_wrapper, but I noticed other places where
1719# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1618# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1720# $5 == path for wrapper 1619# $5 == path for wrapper
1721make_wrapper() { 1620make_wrapper() {
1722 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1621 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1723 local tmpwrapper=$(emktemp) 1622 local tmpwrapper=$(emktemp)
1623 # We don't want to quote ${bin} so that people can pass complex
1624 # things as $bin ... "./someprog --args"
1724 cat << EOF > "${tmpwrapper}" 1625 cat << EOF > "${tmpwrapper}"
1725#!/bin/sh 1626#!/bin/sh
1726cd "${chdir}" 1627cd "${chdir:-.}"
1628if [ -n "${libdir}" ] ; then
1629 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1727export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1631 else
1632 export LD_LIBRARY_PATH="${libdir}"
1633 fi
1634fi
1728exec ${bin} "\$@" 1635exec ${bin} "\$@"
1729EOF 1636EOF
1730 chmod go+rx "${tmpwrapper}" 1637 chmod go+rx "${tmpwrapper}"
1731 if [ -n "${5}" ] 1638 if [[ -n ${path} ]] ; then
1732 then
1733 exeinto ${5} 1639 exeinto "${path}"
1734 newexe "${tmpwrapper}" "${wrapper}" 1640 newexe "${tmpwrapper}" "${wrapper}"
1735 else 1641 else
1736 newbin "${tmpwrapper}" "${wrapper}" 1642 newbin "${tmpwrapper}" "${wrapper}"
1737 fi 1643 fi
1738} 1644}

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

  ViewVC Help
Powered by ViewVC 1.1.20