/[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.233
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.233 2006/04/19 03:53:19 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 )"
15RDEPEND=""
16# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 17
18DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
19 19
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 20# 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 21# 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. 61# to point to the latest version of the library present.
62# 62#
63# <azarah@gentoo.org> (26 Oct 2002) 63# <azarah@gentoo.org> (26 Oct 2002)
64# 64#
65gen_usr_ldscript() { 65gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 66 local lib libdir=$(get_libdir)
67 # Just make sure it exists 67 # Just make sure it exists
68 dodir /usr/${libdir} 68 dodir /usr/${libdir}
69 69
70 for lib in "${@}" ; do 70 for lib in "${@}" ; do
71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
72 /* GNU ld script 72 /* GNU ld script
73 Since Gentoo has critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
74 in /lib, and the static versions in /usr/lib, 74 in /lib, and the static versions in /usr/lib,
75 we need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
76 otherwise we run into linking problems. 76 otherwise we run into linking problems.
77 77
78 See bug http://bugs.gentoo.org/4411 for more info. 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */ 79 */
80 GROUP ( /${libdir}/${lib} ) 80 GROUP ( /${libdir}/${lib} )
81 END_LDSCRIPT 81 END_LDSCRIPT
82 fperms a+x "/usr/${libdir}/${lib}" 82 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
83 done 83 done
84} 84}
85 85
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 86
117# Default directory where patches are located 87# Default directory where patches are located
118EPATCH_SOURCE="${WORKDIR}/patch" 88EPATCH_SOURCE="${WORKDIR}/patch"
119# Default extension for patches 89# Default extension for patches
120EPATCH_SUFFIX="patch.bz2" 90EPATCH_SUFFIX="patch.bz2"
121# Default options for patch 91# Default options for patch
122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 92# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
123EPATCH_OPTS="-g0" 93# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
94# Set -E to automatically remove empty files.
95EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 96# List of patches not to apply. Not this is only file names,
125# and not the full path .. 97# and not the full path ..
126EPATCH_EXCLUDE="" 98EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 99# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 100EPATCH_SINGLE_MSG=""
101# Change the printed message for multiple patches.
102EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
129# Force applying bulk patches even if not following the style: 103# Force applying bulk patches even if not following the style:
130# 104#
131# ??_${ARCH}_foo.${EPATCH_SUFFIX} 105# ??_${ARCH}_foo.${EPATCH_SUFFIX}
132# 106#
133EPATCH_FORCE="no" 107EPATCH_FORCE="no"
164# hand its a directory, it will set EPATCH_SOURCE to this. 138# hand its a directory, it will set EPATCH_SOURCE to this.
165# 139#
166# <azarah@gentoo.org> (10 Nov 2002) 140# <azarah@gentoo.org> (10 Nov 2002)
167# 141#
168epatch() { 142epatch() {
143 _epatch_draw_line() {
144 [[ -z $1 ]] && set "$(printf "%65s" '')"
145 echo "${1//?/=}"
146 }
147 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
169 local PIPE_CMD="" 148 local PIPE_CMD=""
170 local STDERR_TARGET="${T}/$$.out" 149 local STDERR_TARGET="${T}/$$.out"
171 local PATCH_TARGET="${T}/$$.patch" 150 local PATCH_TARGET="${T}/$$.patch"
172 local PATCH_SUFFIX="" 151 local PATCH_SUFFIX=""
173 local SINGLE_PATCH="no" 152 local SINGLE_PATCH="no"
174 local x="" 153 local x=""
154
155 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
175 156
176 if [ "$#" -gt 1 ] 157 if [ "$#" -gt 1 ]
177 then 158 then
178 local m="" 159 local m=""
179 for m in "$@" ; do 160 for m in "$@" ; do
237 ;; 218 ;;
238 esac 219 esac
239 220
240 if [ "${SINGLE_PATCH}" = "no" ] 221 if [ "${SINGLE_PATCH}" = "no" ]
241 then 222 then
242 einfo "Applying various patches (bugfixes/updates) ..." 223 einfo "${EPATCH_MULTI_MSG}"
243 fi 224 fi
244 for x in ${EPATCH_SOURCE} 225 for x in ${EPATCH_SOURCE}
245 do 226 do
246 # New ARCH dependant patch naming scheme ... 227 # New ARCH dependant patch naming scheme ...
247 # 228 #
248 # ???_arch_foo.patch 229 # ???_arch_foo.patch
249 # 230 #
250 if [ -f ${x} ] && \ 231 if [ -f ${x} ] && \
251 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 232 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
252 [ "${EPATCH_FORCE}" = "yes" ]) 233 [ "${EPATCH_FORCE}" = "yes" ])
253 then 234 then
254 local count=0 235 local count=0
255 local popts="${EPATCH_OPTS}" 236 local popts="${EPATCH_OPTS}"
256 local patchname=${x##*/} 237 local patchname=${x##*/}
280 261
281 # Allow for prefix to differ ... im lazy, so shoot me :/ 262 # Allow for prefix to differ ... im lazy, so shoot me :/
282 while [ "${count}" -lt 5 ] 263 while [ "${count}" -lt 5 ]
283 do 264 do
284 # Generate some useful debug info ... 265 # Generate some useful debug info ...
285 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 266 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 267 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 268
288 if [ "${PATCH_SUFFIX}" != "patch" ] 269 if [ "${PATCH_SUFFIX}" != "patch" ]
289 then 270 then
290 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 276
296 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 279
299 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 281 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
301 282
302 if [ "${PATCH_SUFFIX}" != "patch" ] 283 if [ "${PATCH_SUFFIX}" != "patch" ]
303 then 284 then
304 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 285 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
305 then 286 then
309 count=5 290 count=5
310 break 291 break
311 fi 292 fi
312 fi 293 fi
313 294
314 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 295 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
315 then 296 then
316 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
318 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 301 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 302
322 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 303 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
304 _epatch_assert
323 305
324 if [ "$?" -ne 0 ] 306 if [ "$?" -ne 0 ]
325 then 307 then
326 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 308 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 echo 309 echo
366 then 348 then
367 einfo "Done with patching" 349 einfo "Done with patching"
368 fi 350 fi
369} 351}
370 352
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) 353# Cheap replacement for when debianutils (and thus mktemp)
498# does not exist on the users system 354# does not exist on the users system
499# vapier@gentoo.org 355# vapier@gentoo.org
500# 356#
501# Takes just 1 optional parameter (the directory to create tmpfile in) 357# Takes just 1 optional parameter (the directory to create tmpfile in)
502emktemp() { 358emktemp() {
503 local exe="touch" 359 local exe="touch"
504 [ "$1" == "-d" ] && exe="mkdir" && shift 360 [[ $1 == -d ]] && exe="mkdir" && shift
505 local topdir="$1" 361 local topdir=$1
506 362
507 if [ -z "${topdir}" ] 363 if [[ -z ${topdir} ]] ; then
508 then
509 [ -z "${T}" ] \ 364 [[ -z ${T} ]] \
510 && topdir="/tmp" \ 365 && topdir="/tmp" \
511 || topdir="${T}" 366 || topdir=${T}
512 fi 367 fi
513 368
514 if [ -z "$(type -p mktemp)" ] 369 if [[ -z $(type -p mktemp) ]] ; then
515 then
516 local tmp=/ 370 local tmp=/
517 while [ -e "${tmp}" ] ; do 371 while [[ -e ${tmp} ]] ; do
518 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 372 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
519 done 373 done
520 ${exe} "${tmp}" 374 ${exe} "${tmp}" || ${exe} -p "${tmp}"
521 echo "${tmp}" 375 echo "${tmp}"
522 else 376 else
523 [ "${exe}" == "touch" ] \ 377 if [[ ${exe} == "touch" ]] ; then
524 && exe="-p" \ 378 [[ ${USERLAND} == "GNU" ]] \
525 || exe="-d" 379 && mktemp -p "${topdir}" \
526 mktemp ${exe} "${topdir}" 380 || TMPDIR="${topdir}" mktemp -t tmp
381 else
382 [[ ${USERLAND} == "GNU" ]] \
383 && mktemp -d "${topdir}" \
384 || TMPDIR="${topdir}" mktemp -dt tmp
385 fi
527 fi 386 fi
528} 387}
529 388
530# Small wrapper for getent (Linux), nidump (Mac OS X), 389# Small wrapper for getent (Linux), nidump (Mac OS X),
531# and pw (FreeBSD) used in enewuser()/enewgroup() 390# and pw (FreeBSD) used in enewuser()/enewgroup()
532# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 391# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
533# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 392# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
534# 393#
535# egetent(database, key) 394# egetent(database, key)
536egetent() { 395egetent() {
537 if useq ppc-macos ; then 396 case ${CHOST} in
397 *-darwin*)
538 case "$2" in 398 case "$2" in
539 *[!0-9]*) # Non numeric 399 *[!0-9]*) # Non numeric
540 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 400 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
541 ;; 401 ;;
542 *) # Numeric 402 *) # Numeric
543 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 403 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
544 ;; 404 ;;
545 esac 405 esac
546 elif useq x86-fbsd ; then 406 ;;
547 local action 407 *-freebsd*|*-dragonfly*)
548 if [ "$1" == "passwd" ] 408 local opts action="user"
549 then 409 [[ $1 == "passwd" ]] || action="group"
550 action="user" 410
551 else 411 # lookup by uid/gid
552 action="group" 412 if [[ $2 == [[:digit:]]* ]] ; then
413 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
553 fi 414 fi
415
554 pw show "${action}" "$2" -q 416 pw show ${action} ${opts} "$2" -q
555 else 417 ;;
418 *-netbsd*|*-openbsd*)
419 grep "$2:\*:" /etc/$1
420 ;;
421 *)
556 which nscd >& /dev/null && nscd -i "$1" 422 type -p nscd >& /dev/null && nscd -i "$1"
557 getent "$1" "$2" 423 getent "$1" "$2"
558 fi 424 ;;
425 esac
559} 426}
560 427
561# Simplify/standardize adding users to the system 428# Simplify/standardize adding users to the system
562# vapier@gentoo.org 429# vapier@gentoo.org
563# 430#
570# shell: /bin/false 437# shell: /bin/false
571# homedir: /dev/null 438# homedir: /dev/null
572# groups: none 439# groups: none
573# extra: comment of 'added by portage for ${PN}' 440# extra: comment of 'added by portage for ${PN}'
574enewuser() { 441enewuser() {
442 case ${EBUILD_PHASE} in
443 unpack|compile|test|install)
444 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
445 eerror "Package fails at QA and at life. Please file a bug."
446 die "Bad package! enewuser is only for use in pkg_* functions!"
447 esac
448
575 # get the username 449 # get the username
576 local euser="$1"; shift 450 local euser=$1; shift
577 if [ -z "${euser}" ] 451 if [[ -z ${euser} ]] ; then
578 then
579 eerror "No username specified !" 452 eerror "No username specified !"
580 die "Cannot call enewuser without a username" 453 die "Cannot call enewuser without a username"
581 fi 454 fi
582 455
583 # lets see if the username already exists 456 # lets see if the username already exists
584 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 457 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
585 then
586 return 0 458 return 0
587 fi 459 fi
588 einfo "Adding user '${euser}' to your system ..." 460 einfo "Adding user '${euser}' to your system ..."
589 461
590 # options to pass to useradd 462 # options to pass to useradd
591 local opts= 463 local opts=
592 464
593 # handle uid 465 # handle uid
594 local euid="$1"; shift 466 local euid=$1; shift
595 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 467 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
596 then
597 if [ "${euid}" -gt 0 ] 468 if [[ ${euid} -gt 0 ]] ; then
598 then
599 if [ ! -z "`egetent passwd ${euid}`" ] 469 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
600 then
601 euid="next" 470 euid="next"
602 fi 471 fi
603 else 472 else
604 eerror "Userid given but is not greater than 0 !" 473 eerror "Userid given but is not greater than 0 !"
605 die "${euid} is not a valid UID" 474 die "${euid} is not a valid UID"
606 fi 475 fi
607 else 476 else
608 euid="next" 477 euid="next"
609 fi 478 fi
610 if [ "${euid}" == "next" ] 479 if [[ ${euid} == "next" ]] ; then
611 then 480 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 481 [[ -z $(egetent passwd ${euid}) ]] && break
620 done 482 done
621 fi 483 fi
622 opts="${opts} -u ${euid}" 484 opts="${opts} -u ${euid}"
623 einfo " - Userid: ${euid}" 485 einfo " - Userid: ${euid}"
624 486
625 # handle shell 487 # handle shell
626 local eshell="$1"; shift 488 local eshell=$1; shift
627 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 489 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
628 then 490 if [[ ! -e ${ROOT}${eshell} ]] ; then
629 if [ ! -e "${eshell}" ]
630 then
631 eerror "A shell was specified but it does not exist !" 491 eerror "A shell was specified but it does not exist !"
632 die "${eshell} does not exist" 492 die "${eshell} does not exist in ${ROOT}"
633 fi 493 fi
634 else 494 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
635 if [ "${USERLAND}" == "BSD" ] 495 eerror "Do not specify ${eshell} yourself, use -1"
636 then 496 die "Pass '-1' as the shell parameter"
637 eshell="/usr/bin/false" 497 fi
638 else 498 else
639 eshell="/bin/false" 499 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
500 [[ -x ${ROOT}${shell} ]] && break
501 done
502
503 if [[ ${shell} == "/dev/null" ]] ; then
504 eerror "Unable to identify the shell to use"
505 die "Unable to identify the shell to use"
640 fi 506 fi
507
508 eshell=${shell}
641 fi 509 fi
642 einfo " - Shell: ${eshell}" 510 einfo " - Shell: ${eshell}"
643 opts="${opts} -s ${eshell}" 511 opts="${opts} -s ${eshell}"
644 512
645 # handle homedir 513 # handle homedir
646 local ehome="$1"; shift 514 local ehome=$1; shift
647 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 515 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
648 then
649 ehome="/dev/null" 516 ehome="/dev/null"
650 fi 517 fi
651 einfo " - Home: ${ehome}" 518 einfo " - Home: ${ehome}"
652 opts="${opts} -d ${ehome}" 519 opts="${opts} -d ${ehome}"
653 520
654 # handle groups 521 # handle groups
655 local egroups="$1"; shift 522 local egroups=$1; shift
656 if [ ! -z "${egroups}" ] 523 if [[ ! -z ${egroups} ]] ; then
657 then
658 local oldifs="${IFS}" 524 local oldifs=${IFS}
659 local defgroup="" exgroups="" 525 local defgroup="" exgroups=""
660 526
661 export IFS="," 527 export IFS=","
662 for g in ${egroups} 528 for g in ${egroups} ; do
663 do
664 export IFS="${oldifs}" 529 export IFS=${oldifs}
665 if [ -z "`egetent group \"${g}\"`" ] 530 if [[ -z $(egetent group "${g}") ]] ; then
666 then
667 eerror "You must add group ${g} to the system first" 531 eerror "You must add group ${g} to the system first"
668 die "${g} is not a valid GID" 532 die "${g} is not a valid GID"
669 fi 533 fi
670 if [ -z "${defgroup}" ] 534 if [[ -z ${defgroup} ]] ; then
671 then
672 defgroup="${g}" 535 defgroup=${g}
673 else 536 else
674 exgroups="${exgroups},${g}" 537 exgroups="${exgroups},${g}"
675 fi 538 fi
676 export IFS="," 539 export IFS=","
677 done 540 done
678 export IFS="${oldifs}" 541 export IFS=${oldifs}
679 542
680 opts="${opts} -g ${defgroup}" 543 opts="${opts} -g ${defgroup}"
681 if [ ! -z "${exgroups}" ] 544 if [[ ! -z ${exgroups} ]] ; then
682 then
683 opts="${opts} -G ${exgroups:1}" 545 opts="${opts} -G ${exgroups:1}"
684 fi 546 fi
685 else 547 else
686 egroups="(none)" 548 egroups="(none)"
687 fi 549 fi
688 einfo " - Groups: ${egroups}" 550 einfo " - Groups: ${egroups}"
689 551
690 # handle extra and add the user 552 # handle extra and add the user
691 local eextra="$@"
692 local oldsandbox="${SANDBOX_ON}" 553 local oldsandbox=${SANDBOX_ON}
693 export SANDBOX_ON="0" 554 export SANDBOX_ON="0"
694 if useq ppc-macos 555 case ${CHOST} in
695 then 556 *-darwin*)
696 ### Make the user 557 ### Make the user
697 if [ -z "${eextra}" ] 558 if [[ -z $@ ]] ; then
698 then
699 dscl . create /users/${euser} uid ${euid} 559 dscl . create /users/${euser} uid ${euid}
700 dscl . create /users/${euser} shell ${eshell} 560 dscl . create /users/${euser} shell ${eshell}
701 dscl . create /users/${euser} home ${ehome} 561 dscl . create /users/${euser} home ${ehome}
702 dscl . create /users/${euser} realname "added by portage for ${PN}" 562 dscl . create /users/${euser} realname "added by portage for ${PN}"
703 ### Add the user to the groups specified 563 ### Add the user to the groups specified
704 local oldifs="${IFS}" 564 local oldifs=${IFS}
705 export IFS="," 565 export IFS=","
706 for g in ${egroups} 566 for g in ${egroups} ; do
707 do
708 dscl . merge /groups/${g} users ${euser} 567 dscl . merge /groups/${g} users ${euser}
709 done 568 done
710 export IFS="${oldifs}" 569 export IFS=${oldifs}
711 else 570 else
712 einfo "Extra options are not supported on macos yet" 571 einfo "Extra options are not supported on Darwin yet"
713 einfo "Please report the ebuild along with the info below" 572 einfo "Please report the ebuild along with the info below"
714 einfo "eextra: ${eextra}" 573 einfo "eextra: $@"
715 die "Required function missing" 574 die "Required function missing"
716 fi 575 fi
717 elif use x86-fbsd ; then 576 ;;
718 if [ -z "${eextra}" ] 577 *-freebsd*|*-dragonfly*)
719 then 578 if [[ -z $@ ]] ; then
720 pw useradd ${euser} ${opts} \ 579 pw useradd ${euser} ${opts} \
721 -c "added by portage for ${PN}" \ 580 -c "added by portage for ${PN}" \
722 die "enewuser failed" 581 die "enewuser failed"
723 else 582 else
724 einfo " - Extra: ${eextra}" 583 einfo " - Extra: $@"
725 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
726 -c ${eextra} || die "enewuser failed" 585 "$@" || die "enewuser failed"
727 fi 586 fi
587 ;;
588
589 *-netbsd*)
590 if [[ -z $@ ]] ; then
591 useradd ${opts} ${euser} || die "enewuser failed"
728 else 592 else
729 if [ -z "${eextra}" ] 593 einfo " - Extra: $@"
730 then 594 useradd ${opts} ${euser} "$@" || die "enewuser failed"
595 fi
596 ;;
597
598 *-openbsd*)
599 if [[ -z $@ ]] ; then
600 useradd -u ${euid} -s ${eshell} \
601 -d ${ehome} -c "Added by portage for ${PN}" \
602 -g ${egroups} ${euser} || die "enewuser failed"
603 else
604 einfo " - Extra: $@"
605 useradd -u ${euid} -s ${eshell} \
606 -d ${ehome} -c "Added by portage for ${PN}" \
607 -g ${egroups} ${euser} "$@" || die "enewuser failed"
608 fi
609 ;;
610
611 *)
612 if [[ -z $@ ]] ; then
731 useradd ${opts} ${euser} \ 613 useradd ${opts} ${euser} \
732 -c "added by portage for ${PN}" \ 614 -c "added by portage for ${PN}" \
733 || die "enewuser failed" 615 || die "enewuser failed"
734 else 616 else
735 einfo " - Extra: ${eextra}" 617 einfo " - Extra: $@"
736 useradd ${opts} ${euser} ${eextra} \ 618 useradd ${opts} ${euser} "$@" \
737 || die "enewuser failed" 619 || die "enewuser failed"
738 fi 620 fi
621 ;;
622 esac
623
624 if [[ ! -e ${ROOT}/${ehome} ]] ; then
625 einfo " - Creating ${ehome} in ${ROOT}"
626 mkdir -p "${ROOT}/${ehome}"
627 chown ${euser} "${ROOT}/${ehome}"
628 chmod 755 "${ROOT}/${ehome}"
739 fi 629 fi
630
740 export SANDBOX_ON="${oldsandbox}" 631 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} 632}
750 633
751# Simplify/standardize adding groups to the system 634# Simplify/standardize adding groups to the system
752# vapier@gentoo.org 635# vapier@gentoo.org
753# 636#
756# Default values if you do not specify any: 639# Default values if you do not specify any:
757# groupname: REQUIRED ! 640# groupname: REQUIRED !
758# gid: next available (see groupadd(8)) 641# gid: next available (see groupadd(8))
759# extra: none 642# extra: none
760enewgroup() { 643enewgroup() {
644 case ${EBUILD_PHASE} in
645 unpack|compile|test|install)
646 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
647 eerror "Package fails at QA and at life. Please file a bug."
648 die "Bad package! enewgroup is only for use in pkg_* functions!"
649 esac
650
761 # get the group 651 # get the group
762 local egroup="$1"; shift 652 local egroup="$1"; shift
763 if [ -z "${egroup}" ] 653 if [ -z "${egroup}" ]
764 then 654 then
765 eerror "No group specified !" 655 eerror "No group specified !"
782 then 672 then
783 if [ "${egid}" -gt 0 ] 673 if [ "${egid}" -gt 0 ]
784 then 674 then
785 if [ -z "`egetent group ${egid}`" ] 675 if [ -z "`egetent group ${egid}`" ]
786 then 676 then
787 if useq ppc-macos ; then 677 if [[ "${CHOST}" == *-darwin* ]]; then
788 opts="${opts} ${egid}" 678 opts="${opts} ${egid}"
789 else 679 else
790 opts="${opts} -g ${egid}" 680 opts="${opts} -g ${egid}"
791 fi 681 fi
792 else 682 else
806 opts="${opts} ${eextra}" 696 opts="${opts} ${eextra}"
807 697
808 # add the group 698 # add the group
809 local oldsandbox="${SANDBOX_ON}" 699 local oldsandbox="${SANDBOX_ON}"
810 export SANDBOX_ON="0" 700 export SANDBOX_ON="0"
811 if useq ppc-macos ; then 701 case ${CHOST} in
702 *-darwin*)
812 if [ ! -z "${eextra}" ]; 703 if [ ! -z "${eextra}" ];
813 then 704 then
814 einfo "Extra options are not supported on macos yet" 705 einfo "Extra options are not supported on Darwin/OS X yet"
815 einfo "Please report the ebuild along with the info below" 706 einfo "Please report the ebuild along with the info below"
816 einfo "eextra: ${eextra}" 707 einfo "eextra: ${eextra}"
817 die "Required function missing" 708 die "Required function missing"
818 fi 709 fi
819 710
820 # If we need the next available 711 # If we need the next available
821 case ${egid} in 712 case ${egid} in
822 *[!0-9]*) # Non numeric 713 *[!0-9]*) # Non numeric
823 for egid in `jot 898 101`; do 714 for egid in $(seq 101 999); do
824 [ -z "`egetent group ${egid}`" ] && break 715 [ -z "`egetent group ${egid}`" ] && break
825 done 716 done
826 esac 717 esac
827 dscl . create /groups/${egroup} gid ${egid} 718 dscl . create /groups/${egroup} gid ${egid}
828 dscl . create /groups/${egroup} passwd '*' 719 dscl . create /groups/${egroup} passwd '*'
829 elif use x86-fbsd ; then 720 ;;
721
722 *-freebsd*|*-dragonfly*)
830 case ${egid} in 723 case ${egid} in
831 *[!0-9]*) # Non numeric 724 *[!0-9]*) # Non numeric
832 for egid in `jot 898 101`; do 725 for egid in $(seq 101 999); do
833 [ -z "`egetent group ${egid}`" ] && break 726 [ -z "`egetent group ${egid}`" ] && break
834 done 727 done
835 esac 728 esac
836 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 729 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
837 else 730 ;;
731
732 *-netbsd*)
733 case ${egid} in
734 *[!0-9]*) # Non numeric
735 for egid in $(seq 101 999); do
736 [ -z "`egetent group ${egid}`" ] && break
737 done
738 esac
739 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
740 ;;
741
742 *)
838 groupadd ${opts} ${egroup} || die "enewgroup failed" 743 groupadd ${opts} ${egroup} || die "enewgroup failed"
839 fi 744 ;;
745 esac
840 export SANDBOX_ON="${oldsandbox}" 746 export SANDBOX_ON="${oldsandbox}"
841} 747}
842 748
843# Simple script to replace 'dos2unix' binaries 749# Simple script to replace 'dos2unix' binaries
844# vapier@gentoo.org 750# vapier@gentoo.org
869# name: the name that will show up in the menu 775# name: the name that will show up in the menu
870# icon: give your little like a pretty little icon ... 776# icon: give your little like a pretty little icon ...
871# this can be relative (to /usr/share/pixmaps) or 777# this can be relative (to /usr/share/pixmaps) or
872# a full path to an icon 778# a full path to an icon
873# type: what kind of application is this ? for categories: 779# type: what kind of application is this ? for categories:
874# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 780# http://www.freedesktop.org/Standards/desktop-entry-spec
875# path: if your app needs to startup in a specific dir 781# path: if your app needs to startup in a specific dir
876make_desktop_entry() { 782make_desktop_entry() {
877 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 783 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
878 784
879 local exec=${1} 785 local exec=${1}
905 dev) 811 dev)
906 type="Development" 812 type="Development"
907 ;; 813 ;;
908 814
909 games) 815 games)
910 [[ -z ${path} ]] && path=${GAMES_BINDIR}
911
912 case ${catmin} in 816 case ${catmin} in
913 action) type=ActionGame;; 817 action) type=ActionGame;;
914 arcade) type=ArcadeGame;; 818 arcade) type=ArcadeGame;;
915 board) type=BoardGame;; 819 board) type=BoardGame;;
916 kid) type=KidsGame;; 820 kid) type=KidsGame;;
957 type="Network;${type}" 861 type="Network;${type}"
958 ;; 862 ;;
959 863
960 sci) 864 sci)
961 case ${catmin} in 865 case ${catmin} in
962 astro*) type=Astronomoy;; 866 astro*) type=Astronomy;;
963 bio*) type=Biology;; 867 bio*) type=Biology;;
964 calc*) type=Calculator;; 868 calc*) type=Calculator;;
965 chem*) type=Chemistry;; 869 chem*) type=Chemistry;;
966 geo*) type=Geology;; 870 geo*) type=Geology;;
967 math*) type=Math;; 871 math*) type=Math;;
981 *) 885 *)
982 type= 886 type=
983 ;; 887 ;;
984 esac 888 esac
985 fi 889 fi
986 890 if [ "${SLOT}" == "0" ] ; then
891 local desktop_name="${PN}"
892 else
893 local desktop_name="${PN}-${SLOT}"
894 fi
987 local desktop=${T}/${exec%% *}-${P}.desktop 895 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
988 896
989echo "[Desktop Entry] 897echo "[Desktop Entry]
990Encoding=UTF-8 898Encoding=UTF-8
991Version=0.9.2 899Version=0.9.2
992Name=${name} 900Name=${name}
995Exec=${exec} 903Exec=${exec}
996Path=${path} 904Path=${path}
997Icon=${icon} 905Icon=${icon}
998Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
999 907
908 (
909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
1000 insinto /usr/share/applications 911 insinto /usr/share/applications
1001 doins "${desktop}" 912 doins "${desktop}"
1002 913 )
1003 return 0
1004} 914}
1005 915
1006# Make a GDM/KDM Session file 916# Make a GDM/KDM Session file
1007# 917#
1008# make_desktop_entry(<title>, <command>) 918# make_desktop_entry(<title>, <command>)
1037 doins "${i}" 947 doins "${i}"
1038 elif [[ -d ${i} ]] ; then 948 elif [[ -d ${i} ]] ; then
1039 for j in "${i}"/*.desktop ; do 949 for j in "${i}"/*.desktop ; do
1040 doins "${j}" 950 doins "${j}"
1041 done 951 done
1042 fi 952 fi
1043 done 953 done
1044} 954}
1045newmenu() { 955newmenu() {
1046 insinto /usr/share/applications 956 insinto /usr/share/applications
1047 newins "$1" "$2" 957 newins "$1" "$2"
1055 doins "${i}" 965 doins "${i}"
1056 elif [[ -d ${i} ]] ; then 966 elif [[ -d ${i} ]] ; then
1057 for j in "${i}"/*.png ; do 967 for j in "${i}"/*.png ; do
1058 doins "${j}" 968 doins "${j}"
1059 done 969 done
1060 fi 970 fi
1061 done 971 done
1062} 972}
1063newicon() { 973newicon() {
1064 insinto /usr/share/pixmaps 974 insinto /usr/share/pixmaps
1065 newins "$1" "$2" 975 newins "$1" "$2"
1070############################################################## 980##############################################################
1071 981
1072 982
1073# for internal use only (unpack_pdv and unpack_makeself) 983# for internal use only (unpack_pdv and unpack_makeself)
1074find_unpackable_file() { 984find_unpackable_file() {
1075 local src="$1" 985 local src=$1
1076 if [ -z "${src}" ] 986 if [[ -z ${src} ]] ; then
1077 then
1078 src="${DISTDIR}/${A}" 987 src=${DISTDIR}/${A}
1079 else 988 else
1080 if [ -e "${DISTDIR}/${src}" ] 989 if [[ -e ${DISTDIR}/${src} ]] ; then
1081 then
1082 src="${DISTDIR}/${src}" 990 src=${DISTDIR}/${src}
1083 elif [ -e "${PWD}/${src}" ] 991 elif [[ -e ${PWD}/${src} ]] ; then
1084 then
1085 src="${PWD}/${src}" 992 src=${PWD}/${src}
1086 elif [ -e "${src}" ] 993 elif [[ -e ${src} ]] ; then
1087 then
1088 src="${src}" 994 src=${src}
1089 fi
1090 fi 995 fi
1091 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 996 fi
997 [[ ! -e ${src} ]] && return 1
1092 echo "${src}" 998 echo "${src}"
1093} 999}
1094 1000
1095# Unpack those pesky pdv generated files ... 1001# Unpack those pesky pdv generated files ...
1096# They're self-unpacking programs with the binary package stuffed in 1002# They're self-unpacking programs with the binary package stuffed in
1111# lseek 1017# lseek
1112# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1113# lseek(3, -4, SEEK_END) = 2981250 1019# lseek(3, -4, SEEK_END) = 2981250
1114# thus we would pass in the value of '4' as the second parameter. 1020# thus we would pass in the value of '4' as the second parameter.
1115unpack_pdv() { 1021unpack_pdv() {
1116 local src="`find_unpackable_file $1`" 1022 local src=$(find_unpackable_file $1)
1117 local sizeoff_t="$2" 1023 local sizeoff_t=$2
1118 1024
1025 [[ -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 :(" 1026 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1120 1027
1121 local shrtsrc="`basename ${src}`" 1028 local shrtsrc=$(basename "${src}")
1122 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1123 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1030 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\"` 1031 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1125 1032
1126 # grab metadata for debug reasons 1033 # grab metadata for debug reasons
1190# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1191# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1192# - If the offset is not specified then we will attempt to extract 1099# - If the offset is not specified then we will attempt to extract
1193# the proper offset from the script itself. 1100# the proper offset from the script itself.
1194unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1195 local src="$(find_unpackable_file "$1")" 1103 local src=$(find_unpackable_file "${src_input}")
1196 local skip="$2" 1104 local skip=$2
1197 local exe="$3" 1105 local exe=$3
1198 1106
1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1108
1199 local shrtsrc="$(basename "${src}")" 1109 local shrtsrc=$(basename "${src}")
1200 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1201 if [ -z "${skip}" ] 1111 if [[ -z ${skip} ]] ; then
1202 then
1203 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1204 local skip=0 1113 local skip=0
1205 exe=tail 1114 exe=tail
1206 case ${ver} in 1115 case ${ver} in
1207 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1116 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1208 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1220 ;; 1129 ;;
1221 2.1.3) 1130 2.1.3)
1222 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1131 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1223 let skip="skip + 1" 1132 let skip="skip + 1"
1224 ;; 1133 ;;
1225 2.1.4) 1134 2.1.4|2.1.5)
1226 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1135 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1227 skip=$(head -n ${skip} "${src}" | wc -c) 1136 skip=$(head -n ${skip} "${src}" | wc -c)
1228 exe="dd" 1137 exe="dd"
1229 ;; 1138 ;;
1230 *) 1139 *)
1275check_license() { 1184check_license() {
1276 local lic=$1 1185 local lic=$1
1277 if [ -z "${lic}" ] ; then 1186 if [ -z "${lic}" ] ; then
1278 lic="${PORTDIR}/licenses/${LICENSE}" 1187 lic="${PORTDIR}/licenses/${LICENSE}"
1279 else 1188 else
1280 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1189 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1281 lic="${PORTDIR}/licenses/${src}" 1190 lic="${PORTDIR}/licenses/${lic}"
1282 elif [ -e "${PWD}/${src}" ] ; then 1191 elif [ -e "${PWD}/${lic}" ] ; then
1283 lic="${PWD}/${src}" 1192 lic="${PWD}/${lic}"
1284 elif [ -e "${src}" ] ; then 1193 elif [ -e "${lic}" ] ; then
1285 lic="${src}" 1194 lic="${lic}"
1286 fi
1287 fi 1195 fi
1196 fi
1288 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1197 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1289 local l="`basename ${lic}`" 1198 local l="`basename ${lic}`"
1290 1199
1291 # here is where we check for the licenses the user already 1200 # 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 1201 # accepted ... if we don't find a match, we make the user accept
1293 local shopts=$- 1202 local shopts=$-
1349 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1350 # the # of files they gave us 1259 # the # of files they gave us
1351 local cdcnt=0 1260 local cdcnt=0
1352 local f= 1261 local f=
1353 for f in "$@" ; do 1262 for f in "$@" ; do
1354 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1355 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1356 done 1265 done
1357 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1358 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1359 1268
1360 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1361 # if they did, let's just believe them that it's correct 1270 # 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 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1369 local var= 1272 local var=
1370 cdcnt=0 1273 cdcnt=0
1371 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1372 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1373 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1374 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1375 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1376 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1377 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1378 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1379 fi 1283 fi
1380 export CDROM_ROOTS_${cdcnt}="${!var}"
1381 done 1284 done
1382 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1383 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1384 return 1293 return
1385 fi 1294 fi
1386 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1387 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1388 einfon "This ebuild will need the " 1299 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 1300 echo
1395 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1396 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1397 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1398 einfo "directory containing the files." 1304 einfo "directory containing the files."
1402 echo 1308 echo
1403 else 1309 else
1404 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1405 cdcnt=0 1311 cdcnt=0
1406 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1407 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1408 var="CDROM_NAME_${cdcnt}" 1314 var="CDROM_NAME_${cdcnt}"
1409 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1315 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1410 done 1316 done
1411 echo 1317 echo
1412 einfo "If you do not have the CDs, but have the data files" 1318 einfo "If you do not have the CDs, but have the data files"
1413 einfo "mounted somewhere on your filesystem, just export" 1319 einfo "mounted somewhere on your filesystem, just export"
1414 einfo "the following variables so they point to the right place:" 1320 einfo "the following variables so they point to the right place:"
1415 einfon "" 1321 einfon ""
1416 cdcnt=0 1322 cdcnt=0
1417 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1418 cdcnt=$((cdcnt + 1)) 1324 ((++cdcnt))
1419 echo -n " CD_ROOT_${cdcnt}" 1325 echo -n " CD_ROOT_${cdcnt}"
1420 done 1326 done
1421 echo 1327 echo
1422 einfo "Or, if you have all the files in the same place, or" 1328 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" 1329 einfo "you only have one cdrom, you can export CD_ROOT"
1426 echo 1332 echo
1427 einfo "For example:" 1333 einfo "For example:"
1428 einfo "export CD_ROOT_1=/mnt/cdrom" 1334 einfo "export CD_ROOT_1=/mnt/cdrom"
1429 echo 1335 echo
1430 fi 1336 fi
1337
1338 export CDROM_SET=""
1431 export CDROM_CURRENT_CD=0 1339 export CDROM_CURRENT_CD=0
1432 cdrom_load_next_cd 1340 cdrom_load_next_cd
1433} 1341}
1434 1342
1435# this is only used when you need access to more than one cd. 1343# 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. 1344# 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. 1345# 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. 1346# remember, you can only go forward in the cd chain, you can't go back.
1439cdrom_load_next_cd() { 1347cdrom_load_next_cd() {
1440 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1441 local var= 1348 local var
1442 1349 ((++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 1350
1448 unset CDROM_ROOT 1351 unset CDROM_ROOT
1449 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1352 var=CD_ROOT_${CDROM_CURRENT_CD}
1353 [[ -z ${!var} ]] && var="CD_ROOT"
1450 if [[ -z ${!var} ]] ; then 1354 if [[ -z ${!var} ]] ; then
1451 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1355 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1452 cdrom_locate_file_on_cd ${!var} 1356 _cdrom_locate_file_on_cd ${!var}
1453 else 1357 else
1454 export CDROM_ROOT=${!var} 1358 export CDROM_ROOT=${!var}
1455 fi 1359 fi
1456 1360
1457 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1361 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 1366# 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 1367# found, then a message asking for the user to insert the cdrom will be
1464# displayed and we'll hang out here until: 1368# displayed and we'll hang out here until:
1465# (1) the file is found on a mounted cdrom 1369# (1) the file is found on a mounted cdrom
1466# (2) the user hits CTRL+C 1370# (2) the user hits CTRL+C
1467cdrom_locate_file_on_cd() { 1371_cdrom_locate_file_on_cd() {
1372 local mline=""
1373 local showedmsg=0
1374
1468 while [[ -z ${CDROM_ROOT} ]] ; do 1375 while [[ -z ${CDROM_ROOT} ]] ; do
1376 local i=0
1377 local -a cdset=(${*//:/ })
1378 if [[ -n ${CDROM_SET} ]] ; then
1379 cdset=(${cdset[${CDROM_SET}]})
1380 fi
1381
1382 while [[ -n ${cdset[${i}]} ]] ; do
1469 local dir="$(dirname ${@})" 1383 local dir=$(dirname ${cdset[${i}]})
1470 local file="$(basename ${@})" 1384 local file=$(basename ${cdset[${i}]})
1471 local mline=""
1472 local showedmsg=0
1473 1385
1474 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1386 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1475 [[ -d ${mline}/${dir} ]] || continue 1387 [[ -d ${mline}/${dir} ]] || continue
1476 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1477 && export CDROM_ROOT=${mline} 1389 export CDROM_ROOT=${mline}
1390 export CDROM_SET=${i}
1391 export CDROM_MATCH=${cdset[${i}]}
1392 return
1393 fi
1394 done
1395
1396 ((++i))
1478 done 1397 done
1479 1398
1480 if [[ -z ${CDROM_ROOT} ]] ; then
1481 echo 1399 echo
1482 if [[ ${showedmsg} -eq 0 ]] ; then 1400 if [[ ${showedmsg} -eq 0 ]] ; then
1483 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1484 if [[ -z ${CDROM_NAME} ]] ; then 1402 if [[ -z ${CDROM_NAME} ]] ; then
1485 einfo "Please insert the cdrom for ${PN} now !" 1403 einfo "Please insert+mount the cdrom for ${PN} now !"
1486 else
1487 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1488 fi
1489 else 1404 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 !" 1405 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1495 fi
1496 fi 1406 fi
1497 showedmsg=1 1407 else
1408 if [[ -z ${CDROM_NAME_1} ]] ; then
1409 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1410 else
1411 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1412 einfo "Please insert+mount the ${!var} cdrom now !"
1413 fi
1498 fi 1414 fi
1415 showedmsg=1
1416 fi
1499 einfo "Press return to scan for the cd again" 1417 einfo "Press return to scan for the cd again"
1500 einfo "or hit CTRL+C to abort the emerge." 1418 einfo "or hit CTRL+C to abort the emerge."
1501 read 1419 echo
1502 fi 1420 einfo "If you are having trouble with the detection"
1421 einfo "of your CD, it is possible that you do not have"
1422 einfo "Joliet support enabled in your kernel. Please"
1423 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1424 read || die "something is screwed with your system"
1503 done 1425 done
1504} 1426}
1505 1427
1506# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1507# a package can support 1429# a package can support
1517# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1518strip-linguas() { 1440strip-linguas() {
1519 local ls newls 1441 local ls newls
1520 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1521 local op=$1; shift 1443 local op=$1; shift
1522 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=" $(find "$1" -name '*.po' -exec basename {} \;) "; shift
1523 local d f 1445 local d f
1524 for d in "$@" ; do 1446 for d in "$@" ; do
1525 if [[ ${op} == "-u" ]] ; then 1447 if [[ ${op} == "-u" ]] ; then
1526 newls=${ls} 1448 newls=${ls}
1527 else 1449 else
1528 newls="" 1450 newls=""
1529 fi 1451 fi
1530 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} \;) ; do
1531 if [[ ${op} == "-i" ]] ; then 1453 if [[ ${op} == "-i" ]] ; then
1532 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1454 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1533 else 1455 else
1534 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1456 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1535 fi 1457 fi
1569 while ((i--)) ; do 1491 while ((i--)) ; do
1570 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1492 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1571 done 1493 done
1572 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1494 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1573 case ${ARCH} in 1495 case ${ARCH} in
1574 x86) export ARCH="i386";; 1496 x86) export ARCH="i386";;
1575 amd64) export ARCH="x86_64";; 1497 amd64) export ARCH="x86_64";;
1576 hppa) export ARCH="parisc";; 1498 hppa) export ARCH="parisc";;
1577 mips) export ARCH="mips";; 1499 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! 1500 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}";; 1501 *) export ARCH="${ARCH}";;
1580 esac 1502 esac
1581} 1503}
1582 1504
1583# set's ARCH back to what portage expects 1505# set's ARCH back to what portage expects
1584set_arch_to_portage() { 1506set_arch_to_portage() {
1591 1513
1592# Jeremy Huddleston <eradicator@gentoo.org>: 1514# Jeremy Huddleston <eradicator@gentoo.org>:
1593# preserve_old_lib /path/to/libblah.so.0 1515# preserve_old_lib /path/to/libblah.so.0
1594# preserve_old_lib_notify /path/to/libblah.so.0 1516# preserve_old_lib_notify /path/to/libblah.so.0
1595# 1517#
1596# These functions are useful when a lib in your package changes --soname. Such 1518# These functions are useful when a lib in your package changes --library. Such
1597# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1519# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1598# would break packages that link against it. Most people get around this 1520# would break packages that link against it. Most people get around this
1599# by using the portage SLOT mechanism, but that is not always a relevant 1521# by using the portage SLOT mechanism, but that is not always a relevant
1600# solution, so instead you can add the following to your ebuilds: 1522# solution, so instead you can add the following to your ebuilds:
1601# 1523#
1628 LIB=$1 1550 LIB=$1
1629 1551
1630 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1552 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1631 SONAME=`basename ${LIB}` 1553 SONAME=`basename ${LIB}`
1632 1554
1633 einfo "An old version of an installed library was detected on your system." 1555 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" 1556 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," 1557 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:" 1558 ewarn "you will need to execute the following command:"
1637 einfo " revdep-rebuild --soname ${SONAME}" 1559 ewarn " revdep-rebuild --library ${SONAME}"
1638 einfo 1560 ewarn
1639 einfo "After doing that, you can safely remove ${LIB}" 1561 ewarn "After doing that, you can safely remove ${LIB}"
1640 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1562 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1641 fi 1563 fi
1642} 1564}
1643 1565
1644# Hack for people to figure out if a package was built with 1566# Hack for people to figure out if a package was built with
1645# certain USE flags 1567# certain USE flags
1655 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1577 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1656 1578
1657 local PKG=$(best_version $1) 1579 local PKG=$(best_version $1)
1658 shift 1580 shift
1659 1581
1660 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1582 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1583
1584 # if the USE file doesnt exist, assume the $PKG is either
1585 # injected or package.provided
1661 [[ ! -e ${USEFILE} ]] && return 1 1586 [[ ! -e ${USEFILE} ]] && return 0
1662 1587
1663 local USE_BUILT=$(<${USEFILE}) 1588 local USE_BUILT=$(<${USEFILE})
1664 while [[ $# -gt 0 ]] ; do 1589 while [[ $# -gt 0 ]] ; do
1665 if [[ ${opt} = "-o" ]] ; then 1590 if [[ ${opt} = "-o" ]] ; then
1666 has $1 ${USE_BUILT} && return 0 1591 has $1 ${USE_BUILT} && return 0
1691dopamd() { 1616dopamd() {
1692 [[ -z $1 ]] && die "dopamd requires at least one argument" 1617 [[ -z $1 ]] && die "dopamd requires at least one argument"
1693 1618
1694 use pam || return 0 1619 use pam || return 0
1695 1620
1696 insinto /etc/pam.d 1621 INSDESTTREE=/etc/pam.d \
1697 doins "$@" || die "failed to install $@" 1622 doins "$@" || die "failed to install $@"
1698} 1623}
1699# newpamd <old name> <new name> 1624# newpamd <old name> <new name>
1700# 1625#
1701# Install pam file <old name> as <new name> in /etc/pam.d 1626# Install pam file <old name> as <new name> in /etc/pam.d
1702newpamd() { 1627newpamd() {
1703 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1628 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1704 1629
1705 use pam || return 0 1630 use pam || return 0
1706 1631
1707 insinto /etc/pam.d 1632 INSDESTTREE=/etc/pam.d \
1708 newins "$1" "$2" || die "failed to install $1 as $2" 1633 newins "$1" "$2" || die "failed to install $1 as $2"
1709} 1634}
1710 1635
1711# make a wrapper script ... 1636# make a wrapper script ...
1712# NOTE: this was originally games_make_wrapper, but I noticed other places where 1637# NOTE: this was originally games_make_wrapper, but I noticed other places where
1718# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1643# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1719# $5 == path for wrapper 1644# $5 == path for wrapper
1720make_wrapper() { 1645make_wrapper() {
1721 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1646 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1722 local tmpwrapper=$(emktemp) 1647 local tmpwrapper=$(emktemp)
1648 # We don't want to quote ${bin} so that people can pass complex
1649 # things as $bin ... "./someprog --args"
1723 cat << EOF > "${tmpwrapper}" 1650 cat << EOF > "${tmpwrapper}"
1724#!/bin/sh 1651#!/bin/sh
1725cd "${chdir}" 1652cd "${chdir:-.}"
1653if [ -n "${libdir}" ] ; then
1654 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1726export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1655 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1656 else
1657 export LD_LIBRARY_PATH="${libdir}"
1658 fi
1659fi
1727exec ${bin} "\$@" 1660exec ${bin} "\$@"
1728EOF 1661EOF
1729 chmod go+rx "${tmpwrapper}" 1662 chmod go+rx "${tmpwrapper}"
1730 if [ -n "${5}" ] 1663 if [[ -n ${path} ]] ; then
1731 then
1732 exeinto ${5} 1664 exeinto "${path}"
1733 newexe "${tmpwrapper}" "${wrapper}" 1665 newexe "${tmpwrapper}" "${wrapper}"
1734 else 1666 else
1735 newbin "${tmpwrapper}" "${wrapper}" 1667 newbin "${tmpwrapper}" "${wrapper}"
1736 fi 1668 fi
1737} 1669}

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

  ViewVC Help
Powered by ViewVC 1.1.20