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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20