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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.171  
changed lines
  Added in v.1.223

  ViewVC Help
Powered by ViewVC 1.1.20