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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20