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

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

  ViewVC Help
Powered by ViewVC 1.1.20