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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.170  
changed lines
  Added in v.1.252

  ViewVC Help
Powered by ViewVC 1.1.20