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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.165  
changed lines
  Added in v.1.256

  ViewVC Help
Powered by ViewVC 1.1.20