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

Diff of /eclass/eutils.eclass

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

Revision 1.173 Revision 1.228
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.173 2005/05/24 03:17:19 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.228 2006/03/10 23:24:21 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
61# to point to the latest version of the library present. 60# to point to the latest version of the library present.
62# 61#
63# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
64# 63#
65gen_usr_ldscript() { 64gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
67 # Just make sure it exists 66 # Just make sure it exists
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}" || die "could not change perms on ${lib}"
83 done 82 done
84} 83}
85 84
86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
88#
89# <azarah@gentoo.org> (11 Nov 2002)
90#
91draw_line() {
92 local i=0
93 local str_length=""
94
95 # Handle calls that do not have args, or wc not being installed ...
96 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
97 then
98 echo "==============================================================="
99 return 0
100 fi
101
102 # Get the length of $*
103 str_length="$(echo -n "$*" | wc -m)"
104
105 while [ "$i" -lt "${str_length}" ]
106 do
107 echo -n "="
108
109 i=$((i + 1))
110 done
111
112 echo
113
114 return 0
115}
116 85
117# Default directory where patches are located 86# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 88# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
167# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
168# 137#
169# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
170# 139#
171epatch() { 140epatch() {
141 _epatch_draw_line() {
142 # this func produces a lot of pointless noise when debugging is turned on ...
143 local is_debug=0
144 [[ $- == *x* ]] && is_debug=1 && set +x
145
146 local i=0 str_length="" str_out=""
147
148 # Handle calls that do not have args, or wc not being installed ...
149 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
150 str_length=65
151 else
152 str_length=$(echo -n "$*" | wc -m)
153 fi
154
155 while ((i++ < ${str_length})) ; do
156 str_out="${str_out}="
157 done
158 echo ${str_out}
159
160 [[ ${is_debug} -eq 1 ]] && set -x
161 return 0
162 }
163 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 164 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 168 local SINGLE_PATCH="no"
177 local x="" 169 local x=""
170
171 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 172
179 if [ "$#" -gt 1 ] 173 if [ "$#" -gt 1 ]
180 then 174 then
181 local m="" 175 local m=""
182 for m in "$@" ; do 176 for m in "$@" ; do
249 # New ARCH dependant patch naming scheme ... 243 # New ARCH dependant patch naming scheme ...
250 # 244 #
251 # ???_arch_foo.patch 245 # ???_arch_foo.patch
252 # 246 #
253 if [ -f ${x} ] && \ 247 if [ -f ${x} ] && \
254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
255 [ "${EPATCH_FORCE}" = "yes" ]) 249 [ "${EPATCH_FORCE}" = "yes" ])
256 then 250 then
257 local count=0 251 local count=0
258 local popts="${EPATCH_OPTS}" 252 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/} 253 local patchname=${x##*/}
283 277
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
286 do 280 do
287 # Generate some useful debug info ... 281 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 284
291 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 286 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 292
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 294 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 295
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 298
305 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 300 then
307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 301 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
308 then 302 then
312 count=5 306 count=5
313 break 307 break
314 fi 308 fi
315 fi 309 fi
316 310
317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 311 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
318 then 312 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 318
325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 319 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
320 _epatch_assert
326 321
327 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
328 then 323 then
329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 324 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo 325 echo
369 then 364 then
370 einfo "Done with patching" 365 einfo "Done with patching"
371 fi 366 fi
372} 367}
373 368
374# This function check how many cpu's are present, and then set
375# -j in MAKEOPTS accordingly.
376#
377# Thanks to nall <nall@gentoo.org> for this.
378#
379get_number_of_jobs() {
380 local jobs=0
381
382 if [ ! -r /proc/cpuinfo ]
383 then
384 return 1
385 fi
386
387 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
388 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
389 then
390 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
391 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
392 ADMINPARAM="${ADMINPARAM/-j}"
393 fi
394
395 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
396
397 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
398 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
399 then
400 # these archs will always have "[Pp]rocessor"
401 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
402
403 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
404 then
405 # sparc always has "ncpus active"
406 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
407
408 elif [ "${ARCH}" = "alpha" ]
409 then
410 # alpha has "cpus active", but only when compiled with SMP
411 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
412 then
413 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
414 else
415 jobs=2
416 fi
417
418 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
419 then
420 # ppc has "processor", but only when compiled with SMP
421 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
422 then
423 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
424 else
425 jobs=2
426 fi
427 elif [ "${ARCH}" = "s390" ]
428 then
429 # s390 has "# processors : "
430 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
431 else
432 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
433 die "Unknown ARCH -- ${ARCH}!"
434 fi
435
436 # Make sure the number is valid ...
437 if [ "${jobs}" -lt 1 ]
438 then
439 jobs=1
440 fi
441
442 if [ -n "${ADMINPARAM}" ]
443 then
444 if [ "${jobs}" -gt "${ADMINPARAM}" ]
445 then
446 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
447 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
448 else
449 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
450 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
451 fi
452 fi
453}
454
455# Cheap replacement for when debianutils (and thus mktemp) 369# Cheap replacement for when debianutils (and thus mktemp)
456# does not exist on the users system 370# does not exist on the users system
457# vapier@gentoo.org 371# vapier@gentoo.org
458# 372#
459# Takes just 1 optional parameter (the directory to create tmpfile in) 373# Takes just 1 optional parameter (the directory to create tmpfile in)
460emktemp() { 374emktemp() {
461 local exe="touch" 375 local exe="touch"
462 [ "$1" == "-d" ] && exe="mkdir" && shift 376 [[ $1 == -d ]] && exe="mkdir" && shift
463 local topdir="$1" 377 local topdir=$1
464 378
465 if [ -z "${topdir}" ] 379 if [[ -z ${topdir} ]] ; then
466 then
467 [ -z "${T}" ] \ 380 [[ -z ${T} ]] \
468 && topdir="/tmp" \ 381 && topdir="/tmp" \
469 || topdir="${T}" 382 || topdir=${T}
470 fi 383 fi
471 384
472 if [ -z "$(type -p mktemp)" ] 385 if [[ -z $(type -p mktemp) ]] ; then
473 then
474 local tmp=/ 386 local tmp=/
475 while [ -e "${tmp}" ] ; do 387 while [[ -e ${tmp} ]] ; do
476 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
477 done 389 done
478 ${exe} "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
479 echo "${tmp}" 391 echo "${tmp}"
480 else 392 else
481 [ "${exe}" == "touch" ] \ 393 if [[ ${exe} == "touch" ]] ; then
482 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
483 || exe="-d" 395 && mktemp -p "${topdir}" \
484 mktemp ${exe} "${topdir}" 396 || TMPDIR="${topdir}" mktemp -t tmp
397 else
398 [[ ${USERLAND} == "GNU" ]] \
399 && mktemp -d "${topdir}" \
400 || TMPDIR="${topdir}" mktemp -dt tmp
401 fi
485 fi 402 fi
486} 403}
487 404
488# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
489# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
490# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 407# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
491# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 408# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
492# 409#
493# egetent(database, key) 410# egetent(database, key)
494egetent() { 411egetent() {
495 if useq ppc-macos ; then 412 case ${CHOST} in
413 *-darwin*)
496 case "$2" in 414 case "$2" in
497 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
498 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
499 ;; 417 ;;
500 *) # Numeric 418 *) # Numeric
501 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
502 ;; 420 ;;
503 esac 421 esac
504 elif useq x86-fbsd ; then 422 ;;
505 local action 423 *-freebsd*|*-dragonfly*)
506 if [ "$1" == "passwd" ] 424 local opts action="user"
507 then 425 [[ $1 == "passwd" ]] || action="group"
508 action="user" 426
509 else 427 # lookup by uid/gid
510 action="group" 428 if [[ $2 == [[:digit:]]* ]] ; then
429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
511 fi 430 fi
431
512 pw show "${action}" "$2" -q 432 pw show ${action} ${opts} "$2" -q
513 else 433 ;;
434 *-netbsd*|*-openbsd*)
435 grep "$2:\*:" /etc/$1
436 ;;
437 *)
514 which nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
515 getent "$1" "$2" 439 getent "$1" "$2"
516 fi 440 ;;
441 esac
517} 442}
518 443
519# Simplify/standardize adding users to the system 444# Simplify/standardize adding users to the system
520# vapier@gentoo.org 445# vapier@gentoo.org
521# 446#
529# homedir: /dev/null 454# homedir: /dev/null
530# groups: none 455# groups: none
531# extra: comment of 'added by portage for ${PN}' 456# extra: comment of 'added by portage for ${PN}'
532enewuser() { 457enewuser() {
533 # get the username 458 # get the username
534 local euser="$1"; shift 459 local euser=$1; shift
535 if [ -z "${euser}" ] 460 if [[ -z ${euser} ]] ; then
536 then
537 eerror "No username specified !" 461 eerror "No username specified !"
538 die "Cannot call enewuser without a username" 462 die "Cannot call enewuser without a username"
539 fi 463 fi
540 464
541 # lets see if the username already exists 465 # lets see if the username already exists
542 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 466 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
543 then
544 return 0 467 return 0
545 fi 468 fi
546 einfo "Adding user '${euser}' to your system ..." 469 einfo "Adding user '${euser}' to your system ..."
547 470
548 # options to pass to useradd 471 # options to pass to useradd
549 local opts= 472 local opts=
550 473
551 # handle uid 474 # handle uid
552 local euid="$1"; shift 475 local euid=$1; shift
553 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 476 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
554 then
555 if [ "${euid}" -gt 0 ] 477 if [[ ${euid} -gt 0 ]] ; then
556 then
557 if [ ! -z "`egetent passwd ${euid}`" ] 478 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
558 then
559 euid="next" 479 euid="next"
560 fi 480 fi
561 else 481 else
562 eerror "Userid given but is not greater than 0 !" 482 eerror "Userid given but is not greater than 0 !"
563 die "${euid} is not a valid UID" 483 die "${euid} is not a valid UID"
564 fi 484 fi
565 else 485 else
566 euid="next" 486 euid="next"
567 fi 487 fi
568 if [ "${euid}" == "next" ] 488 if [[ ${euid} == "next" ]] ; then
569 then 489 for euid in $(seq 101 999) ; do
570 local pwrange
571 if [ "${USERLAND}" == "BSD" ] ; then
572 pwrange="`jot 898 101`"
573 else
574 pwrange="`seq 101 999`"
575 fi
576 for euid in ${pwrange} ; do
577 [ -z "`egetent passwd ${euid}`" ] && break 490 [[ -z $(egetent passwd ${euid}) ]] && break
578 done 491 done
579 fi 492 fi
580 opts="${opts} -u ${euid}" 493 opts="${opts} -u ${euid}"
581 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
582 495
583 # handle shell 496 # handle shell
584 local eshell="$1"; shift 497 local eshell=$1; shift
585 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
586 then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
587 if [ ! -e "${eshell}" ]
588 then
589 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
590 die "${eshell} does not exist" 501 die "${eshell} does not exist in ${ROOT}"
591 fi 502 fi
592 else 503 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
593 if [ "${USERLAND}" == "BSD" ] 504 eerror "Do not specify ${eshell} yourself, use -1"
594 then 505 die "Pass '-1' as the shell parameter"
595 eshell="/usr/bin/false" 506 fi
596 else 507 else
597 eshell="/bin/false" 508 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
509 [[ -x ${ROOT}${shell} ]] && break
510 done
511
512 if [[ ${shell} == "/dev/null" ]] ; then
513 eerror "Unable to identify the shell to use"
514 die "Unable to identify the shell to use"
598 fi 515 fi
516
517 eshell=${shell}
599 fi 518 fi
600 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
601 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
602 521
603 # handle homedir 522 # handle homedir
604 local ehome="$1"; shift 523 local ehome=$1; shift
605 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 524 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
606 then
607 ehome="/dev/null" 525 ehome="/dev/null"
608 fi 526 fi
609 einfo " - Home: ${ehome}" 527 einfo " - Home: ${ehome}"
610 opts="${opts} -d ${ehome}" 528 opts="${opts} -d ${ehome}"
611 529
612 # handle groups 530 # handle groups
613 local egroups="$1"; shift 531 local egroups=$1; shift
614 if [ ! -z "${egroups}" ] 532 if [[ ! -z ${egroups} ]] ; then
615 then
616 local oldifs="${IFS}" 533 local oldifs=${IFS}
617 local defgroup="" exgroups="" 534 local defgroup="" exgroups=""
618 535
619 export IFS="," 536 export IFS=","
620 for g in ${egroups} 537 for g in ${egroups} ; do
621 do
622 export IFS="${oldifs}" 538 export IFS=${oldifs}
623 if [ -z "`egetent group \"${g}\"`" ] 539 if [[ -z $(egetent group "${g}") ]] ; then
624 then
625 eerror "You must add group ${g} to the system first" 540 eerror "You must add group ${g} to the system first"
626 die "${g} is not a valid GID" 541 die "${g} is not a valid GID"
627 fi 542 fi
628 if [ -z "${defgroup}" ] 543 if [[ -z ${defgroup} ]] ; then
629 then
630 defgroup="${g}" 544 defgroup=${g}
631 else 545 else
632 exgroups="${exgroups},${g}" 546 exgroups="${exgroups},${g}"
633 fi 547 fi
634 export IFS="," 548 export IFS=","
635 done 549 done
636 export IFS="${oldifs}" 550 export IFS=${oldifs}
637 551
638 opts="${opts} -g ${defgroup}" 552 opts="${opts} -g ${defgroup}"
639 if [ ! -z "${exgroups}" ] 553 if [[ ! -z ${exgroups} ]] ; then
640 then
641 opts="${opts} -G ${exgroups:1}" 554 opts="${opts} -G ${exgroups:1}"
642 fi 555 fi
643 else 556 else
644 egroups="(none)" 557 egroups="(none)"
645 fi 558 fi
646 einfo " - Groups: ${egroups}" 559 einfo " - Groups: ${egroups}"
647 560
648 # handle extra and add the user 561 # handle extra and add the user
649 local eextra="$@"
650 local oldsandbox="${SANDBOX_ON}" 562 local oldsandbox=${SANDBOX_ON}
651 export SANDBOX_ON="0" 563 export SANDBOX_ON="0"
652 if useq ppc-macos 564 case ${CHOST} in
653 then 565 *-darwin*)
654 ### Make the user 566 ### Make the user
655 if [ -z "${eextra}" ] 567 if [[ -z $@ ]] ; then
656 then
657 dscl . create /users/${euser} uid ${euid} 568 dscl . create /users/${euser} uid ${euid}
658 dscl . create /users/${euser} shell ${eshell} 569 dscl . create /users/${euser} shell ${eshell}
659 dscl . create /users/${euser} home ${ehome} 570 dscl . create /users/${euser} home ${ehome}
660 dscl . create /users/${euser} realname "added by portage for ${PN}" 571 dscl . create /users/${euser} realname "added by portage for ${PN}"
661 ### Add the user to the groups specified 572 ### Add the user to the groups specified
662 local oldifs="${IFS}" 573 local oldifs=${IFS}
663 export IFS="," 574 export IFS=","
664 for g in ${egroups} 575 for g in ${egroups} ; do
665 do
666 dscl . merge /groups/${g} users ${euser} 576 dscl . merge /groups/${g} users ${euser}
667 done 577 done
668 export IFS="${oldifs}" 578 export IFS=${oldifs}
669 else 579 else
670 einfo "Extra options are not supported on macos yet" 580 einfo "Extra options are not supported on Darwin yet"
671 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
672 einfo "eextra: ${eextra}" 582 einfo "eextra: $@"
673 die "Required function missing" 583 die "Required function missing"
674 fi 584 fi
675 elif use x86-fbsd ; then 585 ;;
676 if [ -z "${eextra}" ] 586 *-freebsd*|*-dragonfly*)
677 then 587 if [[ -z $@ ]] ; then
678 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
679 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
680 die "enewuser failed" 590 die "enewuser failed"
681 else 591 else
682 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
683 pw useradd ${euser} ${opts} \ 593 pw useradd ${euser} ${opts} \
684 -c ${eextra} || die "enewuser failed" 594 "$@" || die "enewuser failed"
685 fi 595 fi
596 ;;
597
598 *-netbsd*)
599 if [[ -z $@ ]] ; then
600 useradd ${opts} ${euser} || die "enewuser failed"
686 else 601 else
687 if [ -z "${eextra}" ] 602 einfo " - Extra: $@"
688 then 603 useradd ${opts} ${euser} "$@" || die "enewuser failed"
604 fi
605 ;;
606
607 *-openbsd*)
608 if [[ -z $@ ]] ; then
609 useradd -u ${euid} -s ${eshell} \
610 -d ${ehome} -c "Added by portage for ${PN}" \
611 -g ${egroups} ${euser} || die "enewuser failed"
612 else
613 einfo " - Extra: $@"
614 useradd -u ${euid} -s ${eshell} \
615 -d ${ehome} -c "Added by portage for ${PN}" \
616 -g ${egroups} ${euser} "$@" || die "enewuser failed"
617 fi
618 ;;
619
620 *)
621 if [[ -z $@ ]] ; then
689 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
690 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
691 || die "enewuser failed" 624 || die "enewuser failed"
692 else 625 else
693 einfo " - Extra: ${eextra}" 626 einfo " - Extra: $@"
694 useradd ${opts} ${euser} ${eextra} \ 627 useradd ${opts} ${euser} "$@" \
695 || die "enewuser failed" 628 || die "enewuser failed"
696 fi 629 fi
630 ;;
631 esac
632
633 if [[ ! -e ${ROOT}/${ehome} ]] ; then
634 einfo " - Creating ${ehome} in ${ROOT}"
635 mkdir -p "${ROOT}/${ehome}"
636 chown ${euser} "${ROOT}/${ehome}"
637 chmod 755 "${ROOT}/${ehome}"
697 fi 638 fi
639
698 export SANDBOX_ON="${oldsandbox}" 640 export SANDBOX_ON=${oldsandbox}
699
700 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
701 then
702 einfo " - Creating ${ehome} in ${D}"
703 dodir ${ehome}
704 fowners ${euser} ${ehome}
705 fperms 755 ${ehome}
706 fi
707} 641}
708 642
709# Simplify/standardize adding groups to the system 643# Simplify/standardize adding groups to the system
710# vapier@gentoo.org 644# vapier@gentoo.org
711# 645#
740 then 674 then
741 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
742 then 676 then
743 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
744 then 678 then
745 if useq ppc-macos ; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
746 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
747 else 681 else
748 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
749 fi 683 fi
750 else 684 else
764 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
765 699
766 # add the group 700 # add the group
767 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
768 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
769 if useq ppc-macos ; then 703 case ${CHOST} in
704 *-darwin*)
770 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
771 then 706 then
772 einfo "Extra options are not supported on macos yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
773 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
774 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
775 die "Required function missing" 710 die "Required function missing"
776 fi 711 fi
777 712
778 # If we need the next available 713 # If we need the next available
779 case ${egid} in 714 case ${egid} in
780 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
781 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
782 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
783 done 718 done
784 esac 719 esac
785 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
786 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
787 elif use x86-fbsd ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
788 case ${egid} in 725 case ${egid} in
789 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
790 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
791 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
792 done 729 done
793 esac 730 esac
794 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
795 else 732 ;;
733
734 *-netbsd*)
735 case ${egid} in
736 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do
738 [ -z "`egetent group ${egid}`" ] && break
739 done
740 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;;
743
744 *)
796 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
797 fi 746 ;;
747 esac
798 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
799} 749}
800 750
801# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
802# vapier@gentoo.org 752# vapier@gentoo.org
827# name: the name that will show up in the menu 777# name: the name that will show up in the menu
828# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
829# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
830# a full path to an icon 780# a full path to an icon
831# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
832# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
833# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
834make_desktop_entry() { 784make_desktop_entry() {
835 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 785 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
836 786
837 local exec=${1} 787 local exec=${1}
863 dev) 813 dev)
864 type="Development" 814 type="Development"
865 ;; 815 ;;
866 816
867 games) 817 games)
868 [[ -z ${path} ]] && path=${GAMES_BINDIR}
869
870 case ${catmin} in 818 case ${catmin} in
871 action) type=ActionGame;; 819 action) type=ActionGame;;
872 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
873 board) type=BoardGame;; 821 board) type=BoardGame;;
874 kid) type=KidsGame;; 822 kid) type=KidsGame;;
915 type="Network;${type}" 863 type="Network;${type}"
916 ;; 864 ;;
917 865
918 sci) 866 sci)
919 case ${catmin} in 867 case ${catmin} in
920 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
921 bio*) type=Biology;; 869 bio*) type=Biology;;
922 calc*) type=Calculator;; 870 calc*) type=Calculator;;
923 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
924 geo*) type=Geology;; 872 geo*) type=Geology;;
925 math*) type=Math;; 873 math*) type=Math;;
939 *) 887 *)
940 type= 888 type=
941 ;; 889 ;;
942 esac 890 esac
943 fi 891 fi
944 892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
945 local desktop=${T}/${exec%% *}-${P}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
946 898
947echo "[Desktop Entry] 899echo "[Desktop Entry]
948Encoding=UTF-8 900Encoding=UTF-8
949Version=0.9.2 901Version=0.9.2
950Name=${name} 902Name=${name}
953Exec=${exec} 905Exec=${exec}
954Path=${path} 906Path=${path}
955Icon=${icon} 907Icon=${icon}
956Categories=Application;${type};" > "${desktop}" 908Categories=Application;${type};" > "${desktop}"
957 909
910 (
911 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller
958 insinto /usr/share/applications 913 insinto /usr/share/applications
959 doins "${desktop}" 914 doins "${desktop}"
960 915 )
961 return 0
962} 916}
963 917
964# Make a GDM/KDM Session file 918# Make a GDM/KDM Session file
965# 919#
966# make_desktop_entry(<title>, <command>) 920# make_desktop_entry(<title>, <command>)
995 doins "${i}" 949 doins "${i}"
996 elif [[ -d ${i} ]] ; then 950 elif [[ -d ${i} ]] ; then
997 for j in "${i}"/*.desktop ; do 951 for j in "${i}"/*.desktop ; do
998 doins "${j}" 952 doins "${j}"
999 done 953 done
1000 fi 954 fi
1001 done 955 done
1002} 956}
1003newmenu() { 957newmenu() {
1004 insinto /usr/share/applications 958 insinto /usr/share/applications
1005 newins "$1" "$2" 959 newins "$1" "$2"
1013 doins "${i}" 967 doins "${i}"
1014 elif [[ -d ${i} ]] ; then 968 elif [[ -d ${i} ]] ; then
1015 for j in "${i}"/*.png ; do 969 for j in "${i}"/*.png ; do
1016 doins "${j}" 970 doins "${j}"
1017 done 971 done
1018 fi 972 fi
1019 done 973 done
1020} 974}
1021newicon() { 975newicon() {
1022 insinto /usr/share/pixmaps 976 insinto /usr/share/pixmaps
1023 newins "$1" "$2" 977 newins "$1" "$2"
1028############################################################## 982##############################################################
1029 983
1030 984
1031# for internal use only (unpack_pdv and unpack_makeself) 985# for internal use only (unpack_pdv and unpack_makeself)
1032find_unpackable_file() { 986find_unpackable_file() {
1033 local src="$1" 987 local src=$1
1034 if [ -z "${src}" ] 988 if [[ -z ${src} ]] ; then
1035 then
1036 src="${DISTDIR}/${A}" 989 src=${DISTDIR}/${A}
1037 else 990 else
1038 if [ -e "${DISTDIR}/${src}" ] 991 if [[ -e ${DISTDIR}/${src} ]] ; then
1039 then
1040 src="${DISTDIR}/${src}" 992 src=${DISTDIR}/${src}
1041 elif [ -e "${PWD}/${src}" ] 993 elif [[ -e ${PWD}/${src} ]] ; then
1042 then
1043 src="${PWD}/${src}" 994 src=${PWD}/${src}
1044 elif [ -e "${src}" ] 995 elif [[ -e ${src} ]] ; then
1045 then
1046 src="${src}" 996 src=${src}
1047 fi
1048 fi 997 fi
1049 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 998 fi
999 [[ ! -e ${src} ]] && return 1
1050 echo "${src}" 1000 echo "${src}"
1051} 1001}
1052 1002
1053# Unpack those pesky pdv generated files ... 1003# Unpack those pesky pdv generated files ...
1054# They're self-unpacking programs with the binary package stuffed in 1004# They're self-unpacking programs with the binary package stuffed in
1069# lseek 1019# lseek
1070# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1020# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1071# lseek(3, -4, SEEK_END) = 2981250 1021# lseek(3, -4, SEEK_END) = 2981250
1072# thus we would pass in the value of '4' as the second parameter. 1022# thus we would pass in the value of '4' as the second parameter.
1073unpack_pdv() { 1023unpack_pdv() {
1074 local src="`find_unpackable_file $1`" 1024 local src=$(find_unpackable_file $1)
1075 local sizeoff_t="$2" 1025 local sizeoff_t=$2
1076 1026
1027 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1077 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1078 1029
1079 local shrtsrc="`basename ${src}`" 1030 local shrtsrc=$(basename "${src}")
1080 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1081 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1032 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1082 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1083 1034
1084 # grab metadata for debug reasons 1035 # grab metadata for debug reasons
1148# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1149# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1150# - If the offset is not specified then we will attempt to extract 1101# - If the offset is not specified then we will attempt to extract
1151# the proper offset from the script itself. 1102# the proper offset from the script itself.
1152unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1153 local src="$(find_unpackable_file "$1")" 1105 local src=$(find_unpackable_file "${src_input}")
1154 local skip="$2" 1106 local skip=$2
1155 local exe="$3" 1107 local exe=$3
1156 1108
1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1110
1157 local shrtsrc="$(basename "${src}")" 1111 local shrtsrc=$(basename "${src}")
1158 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1159 if [ -z "${skip}" ] 1113 if [[ -z ${skip} ]] ; then
1160 then
1161 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1162 local skip=0 1115 local skip=0
1163 exe=tail 1116 exe=tail
1164 case ${ver} in 1117 case ${ver} in
1165 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1118 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1166 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1178 ;; 1131 ;;
1179 2.1.3) 1132 2.1.3)
1180 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1133 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1181 let skip="skip + 1" 1134 let skip="skip + 1"
1182 ;; 1135 ;;
1183 2.1.4) 1136 2.1.4|2.1.5)
1184 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1137 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1185 skip=$(head -n ${skip} "${src}" | wc -c) 1138 skip=$(head -n ${skip} "${src}" | wc -c)
1186 exe="dd" 1139 exe="dd"
1187 ;; 1140 ;;
1188 *) 1141 *)
1233check_license() { 1186check_license() {
1234 local lic=$1 1187 local lic=$1
1235 if [ -z "${lic}" ] ; then 1188 if [ -z "${lic}" ] ; then
1236 lic="${PORTDIR}/licenses/${LICENSE}" 1189 lic="${PORTDIR}/licenses/${LICENSE}"
1237 else 1190 else
1238 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1191 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1239 lic="${PORTDIR}/licenses/${src}" 1192 lic="${PORTDIR}/licenses/${lic}"
1240 elif [ -e "${PWD}/${src}" ] ; then 1193 elif [ -e "${PWD}/${lic}" ] ; then
1241 lic="${PWD}/${src}" 1194 lic="${PWD}/${lic}"
1242 elif [ -e "${src}" ] ; then 1195 elif [ -e "${lic}" ] ; then
1243 lic="${src}" 1196 lic="${lic}"
1244 fi
1245 fi 1197 fi
1198 fi
1246 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1199 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1247 local l="`basename ${lic}`" 1200 local l="`basename ${lic}`"
1248 1201
1249 # here is where we check for the licenses the user already 1202 # here is where we check for the licenses the user already
1250 # accepted ... if we don't find a match, we make the user accept 1203 # accepted ... if we don't find a match, we make the user accept
1251 local shopts=$- 1204 local shopts=$-
1307 # first we figure out how many cds we're dealing with by 1260 # first we figure out how many cds we're dealing with by
1308 # the # of files they gave us 1261 # the # of files they gave us
1309 local cdcnt=0 1262 local cdcnt=0
1310 local f= 1263 local f=
1311 for f in "$@" ; do 1264 for f in "$@" ; do
1312 cdcnt=$((cdcnt + 1)) 1265 ((++cdcnt))
1313 export CDROM_CHECK_${cdcnt}="$f" 1266 export CDROM_CHECK_${cdcnt}="$f"
1314 done 1267 done
1315 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1316 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1317 1270
1318 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1319 # if they did, let's just believe them that it's correct 1272 # if they did, let's just believe them that it's correct
1320 if [[ ! -z ${CD_ROOT} ]] ; then
1321 export CDROM_ROOT=${CD_ROOT}
1322 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1323 return
1324 fi
1325 # do the same for CD_ROOT_X
1326 if [[ ! -z ${CD_ROOT_1} ]] ; then 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1327 local var= 1274 local var=
1328 cdcnt=0 1275 cdcnt=0
1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1330 cdcnt=$((cdcnt + 1)) 1277 ((++cdcnt))
1331 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1332 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1333 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1334 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1335 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1283 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1336 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1337 fi 1285 fi
1338 export CDROM_ROOTS_${cdcnt}="${!var}"
1339 done 1286 done
1340 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1341 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1288 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1289 export CDROM_SET=-1
1290 for f in ${CDROM_CHECK_1//:/ } ; do
1291 ((++CDROM_SET))
1292 [[ -e ${CD_ROOT}/${f} ]] && break
1293 done
1294 export CDROM_MATCH=${f}
1342 return 1295 return
1343 fi 1296 fi
1344 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1345 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1346 einfon "This ebuild will need the " 1301 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1347 if [[ -z ${CDROM_NAME} ]] ; then
1348 echo "cdrom for ${PN}."
1349 else
1350 echo "${CDROM_NAME}."
1351 fi
1352 echo 1302 echo
1353 einfo "If you do not have the CD, but have the data files" 1303 einfo "If you do not have the CD, but have the data files"
1354 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1355 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1356 einfo "directory containing the files." 1306 einfo "directory containing the files."
1360 echo 1310 echo
1361 else 1311 else
1362 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1363 cdcnt=0 1313 cdcnt=0
1364 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1365 cdcnt=$((cdcnt + 1)) 1315 ((++cdcnt))
1366 var="CDROM_NAME_${cdcnt}" 1316 var="CDROM_NAME_${cdcnt}"
1367 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1317 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1368 done 1318 done
1369 echo 1319 echo
1370 einfo "If you do not have the CDs, but have the data files" 1320 einfo "If you do not have the CDs, but have the data files"
1371 einfo "mounted somewhere on your filesystem, just export" 1321 einfo "mounted somewhere on your filesystem, just export"
1372 einfo "the following variables so they point to the right place:" 1322 einfo "the following variables so they point to the right place:"
1373 einfon "" 1323 einfon ""
1374 cdcnt=0 1324 cdcnt=0
1375 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1376 cdcnt=$((cdcnt + 1)) 1326 ((++cdcnt))
1377 echo -n " CD_ROOT_${cdcnt}" 1327 echo -n " CD_ROOT_${cdcnt}"
1378 done 1328 done
1379 echo 1329 echo
1380 einfo "Or, if you have all the files in the same place, or" 1330 einfo "Or, if you have all the files in the same place, or"
1381 einfo "you only have one cdrom, you can export CD_ROOT" 1331 einfo "you only have one cdrom, you can export CD_ROOT"
1384 echo 1334 echo
1385 einfo "For example:" 1335 einfo "For example:"
1386 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1387 echo 1337 echo
1388 fi 1338 fi
1339
1340 export CDROM_SET=""
1389 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1390 cdrom_load_next_cd 1342 cdrom_load_next_cd
1391} 1343}
1392 1344
1393# this is only used when you need access to more than one cd. 1345# this is only used when you need access to more than one cd.
1394# when you have finished using the first cd, just call this function. 1346# when you have finished using the first cd, just call this function.
1395# when it returns, CDROM_ROOT will be pointing to the second cd. 1347# when it returns, CDROM_ROOT will be pointing to the second cd.
1396# remember, you can only go forward in the cd chain, you can't go back. 1348# remember, you can only go forward in the cd chain, you can't go back.
1397cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1398 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1399 local var= 1350 local var
1400 1351 ((++CDROM_CURRENT_CD))
1401 if [[ ! -z ${CD_ROOT} ]] ; then
1402 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1403 return
1404 fi
1405 1352
1406 unset CDROM_ROOT 1353 unset CDROM_ROOT
1407 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1408 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1409 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1410 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1411 else 1359 else
1412 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1413 fi 1361 fi
1414 1362
1415 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1420# all it does is try to locate a give file on a cd ... if the cd isn't 1368# all it does is try to locate a give file on a cd ... if the cd isn't
1421# found, then a message asking for the user to insert the cdrom will be 1369# found, then a message asking for the user to insert the cdrom will be
1422# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1423# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1424# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1425cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1374 local mline=""
1375 local showedmsg=0
1376
1426 while [[ -z ${CDROM_ROOT} ]] ; do 1377 while [[ -z ${CDROM_ROOT} ]] ; do
1378 local i=0
1379 local -a cdset=(${*//:/ })
1380 if [[ -n ${CDROM_SET} ]] ; then
1381 cdset=(${cdset[${CDROM_SET}]})
1382 fi
1383
1384 while [[ -n ${cdset[${i}]} ]] ; do
1427 local dir="$(dirname ${@})" 1385 local dir=$(dirname ${cdset[${i}]})
1428 local file="$(basename ${@})" 1386 local file=$(basename ${cdset[${i}]})
1429 local mline=""
1430 local showedmsg=0
1431 1387
1432 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1388 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1433 [[ -d ${mline}/${dir} ]] || continue 1389 [[ -d ${mline}/${dir} ]] || continue
1434 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1435 && export CDROM_ROOT=${mline} 1391 export CDROM_ROOT=${mline}
1392 export CDROM_SET=${i}
1393 export CDROM_MATCH=${cdset[${i}]}
1394 return
1395 fi
1396 done
1397
1398 ((++i))
1436 done 1399 done
1437 1400
1438 if [[ -z ${CDROM_ROOT} ]] ; then
1439 echo 1401 echo
1440 if [[ ${showedmsg} -eq 0 ]] ; then 1402 if [[ ${showedmsg} -eq 0 ]] ; then
1441 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1403 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1442 if [[ -z ${CDROM_NAME} ]] ; then 1404 if [[ -z ${CDROM_NAME} ]] ; then
1443 einfo "Please insert the cdrom for ${PN} now !" 1405 einfo "Please insert+mount the cdrom for ${PN} now !"
1444 else
1445 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1446 fi
1447 else 1406 else
1448 if [[ -z ${CDROM_NAME_1} ]] ; then
1449 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1450 else
1451 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1452 einfo "Please insert+mount the ${!var} cdrom now !" 1407 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1453 fi
1454 fi 1408 fi
1455 showedmsg=1 1409 else
1410 if [[ -z ${CDROM_NAME_1} ]] ; then
1411 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1412 else
1413 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1414 einfo "Please insert+mount the ${!var} cdrom now !"
1415 fi
1456 fi 1416 fi
1417 showedmsg=1
1418 fi
1457 einfo "Press return to scan for the cd again" 1419 einfo "Press return to scan for the cd again"
1458 einfo "or hit CTRL+C to abort the emerge." 1420 einfo "or hit CTRL+C to abort the emerge."
1459 read 1421 echo
1460 fi 1422 einfo "If you are having trouble with the detection"
1423 einfo "of your CD, it is possible that you do not have"
1424 einfo "Joliet support enabled in your kernel. Please"
1425 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1426 read || die "something is screwed with your system"
1461 done 1427 done
1462} 1428}
1463 1429
1464# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1465# a package can support 1431# a package can support
1475# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1476strip-linguas() { 1442strip-linguas() {
1477 local ls newls 1443 local ls newls
1478 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1479 local op=$1; shift 1445 local op=$1; shift
1480 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1481 local d f 1447 local d f
1482 for d in "$@" ; do 1448 for d in "$@" ; do
1483 if [[ ${op} == "-u" ]] ; then 1449 if [[ ${op} == "-u" ]] ; then
1484 newls=${ls} 1450 newls=${ls}
1485 else 1451 else
1486 newls="" 1452 newls=""
1487 fi 1453 fi
1488 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1489 if [[ ${op} == "-i" ]] ; then 1455 if [[ ${op} == "-i" ]] ; then
1490 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1491 else 1457 else
1492 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1493 fi 1459 fi
1527 while ((i--)) ; do 1493 while ((i--)) ; do
1528 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1494 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1529 done 1495 done
1530 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1496 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1531 case ${ARCH} in 1497 case ${ARCH} in
1532 x86) export ARCH="i386";; 1498 x86) export ARCH="i386";;
1533 amd64) export ARCH="x86_64";; 1499 amd64) export ARCH="x86_64";;
1534 hppa) export ARCH="parisc";; 1500 hppa) export ARCH="parisc";;
1535 mips) export ARCH="mips";; 1501 mips) export ARCH="mips";;
1536 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! 1502 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!
1537 *) export ARCH="${ARCH}";; 1503 *) export ARCH="${ARCH}";;
1538 esac 1504 esac
1539} 1505}
1540 1506
1541# set's ARCH back to what portage expects 1507# set's ARCH back to what portage expects
1542set_arch_to_portage() { 1508set_arch_to_portage() {
1549 1515
1550# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1551# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1552# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1553# 1519#
1554# These functions are useful when a lib in your package changes --soname. Such 1520# These functions are useful when a lib in your package changes --library. Such
1555# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1521# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1556# would break packages that link against it. Most people get around this 1522# would break packages that link against it. Most people get around this
1557# by using the portage SLOT mechanism, but that is not always a relevant 1523# by using the portage SLOT mechanism, but that is not always a relevant
1558# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1559# 1525#
1586 LIB=$1 1552 LIB=$1
1587 1553
1588 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1554 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1589 SONAME=`basename ${LIB}` 1555 SONAME=`basename ${LIB}`
1590 1556
1591 einfo "An old version of an installed library was detected on your system." 1557 ewarn "An old version of an installed library was detected on your system."
1592 einfo "In order to avoid breaking packages that link against is, this older version" 1558 ewarn "In order to avoid breaking packages that link against it, this older version"
1593 einfo "is not being removed. In order to make full use of this newer version," 1559 ewarn "is not being removed. In order to make full use of this newer version,"
1594 einfo "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1595 einfo " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1596 einfo 1562 ewarn
1597 einfo "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1598 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1599 fi 1565 fi
1600} 1566}
1601 1567
1602# Hack for people to figure out if a package was built with 1568# Hack for people to figure out if a package was built with
1603# certain USE flags 1569# certain USE flags
1613 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1614 1580
1615 local PKG=$(best_version $1) 1581 local PKG=$(best_version $1)
1616 shift 1582 shift
1617 1583
1618 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1584 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1585
1586 # if the USE file doesnt exist, assume the $PKG is either
1587 # injected or package.provided
1619 [[ ! -e ${USEFILE} ]] && return 1 1588 [[ ! -e ${USEFILE} ]] && return 0
1620 1589
1621 local USE_BUILT=$(<${USEFILE}) 1590 local USE_BUILT=$(<${USEFILE})
1622 while [[ $# -gt 0 ]] ; do 1591 while [[ $# -gt 0 ]] ; do
1623 if [[ ${opt} = "-o" ]] ; then 1592 if [[ ${opt} = "-o" ]] ; then
1624 has $1 ${USE_BUILT} && return 0 1593 has $1 ${USE_BUILT} && return 0
1676# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1645# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1677# $5 == path for wrapper 1646# $5 == path for wrapper
1678make_wrapper() { 1647make_wrapper() {
1679 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1648 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1680 local tmpwrapper=$(emktemp) 1649 local tmpwrapper=$(emktemp)
1650 # We don't want to quote ${bin} so that people can pass complex
1651 # things as $bin ... "./someprog --args"
1681 cat << EOF > "${tmpwrapper}" 1652 cat << EOF > "${tmpwrapper}"
1682#!/bin/sh 1653#!/bin/sh
1683cd "${chdir}" 1654cd "${chdir:-.}"
1655if [ -n "${libdir}" ] ; then
1656 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1684export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1657 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1658 else
1659 export LD_LIBRARY_PATH="${libdir}"
1660 fi
1661fi
1685exec ${bin} "\$@" 1662exec ${bin} "\$@"
1686EOF 1663EOF
1687 chmod go+rx "${tmpwrapper}" 1664 chmod go+rx "${tmpwrapper}"
1688 if [ -n "${5}" ] 1665 if [[ -n ${path} ]] ; then
1689 then
1690 exeinto ${5} 1666 exeinto "${path}"
1691 newexe "${tmpwrapper}" "${wrapper}" 1667 newexe "${tmpwrapper}" "${wrapper}"
1692 else 1668 else
1693 newbin "${tmpwrapper}" "${wrapper}" 1669 newbin "${tmpwrapper}" "${wrapper}"
1694 fi 1670 fi
1695} 1671}

Legend:
Removed from v.1.173  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20