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

Diff of /eclass/eutils.eclass

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

Revision 1.165 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.165 2005/04/12 01:01:23 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}"
83 done 82 done
84} 83}
85 84
86# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
87# 87#
88# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
89# 89#
90draw_line() { 90draw_line() {
91 local i=0 91 local i=0
117EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
118# Default extension for patches 118# Default extension for patches
119EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
120# Default options for patch 120# Default options for patch
121# 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
122EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
123# 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,
124# and not the full path .. 125# and not the full path ..
125EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
126# Change the printed message for a single patch. 127# Change the printed message for a single patch.
127EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
128# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
129# 132#
130# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
131# 134#
132EPATCH_FORCE="no" 135EPATCH_FORCE="no"
163# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
164# 167#
165# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
166# 169#
167epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
168 local PIPE_CMD="" 172 local PIPE_CMD=""
169 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
170 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
171 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
172 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
173 local x="" 177 local x=""
174 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
175 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
176 then 182 then
177 local m="" 183 local m=""
178 einfo "${#} patches to apply ..."
179 for m in "$@" ; do 184 for m in "$@" ; do
180 epatch "${m}" 185 epatch "${m}"
181 done 186 done
182 return 0 187 return 0
183 fi 188 fi
237 ;; 242 ;;
238 esac 243 esac
239 244
240 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
241 then 246 then
242 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
243 fi 248 fi
244 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
245 do 250 do
246 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
247 # 252 #
248 # ???_arch_foo.patch 253 # ???_arch_foo.patch
249 # 254 #
250 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
251 ([ "${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}" ] || \
252 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
253 then 258 then
254 local count=0 259 local count=0
255 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
256 local patchname=${x##*/} 261 local patchname=${x##*/}
309 count=5 314 count=5
310 break 315 break
311 fi 316 fi
312 fi 317 fi
313 318
314 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
315 then 320 then
316 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
318 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 326
322 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
323 329
324 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
325 then 331 then
326 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##*/}
327 echo 333 echo
366 then 372 then
367 einfo "Done with patching" 373 einfo "Done with patching"
368 fi 374 fi
369} 375}
370 376
371# This function return true if we are using the NPTL pthreads
372# implementation.
373#
374# <azarah@gentoo.org> (06 March 2003)
375#
376have_NPTL() {
377 cat > ${T}/test-nptl.c <<-"END"
378 #define _XOPEN_SOURCE
379 #include <unistd.h>
380 #include <stdio.h>
381
382 int main()
383 {
384 char buf[255];
385 char *str = buf;
386
387 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
388 if (NULL != str) {
389 printf("%s\n", str);
390 if (NULL != strstr(str, "NPTL"))
391 return 0;
392 }
393
394 return 1;
395 }
396 END
397
398 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
399 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
400 then
401 echo "yes"
402 einfon "Checking what PTHREADS implementation we have ..."
403 if ${T}/nptl
404 then
405 return 0
406 else
407 return 1
408 fi
409 else
410 echo "no"
411 fi
412
413 return 1
414}
415
416# This function check how many cpu's are present, and then set
417# -j in MAKEOPTS accordingly.
418#
419# Thanks to nall <nall@gentoo.org> for this.
420#
421get_number_of_jobs() {
422 local jobs=0
423
424 if [ ! -r /proc/cpuinfo ]
425 then
426 return 1
427 fi
428
429 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
430 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
431 then
432 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
433 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
434 ADMINPARAM="${ADMINPARAM/-j}"
435 fi
436
437 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
438
439 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
440 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
441 then
442 # these archs will always have "[Pp]rocessor"
443 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
444
445 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
446 then
447 # sparc always has "ncpus active"
448 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
449
450 elif [ "${ARCH}" = "alpha" ]
451 then
452 # alpha has "cpus active", but only when compiled with SMP
453 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
454 then
455 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
456 else
457 jobs=2
458 fi
459
460 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
461 then
462 # ppc has "processor", but only when compiled with SMP
463 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
464 then
465 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
466 else
467 jobs=2
468 fi
469 elif [ "${ARCH}" = "s390" ]
470 then
471 # s390 has "# processors : "
472 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
473 else
474 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
475 die "Unknown ARCH -- ${ARCH}!"
476 fi
477
478 # Make sure the number is valid ...
479 if [ "${jobs}" -lt 1 ]
480 then
481 jobs=1
482 fi
483
484 if [ -n "${ADMINPARAM}" ]
485 then
486 if [ "${jobs}" -gt "${ADMINPARAM}" ]
487 then
488 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
489 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
490 else
491 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
492 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
493 fi
494 fi
495}
496
497# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
498# does not exist on the users system 378# does not exist on the users system
499# vapier@gentoo.org 379# vapier@gentoo.org
500# 380#
501# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
502emktemp() { 382emktemp() {
503 local exe="touch" 383 local exe="touch"
504 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
505 local topdir="$1" 385 local topdir=$1
506 386
507 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
508 then
509 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
510 && topdir="/tmp" \ 389 && topdir="/tmp" \
511 || topdir="${T}" 390 || topdir=${T}
512 fi 391 fi
513 392
514 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
515 then
516 local tmp=/ 394 local tmp=/
517 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
518 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
519 done 397 done
520 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
521 echo "${tmp}" 399 echo "${tmp}"
522 else 400 else
523 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
524 && exe="-p" \ 402 && exe="-p" \
525 || exe="-d" 403 || exe="-d"
526 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
527 fi 405 fi
528} 406}
532# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
533# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
534# 412#
535# egetent(database, key) 413# egetent(database, key)
536egetent() { 414egetent() {
537 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
538 case "$2" in 417 case "$2" in
539 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
540 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
541 ;; 420 ;;
542 *) # Numeric 421 *) # Numeric
543 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
544 ;; 423 ;;
545 esac 424 esac
546 elif useq x86-fbsd ; then 425 ;;
547 local action 426 *-freebsd*)
548 if [ "$1" == "passwd" ] 427 local opts action="user"
549 then 428 [[ $1 == "passwd" ]] || action="group"
550 action="user" 429
551 else 430 # lookup by uid/gid
552 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
553 fi 433 fi
434
554 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
555 else 436 ;;
437 *-netbsd*|*-openbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
556 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
557 getent "$1" "$2" 442 getent "$1" "$2"
558 fi 443 ;;
444 esac
559} 445}
560 446
561# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
562# vapier@gentoo.org 448# vapier@gentoo.org
563# 449#
571# homedir: /dev/null 457# homedir: /dev/null
572# groups: none 458# groups: none
573# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
574enewuser() { 460enewuser() {
575 # get the username 461 # get the username
576 local euser="$1"; shift 462 local euser=$1; shift
577 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
578 then
579 eerror "No username specified !" 464 eerror "No username specified !"
580 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
581 fi 466 fi
582 467
583 # lets see if the username already exists 468 # lets see if the username already exists
584 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
585 then
586 return 0 470 return 0
587 fi 471 fi
588 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
589 473
590 # options to pass to useradd 474 # options to pass to useradd
591 local opts= 475 local opts=
592 476
593 # handle uid 477 # handle uid
594 local euid="$1"; shift 478 local euid=$1; shift
595 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
596 then
597 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
598 then
599 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
600 then
601 euid="next" 482 euid="next"
602 fi 483 fi
603 else 484 else
604 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
605 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
606 fi 487 fi
607 else 488 else
608 euid="next" 489 euid="next"
609 fi 490 fi
610 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
611 then 492 for euid in $(seq 101 999) ; do
612 local pwrange
613 if [ "${USERLAND}" == "BSD" ] ; then
614 pwrange="`jot 898 101`"
615 else
616 pwrange="`seq 101 999`"
617 fi
618 for euid in ${pwrange} ; do
619 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
620 done 494 done
621 fi 495 fi
622 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
623 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
624 498
625 # handle shell 499 # handle shell
626 local eshell="$1"; shift 500 local eshell=$1; shift
627 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
628 then
629 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
630 then
631 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
632 die "${eshell} does not exist" 504 die "${eshell} does not exist"
633 fi 505 fi
634 else 506 else
635 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
636 then 508 [[ -x ${ROOT}${shell} ]] && break
637 eshell="/usr/bin/false" 509 done
638 else 510
639 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"
640 fi 514 fi
515
516 eshell=${shell}
641 fi 517 fi
642 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
643 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
644 520
645 # handle homedir 521 # handle homedir
646 local ehome="$1"; shift 522 local ehome=$1; shift
647 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
648 then
649 ehome="/dev/null" 524 ehome="/dev/null"
650 fi 525 fi
651 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
652 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
653 528
654 # handle groups 529 # handle groups
655 local egroups="$1"; shift 530 local egroups=$1; shift
656 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
657 then
658 local oldifs="${IFS}" 532 local oldifs=${IFS}
659 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
660 534
661 export IFS="," 535 export IFS=","
662 for g in ${egroups} 536 for g in ${egroups} ; do
663 do
664 export IFS="${oldifs}" 537 export IFS=${oldifs}
665 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
666 then
667 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
668 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
669 fi 541 fi
670 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
671 then
672 defgroup="${g}" 543 defgroup=${g}
673 else 544 else
674 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
675 fi 546 fi
676 export IFS="," 547 export IFS=","
677 done 548 done
678 export IFS="${oldifs}" 549 export IFS=${oldifs}
679 550
680 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
681 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
682 then
683 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
684 fi 554 fi
685 else 555 else
686 egroups="(none)" 556 egroups="(none)"
687 fi 557 fi
688 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
689 559
690 # handle extra and add the user 560 # handle extra and add the user
691 local eextra="$@"
692 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
693 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
694 if useq ppc-macos 563 case ${CHOST} in
695 then 564 *-darwin*)
696 ### Make the user 565 ### Make the user
697 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
698 then
699 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
700 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
701 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
702 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
703 ### Add the user to the groups specified 571 ### Add the user to the groups specified
704 local oldifs="${IFS}" 572 local oldifs=${IFS}
705 export IFS="," 573 export IFS=","
706 for g in ${egroups} 574 for g in ${egroups} ; do
707 do
708 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
709 done 576 done
710 export IFS="${oldifs}" 577 export IFS=${oldifs}
711 else 578 else
712 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
713 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
714 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
715 die "Required function missing" 582 die "Required function missing"
716 fi 583 fi
717 elif use x86-fbsd ; then 584 ;;
718 if [ -z "${eextra}" ] 585 *-freebsd*)
719 then 586 if [[ -z $@ ]] ; then
720 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
721 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
722 die "enewuser failed" 589 die "enewuser failed"
723 else 590 else
724 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
725 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
726 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
727 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
728 else 600 else
729 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
730 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
731 useradd ${opts} ${euser} \ 621 useradd ${opts} ${euser} \
732 -c "added by portage for ${PN}" \ 622 -c "added by portage for ${PN}" \
733 || die "enewuser failed" 623 || die "enewuser failed"
734 else 624 else
735 einfo " - Extra: ${eextra}" 625 einfo " - Extra: $@"
736 useradd ${opts} ${euser} ${eextra} \ 626 useradd ${opts} ${euser} "$@" \
737 || die "enewuser failed" 627 || die "enewuser failed"
738 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}"
739 fi 637 fi
638
740 export SANDBOX_ON="${oldsandbox}" 639 export SANDBOX_ON=${oldsandbox}
741
742 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
743 then
744 einfo " - Creating ${ehome} in ${D}"
745 dodir ${ehome}
746 fowners ${euser} ${ehome}
747 fperms 755 ${ehome}
748 fi
749} 640}
750 641
751# Simplify/standardize adding groups to the system 642# Simplify/standardize adding groups to the system
752# vapier@gentoo.org 643# vapier@gentoo.org
753# 644#
782 then 673 then
783 if [ "${egid}" -gt 0 ] 674 if [ "${egid}" -gt 0 ]
784 then 675 then
785 if [ -z "`egetent group ${egid}`" ] 676 if [ -z "`egetent group ${egid}`" ]
786 then 677 then
787 if useq ppc-macos ; then 678 if [[ "${CHOST}" == *-darwin* ]]; then
788 opts="${opts} ${egid}" 679 opts="${opts} ${egid}"
789 else 680 else
790 opts="${opts} -g ${egid}" 681 opts="${opts} -g ${egid}"
791 fi 682 fi
792 else 683 else
806 opts="${opts} ${eextra}" 697 opts="${opts} ${eextra}"
807 698
808 # add the group 699 # add the group
809 local oldsandbox="${SANDBOX_ON}" 700 local oldsandbox="${SANDBOX_ON}"
810 export SANDBOX_ON="0" 701 export SANDBOX_ON="0"
811 if useq ppc-macos ; then 702 case ${CHOST} in
703 *-darwin*)
812 if [ ! -z "${eextra}" ]; 704 if [ ! -z "${eextra}" ];
813 then 705 then
814 einfo "Extra options are not supported on macos yet" 706 einfo "Extra options are not supported on Darwin/OS X yet"
815 einfo "Please report the ebuild along with the info below" 707 einfo "Please report the ebuild along with the info below"
816 einfo "eextra: ${eextra}" 708 einfo "eextra: ${eextra}"
817 die "Required function missing" 709 die "Required function missing"
818 fi 710 fi
819 711
820 # If we need the next available 712 # If we need the next available
821 case ${egid} in 713 case ${egid} in
822 *[!0-9]*) # Non numeric 714 *[!0-9]*) # Non numeric
823 for egid in `jot 898 101`; do 715 for egid in $(seq 101 999); do
824 [ -z "`egetent group ${egid}`" ] && break 716 [ -z "`egetent group ${egid}`" ] && break
825 done 717 done
826 esac 718 esac
827 dscl . create /groups/${egroup} gid ${egid} 719 dscl . create /groups/${egroup} gid ${egid}
828 dscl . create /groups/${egroup} passwd '*' 720 dscl . create /groups/${egroup} passwd '*'
829 elif use x86-fbsd ; then 721 ;;
722
723 *-freebsd*)
830 case ${egid} in 724 case ${egid} in
831 *[!0-9]*) # Non numeric 725 *[!0-9]*) # Non numeric
832 for egid in `jot 898 101`; do 726 for egid in $(seq 101 999); do
833 [ -z "`egetent group ${egid}`" ] && break 727 [ -z "`egetent group ${egid}`" ] && break
834 done 728 done
835 esac 729 esac
836 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 730 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
837 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 *)
838 groupadd ${opts} ${egroup} || die "enewgroup failed" 744 groupadd ${opts} ${egroup} || die "enewgroup failed"
839 fi 745 ;;
746 esac
840 export SANDBOX_ON="${oldsandbox}" 747 export SANDBOX_ON="${oldsandbox}"
841} 748}
842 749
843# Simple script to replace 'dos2unix' binaries 750# Simple script to replace 'dos2unix' binaries
844# vapier@gentoo.org 751# vapier@gentoo.org
869# name: the name that will show up in the menu 776# name: the name that will show up in the menu
870# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
871# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
872# a full path to an icon 779# a full path to an icon
873# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
874# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
875# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
876make_desktop_entry() { 783make_desktop_entry() {
877 [[ -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
878 785
879 local exec=${1} 786 local exec=${1}
905 dev) 812 dev)
906 type="Development" 813 type="Development"
907 ;; 814 ;;
908 815
909 games) 816 games)
910 [[ -z ${path} ]] && path=${GAMES_BINDIR}
911
912 case ${catmin} in 817 case ${catmin} in
913 action) type=ActionGame;; 818 action) type=ActionGame;;
914 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
915 board) type=BoardGame;; 820 board) type=BoardGame;;
916 kid) type=KidsGame;; 821 kid) type=KidsGame;;
957 type="Network;${type}" 862 type="Network;${type}"
958 ;; 863 ;;
959 864
960 sci) 865 sci)
961 case ${catmin} in 866 case ${catmin} in
962 astro*) type=Astronomoy;; 867 astro*) type=Astronomy;;
963 bio*) type=Biology;; 868 bio*) type=Biology;;
964 calc*) type=Calculator;; 869 calc*) type=Calculator;;
965 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
966 geo*) type=Geology;; 871 geo*) type=Geology;;
967 math*) type=Math;; 872 math*) type=Math;;
981 *) 886 *)
982 type= 887 type=
983 ;; 888 ;;
984 esac 889 esac
985 fi 890 fi
986 891 if [ "${SLOT}" == "0" ] ; then
892 local desktop_name="${PN}"
893 else
894 local desktop_name="${PN}-${SLOT}"
895 fi
987 local desktop=${T}/${exec%% *}-${P}.desktop 896 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
988 897
989echo "[Desktop Entry] 898echo "[Desktop Entry]
990Encoding=UTF-8 899Encoding=UTF-8
991Version=0.9.2 900Version=0.9.2
992Name=${name} 901Name=${name}
995Exec=${exec} 904Exec=${exec}
996Path=${path} 905Path=${path}
997Icon=${icon} 906Icon=${icon}
998Categories=Application;${type};" > "${desktop}" 907Categories=Application;${type};" > "${desktop}"
999 908
909 (
910 # wrap the env here so that the 'insinto' call
911 # doesn't corrupt the env of the caller
1000 insinto /usr/share/applications 912 insinto /usr/share/applications
1001 doins "${desktop}" 913 doins "${desktop}"
1002 914 )
1003 return 0
1004} 915}
1005 916
1006# Make a GDM/KDM Session file 917# Make a GDM/KDM Session file
1007# 918#
1008# make_desktop_entry(<title>, <command>) 919# make_desktop_entry(<title>, <command>)
1009# title: File to execute to start the Window Manager 920# title: File to execute to start the Window Manager
1010# command: Name of the Window Manager 921# command: Name of the Window Manager
1011 922
1012make_session_desktop() { 923make_session_desktop() {
1013
1014 [ -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
1015 [ -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
1016 926
1017 local title="${1}" 927 local title=$1
1018 local command="${2}" 928 local command=$2
1019 local desktop="${T}/${wm}.desktop" 929 local desktop=${T}/${wm}.desktop
1020 930
1021echo "[Desktop Entry] 931echo "[Desktop Entry]
1022Encoding=UTF-8 932Encoding=UTF-8
1023Name=${title} 933Name=${title}
1024Comment=This session logs you into ${title} 934Comment=This session logs you into ${title}
1026TryExec=${command} 936TryExec=${command}
1027Type=Application" > "${desktop}" 937Type=Application" > "${desktop}"
1028 938
1029 insinto /usr/share/xsessions 939 insinto /usr/share/xsessions
1030 doins "${desktop}" 940 doins "${desktop}"
1031
1032 return 0
1033} 941}
1034 942
1035domenu() { 943domenu() {
1036 local i 944 local i j
1037 local j
1038 insinto /usr/share/applications 945 insinto /usr/share/applications
1039 for i in ${@} 946 for i in "$@" ; do
1040 do
1041 if [ -f "${i}" ]; 947 if [[ -f ${i} ]] ; then
1042 then
1043 doins ${i} 948 doins "${i}"
1044 elif [ -d "${i}" ]; 949 elif [[ -d ${i} ]] ; then
1045 then
1046 for j in ${i}/*.desktop 950 for j in "${i}"/*.desktop ; do
1047 do
1048 doins ${j} 951 doins "${j}"
1049 done 952 done
1050 fi 953 fi
1051 done 954 done
1052} 955}
956newmenu() {
957 insinto /usr/share/applications
958 newins "$1" "$2"
959}
1053 960
1054doicon() { 961doicon() {
1055 local i 962 local i j
1056 local j
1057 insinto /usr/share/pixmaps 963 insinto /usr/share/pixmaps
1058 for i in ${@} 964 for i in "$@" ; do
1059 do
1060 if [ -f "${i}" ]; 965 if [[ -f ${i} ]] ; then
1061 then
1062 doins ${i} 966 doins "${i}"
1063 elif [ -d "${i}" ]; 967 elif [[ -d ${i} ]] ; then
1064 then
1065 for j in ${i}/*.png 968 for j in "${i}"/*.png ; do
1066 do
1067 doins ${j} 969 doins "${j}"
1068 done 970 done
1069 fi 971 fi
1070 done 972 done
973}
974newicon() {
975 insinto /usr/share/pixmaps
976 newins "$1" "$2"
1071} 977}
1072 978
1073############################################################## 979##############################################################
1074# END: Handle .desktop files and menu entries # 980# END: Handle .desktop files and menu entries #
1075############################################################## 981##############################################################
1076 982
1077 983
1078# for internal use only (unpack_pdv and unpack_makeself) 984# for internal use only (unpack_pdv and unpack_makeself)
1079find_unpackable_file() { 985find_unpackable_file() {
1080 local src="$1" 986 local src=$1
1081 if [ -z "${src}" ] 987 if [[ -z ${src} ]] ; then
1082 then
1083 src="${DISTDIR}/${A}" 988 src=${DISTDIR}/${A}
1084 else 989 else
1085 if [ -e "${DISTDIR}/${src}" ] 990 if [[ -e ${DISTDIR}/${src} ]] ; then
1086 then
1087 src="${DISTDIR}/${src}" 991 src=${DISTDIR}/${src}
1088 elif [ -e "${PWD}/${src}" ] 992 elif [[ -e ${PWD}/${src} ]] ; then
1089 then
1090 src="${PWD}/${src}" 993 src=${PWD}/${src}
1091 elif [ -e "${src}" ] 994 elif [[ -e ${src} ]] ; then
1092 then
1093 src="${src}" 995 src=${src}
1094 fi
1095 fi 996 fi
1096 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 997 fi
998 [[ ! -e ${src} ]] && return 1
1097 echo "${src}" 999 echo "${src}"
1098} 1000}
1099 1001
1100# Unpack those pesky pdv generated files ... 1002# Unpack those pesky pdv generated files ...
1101# They're self-unpacking programs with the binary package stuffed in 1003# They're self-unpacking programs with the binary package stuffed in
1116# lseek 1018# lseek
1117# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1019# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1118# lseek(3, -4, SEEK_END) = 2981250 1020# lseek(3, -4, SEEK_END) = 2981250
1119# 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.
1120unpack_pdv() { 1022unpack_pdv() {
1121 local src="`find_unpackable_file $1`" 1023 local src=$(find_unpackable_file $1)
1122 local sizeoff_t="$2" 1024 local sizeoff_t=$2
1123 1025
1026 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1124 [ -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 :("
1125 1028
1126 local shrtsrc="`basename ${src}`" 1029 local shrtsrc=$(basename "${src}")
1127 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1030 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1128 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1031 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1129 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\"`
1130 1033
1131 # grab metadata for debug reasons 1034 # grab metadata for debug reasons
1195# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1098# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1196# - If the file is not specified then unpack will utilize ${A}. 1099# - If the file is not specified then unpack will utilize ${A}.
1197# - 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
1198# the proper offset from the script itself. 1101# the proper offset from the script itself.
1199unpack_makeself() { 1102unpack_makeself() {
1103 local src_input=${1:-${A}}
1200 local src="$(find_unpackable_file "$1")" 1104 local src=$(find_unpackable_file "${src_input}")
1201 local skip="$2" 1105 local skip=$2
1202 local exe="$3" 1106 local exe=$3
1203 1107
1108 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1109
1204 local shrtsrc="$(basename "${src}")" 1110 local shrtsrc=$(basename "${src}")
1205 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1111 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1206 if [ -z "${skip}" ] 1112 if [[ -z ${skip} ]] ; then
1207 then
1208 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1113 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1209 local skip=0 1114 local skip=0
1210 exe=tail 1115 exe=tail
1211 case ${ver} in 1116 case ${ver} in
1212 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
1213 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1118 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1225 ;; 1130 ;;
1226 2.1.3) 1131 2.1.3)
1227 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1132 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1228 let skip="skip + 1" 1133 let skip="skip + 1"
1229 ;; 1134 ;;
1230 2.1.4) 1135 2.1.4|2.1.5)
1231 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)
1232 skip=$(head -n ${skip} "${src}" | wc -c) 1137 skip=$(head -n ${skip} "${src}" | wc -c)
1233 exe="dd" 1138 exe="dd"
1234 ;; 1139 ;;
1235 *) 1140 *)
1280check_license() { 1185check_license() {
1281 local lic=$1 1186 local lic=$1
1282 if [ -z "${lic}" ] ; then 1187 if [ -z "${lic}" ] ; then
1283 lic="${PORTDIR}/licenses/${LICENSE}" 1188 lic="${PORTDIR}/licenses/${LICENSE}"
1284 else 1189 else
1285 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1190 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1286 lic="${PORTDIR}/licenses/${src}" 1191 lic="${PORTDIR}/licenses/${lic}"
1287 elif [ -e "${PWD}/${src}" ] ; then 1192 elif [ -e "${PWD}/${lic}" ] ; then
1288 lic="${PWD}/${src}" 1193 lic="${PWD}/${lic}"
1289 elif [ -e "${src}" ] ; then 1194 elif [ -e "${lic}" ] ; then
1290 lic="${src}" 1195 lic="${lic}"
1291 fi
1292 fi 1196 fi
1197 fi
1293 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1198 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1294 local l="`basename ${lic}`" 1199 local l="`basename ${lic}`"
1295 1200
1296 # here is where we check for the licenses the user already 1201 # here is where we check for the licenses the user already
1297 # 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
1298 local shopts=$- 1203 local shopts=$-
1354 # 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
1355 # the # of files they gave us 1260 # the # of files they gave us
1356 local cdcnt=0 1261 local cdcnt=0
1357 local f= 1262 local f=
1358 for f in "$@" ; do 1263 for f in "$@" ; do
1359 cdcnt=$((cdcnt + 1)) 1264 ((++cdcnt))
1360 export CDROM_CHECK_${cdcnt}="$f" 1265 export CDROM_CHECK_${cdcnt}="$f"
1361 done 1266 done
1362 export CDROM_TOTAL_CDS=${cdcnt} 1267 export CDROM_TOTAL_CDS=${cdcnt}
1363 export CDROM_CURRENT_CD=1 1268 export CDROM_CURRENT_CD=1
1364 1269
1365 # now we see if the user gave use CD_ROOT ... 1270 # now we see if the user gave use CD_ROOT ...
1366 # 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
1367 if [[ ! -z ${CD_ROOT} ]] ; then
1368 export CDROM_ROOT=${CD_ROOT}
1369 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1370 return
1371 fi
1372 # do the same for CD_ROOT_X
1373 if [[ ! -z ${CD_ROOT_1} ]] ; then 1272 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1374 local var= 1273 local var=
1375 cdcnt=0 1274 cdcnt=0
1376 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1275 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1377 cdcnt=$((cdcnt + 1)) 1276 ((++cdcnt))
1378 var="CD_ROOT_${cdcnt}" 1277 var="CD_ROOT_${cdcnt}"
1278 [[ -z ${!var} ]] && var="CD_ROOT"
1379 if [[ -z ${!var} ]] ; then 1279 if [[ -z ${!var} ]] ; then
1380 eerror "You must either use just the CD_ROOT" 1280 eerror "You must either use just the CD_ROOT"
1381 eerror "or specify ALL the CD_ROOT_X variables." 1281 eerror "or specify ALL the CD_ROOT_X variables."
1382 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."
1383 die "could not locate CD_ROOT_${cdcnt}" 1283 die "could not locate CD_ROOT_${cdcnt}"
1384 fi 1284 fi
1385 export CDROM_ROOTS_${cdcnt}="${!var}"
1386 done 1285 done
1387 export CDROM_ROOT=${CDROM_ROOTS_1} 1286 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1388 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}
1389 return 1294 return
1390 fi 1295 fi
1391 1296
1297 # User didn't help us out so lets make sure they know they can
1298 # simplify the whole process ...
1392 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1299 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1393 einfon "This ebuild will need the " 1300 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1394 if [[ -z ${CDROM_NAME} ]] ; then
1395 echo "cdrom for ${PN}."
1396 else
1397 echo "${CDROM_NAME}."
1398 fi
1399 echo 1301 echo
1400 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"
1401 einfo "mounted somewhere on your filesystem, just export" 1303 einfo "mounted somewhere on your filesystem, just export"
1402 einfo "the variable CD_ROOT so that it points to the" 1304 einfo "the variable CD_ROOT so that it points to the"
1403 einfo "directory containing the files." 1305 einfo "directory containing the files."
1407 echo 1309 echo
1408 else 1310 else
1409 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1311 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1410 cdcnt=0 1312 cdcnt=0
1411 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1412 cdcnt=$((cdcnt + 1)) 1314 ((++cdcnt))
1413 var="CDROM_NAME_${cdcnt}" 1315 var="CDROM_NAME_${cdcnt}"
1414 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1316 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1415 done 1317 done
1416 echo 1318 echo
1417 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"
1418 einfo "mounted somewhere on your filesystem, just export" 1320 einfo "mounted somewhere on your filesystem, just export"
1419 einfo "the following variables so they point to the right place:" 1321 einfo "the following variables so they point to the right place:"
1420 einfon "" 1322 einfon ""
1421 cdcnt=0 1323 cdcnt=0
1422 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1324 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1423 cdcnt=$((cdcnt + 1)) 1325 ((++cdcnt))
1424 echo -n " CD_ROOT_${cdcnt}" 1326 echo -n " CD_ROOT_${cdcnt}"
1425 done 1327 done
1426 echo 1328 echo
1427 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"
1428 einfo "you only have one cdrom, you can export CD_ROOT" 1330 einfo "you only have one cdrom, you can export CD_ROOT"
1431 echo 1333 echo
1432 einfo "For example:" 1334 einfo "For example:"
1433 einfo "export CD_ROOT_1=/mnt/cdrom" 1335 einfo "export CD_ROOT_1=/mnt/cdrom"
1434 echo 1336 echo
1435 fi 1337 fi
1338
1339 export CDROM_SET=""
1436 export CDROM_CURRENT_CD=0 1340 export CDROM_CURRENT_CD=0
1437 cdrom_load_next_cd 1341 cdrom_load_next_cd
1438} 1342}
1439 1343
1440# 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.
1441# 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.
1442# 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.
1443# 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.
1444cdrom_load_next_cd() { 1348cdrom_load_next_cd() {
1445 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1446 local var= 1349 local var
1447 1350 ((++CDROM_CURRENT_CD))
1448 if [[ ! -z ${CD_ROOT} ]] ; then
1449 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1450 return
1451 fi
1452 1351
1453 unset CDROM_ROOT 1352 unset CDROM_ROOT
1454 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1353 var=CD_ROOT_${CDROM_CURRENT_CD}
1354 [[ -z ${!var} ]] && var="CD_ROOT"
1455 if [[ -z ${!var} ]] ; then 1355 if [[ -z ${!var} ]] ; then
1456 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1356 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1457 cdrom_locate_file_on_cd ${!var} 1357 _cdrom_locate_file_on_cd ${!var}
1458 else 1358 else
1459 export CDROM_ROOT=${!var} 1359 export CDROM_ROOT=${!var}
1460 fi 1360 fi
1461 1361
1462 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1362 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1467# 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
1468# 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
1469# displayed and we'll hang out here until: 1369# displayed and we'll hang out here until:
1470# (1) the file is found on a mounted cdrom 1370# (1) the file is found on a mounted cdrom
1471# (2) the user hits CTRL+C 1371# (2) the user hits CTRL+C
1472cdrom_locate_file_on_cd() { 1372_cdrom_locate_file_on_cd() {
1373 local mline=""
1374 local showedmsg=0
1375
1473 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
1474 local dir="$(dirname ${@})" 1384 local dir=$(dirname ${cdset[${i}]})
1475 local file="$(basename ${@})" 1385 local file=$(basename ${cdset[${i}]})
1476 local mline=""
1477 local showedmsg=0
1478 1386
1479 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
1480 [[ -d ${mline}/${dir} ]] || continue 1388 [[ -d ${mline}/${dir} ]] || continue
1481 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1389 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1482 && 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))
1483 done 1398 done
1484 1399
1485 if [[ -z ${CDROM_ROOT} ]] ; then
1486 echo 1400 echo
1487 if [[ ${showedmsg} -eq 0 ]] ; then 1401 if [[ ${showedmsg} -eq 0 ]] ; then
1488 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1402 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1489 if [[ -z ${CDROM_NAME} ]] ; then 1403 if [[ -z ${CDROM_NAME} ]] ; then
1490 einfo "Please insert the cdrom for ${PN} now !" 1404 einfo "Please insert+mount the cdrom for ${PN} now !"
1491 else
1492 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1493 fi
1494 else 1405 else
1495 if [[ -z ${CDROM_NAME_1} ]] ; then
1496 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1497 else
1498 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1499 einfo "Please insert+mount the ${!var} cdrom now !" 1406 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1500 fi
1501 fi 1407 fi
1502 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
1503 fi 1415 fi
1416 showedmsg=1
1417 fi
1504 einfo "Press return to scan for the cd again" 1418 einfo "Press return to scan for the cd again"
1505 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."
1506 read 1425 read
1507 fi
1508 done 1426 done
1509} 1427}
1510 1428
1511# Make sure that LINGUAS only contains languages that 1429# Make sure that LINGUAS only contains languages that
1512# a package can support 1430# a package can support
1554 else 1472 else
1555 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1473 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1556 fi 1474 fi
1557 done 1475 done
1558 if [[ -z ${newls} ]] ; then 1476 if [[ -z ${newls} ]] ; then
1559 unset LINGUAS 1477 export LINGUAS=""
1560 else 1478 else
1561 export LINGUAS=${newls:1} 1479 export LINGUAS=${newls:1}
1562 fi 1480 fi
1563} 1481}
1564 1482
1574 while ((i--)) ; do 1492 while ((i--)) ; do
1575 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1493 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1576 done 1494 done
1577 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1495 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1578 case ${ARCH} in 1496 case ${ARCH} in
1579 x86) export ARCH="i386";; 1497 x86) export ARCH="i386";;
1580 amd64) export ARCH="x86_64";; 1498 amd64) export ARCH="x86_64";;
1581 hppa) export ARCH="parisc";; 1499 hppa) export ARCH="parisc";;
1582 mips) export ARCH="mips";; 1500 mips) export ARCH="mips";;
1583 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!
1584 *) export ARCH="${ARCH}";; 1502 *) export ARCH="${ARCH}";;
1585 esac 1503 esac
1586} 1504}
1587 1505
1588# set's ARCH back to what portage expects 1506# set's ARCH back to what portage expects
1589set_arch_to_portage() { 1507set_arch_to_portage() {
1633 LIB=$1 1551 LIB=$1
1634 1552
1635 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1636 SONAME=`basename ${LIB}` 1554 SONAME=`basename ${LIB}`
1637 1555
1638 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."
1639 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"
1640 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,"
1641 einfo "you will need to execute the following command:" 1559 ewarn "you will need to execute the following command:"
1642 einfo " revdep-rebuild --soname ${SONAME}" 1560 ewarn " revdep-rebuild --soname ${SONAME}"
1643 einfo 1561 ewarn
1644 einfo "After doing that, you can safely remove ${LIB}" 1562 ewarn "After doing that, you can safely remove ${LIB}"
1645 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1563 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1646 fi 1564 fi
1647} 1565}
1648 1566
1649# 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
1650# certain USE flags 1568# certain USE flags
1660 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1578 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1661 1579
1662 local PKG=$(best_version $1) 1580 local PKG=$(best_version $1)
1663 shift 1581 shift
1664 1582
1665 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
1666 [[ ! -e ${USEFILE} ]] && return 1 1587 [[ ! -e ${USEFILE} ]] && return 0
1667 1588
1668 local USE_BUILT=$(<${USEFILE}) 1589 local USE_BUILT=$(<${USEFILE})
1669 while [[ $# -gt 0 ]] ; do 1590 while [[ $# -gt 0 ]] ; do
1670 if [[ ${opt} = "-o" ]] ; then 1591 if [[ ${opt} = "-o" ]] ; then
1671 has $1 ${USE_BUILT} && return 0 1592 has $1 ${USE_BUILT} && return 0
1696dopamd() { 1617dopamd() {
1697 [[ -z $1 ]] && die "dopamd requires at least one argument" 1618 [[ -z $1 ]] && die "dopamd requires at least one argument"
1698 1619
1699 use pam || return 0 1620 use pam || return 0
1700 1621
1701 insinto /etc/pam.d 1622 INSDESTTREE=/etc/pam.d \
1702 doins "$@" || die "failed to install $@" 1623 doins "$@" || die "failed to install $@"
1703} 1624}
1704# newpamd <old name> <new name> 1625# newpamd <old name> <new name>
1705# 1626#
1706# 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
1707newpamd() { 1628newpamd() {
1708 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1629 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1709 1630
1710 use pam || return 0 1631 use pam || return 0
1711 1632
1712 insinto /etc/pam.d 1633 INSDESTTREE=/etc/pam.d \
1713 newins "$1" "$2" || die "failed to install $1 as $2" 1634 newins "$1" "$2" || die "failed to install $1 as $2"
1714} 1635}
1715 1636
1716# make a wrapper script ... 1637# make a wrapper script ...
1717# 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
1723# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1644# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1724# $5 == path for wrapper 1645# $5 == path for wrapper
1725make_wrapper() { 1646make_wrapper() {
1726 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1647 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1727 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"
1728 cat << EOF > "${tmpwrapper}" 1651 cat << EOF > "${tmpwrapper}"
1729#!/bin/sh 1652#!/bin/sh
1730cd "${chdir}" 1653cd "${chdir:-.}"
1654if [ -n "${libdir}" ] ; then
1655 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1731export 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
1732exec ${bin} "\$@" 1661exec ${bin} "\$@"
1733EOF 1662EOF
1734 chmod go+rx "${tmpwrapper}" 1663 chmod go+rx "${tmpwrapper}"
1735 if [ -n "${5}" ] 1664 if [[ -n ${path} ]] ; then
1736 then
1737 exeinto ${5} 1665 exeinto "${path}"
1738 newexe "${tmpwrapper}" "${wrapper}" 1666 newexe "${tmpwrapper}" "${wrapper}"
1739 else 1667 else
1740 newbin "${tmpwrapper}" "${wrapper}" 1668 newbin "${tmpwrapper}" "${wrapper}"
1741 fi 1669 fi
1742} 1670}

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

  ViewVC Help
Powered by ViewVC 1.1.20