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

Diff of /eclass/eutils.eclass

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

Revision 1.173 Revision 1.245
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.173 2005/05/24 03:17:19 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.245 2006/07/15 19:26:55 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
22# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
23# must be an integer greater than zero. 19# must be an integer greater than zero.
24# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
25epause() { 21epause() {
26 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
27 sleep ${1:-5}
28 fi
29} 23}
30 24
31# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
32# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
33# don't beep. 27# don't beep.
34# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
35ebeep() { 29ebeep() {
36 local n 30 local n
37 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
38 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
39 echo -ne "\a" 33 echo -ne "\a"
40 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
41 echo -ne "\a" 35 echo -ne "\a"
42 sleep 1 36 sleep 1
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
123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch" 89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
125# 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,
126# and not the full path .. 91# and not the full path ..
127EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
128# Change the printed message for a single patch. 93# Change the printed message for a single patch.
129EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
167# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
168# 133#
169# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
170# 135#
171epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
172 local PIPE_CMD="" 142 local PIPE_CMD=""
173 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
174 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
175 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
176 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
177 local x="" 147 local x=""
148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
178 150
179 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
180 then 152 then
181 local m="" 153 local m=""
182 for m in "$@" ; do 154 for m in "$@" ; do
249 # New ARCH dependant patch naming scheme ... 221 # New ARCH dependant patch naming scheme ...
250 # 222 #
251 # ???_arch_foo.patch 223 # ???_arch_foo.patch
252 # 224 #
253 if [ -f ${x} ] && \ 225 if [ -f ${x} ] && \
254 ([ "${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}" ] || \
255 [ "${EPATCH_FORCE}" = "yes" ]) 227 [ "${EPATCH_FORCE}" = "yes" ])
256 then 228 then
257 local count=0 229 local count=0
258 local popts="${EPATCH_OPTS}" 230 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/} 231 local patchname=${x##*/}
283 255
284 # Allow for prefix to differ ... im lazy, so shoot me :/ 256 # Allow for prefix to differ ... im lazy, so shoot me :/
285 while [ "${count}" -lt 5 ] 257 while [ "${count}" -lt 5 ]
286 do 258 do
287 # Generate some useful debug info ... 259 # Generate some useful debug info ...
288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 260 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 261 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
290 262
291 if [ "${PATCH_SUFFIX}" != "patch" ] 263 if [ "${PATCH_SUFFIX}" != "patch" ]
292 then 264 then
293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
298 270
299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 271 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
300 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##*/}
301 273
302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
304 276
305 if [ "${PATCH_SUFFIX}" != "patch" ] 277 if [ "${PATCH_SUFFIX}" != "patch" ]
306 then 278 then
307 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
308 then 280 then
312 count=5 284 count=5
313 break 285 break
314 fi 286 fi
315 fi 287 fi
316 288
317 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
318 then 290 then
319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 291 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 292 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 293 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 294 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
324 296
325 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
326 299
327 if [ "$?" -ne 0 ] 300 if [ "$?" -ne 0 ]
328 then 301 then
329 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##*/}
330 echo 303 echo
369 then 342 then
370 einfo "Done with patching" 343 einfo "Done with patching"
371 fi 344 fi
372} 345}
373 346
374# This function check how many cpu's are present, and then set
375# -j in MAKEOPTS accordingly.
376#
377# Thanks to nall <nall@gentoo.org> for this.
378#
379get_number_of_jobs() {
380 local jobs=0
381
382 if [ ! -r /proc/cpuinfo ]
383 then
384 return 1
385 fi
386
387 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
388 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
389 then
390 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
391 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
392 ADMINPARAM="${ADMINPARAM/-j}"
393 fi
394
395 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
396
397 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
398 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
399 then
400 # these archs will always have "[Pp]rocessor"
401 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
402
403 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
404 then
405 # sparc always has "ncpus active"
406 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
407
408 elif [ "${ARCH}" = "alpha" ]
409 then
410 # alpha has "cpus active", but only when compiled with SMP
411 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
412 then
413 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
414 else
415 jobs=2
416 fi
417
418 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
419 then
420 # ppc has "processor", but only when compiled with SMP
421 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
422 then
423 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
424 else
425 jobs=2
426 fi
427 elif [ "${ARCH}" = "s390" ]
428 then
429 # s390 has "# processors : "
430 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
431 else
432 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
433 die "Unknown ARCH -- ${ARCH}!"
434 fi
435
436 # Make sure the number is valid ...
437 if [ "${jobs}" -lt 1 ]
438 then
439 jobs=1
440 fi
441
442 if [ -n "${ADMINPARAM}" ]
443 then
444 if [ "${jobs}" -gt "${ADMINPARAM}" ]
445 then
446 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
447 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
448 else
449 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
450 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
451 fi
452 fi
453}
454
455# Cheap replacement for when debianutils (and thus mktemp) 347# Cheap replacement for when debianutils (and thus mktemp)
456# does not exist on the users system 348# does not exist on the users system
457# vapier@gentoo.org 349# vapier@gentoo.org
458# 350#
459# Takes just 1 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
460emktemp() { 352emktemp() {
461 local exe="touch" 353 local exe="touch"
462 [ "$1" == "-d" ] && exe="mkdir" && shift 354 [[ $1 == -d ]] && exe="mkdir" && shift
463 local topdir="$1" 355 local topdir=$1
464 356
465 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
466 then
467 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
468 && topdir="/tmp" \ 359 && topdir="/tmp" \
469 || topdir="${T}" 360 || topdir=${T}
470 fi 361 fi
471 362
472 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
473 then
474 local tmp=/ 364 local tmp=/
475 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
476 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
477 done 367 done
478 ${exe} "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
479 echo "${tmp}" 369 echo "${tmp}"
480 else 370 else
481 [ "${exe}" == "touch" ] \ 371 if [[ ${exe} == "touch" ]] ; then
482 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
483 || exe="-d" 373 && mktemp -p "${topdir}" \
484 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
485 fi 380 fi
486} 381}
487 382
488# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
489# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
490# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
491# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
492# 387#
493# egetent(database, key) 388# egetent(database, key)
494egetent() { 389egetent() {
495 if useq ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
496 case "$2" in 392 case "$2" in
497 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
498 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
499 ;; 395 ;;
500 *) # Numeric 396 *) # Numeric
501 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
502 ;; 398 ;;
503 esac 399 esac
504 elif useq x86-fbsd ; then 400 ;;
505 local action 401 *-freebsd*|*-dragonfly*)
506 if [ "$1" == "passwd" ] 402 local opts action="user"
507 then 403 [[ $1 == "passwd" ]] || action="group"
508 action="user" 404
509 else 405 # lookup by uid/gid
510 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
511 fi 408 fi
409
512 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
513 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
514 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
515 getent "$1" "$2" 417 getent "$1" "$2"
516 fi 418 ;;
419 esac
517} 420}
518 421
519# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
520# vapier@gentoo.org 423# vapier@gentoo.org
521# 424#
528# shell: /bin/false 431# shell: /bin/false
529# homedir: /dev/null 432# homedir: /dev/null
530# groups: none 433# groups: none
531# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
532enewuser() { 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
533 # get the username 443 # get the username
534 local euser="$1"; shift 444 local euser=$1; shift
535 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
536 then
537 eerror "No username specified !" 446 eerror "No username specified !"
538 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
539 fi 448 fi
540 449
541 # lets see if the username already exists 450 # lets see if the username already exists
542 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
543 then
544 return 0 452 return 0
545 fi 453 fi
546 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
547 455
548 # options to pass to useradd 456 # options to pass to useradd
549 local opts= 457 local opts=
550 458
551 # handle uid 459 # handle uid
552 local euid="$1"; shift 460 local euid=$1; shift
553 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
554 then
555 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
556 then
557 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
558 then
559 euid="next" 464 euid="next"
560 fi 465 fi
561 else 466 else
562 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
563 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
564 fi 469 fi
565 else 470 else
566 euid="next" 471 euid="next"
567 fi 472 fi
568 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
569 then 474 for euid in $(seq 101 999) ; do
570 local pwrange
571 if [ "${USERLAND}" == "BSD" ] ; then
572 pwrange="`jot 898 101`"
573 else
574 pwrange="`seq 101 999`"
575 fi
576 for euid in ${pwrange} ; do
577 [ -z "`egetent passwd ${euid}`" ] && break 475 [[ -z $(egetent passwd ${euid}) ]] && break
578 done 476 done
579 fi 477 fi
580 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
581 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
582 480
583 # handle shell 481 # handle shell
584 local eshell="$1"; shift 482 local eshell=$1; shift
585 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
586 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
587 if [ ! -e "${eshell}" ]
588 then
589 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
590 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"
591 fi 491 fi
592 else 492 else
593 if [ "${USERLAND}" == "BSD" ] 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
594 then 494 [[ -x ${ROOT}${shell} ]] && break
595 eshell="/usr/bin/false" 495 done
596 else 496
597 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"
598 fi 500 fi
501
502 eshell=${shell}
599 fi 503 fi
600 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
601 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
602 506
603 # handle homedir 507 # handle homedir
604 local ehome="$1"; shift 508 local ehome=$1; shift
605 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
606 then
607 ehome="/dev/null" 510 ehome="/dev/null"
608 fi 511 fi
609 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
610 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
611 514
612 # handle groups 515 # handle groups
613 local egroups="$1"; shift 516 local egroups=$1; shift
614 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
615 then
616 local oldifs="${IFS}" 518 local oldifs=${IFS}
617 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
618 520
619 export IFS="," 521 export IFS=","
620 for g in ${egroups} 522 for g in ${egroups} ; do
621 do
622 export IFS="${oldifs}" 523 export IFS=${oldifs}
623 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
624 then
625 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
626 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
627 fi 527 fi
628 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
629 then
630 defgroup="${g}" 529 defgroup=${g}
631 else 530 else
632 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
633 fi 532 fi
634 export IFS="," 533 export IFS=","
635 done 534 done
636 export IFS="${oldifs}" 535 export IFS=${oldifs}
637 536
638 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
639 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
640 then
641 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
642 fi 540 fi
643 else 541 else
644 egroups="(none)" 542 egroups="(none)"
645 fi 543 fi
646 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
647 545
648 # handle extra and add the user 546 # handle extra and add the user
649 local eextra="$@"
650 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
651 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
652 if useq ppc-macos 549 case ${CHOST} in
653 then 550 *-darwin*)
654 ### Make the user 551 ### Make the user
655 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
656 then
657 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
658 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
659 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
660 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
661 ### Add the user to the groups specified 557 ### Add the user to the groups specified
662 local oldifs="${IFS}" 558 local oldifs=${IFS}
663 export IFS="," 559 export IFS=","
664 for g in ${egroups} 560 for g in ${egroups} ; do
665 do
666 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
667 done 562 done
668 export IFS="${oldifs}" 563 export IFS=${oldifs}
669 else 564 else
670 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
671 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
672 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
673 die "Required function missing" 568 die "Required function missing"
674 fi 569 fi
675 elif use x86-fbsd ; then 570 ;;
676 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
677 then 572 if [[ -z $@ ]] ; then
678 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
679 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
680 die "enewuser failed" 575 die "enewuser failed"
681 else 576 else
682 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
683 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
684 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
685 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
686 else 586 else
687 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
688 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
689 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
690 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
691 || die "enewuser failed" 609 || die "enewuser failed"
692 else 610 else
693 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
694 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
695 || die "enewuser failed" 613 || die "enewuser failed"
696 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}"
697 fi 623 fi
624
698 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
699
700 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
701 then
702 einfo " - Creating ${ehome} in ${D}"
703 dodir ${ehome}
704 fowners ${euser} ${ehome}
705 fperms 755 ${ehome}
706 fi
707} 626}
708 627
709# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
710# vapier@gentoo.org 629# vapier@gentoo.org
711# 630#
714# Default values if you do not specify any: 633# Default values if you do not specify any:
715# groupname: REQUIRED ! 634# groupname: REQUIRED !
716# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
717# extra: none 636# extra: none
718enewgroup() { 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
719 # get the group 645 # get the group
720 local egroup="$1"; shift 646 local egroup="$1"; shift
721 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
722 then 648 then
723 eerror "No group specified !" 649 eerror "No group specified !"
740 then 666 then
741 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
742 then 668 then
743 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
744 then 670 then
745 if useq ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
746 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
747 else 673 else
748 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
749 fi 675 fi
750 else 676 else
764 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
765 691
766 # add the group 692 # add the group
767 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
768 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
769 if useq ppc-macos ; then 695 case ${CHOST} in
696 *-darwin*)
770 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
771 then 698 then
772 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
773 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
774 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
775 die "Required function missing" 702 die "Required function missing"
776 fi 703 fi
777 704
778 # If we need the next available 705 # If we need the next available
779 case ${egid} in 706 case ${egid} in
780 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
781 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
782 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
783 done 710 done
784 esac 711 esac
785 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
786 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
787 elif use x86-fbsd ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
788 case ${egid} in 717 case ${egid} in
789 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
790 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
791 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
792 done 721 done
793 esac 722 esac
794 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
795 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 *)
796 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
797 fi 738 ;;
739 esac
798 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
799} 741}
800 742
801# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
802# vapier@gentoo.org 744# vapier@gentoo.org
819 761
820# Make a desktop file ! 762# Make a desktop file !
821# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
822# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
823# 765#
824# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
825# 767#
826# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
827# name: the name that will show up in the menu 769# name: the name that will show up in the menu
828# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
829# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
830# a full path to an icon 772# a full path to an icon
831# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
832# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 774# http://www.freedesktop.org/Standards/desktop-entry-spec
833# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
834make_desktop_entry() { 776make_desktop_entry() {
835 [[ -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
836 778
837 local exec=${1} 779 local exec=${1}
863 dev) 805 dev)
864 type="Development" 806 type="Development"
865 ;; 807 ;;
866 808
867 games) 809 games)
868 [[ -z ${path} ]] && path=${GAMES_BINDIR}
869
870 case ${catmin} in 810 case ${catmin} in
871 action) type=ActionGame;; 811 action) type=ActionGame;;
872 arcade) type=ArcadeGame;; 812 arcade) type=ArcadeGame;;
873 board) type=BoardGame;; 813 board) type=BoardGame;;
874 kid) type=KidsGame;; 814 kid) type=KidsGame;;
915 type="Network;${type}" 855 type="Network;${type}"
916 ;; 856 ;;
917 857
918 sci) 858 sci)
919 case ${catmin} in 859 case ${catmin} in
920 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
921 bio*) type=Biology;; 861 bio*) type=Biology;;
922 calc*) type=Calculator;; 862 calc*) type=Calculator;;
923 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
924 geo*) type=Geology;; 864 geo*) type=Geology;;
925 math*) type=Math;; 865 math*) type=Math;;
939 *) 879 *)
940 type= 880 type=
941 ;; 881 ;;
942 esac 882 esac
943 fi 883 fi
944 884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
945 local desktop=${T}/${exec%% *}-${P}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
946 891
947echo "[Desktop Entry] 892echo "[Desktop Entry]
948Encoding=UTF-8 893Encoding=UTF-8
949Version=0.9.2 894Version=0.9.2
950Name=${name} 895Name=${name}
951Type=Application 896Type=Application
952Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
953Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
954Path=${path} 900Path=${path}
955Icon=${icon} 901Icon=${icon}
956Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
957 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
958 insinto /usr/share/applications 907 insinto /usr/share/applications
959 doins "${desktop}" 908 doins "${desktop}"
960 909 )
961 return 0
962} 910}
963 911
964# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
965# 913#
966# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
995 doins "${i}" 943 doins "${i}"
996 elif [[ -d ${i} ]] ; then 944 elif [[ -d ${i} ]] ; then
997 for j in "${i}"/*.desktop ; do 945 for j in "${i}"/*.desktop ; do
998 doins "${j}" 946 doins "${j}"
999 done 947 done
1000 fi 948 fi
1001 done 949 done
1002} 950}
1003newmenu() { 951newmenu() {
1004 insinto /usr/share/applications 952 insinto /usr/share/applications
1005 newins "$1" "$2" 953 newins "$1" "$2"
1013 doins "${i}" 961 doins "${i}"
1014 elif [[ -d ${i} ]] ; then 962 elif [[ -d ${i} ]] ; then
1015 for j in "${i}"/*.png ; do 963 for j in "${i}"/*.png ; do
1016 doins "${j}" 964 doins "${j}"
1017 done 965 done
1018 fi 966 fi
1019 done 967 done
1020} 968}
1021newicon() { 969newicon() {
1022 insinto /usr/share/pixmaps 970 insinto /usr/share/pixmaps
1023 newins "$1" "$2" 971 newins "$1" "$2"
1028############################################################## 976##############################################################
1029 977
1030 978
1031# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
1032find_unpackable_file() { 980find_unpackable_file() {
1033 local src="$1" 981 local src=$1
1034 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
1035 then
1036 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
1037 else 984 else
1038 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
1039 then
1040 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
1041 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
1042 then
1043 src="${PWD}/${src}" 988 src=${PWD}/${src}
1044 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
1045 then
1046 src="${src}" 990 src=${src}
1047 fi
1048 fi 991 fi
1049 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
1050 echo "${src}" 994 echo "${src}"
1051} 995}
1052 996
1053# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
1054# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
1069# lseek 1013# lseek
1070# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1071# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
1072# 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.
1073unpack_pdv() { 1017unpack_pdv() {
1074 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
1075 local sizeoff_t="$2" 1019 local sizeoff_t=$2
1076 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1077 [ -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 :("
1078 1023
1079 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1080 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1081 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1082 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\"`
1083 1028
1084 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1148# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1149# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1150# - 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
1151# the proper offset from the script itself. 1096# the proper offset from the script itself.
1152unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1153 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1154 local skip="$2" 1100 local skip=$2
1155 local exe="$3" 1101 local exe=$3
1156 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1157 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1158 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1159 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1160 then
1161 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1162 local skip=0 1109 local skip=0
1163 exe=tail 1110 exe=tail
1164 case ${ver} in 1111 case ${ver} in
1165 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1112 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1166 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1167 ;; 1114 ;;
1168 2.0|2.0.1) 1115 2.0|2.0.1)
1169 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1170 ;; 1117 ;;
1178 ;; 1125 ;;
1179 2.1.3) 1126 2.1.3)
1180 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1181 let skip="skip + 1" 1128 let skip="skip + 1"
1182 ;; 1129 ;;
1183 2.1.4) 1130 2.1.4|2.1.5)
1184 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)
1185 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1186 exe="dd" 1133 exe="dd"
1187 ;; 1134 ;;
1188 *) 1135 *)
1233check_license() { 1180check_license() {
1234 local lic=$1 1181 local lic=$1
1235 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1236 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1237 else 1184 else
1238 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1239 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1240 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1241 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1242 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1243 lic="${src}" 1190 lic="${lic}"
1244 fi
1245 fi 1191 fi
1192 fi
1246 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1247 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1248 1195
1249 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1250 # 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
1251 local shopts=$- 1198 local shopts=$-
1293# and when the function returns, you can assume that the cd has been 1240# and when the function returns, you can assume that the cd has been
1294# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1295# 1242#
1296# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1243# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1297# etc... if you want to give the cds better names, then just export 1244# etc... if you want to give the cds better names, then just export
1298# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1245# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1246# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1247# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1248# CDROM_NAME_2="data cd"
1249# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1299# 1250#
1300# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1301# 1252#
1302# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1303# - this will attempt to locate a cd based upon a file that is on 1254# - this will attempt to locate a cd based upon a file that is on
1307 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1308 # the # of files they gave us 1259 # the # of files they gave us
1309 local cdcnt=0 1260 local cdcnt=0
1310 local f= 1261 local f=
1311 for f in "$@" ; do 1262 for f in "$@" ; do
1312 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1313 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1314 done 1265 done
1315 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1316 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1317 1268
1318 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1319 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1320 if [[ ! -z ${CD_ROOT} ]] ; then
1321 export CDROM_ROOT=${CD_ROOT}
1322 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1323 return
1324 fi
1325 # do the same for CD_ROOT_X
1326 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1327 local var= 1272 local var=
1328 cdcnt=0 1273 cdcnt=0
1329 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1330 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1331 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1332 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1333 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1334 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1335 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1336 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1337 fi 1283 fi
1338 export CDROM_ROOTS_${cdcnt}="${!var}"
1339 done 1284 done
1340 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1341 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1342 return 1293 return
1343 fi 1294 fi
1344 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1345 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1346 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1347 if [[ -z ${CDROM_NAME} ]] ; then
1348 echo "cdrom for ${PN}."
1349 else
1350 echo "${CDROM_NAME}."
1351 fi
1352 echo 1300 echo
1353 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1354 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1355 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1356 einfo "directory containing the files." 1304 einfo "directory containing the files."
1357 echo 1305 echo
1358 einfo "For example:" 1306 einfo "For example:"
1359 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1360 echo 1308 echo
1361 else 1309 else
1310 if [[ -n ${CDROM_NAME_SET} ]] ; then
1311 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1312 cdcnt=0
1313 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1314 ((++cdcnt))
1315 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1316 done
1317 fi
1318
1362 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1363 cdcnt=0 1320 cdcnt=0
1364 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1365 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1366 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1367 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1368 done 1325 done
1369 echo 1326 echo
1370 einfo "If you do not have the CDs, but have the data files" 1327 einfo "If you do not have the CDs, but have the data files"
1371 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1372 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1373 einfon "" 1330 einfon ""
1374 cdcnt=0 1331 cdcnt=0
1375 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1376 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1377 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1378 done 1335 done
1379 echo 1336 echo
1380 einfo "Or, if you have all the files in the same place, or" 1337 einfo "Or, if you have all the files in the same place, or"
1381 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1384 echo 1341 echo
1385 einfo "For example:" 1342 einfo "For example:"
1386 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1387 echo 1344 echo
1388 fi 1345 fi
1346
1347 export CDROM_SET=""
1389 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1390 cdrom_load_next_cd 1349 cdrom_load_next_cd
1391} 1350}
1392 1351
1393# this is only used when you need access to more than one cd. 1352# this is only used when you need access to more than one cd.
1394# when you have finished using the first cd, just call this function. 1353# when you have finished using the first cd, just call this function.
1395# when it returns, CDROM_ROOT will be pointing to the second cd. 1354# when it returns, CDROM_ROOT will be pointing to the second cd.
1396# remember, you can only go forward in the cd chain, you can't go back. 1355# remember, you can only go forward in the cd chain, you can't go back.
1397cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1398 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1399 local var= 1357 local var
1400 1358 ((++CDROM_CURRENT_CD))
1401 if [[ ! -z ${CD_ROOT} ]] ; then
1402 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1403 return
1404 fi
1405 1359
1406 unset CDROM_ROOT 1360 unset CDROM_ROOT
1407 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1408 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1409 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1410 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1411 else 1366 else
1412 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1413 fi 1368 fi
1414 1369
1415 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1420# all it does is try to locate a give file on a cd ... if the cd isn't 1375# all it does is try to locate a give file on a cd ... if the cd isn't
1421# found, then a message asking for the user to insert the cdrom will be 1376# found, then a message asking for the user to insert the cdrom will be
1422# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1423# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1424# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1425cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1426 while [[ -z ${CDROM_ROOT} ]] ; do 1384 while [[ -z ${CDROM_ROOT} ]] ; do
1385 local i=0
1386 local -a cdset=(${*//:/ })
1387 if [[ -n ${CDROM_SET} ]] ; then
1388 cdset=(${cdset[${CDROM_SET}]})
1389 fi
1390
1391 while [[ -n ${cdset[${i}]} ]] ; do
1427 local dir="$(dirname ${@})" 1392 local dir=$(dirname ${cdset[${i}]})
1428 local file="$(basename ${@})" 1393 local file=$(basename ${cdset[${i}]})
1429 local mline=""
1430 local showedmsg=0
1431 1394
1432 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1395 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1433 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1434 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1435 && export CDROM_ROOT=${mline} 1398 export CDROM_ROOT=${mline}
1399 export CDROM_SET=${i}
1400 export CDROM_MATCH=${cdset[${i}]}
1401 return
1402 fi
1403 done
1404
1405 ((++i))
1436 done 1406 done
1437 1407
1438 if [[ -z ${CDROM_ROOT} ]] ; then
1439 echo 1408 echo
1440 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1441 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1442 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1443 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1444 else
1445 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1446 fi
1447 else 1413 else
1448 if [[ -z ${CDROM_NAME_1} ]] ; then
1449 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1450 else
1451 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1452 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1453 fi
1454 fi 1415 fi
1455 showedmsg=1 1416 else
1417 if [[ -z ${CDROM_NAME_1} ]] ; then
1418 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1419 else
1420 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1421 einfo "Please insert+mount the ${!var} cdrom now !"
1422 fi
1456 fi 1423 fi
1424 showedmsg=1
1425 fi
1457 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1458 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1459 read 1428 echo
1460 fi 1429 einfo "If you are having trouble with the detection"
1430 einfo "of your CD, it is possible that you do not have"
1431 einfo "Joliet support enabled in your kernel. Please"
1432 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1433 read || die "something is screwed with your system"
1461 done 1434 done
1462} 1435}
1463 1436
1464# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1465# a package can support 1438# a package can support
1472# The -i builds a list of po files found in all the 1445# The -i builds a list of po files found in all the
1473# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1474# The -u builds a list of po files found in all the 1447# The -u builds a list of po files found in all the
1475# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1476strip-linguas() { 1449strip-linguas() {
1477 local ls newls 1450 local ls newls nols
1478 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1479 local op=$1; shift 1452 local op=$1; shift
1480 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1481 local d f 1454 local d f
1482 for d in "$@" ; do 1455 for d in "$@" ; do
1483 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1484 newls=${ls} 1457 newls=${ls}
1485 else 1458 else
1486 newls="" 1459 newls=""
1487 fi 1460 fi
1488 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1489 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1490 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1491 else 1464 else
1492 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1493 fi 1466 fi
1494 done 1467 done
1495 ls=${newls} 1468 ls=${newls}
1496 done 1469 done
1497 ls=${ls//.po}
1498 else 1470 else
1499 ls=$@ 1471 ls="$@"
1500 fi 1472 fi
1501 1473
1502 ls=" ${ls} " 1474 nols=""
1503 newls="" 1475 newls=""
1504 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1505 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1506 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1507 else 1479 else
1508 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1509 fi 1481 fi
1510 done 1482 done
1511 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1512 export LINGUAS="" 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1513 else
1514 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1515 fi
1516} 1486}
1517 1487
1518# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1519# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1520 1490
1527 while ((i--)) ; do 1497 while ((i--)) ; do
1528 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1498 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1529 done 1499 done
1530 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1500 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1531 case ${ARCH} in 1501 case ${ARCH} in
1532 x86) export ARCH="i386";; 1502 x86) export ARCH="i386";;
1533 amd64) export ARCH="x86_64";; 1503 amd64) export ARCH="x86_64";;
1534 hppa) export ARCH="parisc";; 1504 hppa) export ARCH="parisc";;
1535 mips) export ARCH="mips";; 1505 mips) export ARCH="mips";;
1536 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! 1506 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!
1537 *) export ARCH="${ARCH}";; 1507 *) export ARCH="${ARCH}";;
1538 esac 1508 esac
1539} 1509}
1540 1510
1541# set's ARCH back to what portage expects 1511# set's ARCH back to what portage expects
1542set_arch_to_portage() { 1512set_arch_to_portage() {
1549 1519
1550# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1551# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1552# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1553# 1523#
1554# These functions are useful when a lib in your package changes --soname. Such 1524# These functions are useful when a lib in your package changes --library. Such
1555# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1525# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1556# would break packages that link against it. Most people get around this 1526# would break packages that link against it. Most people get around this
1557# by using the portage SLOT mechanism, but that is not always a relevant 1527# by using the portage SLOT mechanism, but that is not always a relevant
1558# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1559# 1529#
1586 LIB=$1 1556 LIB=$1
1587 1557
1588 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1589 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1590 1560
1591 einfo "An old version of an installed library was detected on your system." 1561 ewarn "An old version of an installed library was detected on your system."
1592 einfo "In order to avoid breaking packages that link against is, this older version" 1562 ewarn "In order to avoid breaking packages that link against it, this older version"
1593 einfo "is not being removed. In order to make full use of this newer version," 1563 ewarn "is not being removed. In order to make full use of this newer version,"
1594 einfo "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1595 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1596 einfo 1566 ewarn
1597 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1598 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1599 fi 1569 fi
1600} 1570}
1601 1571
1602# Hack for people to figure out if a package was built with 1572# Hack for people to figure out if a package was built with
1603# certain USE flags 1573# certain USE flags
1613 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1614 1584
1615 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1616 shift 1586 shift
1617 1587
1618 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1588 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1589
1590 # if the USE file doesnt exist, assume the $PKG is either
1591 # injected or package.provided
1619 [[ ! -e ${USEFILE} ]] && return 1 1592 [[ ! -e ${USEFILE} ]] && return 0
1620 1593
1621 local USE_BUILT=$(<${USEFILE}) 1594 local USE_BUILT=$(<${USEFILE})
1622 while [[ $# -gt 0 ]] ; do 1595 while [[ $# -gt 0 ]] ; do
1623 if [[ ${opt} = "-o" ]] ; then 1596 if [[ ${opt} = "-o" ]] ; then
1624 has $1 ${USE_BUILT} && return 0 1597 has $1 ${USE_BUILT} && return 0
1676# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1649# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1677# $5 == path for wrapper 1650# $5 == path for wrapper
1678make_wrapper() { 1651make_wrapper() {
1679 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1652 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1680 local tmpwrapper=$(emktemp) 1653 local tmpwrapper=$(emktemp)
1654 # We don't want to quote ${bin} so that people can pass complex
1655 # things as $bin ... "./someprog --args"
1681 cat << EOF > "${tmpwrapper}" 1656 cat << EOF > "${tmpwrapper}"
1682#!/bin/sh 1657#!/bin/sh
1683cd "${chdir}" 1658cd "${chdir:-.}"
1659if [ -n "${libdir}" ] ; then
1660 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1684export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1661 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1662 else
1663 export LD_LIBRARY_PATH="${libdir}"
1664 fi
1665fi
1685exec ${bin} "\$@" 1666exec ${bin} "\$@"
1686EOF 1667EOF
1687 chmod go+rx "${tmpwrapper}" 1668 chmod go+rx "${tmpwrapper}"
1688 if [ -n "${5}" ] 1669 if [[ -n ${path} ]] ; then
1689 then
1690 exeinto ${5} 1670 exeinto "${path}"
1691 newexe "${tmpwrapper}" "${wrapper}" 1671 newexe "${tmpwrapper}" "${wrapper}"
1692 else 1672 else
1693 newbin "${tmpwrapper}" "${wrapper}" 1673 newbin "${tmpwrapper}" "${wrapper}"
1694 fi 1674 fi
1695} 1675}

Legend:
Removed from v.1.173  
changed lines
  Added in v.1.245

  ViewVC Help
Powered by ViewVC 1.1.20