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

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

  ViewVC Help
Powered by ViewVC 1.1.20