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

Diff of /eclass/eutils.eclass

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

Revision 1.172 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.172 2005/05/20 02:09: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"
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 # 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 ]] ; }
170 local PIPE_CMD="" 164 local PIPE_CMD=""
171 local STDERR_TARGET="${T}/$$.out" 165 local STDERR_TARGET="${T}/$$.out"
172 local PATCH_TARGET="${T}/$$.patch" 166 local PATCH_TARGET="${T}/$$.patch"
173 local PATCH_SUFFIX="" 167 local PATCH_SUFFIX=""
174 local SINGLE_PATCH="no" 168 local SINGLE_PATCH="no"
175 local x="" 169 local x=""
170
171 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
176 172
177 if [ "$#" -gt 1 ] 173 if [ "$#" -gt 1 ]
178 then 174 then
179 local m="" 175 local m=""
180 for m in "$@" ; do 176 for m in "$@" ; do
238 ;; 234 ;;
239 esac 235 esac
240 236
241 if [ "${SINGLE_PATCH}" = "no" ] 237 if [ "${SINGLE_PATCH}" = "no" ]
242 then 238 then
243 einfo "Applying various patches (bugfixes/updates) ..." 239 einfo "${EPATCH_MULTI_MSG}"
244 fi 240 fi
245 for x in ${EPATCH_SOURCE} 241 for x in ${EPATCH_SOURCE}
246 do 242 do
247 # New ARCH dependant patch naming scheme ... 243 # New ARCH dependant patch naming scheme ...
248 # 244 #
249 # ???_arch_foo.patch 245 # ???_arch_foo.patch
250 # 246 #
251 if [ -f ${x} ] && \ 247 if [ -f ${x} ] && \
252 ([ "${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}" ] || \
253 [ "${EPATCH_FORCE}" = "yes" ]) 249 [ "${EPATCH_FORCE}" = "yes" ])
254 then 250 then
255 local count=0 251 local count=0
256 local popts="${EPATCH_OPTS}" 252 local popts="${EPATCH_OPTS}"
257 local patchname=${x##*/} 253 local patchname=${x##*/}
281 277
282 # Allow for prefix to differ ... im lazy, so shoot me :/ 278 # Allow for prefix to differ ... im lazy, so shoot me :/
283 while [ "${count}" -lt 5 ] 279 while [ "${count}" -lt 5 ]
284 do 280 do
285 # Generate some useful debug info ... 281 # Generate some useful debug info ...
286 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 284
289 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
290 then 286 then
291 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 287 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 292
297 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 293 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 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##*/}
299 295
300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 297 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
302 298
303 if [ "${PATCH_SUFFIX}" != "patch" ] 299 if [ "${PATCH_SUFFIX}" != "patch" ]
304 then 300 then
305 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
306 then 302 then
310 count=5 306 count=5
311 break 307 break
312 fi 308 fi
313 fi 309 fi
314 310
315 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
316 then 312 then
317 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 313 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
318 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 314 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 315 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 316 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 317 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 318
323 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
324 321
325 if [ "$?" -ne 0 ] 322 if [ "$?" -ne 0 ]
326 then 323 then
327 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##*/}
328 echo 325 echo
367 then 364 then
368 einfo "Done with patching" 365 einfo "Done with patching"
369 fi 366 fi
370} 367}
371 368
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) 369# Cheap replacement for when debianutils (and thus mktemp)
454# does not exist on the users system 370# does not exist on the users system
455# vapier@gentoo.org 371# vapier@gentoo.org
456# 372#
457# Takes just 1 optional parameter (the directory to create tmpfile in) 373# Takes just 1 optional parameter (the directory to create tmpfile in)
458emktemp() { 374emktemp() {
459 local exe="touch" 375 local exe="touch"
460 [ "$1" == "-d" ] && exe="mkdir" && shift 376 [[ $1 == -d ]] && exe="mkdir" && shift
461 local topdir="$1" 377 local topdir=$1
462 378
463 if [ -z "${topdir}" ] 379 if [[ -z ${topdir} ]] ; then
464 then
465 [ -z "${T}" ] \ 380 [[ -z ${T} ]] \
466 && topdir="/tmp" \ 381 && topdir="/tmp" \
467 || topdir="${T}" 382 || topdir=${T}
468 fi 383 fi
469 384
470 if [ -z "$(type -p mktemp)" ] 385 if [[ -z $(type -p mktemp) ]] ; then
471 then
472 local tmp=/ 386 local tmp=/
473 while [ -e "${tmp}" ] ; do 387 while [[ -e ${tmp} ]] ; do
474 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 388 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
475 done 389 done
476 ${exe} "${tmp}" 390 ${exe} "${tmp}" || ${exe} -p "${tmp}"
477 echo "${tmp}" 391 echo "${tmp}"
478 else 392 else
479 [ "${exe}" == "touch" ] \ 393 if [[ ${exe} == "touch" ]] ; then
480 && exe="-p" \ 394 [[ ${USERLAND} == "GNU" ]] \
481 || exe="-d" 395 && mktemp -p "${topdir}" \
482 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
483 fi 402 fi
484} 403}
485 404
486# Small wrapper for getent (Linux), nidump (Mac OS X), 405# Small wrapper for getent (Linux), nidump (Mac OS X),
487# and pw (FreeBSD) used in enewuser()/enewgroup() 406# and pw (FreeBSD) used in enewuser()/enewgroup()
488# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 407# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
489# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 408# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
490# 409#
491# egetent(database, key) 410# egetent(database, key)
492egetent() { 411egetent() {
493 if useq ppc-macos ; then 412 case ${CHOST} in
413 *-darwin*)
494 case "$2" in 414 case "$2" in
495 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
496 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
497 ;; 417 ;;
498 *) # Numeric 418 *) # Numeric
499 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
500 ;; 420 ;;
501 esac 421 esac
502 elif useq x86-fbsd ; then 422 ;;
503 local action 423 *-freebsd*|*-dragonfly*)
504 if [ "$1" == "passwd" ] 424 local opts action="user"
505 then 425 [[ $1 == "passwd" ]] || action="group"
506 action="user" 426
507 else 427 # lookup by uid/gid
508 action="group" 428 if [[ $2 == [[:digit:]]* ]] ; then
429 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
509 fi 430 fi
431
510 pw show "${action}" "$2" -q 432 pw show ${action} ${opts} "$2" -q
511 else 433 ;;
434 *-netbsd*|*-openbsd*)
435 grep "$2:\*:" /etc/$1
436 ;;
437 *)
512 which nscd >& /dev/null && nscd -i "$1" 438 type -p nscd >& /dev/null && nscd -i "$1"
513 getent "$1" "$2" 439 getent "$1" "$2"
514 fi 440 ;;
441 esac
515} 442}
516 443
517# Simplify/standardize adding users to the system 444# Simplify/standardize adding users to the system
518# vapier@gentoo.org 445# vapier@gentoo.org
519# 446#
527# homedir: /dev/null 454# homedir: /dev/null
528# groups: none 455# groups: none
529# extra: comment of 'added by portage for ${PN}' 456# extra: comment of 'added by portage for ${PN}'
530enewuser() { 457enewuser() {
531 # get the username 458 # get the username
532 local euser="$1"; shift 459 local euser=$1; shift
533 if [ -z "${euser}" ] 460 if [[ -z ${euser} ]] ; then
534 then
535 eerror "No username specified !" 461 eerror "No username specified !"
536 die "Cannot call enewuser without a username" 462 die "Cannot call enewuser without a username"
537 fi 463 fi
538 464
539 # lets see if the username already exists 465 # lets see if the username already exists
540 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 466 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
541 then
542 return 0 467 return 0
543 fi 468 fi
544 einfo "Adding user '${euser}' to your system ..." 469 einfo "Adding user '${euser}' to your system ..."
545 470
546 # options to pass to useradd 471 # options to pass to useradd
547 local opts= 472 local opts=
548 473
549 # handle uid 474 # handle uid
550 local euid="$1"; shift 475 local euid=$1; shift
551 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 476 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
552 then
553 if [ "${euid}" -gt 0 ] 477 if [[ ${euid} -gt 0 ]] ; then
554 then
555 if [ ! -z "`egetent passwd ${euid}`" ] 478 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
556 then
557 euid="next" 479 euid="next"
558 fi 480 fi
559 else 481 else
560 eerror "Userid given but is not greater than 0 !" 482 eerror "Userid given but is not greater than 0 !"
561 die "${euid} is not a valid UID" 483 die "${euid} is not a valid UID"
562 fi 484 fi
563 else 485 else
564 euid="next" 486 euid="next"
565 fi 487 fi
566 if [ "${euid}" == "next" ] 488 if [[ ${euid} == "next" ]] ; then
567 then 489 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 490 [[ -z $(egetent passwd ${euid}) ]] && break
576 done 491 done
577 fi 492 fi
578 opts="${opts} -u ${euid}" 493 opts="${opts} -u ${euid}"
579 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
580 495
581 # handle shell 496 # handle shell
582 local eshell="$1"; shift 497 local eshell=$1; shift
583 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
584 then 499 if [[ ! -e ${ROOT}${eshell} ]] ; then
585 if [ ! -e "${eshell}" ]
586 then
587 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
588 die "${eshell} does not exist" 501 die "${eshell} does not exist in ${ROOT}"
589 fi 502 fi
590 else 503 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
591 if [ "${USERLAND}" == "BSD" ] 504 eerror "Do not specify ${eshell} yourself, use -1"
592 then 505 die "Pass '-1' as the shell parameter"
593 eshell="/usr/bin/false" 506 fi
594 else 507 else
595 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"
596 fi 515 fi
516
517 eshell=${shell}
597 fi 518 fi
598 einfo " - Shell: ${eshell}" 519 einfo " - Shell: ${eshell}"
599 opts="${opts} -s ${eshell}" 520 opts="${opts} -s ${eshell}"
600 521
601 # handle homedir 522 # handle homedir
602 local ehome="$1"; shift 523 local ehome=$1; shift
603 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 524 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
604 then
605 ehome="/dev/null" 525 ehome="/dev/null"
606 fi 526 fi
607 einfo " - Home: ${ehome}" 527 einfo " - Home: ${ehome}"
608 opts="${opts} -d ${ehome}" 528 opts="${opts} -d ${ehome}"
609 529
610 # handle groups 530 # handle groups
611 local egroups="$1"; shift 531 local egroups=$1; shift
612 if [ ! -z "${egroups}" ] 532 if [[ ! -z ${egroups} ]] ; then
613 then
614 local oldifs="${IFS}" 533 local oldifs=${IFS}
615 local defgroup="" exgroups="" 534 local defgroup="" exgroups=""
616 535
617 export IFS="," 536 export IFS=","
618 for g in ${egroups} 537 for g in ${egroups} ; do
619 do
620 export IFS="${oldifs}" 538 export IFS=${oldifs}
621 if [ -z "`egetent group \"${g}\"`" ] 539 if [[ -z $(egetent group "${g}") ]] ; then
622 then
623 eerror "You must add group ${g} to the system first" 540 eerror "You must add group ${g} to the system first"
624 die "${g} is not a valid GID" 541 die "${g} is not a valid GID"
625 fi 542 fi
626 if [ -z "${defgroup}" ] 543 if [[ -z ${defgroup} ]] ; then
627 then
628 defgroup="${g}" 544 defgroup=${g}
629 else 545 else
630 exgroups="${exgroups},${g}" 546 exgroups="${exgroups},${g}"
631 fi 547 fi
632 export IFS="," 548 export IFS=","
633 done 549 done
634 export IFS="${oldifs}" 550 export IFS=${oldifs}
635 551
636 opts="${opts} -g ${defgroup}" 552 opts="${opts} -g ${defgroup}"
637 if [ ! -z "${exgroups}" ] 553 if [[ ! -z ${exgroups} ]] ; then
638 then
639 opts="${opts} -G ${exgroups:1}" 554 opts="${opts} -G ${exgroups:1}"
640 fi 555 fi
641 else 556 else
642 egroups="(none)" 557 egroups="(none)"
643 fi 558 fi
644 einfo " - Groups: ${egroups}" 559 einfo " - Groups: ${egroups}"
645 560
646 # handle extra and add the user 561 # handle extra and add the user
647 local eextra="$@"
648 local oldsandbox="${SANDBOX_ON}" 562 local oldsandbox=${SANDBOX_ON}
649 export SANDBOX_ON="0" 563 export SANDBOX_ON="0"
650 if useq ppc-macos 564 case ${CHOST} in
651 then 565 *-darwin*)
652 ### Make the user 566 ### Make the user
653 if [ -z "${eextra}" ] 567 if [[ -z $@ ]] ; then
654 then
655 dscl . create /users/${euser} uid ${euid} 568 dscl . create /users/${euser} uid ${euid}
656 dscl . create /users/${euser} shell ${eshell} 569 dscl . create /users/${euser} shell ${eshell}
657 dscl . create /users/${euser} home ${ehome} 570 dscl . create /users/${euser} home ${ehome}
658 dscl . create /users/${euser} realname "added by portage for ${PN}" 571 dscl . create /users/${euser} realname "added by portage for ${PN}"
659 ### Add the user to the groups specified 572 ### Add the user to the groups specified
660 local oldifs="${IFS}" 573 local oldifs=${IFS}
661 export IFS="," 574 export IFS=","
662 for g in ${egroups} 575 for g in ${egroups} ; do
663 do
664 dscl . merge /groups/${g} users ${euser} 576 dscl . merge /groups/${g} users ${euser}
665 done 577 done
666 export IFS="${oldifs}" 578 export IFS=${oldifs}
667 else 579 else
668 einfo "Extra options are not supported on macos yet" 580 einfo "Extra options are not supported on Darwin yet"
669 einfo "Please report the ebuild along with the info below" 581 einfo "Please report the ebuild along with the info below"
670 einfo "eextra: ${eextra}" 582 einfo "eextra: $@"
671 die "Required function missing" 583 die "Required function missing"
672 fi 584 fi
673 elif use x86-fbsd ; then 585 ;;
674 if [ -z "${eextra}" ] 586 *-freebsd*|*-dragonfly*)
675 then 587 if [[ -z $@ ]] ; then
676 pw useradd ${euser} ${opts} \ 588 pw useradd ${euser} ${opts} \
677 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
678 die "enewuser failed" 590 die "enewuser failed"
679 else 591 else
680 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
681 pw useradd ${euser} ${opts} \ 593 pw useradd ${euser} ${opts} \
682 -c ${eextra} || die "enewuser failed" 594 "$@" || die "enewuser failed"
683 fi 595 fi
596 ;;
597
598 *-netbsd*)
599 if [[ -z $@ ]] ; then
600 useradd ${opts} ${euser} || die "enewuser failed"
684 else 601 else
685 if [ -z "${eextra}" ] 602 einfo " - Extra: $@"
686 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
687 useradd ${opts} ${euser} \ 622 useradd ${opts} ${euser} \
688 -c "added by portage for ${PN}" \ 623 -c "added by portage for ${PN}" \
689 || die "enewuser failed" 624 || die "enewuser failed"
690 else 625 else
691 einfo " - Extra: ${eextra}" 626 einfo " - Extra: $@"
692 useradd ${opts} ${euser} ${eextra} \ 627 useradd ${opts} ${euser} "$@" \
693 || die "enewuser failed" 628 || die "enewuser failed"
694 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}"
695 fi 638 fi
639
696 export SANDBOX_ON="${oldsandbox}" 640 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} 641}
706 642
707# Simplify/standardize adding groups to the system 643# Simplify/standardize adding groups to the system
708# vapier@gentoo.org 644# vapier@gentoo.org
709# 645#
738 then 674 then
739 if [ "${egid}" -gt 0 ] 675 if [ "${egid}" -gt 0 ]
740 then 676 then
741 if [ -z "`egetent group ${egid}`" ] 677 if [ -z "`egetent group ${egid}`" ]
742 then 678 then
743 if useq ppc-macos ; then 679 if [[ "${CHOST}" == *-darwin* ]]; then
744 opts="${opts} ${egid}" 680 opts="${opts} ${egid}"
745 else 681 else
746 opts="${opts} -g ${egid}" 682 opts="${opts} -g ${egid}"
747 fi 683 fi
748 else 684 else
762 opts="${opts} ${eextra}" 698 opts="${opts} ${eextra}"
763 699
764 # add the group 700 # add the group
765 local oldsandbox="${SANDBOX_ON}" 701 local oldsandbox="${SANDBOX_ON}"
766 export SANDBOX_ON="0" 702 export SANDBOX_ON="0"
767 if useq ppc-macos ; then 703 case ${CHOST} in
704 *-darwin*)
768 if [ ! -z "${eextra}" ]; 705 if [ ! -z "${eextra}" ];
769 then 706 then
770 einfo "Extra options are not supported on macos yet" 707 einfo "Extra options are not supported on Darwin/OS X yet"
771 einfo "Please report the ebuild along with the info below" 708 einfo "Please report the ebuild along with the info below"
772 einfo "eextra: ${eextra}" 709 einfo "eextra: ${eextra}"
773 die "Required function missing" 710 die "Required function missing"
774 fi 711 fi
775 712
776 # If we need the next available 713 # If we need the next available
777 case ${egid} in 714 case ${egid} in
778 *[!0-9]*) # Non numeric 715 *[!0-9]*) # Non numeric
779 for egid in `jot 898 101`; do 716 for egid in $(seq 101 999); do
780 [ -z "`egetent group ${egid}`" ] && break 717 [ -z "`egetent group ${egid}`" ] && break
781 done 718 done
782 esac 719 esac
783 dscl . create /groups/${egroup} gid ${egid} 720 dscl . create /groups/${egroup} gid ${egid}
784 dscl . create /groups/${egroup} passwd '*' 721 dscl . create /groups/${egroup} passwd '*'
785 elif use x86-fbsd ; then 722 ;;
723
724 *-freebsd*|*-dragonfly*)
786 case ${egid} in 725 case ${egid} in
787 *[!0-9]*) # Non numeric 726 *[!0-9]*) # Non numeric
788 for egid in `jot 898 101`; do 727 for egid in $(seq 101 999); do
789 [ -z "`egetent group ${egid}`" ] && break 728 [ -z "`egetent group ${egid}`" ] && break
790 done 729 done
791 esac 730 esac
792 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
793 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 *)
794 groupadd ${opts} ${egroup} || die "enewgroup failed" 745 groupadd ${opts} ${egroup} || die "enewgroup failed"
795 fi 746 ;;
747 esac
796 export SANDBOX_ON="${oldsandbox}" 748 export SANDBOX_ON="${oldsandbox}"
797} 749}
798 750
799# Simple script to replace 'dos2unix' binaries 751# Simple script to replace 'dos2unix' binaries
800# vapier@gentoo.org 752# vapier@gentoo.org
825# name: the name that will show up in the menu 777# name: the name that will show up in the menu
826# icon: give your little like a pretty little icon ... 778# icon: give your little like a pretty little icon ...
827# this can be relative (to /usr/share/pixmaps) or 779# this can be relative (to /usr/share/pixmaps) or
828# a full path to an icon 780# a full path to an icon
829# type: what kind of application is this ? for categories: 781# type: what kind of application is this ? for categories:
830# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 782# http://www.freedesktop.org/Standards/desktop-entry-spec
831# path: if your app needs to startup in a specific dir 783# path: if your app needs to startup in a specific dir
832make_desktop_entry() { 784make_desktop_entry() {
833 [[ -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
834 786
835 local exec=${1} 787 local exec=${1}
861 dev) 813 dev)
862 type="Development" 814 type="Development"
863 ;; 815 ;;
864 816
865 games) 817 games)
866 [[ -z ${path} ]] && path=${GAMES_BINDIR}
867
868 case ${catmin} in 818 case ${catmin} in
869 action) type=ActionGame;; 819 action) type=ActionGame;;
870 arcade) type=ArcadeGame;; 820 arcade) type=ArcadeGame;;
871 board) type=BoardGame;; 821 board) type=BoardGame;;
872 kid) type=KidsGame;; 822 kid) type=KidsGame;;
913 type="Network;${type}" 863 type="Network;${type}"
914 ;; 864 ;;
915 865
916 sci) 866 sci)
917 case ${catmin} in 867 case ${catmin} in
918 astro*) type=Astronomoy;; 868 astro*) type=Astronomy;;
919 bio*) type=Biology;; 869 bio*) type=Biology;;
920 calc*) type=Calculator;; 870 calc*) type=Calculator;;
921 chem*) type=Chemistry;; 871 chem*) type=Chemistry;;
922 geo*) type=Geology;; 872 geo*) type=Geology;;
923 math*) type=Math;; 873 math*) type=Math;;
937 *) 887 *)
938 type= 888 type=
939 ;; 889 ;;
940 esac 890 esac
941 fi 891 fi
942 892 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}"
894 else
895 local desktop_name="${PN}-${SLOT}"
896 fi
943 local desktop=${T}/${exec%% *}-${P}.desktop 897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
944 898
945echo "[Desktop Entry] 899echo "[Desktop Entry]
946Encoding=UTF-8 900Encoding=UTF-8
947Version=0.9.2 901Version=0.9.2
948Name=${name} 902Name=${name}
951Exec=${exec} 905Exec=${exec}
952Path=${path} 906Path=${path}
953Icon=${icon} 907Icon=${icon}
954Categories=Application;${type};" > "${desktop}" 908Categories=Application;${type};" > "${desktop}"
955 909
910 (
911 # wrap the env here so that the 'insinto' call
912 # doesn't corrupt the env of the caller
956 insinto /usr/share/applications 913 insinto /usr/share/applications
957 doins "${desktop}" 914 doins "${desktop}"
958 915 )
959 return 0
960} 916}
961 917
962# Make a GDM/KDM Session file 918# Make a GDM/KDM Session file
963# 919#
964# make_desktop_entry(<title>, <command>) 920# make_desktop_entry(<title>, <command>)
993 doins "${i}" 949 doins "${i}"
994 elif [[ -d ${i} ]] ; then 950 elif [[ -d ${i} ]] ; then
995 for j in "${i}"/*.desktop ; do 951 for j in "${i}"/*.desktop ; do
996 doins "${j}" 952 doins "${j}"
997 done 953 done
998 fi 954 fi
999 done 955 done
1000} 956}
1001newmenu() { 957newmenu() {
1002 insinto /usr/share/applications 958 insinto /usr/share/applications
1003 newins "$1" "$2" 959 newins "$1" "$2"
1011 doins "${i}" 967 doins "${i}"
1012 elif [[ -d ${i} ]] ; then 968 elif [[ -d ${i} ]] ; then
1013 for j in "${i}"/*.png ; do 969 for j in "${i}"/*.png ; do
1014 doins "${j}" 970 doins "${j}"
1015 done 971 done
1016 fi 972 fi
1017 done 973 done
1018} 974}
1019newicon() { 975newicon() {
1020 insinto /usr/share/pixmaps 976 insinto /usr/share/pixmaps
1021 newins "$1" "$2" 977 newins "$1" "$2"
1026############################################################## 982##############################################################
1027 983
1028 984
1029# for internal use only (unpack_pdv and unpack_makeself) 985# for internal use only (unpack_pdv and unpack_makeself)
1030find_unpackable_file() { 986find_unpackable_file() {
1031 local src="$1" 987 local src=$1
1032 if [ -z "${src}" ] 988 if [[ -z ${src} ]] ; then
1033 then
1034 src="${DISTDIR}/${A}" 989 src=${DISTDIR}/${A}
1035 else 990 else
1036 if [ -e "${DISTDIR}/${src}" ] 991 if [[ -e ${DISTDIR}/${src} ]] ; then
1037 then
1038 src="${DISTDIR}/${src}" 992 src=${DISTDIR}/${src}
1039 elif [ -e "${PWD}/${src}" ] 993 elif [[ -e ${PWD}/${src} ]] ; then
1040 then
1041 src="${PWD}/${src}" 994 src=${PWD}/${src}
1042 elif [ -e "${src}" ] 995 elif [[ -e ${src} ]] ; then
1043 then
1044 src="${src}" 996 src=${src}
1045 fi
1046 fi 997 fi
1047 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 998 fi
999 [[ ! -e ${src} ]] && return 1
1048 echo "${src}" 1000 echo "${src}"
1049} 1001}
1050 1002
1051# Unpack those pesky pdv generated files ... 1003# Unpack those pesky pdv generated files ...
1052# They're self-unpacking programs with the binary package stuffed in 1004# They're self-unpacking programs with the binary package stuffed in
1067# lseek 1019# lseek
1068# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1020# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1069# lseek(3, -4, SEEK_END) = 2981250 1021# lseek(3, -4, SEEK_END) = 2981250
1070# 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.
1071unpack_pdv() { 1023unpack_pdv() {
1072 local src="`find_unpackable_file $1`" 1024 local src=$(find_unpackable_file $1)
1073 local sizeoff_t="$2" 1025 local sizeoff_t=$2
1074 1026
1027 [[ -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 :(" 1028 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1076 1029
1077 local shrtsrc="`basename ${src}`" 1030 local shrtsrc=$(basename "${src}")
1078 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1031 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1079 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1032 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\"` 1033 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1081 1034
1082 # grab metadata for debug reasons 1035 # grab metadata for debug reasons
1146# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1099# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1147# - If the file is not specified then unpack will utilize ${A}. 1100# - If the file is not specified then unpack will utilize ${A}.
1148# - 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
1149# the proper offset from the script itself. 1102# the proper offset from the script itself.
1150unpack_makeself() { 1103unpack_makeself() {
1104 local src_input=${1:-${A}}
1151 local src="$(find_unpackable_file "$1")" 1105 local src=$(find_unpackable_file "${src_input}")
1152 local skip="$2" 1106 local skip=$2
1153 local exe="$3" 1107 local exe=$3
1154 1108
1109 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1110
1155 local shrtsrc="$(basename "${src}")" 1111 local shrtsrc=$(basename "${src}")
1156 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1112 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1157 if [ -z "${skip}" ] 1113 if [[ -z ${skip} ]] ; then
1158 then
1159 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1114 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1160 local skip=0 1115 local skip=0
1161 exe=tail 1116 exe=tail
1162 case ${ver} in 1117 case ${ver} in
1163 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
1164 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1119 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1176 ;; 1131 ;;
1177 2.1.3) 1132 2.1.3)
1178 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1133 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1179 let skip="skip + 1" 1134 let skip="skip + 1"
1180 ;; 1135 ;;
1181 2.1.4) 1136 2.1.4|2.1.5)
1182 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)
1183 skip=$(head -n ${skip} "${src}" | wc -c) 1138 skip=$(head -n ${skip} "${src}" | wc -c)
1184 exe="dd" 1139 exe="dd"
1185 ;; 1140 ;;
1186 *) 1141 *)
1231check_license() { 1186check_license() {
1232 local lic=$1 1187 local lic=$1
1233 if [ -z "${lic}" ] ; then 1188 if [ -z "${lic}" ] ; then
1234 lic="${PORTDIR}/licenses/${LICENSE}" 1189 lic="${PORTDIR}/licenses/${LICENSE}"
1235 else 1190 else
1236 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1191 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1237 lic="${PORTDIR}/licenses/${src}" 1192 lic="${PORTDIR}/licenses/${lic}"
1238 elif [ -e "${PWD}/${src}" ] ; then 1193 elif [ -e "${PWD}/${lic}" ] ; then
1239 lic="${PWD}/${src}" 1194 lic="${PWD}/${lic}"
1240 elif [ -e "${src}" ] ; then 1195 elif [ -e "${lic}" ] ; then
1241 lic="${src}" 1196 lic="${lic}"
1242 fi
1243 fi 1197 fi
1198 fi
1244 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1199 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1245 local l="`basename ${lic}`" 1200 local l="`basename ${lic}`"
1246 1201
1247 # here is where we check for the licenses the user already 1202 # 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 1203 # accepted ... if we don't find a match, we make the user accept
1249 local shopts=$- 1204 local shopts=$-
1305 # 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
1306 # the # of files they gave us 1261 # the # of files they gave us
1307 local cdcnt=0 1262 local cdcnt=0
1308 local f= 1263 local f=
1309 for f in "$@" ; do 1264 for f in "$@" ; do
1310 cdcnt=$((cdcnt + 1)) 1265 ((++cdcnt))
1311 export CDROM_CHECK_${cdcnt}="$f" 1266 export CDROM_CHECK_${cdcnt}="$f"
1312 done 1267 done
1313 export CDROM_TOTAL_CDS=${cdcnt} 1268 export CDROM_TOTAL_CDS=${cdcnt}
1314 export CDROM_CURRENT_CD=1 1269 export CDROM_CURRENT_CD=1
1315 1270
1316 # now we see if the user gave use CD_ROOT ... 1271 # now we see if the user gave use CD_ROOT ...
1317 # 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
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 1273 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1325 local var= 1274 local var=
1326 cdcnt=0 1275 cdcnt=0
1327 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1276 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1328 cdcnt=$((cdcnt + 1)) 1277 ((++cdcnt))
1329 var="CD_ROOT_${cdcnt}" 1278 var="CD_ROOT_${cdcnt}"
1279 [[ -z ${!var} ]] && var="CD_ROOT"
1330 if [[ -z ${!var} ]] ; then 1280 if [[ -z ${!var} ]] ; then
1331 eerror "You must either use just the CD_ROOT" 1281 eerror "You must either use just the CD_ROOT"
1332 eerror "or specify ALL the CD_ROOT_X variables." 1282 eerror "or specify ALL the CD_ROOT_X variables."
1333 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."
1334 die "could not locate CD_ROOT_${cdcnt}" 1284 die "could not locate CD_ROOT_${cdcnt}"
1335 fi 1285 fi
1336 export CDROM_ROOTS_${cdcnt}="${!var}"
1337 done 1286 done
1338 export CDROM_ROOT=${CDROM_ROOTS_1} 1287 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1339 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}
1340 return 1295 return
1341 fi 1296 fi
1342 1297
1298 # User didn't help us out so lets make sure they know they can
1299 # simplify the whole process ...
1343 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1300 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1344 einfon "This ebuild will need the " 1301 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 1302 echo
1351 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"
1352 einfo "mounted somewhere on your filesystem, just export" 1304 einfo "mounted somewhere on your filesystem, just export"
1353 einfo "the variable CD_ROOT so that it points to the" 1305 einfo "the variable CD_ROOT so that it points to the"
1354 einfo "directory containing the files." 1306 einfo "directory containing the files."
1358 echo 1310 echo
1359 else 1311 else
1360 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1312 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1361 cdcnt=0 1313 cdcnt=0
1362 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1314 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1363 cdcnt=$((cdcnt + 1)) 1315 ((++cdcnt))
1364 var="CDROM_NAME_${cdcnt}" 1316 var="CDROM_NAME_${cdcnt}"
1365 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1317 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1366 done 1318 done
1367 echo 1319 echo
1368 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"
1369 einfo "mounted somewhere on your filesystem, just export" 1321 einfo "mounted somewhere on your filesystem, just export"
1370 einfo "the following variables so they point to the right place:" 1322 einfo "the following variables so they point to the right place:"
1371 einfon "" 1323 einfon ""
1372 cdcnt=0 1324 cdcnt=0
1373 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1325 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1374 cdcnt=$((cdcnt + 1)) 1326 ((++cdcnt))
1375 echo -n " CD_ROOT_${cdcnt}" 1327 echo -n " CD_ROOT_${cdcnt}"
1376 done 1328 done
1377 echo 1329 echo
1378 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"
1379 einfo "you only have one cdrom, you can export CD_ROOT" 1331 einfo "you only have one cdrom, you can export CD_ROOT"
1382 echo 1334 echo
1383 einfo "For example:" 1335 einfo "For example:"
1384 einfo "export CD_ROOT_1=/mnt/cdrom" 1336 einfo "export CD_ROOT_1=/mnt/cdrom"
1385 echo 1337 echo
1386 fi 1338 fi
1339
1340 export CDROM_SET=""
1387 export CDROM_CURRENT_CD=0 1341 export CDROM_CURRENT_CD=0
1388 cdrom_load_next_cd 1342 cdrom_load_next_cd
1389} 1343}
1390 1344
1391# 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.
1392# 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.
1393# 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.
1394# 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.
1395cdrom_load_next_cd() { 1349cdrom_load_next_cd() {
1396 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1397 local var= 1350 local var
1398 1351 ((++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 1352
1404 unset CDROM_ROOT 1353 unset CDROM_ROOT
1405 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1354 var=CD_ROOT_${CDROM_CURRENT_CD}
1355 [[ -z ${!var} ]] && var="CD_ROOT"
1406 if [[ -z ${!var} ]] ; then 1356 if [[ -z ${!var} ]] ; then
1407 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1357 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1408 cdrom_locate_file_on_cd ${!var} 1358 _cdrom_locate_file_on_cd ${!var}
1409 else 1359 else
1410 export CDROM_ROOT=${!var} 1360 export CDROM_ROOT=${!var}
1411 fi 1361 fi
1412 1362
1413 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1363 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 1368# 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 1369# found, then a message asking for the user to insert the cdrom will be
1420# displayed and we'll hang out here until: 1370# displayed and we'll hang out here until:
1421# (1) the file is found on a mounted cdrom 1371# (1) the file is found on a mounted cdrom
1422# (2) the user hits CTRL+C 1372# (2) the user hits CTRL+C
1423cdrom_locate_file_on_cd() { 1373_cdrom_locate_file_on_cd() {
1374 local mline=""
1375 local showedmsg=0
1376
1424 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
1425 local dir="$(dirname ${@})" 1385 local dir=$(dirname ${cdset[${i}]})
1426 local file="$(basename ${@})" 1386 local file=$(basename ${cdset[${i}]})
1427 local mline=""
1428 local showedmsg=0
1429 1387
1430 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
1431 [[ -d ${mline}/${dir} ]] || continue 1389 [[ -d ${mline}/${dir} ]] || continue
1432 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1390 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1433 && 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))
1434 done 1399 done
1435 1400
1436 if [[ -z ${CDROM_ROOT} ]] ; then
1437 echo 1401 echo
1438 if [[ ${showedmsg} -eq 0 ]] ; then 1402 if [[ ${showedmsg} -eq 0 ]] ; then
1439 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1403 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1440 if [[ -z ${CDROM_NAME} ]] ; then 1404 if [[ -z ${CDROM_NAME} ]] ; then
1441 einfo "Please insert the cdrom for ${PN} now !" 1405 einfo "Please insert+mount the cdrom for ${PN} now !"
1442 else
1443 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1444 fi
1445 else 1406 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 !" 1407 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1451 fi
1452 fi 1408 fi
1453 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
1454 fi 1416 fi
1417 showedmsg=1
1418 fi
1455 einfo "Press return to scan for the cd again" 1419 einfo "Press return to scan for the cd again"
1456 einfo "or hit CTRL+C to abort the emerge." 1420 einfo "or hit CTRL+C to abort the emerge."
1457 read 1421 echo
1458 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"
1459 done 1427 done
1460} 1428}
1461 1429
1462# Make sure that LINGUAS only contains languages that 1430# Make sure that LINGUAS only contains languages that
1463# a package can support 1431# a package can support
1473# directories and uses the union of the lists. 1441# directories and uses the union of the lists.
1474strip-linguas() { 1442strip-linguas() {
1475 local ls newls 1443 local ls newls
1476 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1444 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1477 local op=$1; shift 1445 local op=$1; shift
1478 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1446 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1479 local d f 1447 local d f
1480 for d in "$@" ; do 1448 for d in "$@" ; do
1481 if [[ ${op} == "-u" ]] ; then 1449 if [[ ${op} == "-u" ]] ; then
1482 newls=${ls} 1450 newls=${ls}
1483 else 1451 else
1484 newls="" 1452 newls=""
1485 fi 1453 fi
1486 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1454 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1487 if [[ ${op} == "-i" ]] ; then 1455 if [[ ${op} == "-i" ]] ; then
1488 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1489 else 1457 else
1490 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1458 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1491 fi 1459 fi
1525 while ((i--)) ; do 1493 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1494 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done 1495 done
1528 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1496 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1529 case ${ARCH} in 1497 case ${ARCH} in
1530 x86) export ARCH="i386";; 1498 x86) export ARCH="i386";;
1531 amd64) export ARCH="x86_64";; 1499 amd64) export ARCH="x86_64";;
1532 hppa) export ARCH="parisc";; 1500 hppa) export ARCH="parisc";;
1533 mips) export ARCH="mips";; 1501 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! 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!
1535 *) export ARCH="${ARCH}";; 1503 *) export ARCH="${ARCH}";;
1536 esac 1504 esac
1537} 1505}
1538 1506
1539# set's ARCH back to what portage expects 1507# set's ARCH back to what portage expects
1540set_arch_to_portage() { 1508set_arch_to_portage() {
1547 1515
1548# Jeremy Huddleston <eradicator@gentoo.org>: 1516# Jeremy Huddleston <eradicator@gentoo.org>:
1549# preserve_old_lib /path/to/libblah.so.0 1517# preserve_old_lib /path/to/libblah.so.0
1550# preserve_old_lib_notify /path/to/libblah.so.0 1518# preserve_old_lib_notify /path/to/libblah.so.0
1551# 1519#
1552# 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
1553# 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
1554# 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
1555# 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
1556# solution, so instead you can add the following to your ebuilds: 1524# solution, so instead you can add the following to your ebuilds:
1557# 1525#
1584 LIB=$1 1552 LIB=$1
1585 1553
1586 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1554 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1587 SONAME=`basename ${LIB}` 1555 SONAME=`basename ${LIB}`
1588 1556
1589 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."
1590 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"
1591 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,"
1592 einfo "you will need to execute the following command:" 1560 ewarn "you will need to execute the following command:"
1593 einfo " revdep-rebuild --soname ${SONAME}" 1561 ewarn " revdep-rebuild --library ${SONAME}"
1594 einfo 1562 ewarn
1595 einfo "After doing that, you can safely remove ${LIB}" 1563 ewarn "After doing that, you can safely remove ${LIB}"
1596 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1564 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1597 fi 1565 fi
1598} 1566}
1599 1567
1600# 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
1601# certain USE flags 1569# certain USE flags
1611 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1579 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1612 1580
1613 local PKG=$(best_version $1) 1581 local PKG=$(best_version $1)
1614 shift 1582 shift
1615 1583
1616 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
1617 [[ ! -e ${USEFILE} ]] && return 1 1588 [[ ! -e ${USEFILE} ]] && return 0
1618 1589
1619 local USE_BUILT=$(<${USEFILE}) 1590 local USE_BUILT=$(<${USEFILE})
1620 while [[ $# -gt 0 ]] ; do 1591 while [[ $# -gt 0 ]] ; do
1621 if [[ ${opt} = "-o" ]] ; then 1592 if [[ ${opt} = "-o" ]] ; then
1622 has $1 ${USE_BUILT} && return 0 1593 has $1 ${USE_BUILT} && return 0
1674# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1645# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1675# $5 == path for wrapper 1646# $5 == path for wrapper
1676make_wrapper() { 1647make_wrapper() {
1677 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1648 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1678 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"
1679 cat << EOF > "${tmpwrapper}" 1652 cat << EOF > "${tmpwrapper}"
1680#!/bin/sh 1653#!/bin/sh
1681cd "${chdir}" 1654cd "${chdir:-.}"
1655if [ -n "${libdir}" ] ; then
1656 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1682export 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
1683exec ${bin} "\$@" 1662exec ${bin} "\$@"
1684EOF 1663EOF
1685 chmod go+rx "${tmpwrapper}" 1664 chmod go+rx "${tmpwrapper}"
1686 if [ -n "${5}" ] 1665 if [[ -n ${path} ]] ; then
1687 then
1688 exeinto ${5} 1666 exeinto "${path}"
1689 newexe "${tmpwrapper}" "${wrapper}" 1667 newexe "${tmpwrapper}" "${wrapper}"
1690 else 1668 else
1691 newbin "${tmpwrapper}" "${wrapper}" 1669 newbin "${tmpwrapper}" "${wrapper}"
1692 fi 1670 fi
1693} 1671}

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

  ViewVC Help
Powered by ViewVC 1.1.20