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

Diff of /eclass/eutils.eclass

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

Revision 1.166 Revision 1.218
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.166 2005/04/15 22:01:42 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.218 2005/11/22 11:15:34 flameeyes 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*|*-openbsd*)
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 *-openbsd*)
607 if [[ -z $@ ]] ; then
608 useradd -u ${euid} -s ${eshell} \
609 -d ${ehome} -c "Added by portage for ${PN}" \
610 -g ${egroups} ${euser} || die "enewuser failed"
611 else
612 einfo " - Extra: $@"
613 useradd -u ${euid} -s ${eshell} \
614 -d ${ehome} -c "Added by portage for ${PN}" \
615 -g ${egroups} ${euser} "$@" || die "enewuser failed"
616 fi
617 ;;
618
619 *)
620 if [[ -z $@ ]] ; then
732 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
733 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
734 || die "enewuser failed" 623 || die "enewuser failed"
735 else 624 else
736 einfo " - Extra: ${eextra}" 625 einfo " - Extra: $@"
737 useradd ${opts} ${euser} ${eextra} \ 626 useradd ${opts} ${euser} "$@" \
738 || die "enewuser failed" 627 || die "enewuser failed"
739 fi 628 fi
629 ;;
630 esac
631
632 if [[ ! -e ${ROOT}/${ehome} ]] ; then
633 einfo " - Creating ${ehome} in ${ROOT}"
634 mkdir -p "${ROOT}/${ehome}"
635 chown ${euser} "${ROOT}/${ehome}"
636 chmod 755 "${ROOT}/${ehome}"
740 fi 637 fi
638
741 export SANDBOX_ON="${oldsandbox}" 639 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} 640}
751 641
752# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
753# vapier@gentoo.org 643# vapier@gentoo.org
754# 644#
783 then 673 then
784 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
785 then 675 then
786 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
787 then 677 then
788 if useq ppc-macos ; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
789 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
790 else 680 else
791 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
792 fi 682 fi
793 else 683 else
807 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
808 698
809 # add the group 699 # add the group
810 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
811 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
812 if useq ppc-macos ; then 702 case ${CHOST} in
703 *-darwin*)
813 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
814 then 705 then
815 einfo "Extra options are not supported on macos yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
816 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
817 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
818 die "Required function missing" 709 die "Required function missing"
819 fi 710 fi
820 711
821 # If we need the next available 712 # If we need the next available
822 case ${egid} in 713 case ${egid} in
823 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
824 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
825 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
826 done 717 done
827 esac 718 esac
828 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
829 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
830 elif use x86-fbsd ; then 721 ;;
722
723 *-freebsd*)
831 case ${egid} in 724 case ${egid} in
832 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
833 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
834 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
835 done 728 done
836 esac 729 esac
837 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
838 else 731 ;;
732
733 *-netbsd*)
734 case ${egid} in
735 *[!0-9]*) # Non numeric
736 for egid in $(seq 101 999); do
737 [ -z "`egetent group ${egid}`" ] && break
738 done
739 esac
740 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
741 ;;
742
743 *)
839 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
840 fi 745 ;;
746 esac
841 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
842} 748}
843 749
844# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
845# vapier@gentoo.org 751# vapier@gentoo.org
870# name: the name that will show up in the menu 776# name: the name that will show up in the menu
871# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
872# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
873# a full path to an icon 779# a full path to an icon
874# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
875# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
876# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
877make_desktop_entry() { 783make_desktop_entry() {
878 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
879 785
880 local exec=${1} 786 local exec=${1}
906 dev) 812 dev)
907 type="Development" 813 type="Development"
908 ;; 814 ;;
909 815
910 games) 816 games)
911 [[ -z ${path} ]] && path=${GAMES_BINDIR}
912
913 case ${catmin} in 817 case ${catmin} in
914 action) type=ActionGame;; 818 action) type=ActionGame;;
915 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 820 board) type=BoardGame;;
917 kid) type=KidsGame;; 821 kid) type=KidsGame;;
958 type="Network;${type}" 862 type="Network;${type}"
959 ;; 863 ;;
960 864
961 sci) 865 sci)
962 case ${catmin} in 866 case ${catmin} in
963 astro*) type=Astronomoy;; 867 astro*) type=Astronomy;;
964 bio*) type=Biology;; 868 bio*) type=Biology;;
965 calc*) type=Calculator;; 869 calc*) type=Calculator;;
966 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
967 geo*) type=Geology;; 871 geo*) type=Geology;;
968 math*) type=Math;; 872 math*) type=Math;;
982 *) 886 *)
983 type= 887 type=
984 ;; 888 ;;
985 esac 889 esac
986 fi 890 fi
987 891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}"
893 else
894 local desktop_name="${PN}-${SLOT}"
895 fi
988 local desktop=${T}/${exec%% *}-${P}.desktop 896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
989 897
990echo "[Desktop Entry] 898echo "[Desktop Entry]
991Encoding=UTF-8 899Encoding=UTF-8
992Version=0.9.2 900Version=0.9.2
993Name=${name} 901Name=${name}
996Exec=${exec} 904Exec=${exec}
997Path=${path} 905Path=${path}
998Icon=${icon} 906Icon=${icon}
999Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
1000 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
1001 insinto /usr/share/applications 912 insinto /usr/share/applications
1002 doins "${desktop}" 913 doins "${desktop}"
1003 914 )
1004 return 0
1005} 915}
1006 916
1007# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
1008# 918#
1009# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
1010# title: File to execute to start the Window Manager 920# title: File to execute to start the Window Manager
1011# command: Name of the Window Manager 921# command: Name of the Window Manager
1012 922
1013make_session_desktop() { 923make_session_desktop() {
1014
1015 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 924 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1016 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 925 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1017 926
1018 local title="${1}" 927 local title=$1
1019 local command="${2}" 928 local command=$2
1020 local desktop="${T}/${wm}.desktop" 929 local desktop=${T}/${wm}.desktop
1021 930
1022echo "[Desktop Entry] 931echo "[Desktop Entry]
1023Encoding=UTF-8 932Encoding=UTF-8
1024Name=${title} 933Name=${title}
1025Comment=This session logs you into ${title} 934Comment=This session logs you into ${title}
1027TryExec=${command} 936TryExec=${command}
1028Type=Application" > "${desktop}" 937Type=Application" > "${desktop}"
1029 938
1030 insinto /usr/share/xsessions 939 insinto /usr/share/xsessions
1031 doins "${desktop}" 940 doins "${desktop}"
1032
1033 return 0
1034} 941}
1035 942
1036domenu() { 943domenu() {
1037 local i 944 local i j
1038 local j
1039 insinto /usr/share/applications 945 insinto /usr/share/applications
1040 for i in ${@} 946 for i in "$@" ; do
1041 do
1042 if [ -f "${i}" ]; 947 if [[ -f ${i} ]] ; then
1043 then
1044 doins ${i} 948 doins "${i}"
1045 elif [ -d "${i}" ]; 949 elif [[ -d ${i} ]] ; then
1046 then
1047 for j in ${i}/*.desktop 950 for j in "${i}"/*.desktop ; do
1048 do
1049 doins ${j} 951 doins "${j}"
1050 done 952 done
1051 fi 953 fi
1052 done 954 done
1053} 955}
956newmenu() {
957 insinto /usr/share/applications
958 newins "$1" "$2"
959}
1054 960
1055doicon() { 961doicon() {
1056 local i 962 local i j
1057 local j
1058 insinto /usr/share/pixmaps 963 insinto /usr/share/pixmaps
1059 for i in ${@} 964 for i in "$@" ; do
1060 do
1061 if [ -f "${i}" ]; 965 if [[ -f ${i} ]] ; then
1062 then
1063 doins ${i} 966 doins "${i}"
1064 elif [ -d "${i}" ]; 967 elif [[ -d ${i} ]] ; then
1065 then
1066 for j in ${i}/*.png 968 for j in "${i}"/*.png ; do
1067 do
1068 doins ${j} 969 doins "${j}"
1069 done 970 done
1070 fi 971 fi
1071 done 972 done
973}
974newicon() {
975 insinto /usr/share/pixmaps
976 newins "$1" "$2"
1072} 977}
1073 978
1074############################################################## 979##############################################################
1075# END: Handle .desktop files and menu entries # 980# END: Handle .desktop files and menu entries #
1076############################################################## 981##############################################################
1077 982
1078 983
1079# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
1080find_unpackable_file() { 985find_unpackable_file() {
1081 local src="$1" 986 local src=$1
1082 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
1083 then
1084 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
1085 else 989 else
1086 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
1087 then
1088 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
1089 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
1090 then
1091 src="${PWD}/${src}" 993 src=${PWD}/${src}
1092 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
1093 then
1094 src="${src}" 995 src=${src}
1095 fi
1096 fi 996 fi
1097 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
1098 echo "${src}" 999 echo "${src}"
1099} 1000}
1100 1001
1101# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
1102# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
1117# lseek 1018# lseek
1118# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1119# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
1120# thus we would pass in the value of '4' as the second parameter. 1021# thus we would pass in the value of '4' as the second parameter.
1121unpack_pdv() { 1022unpack_pdv() {
1122 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
1123 local sizeoff_t="$2" 1024 local sizeoff_t=$2
1124 1025
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1125 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1027 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1126 1028
1127 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
1128 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1129 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1130 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1032 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1131 1033
1132 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1196# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1197# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1198# - If the offset is not specified then we will attempt to extract 1100# - If the offset is not specified then we will attempt to extract
1199# the proper offset from the script itself. 1101# the proper offset from the script itself.
1200unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1201 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1202 local skip="$2" 1105 local skip=$2
1203 local exe="$3" 1106 local exe=$3
1204 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1205 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1206 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1207 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1208 then
1209 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1210 local skip=0 1114 local skip=0
1211 exe=tail 1115 exe=tail
1212 case ${ver} in 1116 case ${ver} in
1213 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1117 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1214 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1226 ;; 1130 ;;
1227 2.1.3) 1131 2.1.3)
1228 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1229 let skip="skip + 1" 1133 let skip="skip + 1"
1230 ;; 1134 ;;
1231 2.1.4) 1135 2.1.4|2.1.5)
1232 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1136 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1233 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1234 exe="dd" 1138 exe="dd"
1235 ;; 1139 ;;
1236 *) 1140 *)
1281check_license() { 1185check_license() {
1282 local lic=$1 1186 local lic=$1
1283 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1284 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1285 else 1189 else
1286 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1287 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1288 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1289 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1290 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1291 lic="${src}" 1195 lic="${lic}"
1292 fi
1293 fi 1196 fi
1197 fi
1294 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1295 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1296 1200
1297 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1298 # accepted ... if we don't find a match, we make the user accept 1202 # accepted ... if we don't find a match, we make the user accept
1299 local shopts=$- 1203 local shopts=$-
1355 # first we figure out how many cds we're dealing with by 1259 # first we figure out how many cds we're dealing with by
1356 # the # of files they gave us 1260 # the # of files they gave us
1357 local cdcnt=0 1261 local cdcnt=0
1358 local f= 1262 local f=
1359 for f in "$@" ; do 1263 for f in "$@" ; do
1360 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1361 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1362 done 1266 done
1363 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1364 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1365 1269
1366 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1367 # if they did, let's just believe them that it's correct 1271 # if they did, let's just believe them that it's correct
1368 if [[ ! -z ${CD_ROOT} ]] ; then
1369 export CDROM_ROOT=${CD_ROOT}
1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1371 return
1372 fi
1373 # do the same for CD_ROOT_X
1374 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1375 local var= 1273 local var=
1376 cdcnt=0 1274 cdcnt=0
1377 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1378 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1379 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1380 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1381 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1382 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1383 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1282 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1384 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1385 fi 1284 fi
1386 export CDROM_ROOTS_${cdcnt}="${!var}"
1387 done 1285 done
1388 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1389 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288 export CDROM_SET=-1
1289 for f in ${CDROM_CHECK_1//:/ } ; do
1290 ((++CDROM_SET))
1291 [[ -e ${CD_ROOT}/${f} ]] && break
1292 done
1293 export CDROM_MATCH=${f}
1390 return 1294 return
1391 fi 1295 fi
1392 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1393 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1394 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1395 if [[ -z ${CDROM_NAME} ]] ; then
1396 echo "cdrom for ${PN}."
1397 else
1398 echo "${CDROM_NAME}."
1399 fi
1400 echo 1301 echo
1401 einfo "If you do not have the CD, but have the data files" 1302 einfo "If you do not have the CD, but have the data files"
1402 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1403 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1404 einfo "directory containing the files." 1305 einfo "directory containing the files."
1408 echo 1309 echo
1409 else 1310 else
1410 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1411 cdcnt=0 1312 cdcnt=0
1412 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1413 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1414 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1415 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1416 done 1317 done
1417 echo 1318 echo
1418 einfo "If you do not have the CDs, but have the data files" 1319 einfo "If you do not have the CDs, but have the data files"
1419 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1420 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1421 einfon "" 1322 einfon ""
1422 cdcnt=0 1323 cdcnt=0
1423 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1424 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1425 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1426 done 1327 done
1427 echo 1328 echo
1428 einfo "Or, if you have all the files in the same place, or" 1329 einfo "Or, if you have all the files in the same place, or"
1429 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1432 echo 1333 echo
1433 einfo "For example:" 1334 einfo "For example:"
1434 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1435 echo 1336 echo
1436 fi 1337 fi
1338
1339 export CDROM_SET=""
1437 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1438 cdrom_load_next_cd 1341 cdrom_load_next_cd
1439} 1342}
1440 1343
1441# this is only used when you need access to more than one cd. 1344# this is only used when you need access to more than one cd.
1442# when you have finished using the first cd, just call this function. 1345# when you have finished using the first cd, just call this function.
1443# when it returns, CDROM_ROOT will be pointing to the second cd. 1346# when it returns, CDROM_ROOT will be pointing to the second cd.
1444# remember, you can only go forward in the cd chain, you can't go back. 1347# remember, you can only go forward in the cd chain, you can't go back.
1445cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1446 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1447 local var= 1349 local var
1448 1350 ((++CDROM_CURRENT_CD))
1449 if [[ ! -z ${CD_ROOT} ]] ; then
1450 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1451 return
1452 fi
1453 1351
1454 unset CDROM_ROOT 1352 unset CDROM_ROOT
1455 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1456 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1457 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1458 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1459 else 1358 else
1460 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1461 fi 1360 fi
1462 1361
1463 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1468# all it does is try to locate a give file on a cd ... if the cd isn't 1367# all it does is try to locate a give file on a cd ... if the cd isn't
1469# found, then a message asking for the user to insert the cdrom will be 1368# found, then a message asking for the user to insert the cdrom will be
1470# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1471# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1472# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1473cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1474 while [[ -z ${CDROM_ROOT} ]] ; do 1376 while [[ -z ${CDROM_ROOT} ]] ; do
1377 local i=0
1378 local -a cdset=(${*//:/ })
1379 if [[ -n ${CDROM_SET} ]] ; then
1380 cdset=(${cdset[${CDROM_SET}]})
1381 fi
1382
1383 while [[ -n ${cdset[${i}]} ]] ; do
1475 local dir="$(dirname ${@})" 1384 local dir=$(dirname ${cdset[${i}]})
1476 local file="$(basename ${@})" 1385 local file=$(basename ${cdset[${i}]})
1477 local mline=""
1478 local showedmsg=0
1479 1386
1480 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1387 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1481 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1482 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1483 && export CDROM_ROOT=${mline} 1390 export CDROM_ROOT=${mline}
1391 export CDROM_SET=${i}
1392 export CDROM_MATCH=${cdset[${i}]}
1393 return
1394 fi
1395 done
1396
1397 ((++i))
1484 done 1398 done
1485 1399
1486 if [[ -z ${CDROM_ROOT} ]] ; then
1487 echo 1400 echo
1488 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1489 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1490 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1491 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1492 else
1493 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1494 fi
1495 else 1405 else
1496 if [[ -z ${CDROM_NAME_1} ]] ; then
1497 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1498 else
1499 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1500 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1501 fi
1502 fi 1407 fi
1503 showedmsg=1 1408 else
1409 if [[ -z ${CDROM_NAME_1} ]] ; then
1410 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1411 else
1412 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1413 einfo "Please insert+mount the ${!var} cdrom now !"
1414 fi
1504 fi 1415 fi
1416 showedmsg=1
1417 fi
1505 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1506 einfo "or hit CTRL+C to abort the emerge." 1419 einfo "or hit CTRL+C to abort the emerge."
1420 echo
1421 einfo "If you are having trouble with the detection"
1422 einfo "of your CD, it is possible that you do not have"
1423 einfo "Joliet support enabled in your kernel. Please"
1424 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1507 read 1425 read
1508 fi
1509 done 1426 done
1510} 1427}
1511 1428
1512# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1513# a package can support 1430# a package can support
1575 while ((i--)) ; do 1492 while ((i--)) ; do
1576 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1577 done 1494 done
1578 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1579 case ${ARCH} in 1496 case ${ARCH} in
1580 x86) export ARCH="i386";; 1497 x86) export ARCH="i386";;
1581 amd64) export ARCH="x86_64";; 1498 amd64) export ARCH="x86_64";;
1582 hppa) export ARCH="parisc";; 1499 hppa) export ARCH="parisc";;
1583 mips) export ARCH="mips";; 1500 mips) export ARCH="mips";;
1584 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! 1501 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!
1585 *) export ARCH="${ARCH}";; 1502 *) export ARCH="${ARCH}";;
1586 esac 1503 esac
1587} 1504}
1588 1505
1589# set's ARCH back to what portage expects 1506# set's ARCH back to what portage expects
1590set_arch_to_portage() { 1507set_arch_to_portage() {
1634 LIB=$1 1551 LIB=$1
1635 1552
1636 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1637 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1638 1555
1639 einfo "An old version of an installed library was detected on your system." 1556 ewarn "An old version of an installed library was detected on your system."
1640 einfo "In order to avoid breaking packages that link against is, this older version" 1557 ewarn "In order to avoid breaking packages that link against it, this older version"
1641 einfo "is not being removed. In order to make full use of this newer version," 1558 ewarn "is not being removed. In order to make full use of this newer version,"
1642 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1643 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1644 einfo 1561 ewarn
1645 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1646 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1647 fi 1564 fi
1648} 1565}
1649 1566
1650# Hack for people to figure out if a package was built with 1567# Hack for people to figure out if a package was built with
1651# certain USE flags 1568# certain USE flags
1661 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1662 1579
1663 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1664 shift 1581 shift
1665 1582
1666 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1583 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1584
1585 # if the USE file doesnt exist, assume the $PKG is either
1586 # injected or package.provided
1667 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1668 1588
1669 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1670 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1671 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1672 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1697dopamd() { 1617dopamd() {
1698 [[ -z $1 ]] && die "dopamd requires at least one argument" 1618 [[ -z $1 ]] && die "dopamd requires at least one argument"
1699 1619
1700 use pam || return 0 1620 use pam || return 0
1701 1621
1702 insinto /etc/pam.d 1622 INSDESTTREE=/etc/pam.d \
1703 doins "$@" || die "failed to install $@" 1623 doins "$@" || die "failed to install $@"
1704} 1624}
1705# newpamd <old name> <new name> 1625# newpamd <old name> <new name>
1706# 1626#
1707# Install pam file <old name> as <new name> in /etc/pam.d 1627# Install pam file <old name> as <new name> in /etc/pam.d
1708newpamd() { 1628newpamd() {
1709 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1629 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1710 1630
1711 use pam || return 0 1631 use pam || return 0
1712 1632
1713 insinto /etc/pam.d 1633 INSDESTTREE=/etc/pam.d \
1714 newins "$1" "$2" || die "failed to install $1 as $2" 1634 newins "$1" "$2" || die "failed to install $1 as $2"
1715} 1635}
1716 1636
1717# make a wrapper script ... 1637# make a wrapper script ...
1718# NOTE: this was originally games_make_wrapper, but I noticed other places where 1638# NOTE: this was originally games_make_wrapper, but I noticed other places where
1724# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1725# $5 == path for wrapper 1645# $5 == path for wrapper
1726make_wrapper() { 1646make_wrapper() {
1727 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1728 local tmpwrapper=$(emktemp) 1648 local tmpwrapper=$(emktemp)
1649 # We don't want to quote ${bin} so that people can pass complex
1650 # things as $bin ... "./someprog --args"
1729 cat << EOF > "${tmpwrapper}" 1651 cat << EOF > "${tmpwrapper}"
1730#!/bin/sh 1652#!/bin/sh
1731cd "${chdir}" 1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1732export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1656 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1657 else
1658 export LD_LIBRARY_PATH="${libdir}"
1659 fi
1660fi
1733exec ${bin} "\$@" 1661exec ${bin} "\$@"
1734EOF 1662EOF
1735 chmod go+rx "${tmpwrapper}" 1663 chmod go+rx "${tmpwrapper}"
1736 if [ -n "${5}" ] 1664 if [[ -n ${path} ]] ; then
1737 then
1738 exeinto ${5} 1665 exeinto "${path}"
1739 newexe "${tmpwrapper}" "${wrapper}" 1666 newexe "${tmpwrapper}" "${wrapper}"
1740 else 1667 else
1741 newbin "${tmpwrapper}" "${wrapper}" 1668 newbin "${tmpwrapper}" "${wrapper}"
1742 fi 1669 fi
1743} 1670}

Legend:
Removed from v.1.166  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20