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

Diff of /eclass/eutils.eclass

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

Revision 1.167 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.167 2005/04/16 07:05:45 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
123EPATCH_OPTS="-g0" 87# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
88# Set -E to automatically remove empty files.
89EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
124# List of patches not to apply. Not this is only file names, 90# List of patches not to apply. Not this is only file names,
125# and not the full path .. 91# and not the full path ..
126EPATCH_EXCLUDE="" 92EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 93# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 94EPATCH_SINGLE_MSG=""
95# Change the printed message for multiple patches.
96EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
129# Force applying bulk patches even if not following the style: 97# Force applying bulk patches even if not following the style:
130# 98#
131# ??_${ARCH}_foo.${EPATCH_SUFFIX} 99# ??_${ARCH}_foo.${EPATCH_SUFFIX}
132# 100#
133EPATCH_FORCE="no" 101EPATCH_FORCE="no"
164# hand its a directory, it will set EPATCH_SOURCE to this. 132# hand its a directory, it will set EPATCH_SOURCE to this.
165# 133#
166# <azarah@gentoo.org> (10 Nov 2002) 134# <azarah@gentoo.org> (10 Nov 2002)
167# 135#
168epatch() { 136epatch() {
137 _epatch_draw_line() {
138 [[ -z $1 ]] && set "$(printf "%65s" '')"
139 echo "${1//?/=}"
140 }
141 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
169 local PIPE_CMD="" 142 local PIPE_CMD=""
170 local STDERR_TARGET="${T}/$$.out" 143 local STDERR_TARGET="${T}/$$.out"
171 local PATCH_TARGET="${T}/$$.patch" 144 local PATCH_TARGET="${T}/$$.patch"
172 local PATCH_SUFFIX="" 145 local PATCH_SUFFIX=""
173 local SINGLE_PATCH="no" 146 local SINGLE_PATCH="no"
174 local x="" 147 local x=""
175 148
149 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
150
176 if [ "$#" -gt 1 ] 151 if [ "$#" -gt 1 ]
177 then 152 then
178 local m="" 153 local m=""
179 einfo "${#} patches to apply ..."
180 for m in "$@" ; do 154 for m in "$@" ; do
181 epatch "${m}" 155 epatch "${m}"
182 done 156 done
183 return 0 157 return 0
184 fi 158 fi
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 return true if we are using the NPTL pthreads
373# implementation.
374#
375# <azarah@gentoo.org> (06 March 2003)
376#
377have_NPTL() {
378 cat > ${T}/test-nptl.c <<-"END"
379 #define _XOPEN_SOURCE
380 #include <unistd.h>
381 #include <stdio.h>
382
383 int main()
384 {
385 char buf[255];
386 char *str = buf;
387
388 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
389 if (NULL != str) {
390 printf("%s\n", str);
391 if (NULL != strstr(str, "NPTL"))
392 return 0;
393 }
394
395 return 1;
396 }
397 END
398
399 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
400 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
401 then
402 echo "yes"
403 einfon "Checking what PTHREADS implementation we have ..."
404 if ${T}/nptl
405 then
406 return 0
407 else
408 return 1
409 fi
410 else
411 echo "no"
412 fi
413
414 return 1
415}
416
417# This function check how many cpu's are present, and then set
418# -j in MAKEOPTS accordingly.
419#
420# Thanks to nall <nall@gentoo.org> for this.
421#
422get_number_of_jobs() {
423 local jobs=0
424
425 if [ ! -r /proc/cpuinfo ]
426 then
427 return 1
428 fi
429
430 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
431 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
432 then
433 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
434 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
435 ADMINPARAM="${ADMINPARAM/-j}"
436 fi
437
438 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
439
440 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
441 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
442 then
443 # these archs will always have "[Pp]rocessor"
444 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
445
446 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
447 then
448 # sparc always has "ncpus active"
449 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
450
451 elif [ "${ARCH}" = "alpha" ]
452 then
453 # alpha has "cpus active", but only when compiled with SMP
454 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
455 then
456 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
457 else
458 jobs=2
459 fi
460
461 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
462 then
463 # ppc has "processor", but only when compiled with SMP
464 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
465 then
466 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
467 else
468 jobs=2
469 fi
470 elif [ "${ARCH}" = "s390" ]
471 then
472 # s390 has "# processors : "
473 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
474 else
475 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
476 die "Unknown ARCH -- ${ARCH}!"
477 fi
478
479 # Make sure the number is valid ...
480 if [ "${jobs}" -lt 1 ]
481 then
482 jobs=1
483 fi
484
485 if [ -n "${ADMINPARAM}" ]
486 then
487 if [ "${jobs}" -gt "${ADMINPARAM}" ]
488 then
489 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
490 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
491 else
492 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
493 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
494 fi
495 fi
496}
497
498# Cheap replacement for when debianutils (and thus mktemp) 347# Cheap replacement for when debianutils (and thus mktemp)
499# does not exist on the users system 348# does not exist on the users system
500# vapier@gentoo.org 349# vapier@gentoo.org
501# 350#
502# Takes just 1 optional parameter (the directory to create tmpfile in) 351# Takes just 1 optional parameter (the directory to create tmpfile in)
503emktemp() { 352emktemp() {
504 local exe="touch" 353 local exe="touch"
505 [ "$1" == "-d" ] && exe="mkdir" && shift 354 [[ $1 == -d ]] && exe="mkdir" && shift
506 local topdir="$1" 355 local topdir=$1
507 356
508 if [ -z "${topdir}" ] 357 if [[ -z ${topdir} ]] ; then
509 then
510 [ -z "${T}" ] \ 358 [[ -z ${T} ]] \
511 && topdir="/tmp" \ 359 && topdir="/tmp" \
512 || topdir="${T}" 360 || topdir=${T}
513 fi 361 fi
514 362
515 if [ -z "$(type -p mktemp)" ] 363 if [[ -z $(type -p mktemp) ]] ; then
516 then
517 local tmp=/ 364 local tmp=/
518 while [ -e "${tmp}" ] ; do 365 while [[ -e ${tmp} ]] ; do
519 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 366 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
520 done 367 done
521 ${exe} "${tmp}" 368 ${exe} "${tmp}" || ${exe} -p "${tmp}"
522 echo "${tmp}" 369 echo "${tmp}"
523 else 370 else
524 [ "${exe}" == "touch" ] \ 371 if [[ ${exe} == "touch" ]] ; then
525 && exe="-p" \ 372 [[ ${USERLAND} == "GNU" ]] \
526 || exe="-d" 373 && mktemp -p "${topdir}" \
527 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
528 fi 380 fi
529} 381}
530 382
531# Small wrapper for getent (Linux), nidump (Mac OS X), 383# Small wrapper for getent (Linux), nidump (Mac OS X),
532# and pw (FreeBSD) used in enewuser()/enewgroup() 384# and pw (FreeBSD) used in enewuser()/enewgroup()
533# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 385# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
534# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 386# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
535# 387#
536# egetent(database, key) 388# egetent(database, key)
537egetent() { 389egetent() {
538 if useq ppc-macos ; then 390 case ${CHOST} in
391 *-darwin*)
539 case "$2" in 392 case "$2" in
540 *[!0-9]*) # Non numeric 393 *[!0-9]*) # Non numeric
541 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 394 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
542 ;; 395 ;;
543 *) # Numeric 396 *) # Numeric
544 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 397 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
545 ;; 398 ;;
546 esac 399 esac
547 elif useq x86-fbsd ; then 400 ;;
548 local action 401 *-freebsd*|*-dragonfly*)
549 if [ "$1" == "passwd" ] 402 local opts action="user"
550 then 403 [[ $1 == "passwd" ]] || action="group"
551 action="user" 404
552 else 405 # lookup by uid/gid
553 action="group" 406 if [[ $2 == [[:digit:]]* ]] ; then
407 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
554 fi 408 fi
409
555 pw show "${action}" "$2" -q 410 pw show ${action} ${opts} "$2" -q
556 else 411 ;;
412 *-netbsd*|*-openbsd*)
413 grep "$2:\*:" /etc/$1
414 ;;
415 *)
557 which nscd >& /dev/null && nscd -i "$1" 416 type -p nscd >& /dev/null && nscd -i "$1"
558 getent "$1" "$2" 417 getent "$1" "$2"
559 fi 418 ;;
419 esac
560} 420}
561 421
562# Simplify/standardize adding users to the system 422# Simplify/standardize adding users to the system
563# vapier@gentoo.org 423# vapier@gentoo.org
564# 424#
571# shell: /bin/false 431# shell: /bin/false
572# homedir: /dev/null 432# homedir: /dev/null
573# groups: none 433# groups: none
574# extra: comment of 'added by portage for ${PN}' 434# extra: comment of 'added by portage for ${PN}'
575enewuser() { 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
576 # get the username 443 # get the username
577 local euser="$1"; shift 444 local euser=$1; shift
578 if [ -z "${euser}" ] 445 if [[ -z ${euser} ]] ; then
579 then
580 eerror "No username specified !" 446 eerror "No username specified !"
581 die "Cannot call enewuser without a username" 447 die "Cannot call enewuser without a username"
582 fi 448 fi
583 449
584 # lets see if the username already exists 450 # lets see if the username already exists
585 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 451 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
586 then
587 return 0 452 return 0
588 fi 453 fi
589 einfo "Adding user '${euser}' to your system ..." 454 einfo "Adding user '${euser}' to your system ..."
590 455
591 # options to pass to useradd 456 # options to pass to useradd
592 local opts= 457 local opts=
593 458
594 # handle uid 459 # handle uid
595 local euid="$1"; shift 460 local euid=$1; shift
596 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 461 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
597 then
598 if [ "${euid}" -gt 0 ] 462 if [[ ${euid} -gt 0 ]] ; then
599 then
600 if [ ! -z "`egetent passwd ${euid}`" ] 463 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
601 then
602 euid="next" 464 euid="next"
603 fi 465 fi
604 else 466 else
605 eerror "Userid given but is not greater than 0 !" 467 eerror "Userid given but is not greater than 0 !"
606 die "${euid} is not a valid UID" 468 die "${euid} is not a valid UID"
607 fi 469 fi
608 else 470 else
609 euid="next" 471 euid="next"
610 fi 472 fi
611 if [ "${euid}" == "next" ] 473 if [[ ${euid} == "next" ]] ; then
612 then 474 for euid in $(seq 101 999) ; do
613 local pwrange
614 if [ "${USERLAND}" == "BSD" ] ; then
615 pwrange="`jot 898 101`"
616 else
617 pwrange="`seq 101 999`"
618 fi
619 for euid in ${pwrange} ; do
620 [ -z "`egetent passwd ${euid}`" ] && break 475 [[ -z $(egetent passwd ${euid}) ]] && break
621 done 476 done
622 fi 477 fi
623 opts="${opts} -u ${euid}" 478 opts="${opts} -u ${euid}"
624 einfo " - Userid: ${euid}" 479 einfo " - Userid: ${euid}"
625 480
626 # handle shell 481 # handle shell
627 local eshell="$1"; shift 482 local eshell=$1; shift
628 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 483 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
629 then 484 if [[ ! -e ${ROOT}${eshell} ]] ; then
630 if [ ! -e "${eshell}" ]
631 then
632 eerror "A shell was specified but it does not exist !" 485 eerror "A shell was specified but it does not exist !"
633 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"
634 fi 491 fi
635 else 492 else
636 if [ "${USERLAND}" == "BSD" ] 493 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
637 then 494 [[ -x ${ROOT}${shell} ]] && break
638 eshell="/usr/bin/false" 495 done
639 else 496
640 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"
641 fi 500 fi
501
502 eshell=${shell}
642 fi 503 fi
643 einfo " - Shell: ${eshell}" 504 einfo " - Shell: ${eshell}"
644 opts="${opts} -s ${eshell}" 505 opts="${opts} -s ${eshell}"
645 506
646 # handle homedir 507 # handle homedir
647 local ehome="$1"; shift 508 local ehome=$1; shift
648 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 509 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
649 then
650 ehome="/dev/null" 510 ehome="/dev/null"
651 fi 511 fi
652 einfo " - Home: ${ehome}" 512 einfo " - Home: ${ehome}"
653 opts="${opts} -d ${ehome}" 513 opts="${opts} -d ${ehome}"
654 514
655 # handle groups 515 # handle groups
656 local egroups="$1"; shift 516 local egroups=$1; shift
657 if [ ! -z "${egroups}" ] 517 if [[ ! -z ${egroups} ]] ; then
658 then
659 local oldifs="${IFS}" 518 local oldifs=${IFS}
660 local defgroup="" exgroups="" 519 local defgroup="" exgroups=""
661 520
662 export IFS="," 521 export IFS=","
663 for g in ${egroups} 522 for g in ${egroups} ; do
664 do
665 export IFS="${oldifs}" 523 export IFS=${oldifs}
666 if [ -z "`egetent group \"${g}\"`" ] 524 if [[ -z $(egetent group "${g}") ]] ; then
667 then
668 eerror "You must add group ${g} to the system first" 525 eerror "You must add group ${g} to the system first"
669 die "${g} is not a valid GID" 526 die "${g} is not a valid GID"
670 fi 527 fi
671 if [ -z "${defgroup}" ] 528 if [[ -z ${defgroup} ]] ; then
672 then
673 defgroup="${g}" 529 defgroup=${g}
674 else 530 else
675 exgroups="${exgroups},${g}" 531 exgroups="${exgroups},${g}"
676 fi 532 fi
677 export IFS="," 533 export IFS=","
678 done 534 done
679 export IFS="${oldifs}" 535 export IFS=${oldifs}
680 536
681 opts="${opts} -g ${defgroup}" 537 opts="${opts} -g ${defgroup}"
682 if [ ! -z "${exgroups}" ] 538 if [[ ! -z ${exgroups} ]] ; then
683 then
684 opts="${opts} -G ${exgroups:1}" 539 opts="${opts} -G ${exgroups:1}"
685 fi 540 fi
686 else 541 else
687 egroups="(none)" 542 egroups="(none)"
688 fi 543 fi
689 einfo " - Groups: ${egroups}" 544 einfo " - Groups: ${egroups}"
690 545
691 # handle extra and add the user 546 # handle extra and add the user
692 local eextra="$@"
693 local oldsandbox="${SANDBOX_ON}" 547 local oldsandbox=${SANDBOX_ON}
694 export SANDBOX_ON="0" 548 export SANDBOX_ON="0"
695 if useq ppc-macos 549 case ${CHOST} in
696 then 550 *-darwin*)
697 ### Make the user 551 ### Make the user
698 if [ -z "${eextra}" ] 552 if [[ -z $@ ]] ; then
699 then
700 dscl . create /users/${euser} uid ${euid} 553 dscl . create /users/${euser} uid ${euid}
701 dscl . create /users/${euser} shell ${eshell} 554 dscl . create /users/${euser} shell ${eshell}
702 dscl . create /users/${euser} home ${ehome} 555 dscl . create /users/${euser} home ${ehome}
703 dscl . create /users/${euser} realname "added by portage for ${PN}" 556 dscl . create /users/${euser} realname "added by portage for ${PN}"
704 ### Add the user to the groups specified 557 ### Add the user to the groups specified
705 local oldifs="${IFS}" 558 local oldifs=${IFS}
706 export IFS="," 559 export IFS=","
707 for g in ${egroups} 560 for g in ${egroups} ; do
708 do
709 dscl . merge /groups/${g} users ${euser} 561 dscl . merge /groups/${g} users ${euser}
710 done 562 done
711 export IFS="${oldifs}" 563 export IFS=${oldifs}
712 else 564 else
713 einfo "Extra options are not supported on macos yet" 565 einfo "Extra options are not supported on Darwin yet"
714 einfo "Please report the ebuild along with the info below" 566 einfo "Please report the ebuild along with the info below"
715 einfo "eextra: ${eextra}" 567 einfo "eextra: $@"
716 die "Required function missing" 568 die "Required function missing"
717 fi 569 fi
718 elif use x86-fbsd ; then 570 ;;
719 if [ -z "${eextra}" ] 571 *-freebsd*|*-dragonfly*)
720 then 572 if [[ -z $@ ]] ; then
721 pw useradd ${euser} ${opts} \ 573 pw useradd ${euser} ${opts} \
722 -c "added by portage for ${PN}" \ 574 -c "added by portage for ${PN}" \
723 die "enewuser failed" 575 die "enewuser failed"
724 else 576 else
725 einfo " - Extra: ${eextra}" 577 einfo " - Extra: $@"
726 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
727 -c ${eextra} || die "enewuser failed" 579 "$@" || die "enewuser failed"
728 fi 580 fi
581 ;;
582
583 *-netbsd*)
584 if [[ -z $@ ]] ; then
585 useradd ${opts} ${euser} || die "enewuser failed"
729 else 586 else
730 if [ -z "${eextra}" ] 587 einfo " - Extra: $@"
731 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
732 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
733 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
734 || die "enewuser failed" 609 || die "enewuser failed"
735 else 610 else
736 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
737 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
738 || die "enewuser failed" 613 || die "enewuser failed"
739 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}"
740 fi 623 fi
624
741 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
742
743 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
744 then
745 einfo " - Creating ${ehome} in ${D}"
746 dodir ${ehome}
747 fowners ${euser} ${ehome}
748 fperms 755 ${ehome}
749 fi
750} 626}
751 627
752# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
753# vapier@gentoo.org 629# vapier@gentoo.org
754# 630#
757# Default values if you do not specify any: 633# Default values if you do not specify any:
758# groupname: REQUIRED ! 634# groupname: REQUIRED !
759# gid: next available (see groupadd(8)) 635# gid: next available (see groupadd(8))
760# extra: none 636# extra: none
761enewgroup() { 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
762 # get the group 645 # get the group
763 local egroup="$1"; shift 646 local egroup="$1"; shift
764 if [ -z "${egroup}" ] 647 if [ -z "${egroup}" ]
765 then 648 then
766 eerror "No group specified !" 649 eerror "No group specified !"
783 then 666 then
784 if [ "${egid}" -gt 0 ] 667 if [ "${egid}" -gt 0 ]
785 then 668 then
786 if [ -z "`egetent group ${egid}`" ] 669 if [ -z "`egetent group ${egid}`" ]
787 then 670 then
788 if useq ppc-macos ; then 671 if [[ "${CHOST}" == *-darwin* ]]; then
789 opts="${opts} ${egid}" 672 opts="${opts} ${egid}"
790 else 673 else
791 opts="${opts} -g ${egid}" 674 opts="${opts} -g ${egid}"
792 fi 675 fi
793 else 676 else
807 opts="${opts} ${eextra}" 690 opts="${opts} ${eextra}"
808 691
809 # add the group 692 # add the group
810 local oldsandbox="${SANDBOX_ON}" 693 local oldsandbox="${SANDBOX_ON}"
811 export SANDBOX_ON="0" 694 export SANDBOX_ON="0"
812 if useq ppc-macos ; then 695 case ${CHOST} in
696 *-darwin*)
813 if [ ! -z "${eextra}" ]; 697 if [ ! -z "${eextra}" ];
814 then 698 then
815 einfo "Extra options are not supported on macos yet" 699 einfo "Extra options are not supported on Darwin/OS X yet"
816 einfo "Please report the ebuild along with the info below" 700 einfo "Please report the ebuild along with the info below"
817 einfo "eextra: ${eextra}" 701 einfo "eextra: ${eextra}"
818 die "Required function missing" 702 die "Required function missing"
819 fi 703 fi
820 704
821 # If we need the next available 705 # If we need the next available
822 case ${egid} in 706 case ${egid} in
823 *[!0-9]*) # Non numeric 707 *[!0-9]*) # Non numeric
824 for egid in `jot 898 101`; do 708 for egid in $(seq 101 999); do
825 [ -z "`egetent group ${egid}`" ] && break 709 [ -z "`egetent group ${egid}`" ] && break
826 done 710 done
827 esac 711 esac
828 dscl . create /groups/${egroup} gid ${egid} 712 dscl . create /groups/${egroup} gid ${egid}
829 dscl . create /groups/${egroup} passwd '*' 713 dscl . create /groups/${egroup} passwd '*'
830 elif use x86-fbsd ; then 714 ;;
715
716 *-freebsd*|*-dragonfly*)
831 case ${egid} in 717 case ${egid} in
832 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
833 for egid in `jot 898 101`; do 719 for egid in $(seq 101 999); do
834 [ -z "`egetent group ${egid}`" ] && break 720 [ -z "`egetent group ${egid}`" ] && break
835 done 721 done
836 esac 722 esac
837 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 723 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
838 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 *)
839 groupadd ${opts} ${egroup} || die "enewgroup failed" 737 groupadd ${opts} ${egroup} || die "enewgroup failed"
840 fi 738 ;;
739 esac
841 export SANDBOX_ON="${oldsandbox}" 740 export SANDBOX_ON="${oldsandbox}"
842} 741}
843 742
844# Simple script to replace 'dos2unix' binaries 743# Simple script to replace 'dos2unix' binaries
845# vapier@gentoo.org 744# vapier@gentoo.org
862 761
863# Make a desktop file ! 762# Make a desktop file !
864# Great for making those icons in kde/gnome startmenu ! 763# Great for making those icons in kde/gnome startmenu !
865# Amaze your friends ! Get the women ! Join today ! 764# Amaze your friends ! Get the women ! Join today !
866# 765#
867# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 766# make_desktop_entry(<command>, [name], [icon], [type], [path])
868# 767#
869# binary: what binary does the app run with ? 768# binary: what command does the app run with ?
870# name: the name that will show up in the menu 769# name: the name that will show up in the menu
871# icon: give your little like a pretty little icon ... 770# icon: give your little like a pretty little icon ...
872# this can be relative (to /usr/share/pixmaps) or 771# this can be relative (to /usr/share/pixmaps) or
873# a full path to an icon 772# a full path to an icon
874# type: what kind of application is this ? for categories: 773# type: what kind of application is this ? for categories:
875# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 774# http://www.freedesktop.org/Standards/desktop-entry-spec
876# path: if your app needs to startup in a specific dir 775# path: if your app needs to startup in a specific dir
877make_desktop_entry() { 776make_desktop_entry() {
878 [[ -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
879 778
880 local exec=${1} 779 local exec=${1}
906 dev) 805 dev)
907 type="Development" 806 type="Development"
908 ;; 807 ;;
909 808
910 games) 809 games)
911 [[ -z ${path} ]] && path=${GAMES_BINDIR}
912
913 case ${catmin} in 810 case ${catmin} in
914 action) type=ActionGame;; 811 action) type=ActionGame;;
915 arcade) type=ArcadeGame;; 812 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 813 board) type=BoardGame;;
917 kid) type=KidsGame;; 814 kid) type=KidsGame;;
958 type="Network;${type}" 855 type="Network;${type}"
959 ;; 856 ;;
960 857
961 sci) 858 sci)
962 case ${catmin} in 859 case ${catmin} in
963 astro*) type=Astronomoy;; 860 astro*) type=Astronomy;;
964 bio*) type=Biology;; 861 bio*) type=Biology;;
965 calc*) type=Calculator;; 862 calc*) type=Calculator;;
966 chem*) type=Chemistry;; 863 chem*) type=Chemistry;;
967 geo*) type=Geology;; 864 geo*) type=Geology;;
968 math*) type=Math;; 865 math*) type=Math;;
982 *) 879 *)
983 type= 880 type=
984 ;; 881 ;;
985 esac 882 esac
986 fi 883 fi
987 884 if [ "${SLOT}" == "0" ] ; then
885 local desktop_name="${PN}"
886 else
887 local desktop_name="${PN}-${SLOT}"
888 fi
988 local desktop=${T}/${exec%% *}-${P}.desktop 889 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
890# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
989 891
990echo "[Desktop Entry] 892echo "[Desktop Entry]
991Encoding=UTF-8 893Encoding=UTF-8
992Version=0.9.2 894Version=0.9.2
993Name=${name} 895Name=${name}
994Type=Application 896Type=Application
995Comment=${DESCRIPTION} 897Comment=${DESCRIPTION}
996Exec=${exec} 898Exec=${exec}
899TryExec=${exec%% *}
997Path=${path} 900Path=${path}
998Icon=${icon} 901Icon=${icon}
999Categories=Application;${type};" > "${desktop}" 902Categories=Application;${type};" > "${desktop}"
1000 903
904 (
905 # wrap the env here so that the 'insinto' call
906 # doesn't corrupt the env of the caller
1001 insinto /usr/share/applications 907 insinto /usr/share/applications
1002 doins "${desktop}" 908 doins "${desktop}"
1003 909 )
1004 return 0
1005} 910}
1006 911
1007# Make a GDM/KDM Session file 912# Make a GDM/KDM Session file
1008# 913#
1009# make_desktop_entry(<title>, <command>) 914# make_desktop_entry(<title>, <command>)
1038 doins "${i}" 943 doins "${i}"
1039 elif [[ -d ${i} ]] ; then 944 elif [[ -d ${i} ]] ; then
1040 for j in "${i}"/*.desktop ; do 945 for j in "${i}"/*.desktop ; do
1041 doins "${j}" 946 doins "${j}"
1042 done 947 done
1043 fi 948 fi
1044 done 949 done
1045} 950}
1046newmenu() { 951newmenu() {
1047 insinto /usr/share/applications 952 insinto /usr/share/applications
1048 newins "$1" "$2" 953 newins "$1" "$2"
1056 doins "${i}" 961 doins "${i}"
1057 elif [[ -d ${i} ]] ; then 962 elif [[ -d ${i} ]] ; then
1058 for j in "${i}"/*.png ; do 963 for j in "${i}"/*.png ; do
1059 doins "${j}" 964 doins "${j}"
1060 done 965 done
1061 fi 966 fi
1062 done 967 done
1063} 968}
1064newicon() { 969newicon() {
1065 insinto /usr/share/pixmaps 970 insinto /usr/share/pixmaps
1066 newins "$1" "$2" 971 newins "$1" "$2"
1071############################################################## 976##############################################################
1072 977
1073 978
1074# for internal use only (unpack_pdv and unpack_makeself) 979# for internal use only (unpack_pdv and unpack_makeself)
1075find_unpackable_file() { 980find_unpackable_file() {
1076 local src="$1" 981 local src=$1
1077 if [ -z "${src}" ] 982 if [[ -z ${src} ]] ; then
1078 then
1079 src="${DISTDIR}/${A}" 983 src=${DISTDIR}/${A}
1080 else 984 else
1081 if [ -e "${DISTDIR}/${src}" ] 985 if [[ -e ${DISTDIR}/${src} ]] ; then
1082 then
1083 src="${DISTDIR}/${src}" 986 src=${DISTDIR}/${src}
1084 elif [ -e "${PWD}/${src}" ] 987 elif [[ -e ${PWD}/${src} ]] ; then
1085 then
1086 src="${PWD}/${src}" 988 src=${PWD}/${src}
1087 elif [ -e "${src}" ] 989 elif [[ -e ${src} ]] ; then
1088 then
1089 src="${src}" 990 src=${src}
1090 fi
1091 fi 991 fi
1092 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 992 fi
993 [[ ! -e ${src} ]] && return 1
1093 echo "${src}" 994 echo "${src}"
1094} 995}
1095 996
1096# Unpack those pesky pdv generated files ... 997# Unpack those pesky pdv generated files ...
1097# They're self-unpacking programs with the binary package stuffed in 998# They're self-unpacking programs with the binary package stuffed in
1112# lseek 1013# lseek
1113# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1014# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1114# lseek(3, -4, SEEK_END) = 2981250 1015# lseek(3, -4, SEEK_END) = 2981250
1115# 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.
1116unpack_pdv() { 1017unpack_pdv() {
1117 local src="`find_unpackable_file $1`" 1018 local src=$(find_unpackable_file $1)
1118 local sizeoff_t="$2" 1019 local sizeoff_t=$2
1119 1020
1021 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1120 [ -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 :("
1121 1023
1122 local shrtsrc="`basename ${src}`" 1024 local shrtsrc=$(basename "${src}")
1123 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1025 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1124 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1026 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1125 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\"`
1126 1028
1127 # grab metadata for debug reasons 1029 # grab metadata for debug reasons
1191# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1093# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1192# - If the file is not specified then unpack will utilize ${A}. 1094# - If the file is not specified then unpack will utilize ${A}.
1193# - 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
1194# the proper offset from the script itself. 1096# the proper offset from the script itself.
1195unpack_makeself() { 1097unpack_makeself() {
1098 local src_input=${1:-${A}}
1196 local src="$(find_unpackable_file "$1")" 1099 local src=$(find_unpackable_file "${src_input}")
1197 local skip="$2" 1100 local skip=$2
1198 local exe="$3" 1101 local exe=$3
1199 1102
1103 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1104
1200 local shrtsrc="$(basename "${src}")" 1105 local shrtsrc=$(basename "${src}")
1201 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1106 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1202 if [ -z "${skip}" ] 1107 if [[ -z ${skip} ]] ; then
1203 then
1204 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1108 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1205 local skip=0 1109 local skip=0
1206 exe=tail 1110 exe=tail
1207 case ${ver} in 1111 case ${ver} in
1208 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
1209 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1113 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1210 ;; 1114 ;;
1211 2.0|2.0.1) 1115 2.0|2.0.1)
1212 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1116 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1213 ;; 1117 ;;
1221 ;; 1125 ;;
1222 2.1.3) 1126 2.1.3)
1223 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1127 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1224 let skip="skip + 1" 1128 let skip="skip + 1"
1225 ;; 1129 ;;
1226 2.1.4) 1130 2.1.4|2.1.5)
1227 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)
1228 skip=$(head -n ${skip} "${src}" | wc -c) 1132 skip=$(head -n ${skip} "${src}" | wc -c)
1229 exe="dd" 1133 exe="dd"
1230 ;; 1134 ;;
1231 *) 1135 *)
1276check_license() { 1180check_license() {
1277 local lic=$1 1181 local lic=$1
1278 if [ -z "${lic}" ] ; then 1182 if [ -z "${lic}" ] ; then
1279 lic="${PORTDIR}/licenses/${LICENSE}" 1183 lic="${PORTDIR}/licenses/${LICENSE}"
1280 else 1184 else
1281 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1185 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1282 lic="${PORTDIR}/licenses/${src}" 1186 lic="${PORTDIR}/licenses/${lic}"
1283 elif [ -e "${PWD}/${src}" ] ; then 1187 elif [ -e "${PWD}/${lic}" ] ; then
1284 lic="${PWD}/${src}" 1188 lic="${PWD}/${lic}"
1285 elif [ -e "${src}" ] ; then 1189 elif [ -e "${lic}" ] ; then
1286 lic="${src}" 1190 lic="${lic}"
1287 fi
1288 fi 1191 fi
1192 fi
1289 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1193 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1290 local l="`basename ${lic}`" 1194 local l="`basename ${lic}`"
1291 1195
1292 # here is where we check for the licenses the user already 1196 # here is where we check for the licenses the user already
1293 # 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
1294 local shopts=$- 1198 local shopts=$-
1336# 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
1337# found at CDROM_ROOT. 1241# found at CDROM_ROOT.
1338# 1242#
1339# 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',
1340# 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
1341# 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_#
1342# 1250#
1343# 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.
1344# 1252#
1345# 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] [...]
1346# - 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
1350 # 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
1351 # the # of files they gave us 1259 # the # of files they gave us
1352 local cdcnt=0 1260 local cdcnt=0
1353 local f= 1261 local f=
1354 for f in "$@" ; do 1262 for f in "$@" ; do
1355 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1356 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1357 done 1265 done
1358 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1359 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1360 1268
1361 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1362 # 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
1363 if [[ ! -z ${CD_ROOT} ]] ; then
1364 export CDROM_ROOT=${CD_ROOT}
1365 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1366 return
1367 fi
1368 # do the same for CD_ROOT_X
1369 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1370 local var= 1272 local var=
1371 cdcnt=0 1273 cdcnt=0
1372 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1373 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1374 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1375 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1376 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1377 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1378 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."
1379 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1380 fi 1283 fi
1381 export CDROM_ROOTS_${cdcnt}="${!var}"
1382 done 1284 done
1383 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1384 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}
1385 return 1293 return
1386 fi 1294 fi
1387 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1388 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1389 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1390 if [[ -z ${CDROM_NAME} ]] ; then
1391 echo "cdrom for ${PN}."
1392 else
1393 echo "${CDROM_NAME}."
1394 fi
1395 echo 1300 echo
1396 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"
1397 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1398 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1399 einfo "directory containing the files." 1304 einfo "directory containing the files."
1400 echo 1305 echo
1401 einfo "For example:" 1306 einfo "For example:"
1402 einfo "export CD_ROOT=/mnt/cdrom" 1307 einfo "export CD_ROOT=/mnt/cdrom"
1403 echo 1308 echo
1404 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
1405 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1319 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1406 cdcnt=0 1320 cdcnt=0
1407 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1321 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1408 cdcnt=$((cdcnt + 1)) 1322 ((++cdcnt))
1409 var="CDROM_NAME_${cdcnt}" 1323 var="CDROM_NAME_${cdcnt}"
1410 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1324 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1411 done 1325 done
1412 echo 1326 echo
1413 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"
1414 einfo "mounted somewhere on your filesystem, just export" 1328 einfo "mounted somewhere on your filesystem, just export"
1415 einfo "the following variables so they point to the right place:" 1329 einfo "the following variables so they point to the right place:"
1416 einfon "" 1330 einfon ""
1417 cdcnt=0 1331 cdcnt=0
1418 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1332 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1419 cdcnt=$((cdcnt + 1)) 1333 ((++cdcnt))
1420 echo -n " CD_ROOT_${cdcnt}" 1334 echo -n " CD_ROOT_${cdcnt}"
1421 done 1335 done
1422 echo 1336 echo
1423 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"
1424 einfo "you only have one cdrom, you can export CD_ROOT" 1338 einfo "you only have one cdrom, you can export CD_ROOT"
1427 echo 1341 echo
1428 einfo "For example:" 1342 einfo "For example:"
1429 einfo "export CD_ROOT_1=/mnt/cdrom" 1343 einfo "export CD_ROOT_1=/mnt/cdrom"
1430 echo 1344 echo
1431 fi 1345 fi
1346
1347 export CDROM_SET=""
1432 export CDROM_CURRENT_CD=0 1348 export CDROM_CURRENT_CD=0
1433 cdrom_load_next_cd 1349 cdrom_load_next_cd
1434} 1350}
1435 1351
1436# 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.
1437# 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.
1438# 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.
1439# 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.
1440cdrom_load_next_cd() { 1356cdrom_load_next_cd() {
1441 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1442 local var= 1357 local var
1443 1358 ((++CDROM_CURRENT_CD))
1444 if [[ ! -z ${CD_ROOT} ]] ; then
1445 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1446 return
1447 fi
1448 1359
1449 unset CDROM_ROOT 1360 unset CDROM_ROOT
1450 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1361 var=CD_ROOT_${CDROM_CURRENT_CD}
1362 [[ -z ${!var} ]] && var="CD_ROOT"
1451 if [[ -z ${!var} ]] ; then 1363 if [[ -z ${!var} ]] ; then
1452 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1364 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1453 cdrom_locate_file_on_cd ${!var} 1365 _cdrom_locate_file_on_cd ${!var}
1454 else 1366 else
1455 export CDROM_ROOT=${!var} 1367 export CDROM_ROOT=${!var}
1456 fi 1368 fi
1457 1369
1458 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1463# 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
1464# 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
1465# displayed and we'll hang out here until: 1377# displayed and we'll hang out here until:
1466# (1) the file is found on a mounted cdrom 1378# (1) the file is found on a mounted cdrom
1467# (2) the user hits CTRL+C 1379# (2) the user hits CTRL+C
1468cdrom_locate_file_on_cd() { 1380_cdrom_locate_file_on_cd() {
1381 local mline=""
1382 local showedmsg=0
1383
1469 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
1470 local dir="$(dirname ${@})" 1392 local dir=$(dirname ${cdset[${i}]})
1471 local file="$(basename ${@})" 1393 local file=$(basename ${cdset[${i}]})
1472 local mline=""
1473 local showedmsg=0
1474 1394
1475 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
1476 [[ -d ${mline}/${dir} ]] || continue 1396 [[ -d ${mline}/${dir} ]] || continue
1477 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1397 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1478 && 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))
1479 done 1406 done
1480 1407
1481 if [[ -z ${CDROM_ROOT} ]] ; then
1482 echo 1408 echo
1483 if [[ ${showedmsg} -eq 0 ]] ; then 1409 if [[ ${showedmsg} -eq 0 ]] ; then
1484 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1410 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1485 if [[ -z ${CDROM_NAME} ]] ; then 1411 if [[ -z ${CDROM_NAME} ]] ; then
1486 einfo "Please insert the cdrom for ${PN} now !" 1412 einfo "Please insert+mount the cdrom for ${PN} now !"
1487 else
1488 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1489 fi
1490 else 1413 else
1491 if [[ -z ${CDROM_NAME_1} ]] ; then
1492 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1493 else
1494 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1495 einfo "Please insert+mount the ${!var} cdrom now !" 1414 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1496 fi
1497 fi 1415 fi
1498 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
1499 fi 1423 fi
1424 showedmsg=1
1425 fi
1500 einfo "Press return to scan for the cd again" 1426 einfo "Press return to scan for the cd again"
1501 einfo "or hit CTRL+C to abort the emerge." 1427 einfo "or hit CTRL+C to abort the emerge."
1502 read 1428 echo
1503 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"
1504 done 1434 done
1505} 1435}
1506 1436
1507# Make sure that LINGUAS only contains languages that 1437# Make sure that LINGUAS only contains languages that
1508# a package can support 1438# a package can support
1515# 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
1516# directories and uses the intersection of the lists. 1446# directories and uses the intersection of the lists.
1517# 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
1518# directories and uses the union of the lists. 1448# directories and uses the union of the lists.
1519strip-linguas() { 1449strip-linguas() {
1520 local ls newls 1450 local ls newls nols
1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1451 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1522 local op=$1; shift 1452 local op=$1; shift
1523 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1453 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1524 local d f 1454 local d f
1525 for d in "$@" ; do 1455 for d in "$@" ; do
1526 if [[ ${op} == "-u" ]] ; then 1456 if [[ ${op} == "-u" ]] ; then
1527 newls=${ls} 1457 newls=${ls}
1528 else 1458 else
1529 newls="" 1459 newls=""
1530 fi 1460 fi
1531 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1461 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1532 if [[ ${op} == "-i" ]] ; then 1462 if [[ ${op} == "-i" ]] ; then
1533 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1463 hasq ${f} ${ls} && newls="${newls} ${f}"
1534 else 1464 else
1535 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1465 hasq ${f} ${ls} || newls="${newls} ${f}"
1536 fi 1466 fi
1537 done 1467 done
1538 ls=${newls} 1468 ls=${newls}
1539 done 1469 done
1540 ls=${ls//.po}
1541 else 1470 else
1542 ls=$@ 1471 ls="$@"
1543 fi 1472 fi
1544 1473
1545 ls=" ${ls} " 1474 nols=""
1546 newls="" 1475 newls=""
1547 for f in ${LINGUAS} ; do 1476 for f in ${LINGUAS} ; do
1548 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1477 if hasq ${f} ${ls} ; then
1549 newls="${newls} ${f}" 1478 newls="${newls} ${f}"
1550 else 1479 else
1551 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1480 nols="${nols} ${f}"
1552 fi 1481 fi
1553 done 1482 done
1554 if [[ -z ${newls} ]] ; then 1483 [[ -n ${nols} ]] \
1555 export LINGUAS="" 1484 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1556 else
1557 export LINGUAS=${newls:1} 1485 export LINGUAS=${newls:1}
1558 fi
1559} 1486}
1560 1487
1561# moved from kernel.eclass since they are generally useful outside of 1488# moved from kernel.eclass since they are generally useful outside of
1562# kernel.eclass -iggy (20041002) 1489# kernel.eclass -iggy (20041002)
1563 1490
1570 while ((i--)) ; do 1497 while ((i--)) ; do
1571 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1498 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1572 done 1499 done
1573 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1500 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1574 case ${ARCH} in 1501 case ${ARCH} in
1575 x86) export ARCH="i386";; 1502 x86) export ARCH="i386";;
1576 amd64) export ARCH="x86_64";; 1503 amd64) export ARCH="x86_64";;
1577 hppa) export ARCH="parisc";; 1504 hppa) export ARCH="parisc";;
1578 mips) export ARCH="mips";; 1505 mips) export ARCH="mips";;
1579 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!
1580 *) export ARCH="${ARCH}";; 1507 *) export ARCH="${ARCH}";;
1581 esac 1508 esac
1582} 1509}
1583 1510
1584# set's ARCH back to what portage expects 1511# set's ARCH back to what portage expects
1585set_arch_to_portage() { 1512set_arch_to_portage() {
1592 1519
1593# Jeremy Huddleston <eradicator@gentoo.org>: 1520# Jeremy Huddleston <eradicator@gentoo.org>:
1594# preserve_old_lib /path/to/libblah.so.0 1521# preserve_old_lib /path/to/libblah.so.0
1595# preserve_old_lib_notify /path/to/libblah.so.0 1522# preserve_old_lib_notify /path/to/libblah.so.0
1596# 1523#
1597# 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
1598# 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
1599# 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
1600# 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
1601# solution, so instead you can add the following to your ebuilds: 1528# solution, so instead you can add the following to your ebuilds:
1602# 1529#
1629 LIB=$1 1556 LIB=$1
1630 1557
1631 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1558 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1632 SONAME=`basename ${LIB}` 1559 SONAME=`basename ${LIB}`
1633 1560
1634 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."
1635 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"
1636 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,"
1637 einfo "you will need to execute the following command:" 1564 ewarn "you will need to execute the following command:"
1638 einfo " revdep-rebuild --soname ${SONAME}" 1565 ewarn " revdep-rebuild --library ${SONAME}"
1639 einfo 1566 ewarn
1640 einfo "After doing that, you can safely remove ${LIB}" 1567 ewarn "After doing that, you can safely remove ${LIB}"
1641 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1568 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1642 fi 1569 fi
1643} 1570}
1644 1571
1645# 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
1646# certain USE flags 1573# certain USE flags
1656 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1583 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1657 1584
1658 local PKG=$(best_version $1) 1585 local PKG=$(best_version $1)
1659 shift 1586 shift
1660 1587
1661 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
1662 [[ ! -e ${USEFILE} ]] && return 1 1592 [[ ! -e ${USEFILE} ]] && return 0
1663 1593
1664 local USE_BUILT=$(<${USEFILE}) 1594 local USE_BUILT=$(<${USEFILE})
1665 while [[ $# -gt 0 ]] ; do 1595 while [[ $# -gt 0 ]] ; do
1666 if [[ ${opt} = "-o" ]] ; then 1596 if [[ ${opt} = "-o" ]] ; then
1667 has $1 ${USE_BUILT} && return 0 1597 has $1 ${USE_BUILT} && return 0
1692dopamd() { 1622dopamd() {
1693 [[ -z $1 ]] && die "dopamd requires at least one argument" 1623 [[ -z $1 ]] && die "dopamd requires at least one argument"
1694 1624
1695 use pam || return 0 1625 use pam || return 0
1696 1626
1697 insinto /etc/pam.d 1627 INSDESTTREE=/etc/pam.d \
1698 doins "$@" || die "failed to install $@" 1628 doins "$@" || die "failed to install $@"
1699} 1629}
1700# newpamd <old name> <new name> 1630# newpamd <old name> <new name>
1701# 1631#
1702# 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
1703newpamd() { 1633newpamd() {
1704 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1634 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1705 1635
1706 use pam || return 0 1636 use pam || return 0
1707 1637
1708 insinto /etc/pam.d 1638 INSDESTTREE=/etc/pam.d \
1709 newins "$1" "$2" || die "failed to install $1 as $2" 1639 newins "$1" "$2" || die "failed to install $1 as $2"
1710} 1640}
1711 1641
1712# make a wrapper script ... 1642# make a wrapper script ...
1713# 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
1719# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1649# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1720# $5 == path for wrapper 1650# $5 == path for wrapper
1721make_wrapper() { 1651make_wrapper() {
1722 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1652 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1723 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"
1724 cat << EOF > "${tmpwrapper}" 1656 cat << EOF > "${tmpwrapper}"
1725#!/bin/sh 1657#!/bin/sh
1726cd "${chdir}" 1658cd "${chdir:-.}"
1659if [ -n "${libdir}" ] ; then
1660 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1727export 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
1728exec ${bin} "\$@" 1666exec ${bin} "\$@"
1729EOF 1667EOF
1730 chmod go+rx "${tmpwrapper}" 1668 chmod go+rx "${tmpwrapper}"
1731 if [ -n "${5}" ] 1669 if [[ -n ${path} ]] ; then
1732 then
1733 exeinto ${5} 1670 exeinto "${path}"
1734 newexe "${tmpwrapper}" "${wrapper}" 1671 newexe "${tmpwrapper}" "${wrapper}"
1735 else 1672 else
1736 newbin "${tmpwrapper}" "${wrapper}" 1673 newbin "${tmpwrapper}" "${wrapper}"
1737 fi 1674 fi
1738} 1675}

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

  ViewVC Help
Powered by ViewVC 1.1.20