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

Diff of /eclass/eutils.eclass

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

Revision 1.166 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.166 2005/04/15 22:01:42 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# - 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
123EPATCH_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"
124# 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,
125# and not the full path .. 99# and not the full path ..
126EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
127# Change the printed message for a single patch. 101# Change the printed message for a single patch.
128EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
103# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
129# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
130# 106#
131# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
132# 108#
133EPATCH_FORCE="no" 109EPATCH_FORCE="no"
164# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
165# 141#
166# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
167# 143#
168epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
169 local PIPE_CMD="" 150 local PIPE_CMD=""
170 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
171 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
172 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
173 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
174 local x="" 155 local x=""
175 156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
158
176 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
177 then 160 then
178 local m="" 161 local m=""
179 einfo "${#} patches to apply ..."
180 for m in "$@" ; do 162 for m in "$@" ; do
181 epatch "${m}" 163 epatch "${m}"
182 done 164 done
183 return 0 165 return 0
184 fi 166 fi
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 [[ -n $(egetent passwd "${euser}") ]] ; 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 [[ -n ${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 [[ -n $(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 = 101; euid <= 999; euid++)); 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
505 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use, proceeding with userland default."
507 case ${USERLAND} in
640 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
641 fi 513 fi
514
515 eshell=${shell}
642 fi 516 fi
643 einfo " - Shell: ${eshell}" 517 einfo " - Shell: ${eshell}"
644 opts="${opts} -s ${eshell}" 518 opts="${opts} -s ${eshell}"
645 519
646 # handle homedir 520 # handle homedir
647 local ehome="$1"; shift 521 local ehome=$1; shift
648 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 522 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
649 then
650 ehome="/dev/null" 523 ehome="/dev/null"
651 fi 524 fi
652 einfo " - Home: ${ehome}" 525 einfo " - Home: ${ehome}"
653 opts="${opts} -d ${ehome}" 526 opts="${opts} -d ${ehome}"
654 527
655 # handle groups 528 # handle groups
656 local egroups="$1"; shift 529 local egroups=$1; shift
657 if [ ! -z "${egroups}" ] 530 if [[ ! -z ${egroups} ]] ; then
658 then
659 local oldifs="${IFS}" 531 local oldifs=${IFS}
660 local defgroup="" exgroups="" 532 local defgroup="" exgroups=""
661 533
662 export IFS="," 534 export IFS=","
663 for g in ${egroups} 535 for g in ${egroups} ; do
664 do
665 export IFS="${oldifs}" 536 export IFS=${oldifs}
666 if [ -z "`egetent group \"${g}\"`" ] 537 if [[ -z $(egetent group "${g}") ]] ; then
667 then
668 eerror "You must add group ${g} to the system first" 538 eerror "You must add group ${g} to the system first"
669 die "${g} is not a valid GID" 539 die "${g} is not a valid GID"
670 fi 540 fi
671 if [ -z "${defgroup}" ] 541 if [[ -z ${defgroup} ]] ; then
672 then
673 defgroup="${g}" 542 defgroup=${g}
674 else 543 else
675 exgroups="${exgroups},${g}" 544 exgroups="${exgroups},${g}"
676 fi 545 fi
677 export IFS="," 546 export IFS=","
678 done 547 done
679 export IFS="${oldifs}" 548 export IFS=${oldifs}
680 549
681 opts="${opts} -g ${defgroup}" 550 opts="${opts} -g ${defgroup}"
682 if [ ! -z "${exgroups}" ] 551 if [[ ! -z ${exgroups} ]] ; then
683 then
684 opts="${opts} -G ${exgroups:1}" 552 opts="${opts} -G ${exgroups:1}"
685 fi 553 fi
686 else 554 else
687 egroups="(none)" 555 egroups="(none)"
688 fi 556 fi
689 einfo " - Groups: ${egroups}" 557 einfo " - Groups: ${egroups}"
690 558
691 # handle extra and add the user 559 # handle extra and add the user
692 local eextra="$@"
693 local oldsandbox="${SANDBOX_ON}" 560 local oldsandbox=${SANDBOX_ON}
694 export SANDBOX_ON="0" 561 export SANDBOX_ON="0"
695 if useq ppc-macos 562 case ${CHOST} in
696 then 563 *-darwin*)
697 ### Make the user 564 ### Make the user
698 if [ -z "${eextra}" ] 565 if [[ -z $@ ]] ; then
699 then
700 dscl . create /users/${euser} uid ${euid} 566 dscl . create /users/${euser} uid ${euid}
701 dscl . create /users/${euser} shell ${eshell} 567 dscl . create /users/${euser} shell ${eshell}
702 dscl . create /users/${euser} home ${ehome} 568 dscl . create /users/${euser} home ${ehome}
703 dscl . create /users/${euser} realname "added by portage for ${PN}" 569 dscl . create /users/${euser} realname "added by portage for ${PN}"
704 ### Add the user to the groups specified 570 ### Add the user to the groups specified
705 local oldifs="${IFS}" 571 local oldifs=${IFS}
706 export IFS="," 572 export IFS=","
707 for g in ${egroups} 573 for g in ${egroups} ; do
708 do
709 dscl . merge /groups/${g} users ${euser} 574 dscl . merge /groups/${g} users ${euser}
710 done 575 done
711 export IFS="${oldifs}" 576 export IFS=${oldifs}
712 else 577 else
713 einfo "Extra options are not supported on macos yet" 578 einfo "Extra options are not supported on Darwin yet"
714 einfo "Please report the ebuild along with the info below" 579 einfo "Please report the ebuild along with the info below"
715 einfo "eextra: ${eextra}" 580 einfo "eextra: $@"
716 die "Required function missing" 581 die "Required function missing"
717 fi 582 fi
718 elif use x86-fbsd ; then 583 ;;
719 if [ -z "${eextra}" ] 584 *-freebsd*|*-dragonfly*)
720 then 585 if [[ -z $@ ]] ; then
721 pw useradd ${euser} ${opts} \ 586 pw useradd ${euser} ${opts} \
722 -c "added by portage for ${PN}" \ 587 -c "added by portage for ${PN}" \
723 die "enewuser failed" 588 die "enewuser failed"
724 else 589 else
725 einfo " - Extra: ${eextra}" 590 einfo " - Extra: $@"
726 pw useradd ${euser} ${opts} \ 591 pw useradd ${euser} ${opts} \
727 -c ${eextra} || die "enewuser failed" 592 "$@" || die "enewuser failed"
728 fi 593 fi
594 ;;
595
596 *-netbsd*)
597 if [[ -z $@ ]] ; then
598 useradd ${opts} ${euser} || die "enewuser failed"
729 else 599 else
730 if [ -z "${eextra}" ] 600 einfo " - Extra: $@"
731 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
732 useradd ${opts} ${euser} \ 620 useradd ${opts} ${euser} \
733 -c "added by portage for ${PN}" \ 621 -c "added by portage for ${PN}" \
734 || die "enewuser failed" 622 || die "enewuser failed"
735 else 623 else
736 einfo " - Extra: ${eextra}" 624 einfo " - Extra: $@"
737 useradd ${opts} ${euser} ${eextra} \ 625 useradd ${opts} ${euser} "$@" \
738 || die "enewuser failed" 626 || die "enewuser failed"
739 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}"
740 fi 636 fi
637
741 export SANDBOX_ON="${oldsandbox}" 638 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} 639}
751 640
752# Simplify/standardize adding groups to the system 641# Simplify/standardize adding groups to the system
753# vapier@gentoo.org 642# vapier@gentoo.org
754# 643#
757# Default values if you do not specify any: 646# Default values if you do not specify any:
758# groupname: REQUIRED ! 647# groupname: REQUIRED !
759# gid: next available (see groupadd(8)) 648# gid: next available (see groupadd(8))
760# extra: none 649# extra: none
761enewgroup() { 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
762 # get the group 658 # get the group
763 local egroup="$1"; shift 659 local egroup="$1"; shift
764 if [ -z "${egroup}" ] 660 if [ -z "${egroup}" ]
765 then 661 then
766 eerror "No group specified !" 662 eerror "No group specified !"
767 die "Cannot call enewgroup without a group" 663 die "Cannot call enewgroup without a group"
768 fi 664 fi
769 665
770 # see if group already exists 666 # see if group already exists
771 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 667 if [[ -n $(egetent group "${egroup}") ]]; then
772 then
773 return 0 668 return 0
774 fi 669 fi
775 einfo "Adding group '${egroup}' to your system ..." 670 einfo "Adding group '${egroup}' to your system ..."
776 671
777 # options to pass to useradd 672 # options to pass to useradd
783 then 678 then
784 if [ "${egid}" -gt 0 ] 679 if [ "${egid}" -gt 0 ]
785 then 680 then
786 if [ -z "`egetent group ${egid}`" ] 681 if [ -z "`egetent group ${egid}`" ]
787 then 682 then
788 if useq ppc-macos ; then 683 if [[ "${CHOST}" == *-darwin* ]]; then
789 opts="${opts} ${egid}" 684 opts="${opts} ${egid}"
790 else 685 else
791 opts="${opts} -g ${egid}" 686 opts="${opts} -g ${egid}"
792 fi 687 fi
793 else 688 else
807 opts="${opts} ${eextra}" 702 opts="${opts} ${eextra}"
808 703
809 # add the group 704 # add the group
810 local oldsandbox="${SANDBOX_ON}" 705 local oldsandbox="${SANDBOX_ON}"
811 export SANDBOX_ON="0" 706 export SANDBOX_ON="0"
812 if useq ppc-macos ; then 707 case ${CHOST} in
708 *-darwin*)
813 if [ ! -z "${eextra}" ]; 709 if [ ! -z "${eextra}" ];
814 then 710 then
815 einfo "Extra options are not supported on macos yet" 711 einfo "Extra options are not supported on Darwin/OS X yet"
816 einfo "Please report the ebuild along with the info below" 712 einfo "Please report the ebuild along with the info below"
817 einfo "eextra: ${eextra}" 713 einfo "eextra: ${eextra}"
818 die "Required function missing" 714 die "Required function missing"
819 fi 715 fi
820 716
821 # If we need the next available 717 # If we need the next available
822 case ${egid} in 718 case ${egid} in
823 *[!0-9]*) # Non numeric 719 *[!0-9]*) # Non numeric
824 for egid in `jot 898 101`; do 720 for ((egid = 101; egid <= 999; egid++)); do
825 [ -z "`egetent group ${egid}`" ] && break 721 [[ -z $(egetent group ${egid}) ]] && break
826 done 722 done
827 esac 723 esac
828 dscl . create /groups/${egroup} gid ${egid} 724 dscl . create /groups/${egroup} gid ${egid}
829 dscl . create /groups/${egroup} passwd '*' 725 dscl . create /groups/${egroup} passwd '*'
830 elif use x86-fbsd ; then 726 ;;
727
728 *-freebsd*|*-dragonfly*)
831 case ${egid} in 729 case ${egid} in
832 *[!0-9]*) # Non numeric 730 *[!0-9]*) # Non numeric
833 for egid in `jot 898 101`; do 731 for ((egid = 101; egid <= 999; egid++)); do
834 [ -z "`egetent group ${egid}`" ] && break 732 [[ -z $(egetent group ${egid}) ]] && break
835 done 733 done
836 esac 734 esac
837 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 735 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
838 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 *)
839 groupadd ${opts} ${egroup} || die "enewgroup failed" 749 groupadd ${opts} ${egroup} || die "enewgroup failed"
840 fi 750 ;;
751 esac
841 export SANDBOX_ON="${oldsandbox}" 752 export SANDBOX_ON="${oldsandbox}"
842} 753}
843 754
844# Simple script to replace 'dos2unix' binaries 755# Simple script to replace 'dos2unix' binaries
845# vapier@gentoo.org 756# vapier@gentoo.org
862 773
863# Make a desktop file ! 774# Make a desktop file !
864# Great for making those icons in kde/gnome startmenu ! 775# Great for making those icons in kde/gnome startmenu !
865# Amaze your friends ! Get the women ! Join today ! 776# Amaze your friends ! Get the women ! Join today !
866# 777#
867# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 778# make_desktop_entry(<command>, [name], [icon], [type], [path])
868# 779#
869# binary: what binary does the app run with ? 780# binary: what command does the app run with ?
870# name: the name that will show up in the menu 781# name: the name that will show up in the menu
871# icon: give your little like a pretty little icon ... 782# icon: give your little like a pretty little icon ...
872# this can be relative (to /usr/share/pixmaps) or 783# this can be relative (to /usr/share/pixmaps) or
873# a full path to an icon 784# a full path to an icon
874# type: what kind of application is this ? for categories: 785# type: what kind of application is this ? for categories:
875# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 786# http://www.freedesktop.org/Standards/desktop-entry-spec
876# path: if your app needs to startup in a specific dir 787# path: if your app needs to startup in a specific dir
877make_desktop_entry() { 788make_desktop_entry() {
878 [[ -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
879 790
880 local exec=${1} 791 local exec=${1}
906 dev) 817 dev)
907 type="Development" 818 type="Development"
908 ;; 819 ;;
909 820
910 games) 821 games)
911 [[ -z ${path} ]] && path=${GAMES_BINDIR}
912
913 case ${catmin} in 822 case ${catmin} in
914 action) type=ActionGame;; 823 action) type=ActionGame;;
915 arcade) type=ArcadeGame;; 824 arcade) type=ArcadeGame;;
916 board) type=BoardGame;; 825 board) type=BoardGame;;
917 kid) type=KidsGame;; 826 kids) type=KidsGame;;
918 emulation) type=Emulator;; 827 emulation) type=Emulator;;
919 puzzle) type=LogicGame;; 828 puzzle) type=LogicGame;;
920 rpg) type=RolePlaying;; 829 rpg) type=RolePlaying;;
921 roguelike) type=RolePlaying;; 830 roguelike) type=RolePlaying;;
922 simulation) type=Simulation;; 831 simulation) type=Simulation;;
958 type="Network;${type}" 867 type="Network;${type}"
959 ;; 868 ;;
960 869
961 sci) 870 sci)
962 case ${catmin} in 871 case ${catmin} in
963 astro*) type=Astronomoy;; 872 astro*) type=Astronomy;;
964 bio*) type=Biology;; 873 bio*) type=Biology;;
965 calc*) type=Calculator;; 874 calc*) type=Calculator;;
966 chem*) type=Chemistry;; 875 chem*) type=Chemistry;;
967 geo*) type=Geology;; 876 geo*) type=Geology;;
968 math*) type=Math;; 877 math*) type=Math;;
982 *) 891 *)
983 type= 892 type=
984 ;; 893 ;;
985 esac 894 esac
986 fi 895 fi
987 896 if [ "${SLOT}" == "0" ] ; then
897 local desktop_name="${PN}"
898 else
899 local desktop_name="${PN}-${SLOT}"
900 fi
988 local desktop=${T}/${exec%% *}-${P}.desktop 901 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
989 903
990echo "[Desktop Entry] 904echo "[Desktop Entry]
991Encoding=UTF-8 905Encoding=UTF-8
992Version=0.9.2 906Version=0.9.2
993Name=${name} 907Name=${name}
994Type=Application 908Type=Application
995Comment=${DESCRIPTION} 909Comment=${DESCRIPTION}
996Exec=${exec} 910Exec=${exec}
911TryExec=${exec%% *}
997Path=${path} 912Path=${path}
998Icon=${icon} 913Icon=${icon}
999Categories=Application;${type};" > "${desktop}" 914Categories=Application;${type};" > "${desktop}"
1000 915
916 (
917 # wrap the env here so that the 'insinto' call
918 # doesn't corrupt the env of the caller
1001 insinto /usr/share/applications 919 insinto /usr/share/applications
1002 doins "${desktop}" 920 doins "${desktop}"
1003 921 )
1004 return 0
1005} 922}
1006 923
1007# Make a GDM/KDM Session file 924# Make a GDM/KDM Session file
1008# 925#
1009# make_desktop_entry(<title>, <command>) 926# make_session_desktop(<title>, <command>)
1010# title: File to execute to start the Window Manager 927# title: File to execute to start the Window Manager
1011# command: Name of the Window Manager 928# command: Name of the Window Manager
1012 929
1013make_session_desktop() { 930make_session_desktop() {
1014
1015 [ -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
1016 [ -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
1017 933
1018 local title="${1}" 934 local title=$1
1019 local command="${2}" 935 local command=$2
1020 local desktop="${T}/${wm}.desktop" 936 local desktop=${T}/${wm}.desktop
1021 937
1022echo "[Desktop Entry] 938echo "[Desktop Entry]
1023Encoding=UTF-8 939Encoding=UTF-8
1024Name=${title} 940Name=${title}
1025Comment=This session logs you into ${title} 941Comment=This session logs you into ${title}
1027TryExec=${command} 943TryExec=${command}
1028Type=Application" > "${desktop}" 944Type=Application" > "${desktop}"
1029 945
1030 insinto /usr/share/xsessions 946 insinto /usr/share/xsessions
1031 doins "${desktop}" 947 doins "${desktop}"
1032
1033 return 0
1034} 948}
1035 949
1036domenu() { 950domenu() {
1037 local i 951 local i j
1038 local j
1039 insinto /usr/share/applications 952 insinto /usr/share/applications
1040 for i in ${@} 953 for i in "$@" ; do
1041 do
1042 if [ -f "${i}" ]; 954 if [[ -f ${i} ]] ; then
1043 then
1044 doins ${i} 955 doins "${i}"
1045 elif [ -d "${i}" ]; 956 elif [[ -d ${i} ]] ; then
1046 then
1047 for j in ${i}/*.desktop 957 for j in "${i}"/*.desktop ; do
1048 do
1049 doins ${j} 958 doins "${j}"
1050 done 959 done
1051 fi 960 fi
1052 done 961 done
1053} 962}
963newmenu() {
964 insinto /usr/share/applications
965 newins "$1" "$2"
966}
1054 967
1055doicon() { 968doicon() {
1056 local i 969 local i j
1057 local j
1058 insinto /usr/share/pixmaps 970 insinto /usr/share/pixmaps
1059 for i in ${@} 971 for i in "$@" ; do
1060 do
1061 if [ -f "${i}" ]; 972 if [[ -f ${i} ]] ; then
1062 then
1063 doins ${i} 973 doins "${i}"
1064 elif [ -d "${i}" ]; 974 elif [[ -d ${i} ]] ; then
1065 then
1066 for j in ${i}/*.png 975 for j in "${i}"/*.png ; do
1067 do
1068 doins ${j} 976 doins "${j}"
1069 done 977 done
1070 fi 978 fi
1071 done 979 done
980}
981newicon() {
982 insinto /usr/share/pixmaps
983 newins "$1" "$2"
1072} 984}
1073 985
1074############################################################## 986##############################################################
1075# END: Handle .desktop files and menu entries # 987# END: Handle .desktop files and menu entries #
1076############################################################## 988##############################################################
1077 989
1078 990
1079# for internal use only (unpack_pdv and unpack_makeself) 991# for internal use only (unpack_pdv and unpack_makeself)
1080find_unpackable_file() { 992find_unpackable_file() {
1081 local src="$1" 993 local src=$1
1082 if [ -z "${src}" ] 994 if [[ -z ${src} ]] ; then
1083 then
1084 src="${DISTDIR}/${A}" 995 src=${DISTDIR}/${A}
1085 else 996 else
1086 if [ -e "${DISTDIR}/${src}" ] 997 if [[ -e ${DISTDIR}/${src} ]] ; then
1087 then
1088 src="${DISTDIR}/${src}" 998 src=${DISTDIR}/${src}
1089 elif [ -e "${PWD}/${src}" ] 999 elif [[ -e ${PWD}/${src} ]] ; then
1090 then
1091 src="${PWD}/${src}" 1000 src=${PWD}/${src}
1092 elif [ -e "${src}" ] 1001 elif [[ -e ${src} ]] ; then
1093 then
1094 src="${src}" 1002 src=${src}
1095 fi
1096 fi 1003 fi
1097 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1004 fi
1005 [[ ! -e ${src} ]] && return 1
1098 echo "${src}" 1006 echo "${src}"
1099} 1007}
1100 1008
1101# Unpack those pesky pdv generated files ... 1009# Unpack those pesky pdv generated files ...
1102# They're self-unpacking programs with the binary package stuffed in 1010# They're self-unpacking programs with the binary package stuffed in
1117# lseek 1025# lseek
1118# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1026# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1119# lseek(3, -4, SEEK_END) = 2981250 1027# lseek(3, -4, SEEK_END) = 2981250
1120# 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.
1121unpack_pdv() { 1029unpack_pdv() {
1122 local src="`find_unpackable_file $1`" 1030 local src=$(find_unpackable_file $1)
1123 local sizeoff_t="$2" 1031 local sizeoff_t=$2
1124 1032
1033 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1125 [ -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 :("
1126 1035
1127 local shrtsrc="`basename ${src}`" 1036 local shrtsrc=$(basename "${src}")
1128 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1037 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1129 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1038 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1130 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\"`
1131 1040
1132 # grab metadata for debug reasons 1041 # grab metadata for debug reasons
1196# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1105# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1197# - If the file is not specified then unpack will utilize ${A}. 1106# - If the file is not specified then unpack will utilize ${A}.
1198# - 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
1199# the proper offset from the script itself. 1108# the proper offset from the script itself.
1200unpack_makeself() { 1109unpack_makeself() {
1110 local src_input=${1:-${A}}
1201 local src="$(find_unpackable_file "$1")" 1111 local src=$(find_unpackable_file "${src_input}")
1202 local skip="$2" 1112 local skip=$2
1203 local exe="$3" 1113 local exe=$3
1204 1114
1115 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1116
1205 local shrtsrc="$(basename "${src}")" 1117 local shrtsrc=$(basename "${src}")
1206 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1118 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1207 if [ -z "${skip}" ] 1119 if [[ -z ${skip} ]] ; then
1208 then
1209 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1120 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1210 local skip=0 1121 local skip=0
1211 exe=tail 1122 exe=tail
1212 case ${ver} in 1123 case ${ver} in
1213 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
1214 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1125 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1215 ;; 1126 ;;
1216 2.0|2.0.1) 1127 2.0|2.0.1)
1217 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1128 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1218 ;; 1129 ;;
1226 ;; 1137 ;;
1227 2.1.3) 1138 2.1.3)
1228 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1139 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1229 let skip="skip + 1" 1140 let skip="skip + 1"
1230 ;; 1141 ;;
1231 2.1.4) 1142 2.1.4|2.1.5)
1232 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)
1233 skip=$(head -n ${skip} "${src}" | wc -c) 1144 skip=$(head -n ${skip} "${src}" | wc -c)
1234 exe="dd" 1145 exe="dd"
1235 ;; 1146 ;;
1236 *) 1147 *)
1281check_license() { 1192check_license() {
1282 local lic=$1 1193 local lic=$1
1283 if [ -z "${lic}" ] ; then 1194 if [ -z "${lic}" ] ; then
1284 lic="${PORTDIR}/licenses/${LICENSE}" 1195 lic="${PORTDIR}/licenses/${LICENSE}"
1285 else 1196 else
1286 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1197 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1287 lic="${PORTDIR}/licenses/${src}" 1198 lic="${PORTDIR}/licenses/${lic}"
1288 elif [ -e "${PWD}/${src}" ] ; then 1199 elif [ -e "${PWD}/${lic}" ] ; then
1289 lic="${PWD}/${src}" 1200 lic="${PWD}/${lic}"
1290 elif [ -e "${src}" ] ; then 1201 elif [ -e "${lic}" ] ; then
1291 lic="${src}" 1202 lic="${lic}"
1292 fi
1293 fi 1203 fi
1204 fi
1294 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1205 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1295 local l="`basename ${lic}`" 1206 local l="`basename ${lic}`"
1296 1207
1297 # here is where we check for the licenses the user already 1208 # here is where we check for the licenses the user already
1298 # 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
1299 local shopts=$- 1210 local shopts=$-
1300 local alic 1211 local alic
1301 set -o noglob #so that bash doesn't expand "*" 1212 set -o noglob #so that bash doesn't expand "*"
1302 for alic in ${ACCEPT_LICENSE} ; do 1213 for alic in ${ACCEPT_LICENSE} ; do
1303 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1214 if [[ ${alic} == ${l} ]]; then
1304 set +o noglob; set -${shopts} #reset old shell opts 1215 set +o noglob; set -${shopts} #reset old shell opts
1305 return 0 1216 return 0
1306 fi 1217 fi
1307 done 1218 done
1308 set +o noglob; set -$shopts #reset old shell opts 1219 set +o noglob; set -$shopts #reset old shell opts
1341# 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
1342# found at CDROM_ROOT. 1253# found at CDROM_ROOT.
1343# 1254#
1344# 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',
1345# 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
1346# 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_#
1347# 1262#
1348# 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.
1349# 1264#
1350# 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] [...]
1351# - 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
1355 # 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
1356 # the # of files they gave us 1271 # the # of files they gave us
1357 local cdcnt=0 1272 local cdcnt=0
1358 local f= 1273 local f=
1359 for f in "$@" ; do 1274 for f in "$@" ; do
1360 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1361 export CDROM_CHECK_${cdcnt}="$f" 1276 export CDROM_CHECK_${cdcnt}="$f"
1362 done 1277 done
1363 export CDROM_TOTAL_CDS=${cdcnt} 1278 export CDROM_TOTAL_CDS=${cdcnt}
1364 export CDROM_CURRENT_CD=1 1279 export CDROM_CURRENT_CD=1
1365 1280
1366 # now we see if the user gave use CD_ROOT ... 1281 # now we see if the user gave use CD_ROOT ...
1367 # 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
1368 if [[ ! -z ${CD_ROOT} ]] ; then
1369 export CDROM_ROOT=${CD_ROOT}
1370 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1371 return
1372 fi
1373 # do the same for CD_ROOT_X
1374 if [[ ! -z ${CD_ROOT_1} ]] ; then 1283 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1375 local var= 1284 local var=
1376 cdcnt=0 1285 cdcnt=0
1377 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1286 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1378 cdcnt=$((cdcnt + 1)) 1287 ((++cdcnt))
1379 var="CD_ROOT_${cdcnt}" 1288 var="CD_ROOT_${cdcnt}"
1289 [[ -z ${!var} ]] && var="CD_ROOT"
1380 if [[ -z ${!var} ]] ; then 1290 if [[ -z ${!var} ]] ; then
1381 eerror "You must either use just the CD_ROOT" 1291 eerror "You must either use just the CD_ROOT"
1382 eerror "or specify ALL the CD_ROOT_X variables." 1292 eerror "or specify ALL the CD_ROOT_X variables."
1383 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."
1384 die "could not locate CD_ROOT_${cdcnt}" 1294 die "could not locate CD_ROOT_${cdcnt}"
1385 fi 1295 fi
1386 export CDROM_ROOTS_${cdcnt}="${!var}"
1387 done 1296 done
1388 export CDROM_ROOT=${CDROM_ROOTS_1} 1297 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1389 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}
1390 return 1305 return
1391 fi 1306 fi
1392 1307
1308 # User didn't help us out so lets make sure they know they can
1309 # simplify the whole process ...
1393 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1310 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1394 einfon "This ebuild will need the " 1311 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1395 if [[ -z ${CDROM_NAME} ]] ; then
1396 echo "cdrom for ${PN}."
1397 else
1398 echo "${CDROM_NAME}."
1399 fi
1400 echo 1312 echo
1401 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"
1402 einfo "mounted somewhere on your filesystem, just export" 1314 einfo "mounted somewhere on your filesystem, just export"
1403 einfo "the variable CD_ROOT so that it points to the" 1315 einfo "the variable CD_ROOT so that it points to the"
1404 einfo "directory containing the files." 1316 einfo "directory containing the files."
1405 echo 1317 echo
1406 einfo "For example:" 1318 einfo "For example:"
1407 einfo "export CD_ROOT=/mnt/cdrom" 1319 einfo "export CD_ROOT=/mnt/cdrom"
1408 echo 1320 echo
1409 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
1410 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1331 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1411 cdcnt=0 1332 cdcnt=0
1412 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1333 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1413 cdcnt=$((cdcnt + 1)) 1334 ((++cdcnt))
1414 var="CDROM_NAME_${cdcnt}" 1335 var="CDROM_NAME_${cdcnt}"
1415 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1336 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1416 done 1337 done
1417 echo 1338 echo
1418 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"
1419 einfo "mounted somewhere on your filesystem, just export" 1340 einfo "mounted somewhere on your filesystem, just export"
1420 einfo "the following variables so they point to the right place:" 1341 einfo "the following variables so they point to the right place:"
1421 einfon "" 1342 einfon ""
1422 cdcnt=0 1343 cdcnt=0
1423 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1344 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1424 cdcnt=$((cdcnt + 1)) 1345 ((++cdcnt))
1425 echo -n " CD_ROOT_${cdcnt}" 1346 echo -n " CD_ROOT_${cdcnt}"
1426 done 1347 done
1427 echo 1348 echo
1428 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"
1429 einfo "you only have one cdrom, you can export CD_ROOT" 1350 einfo "you only have one cdrom, you can export CD_ROOT"
1432 echo 1353 echo
1433 einfo "For example:" 1354 einfo "For example:"
1434 einfo "export CD_ROOT_1=/mnt/cdrom" 1355 einfo "export CD_ROOT_1=/mnt/cdrom"
1435 echo 1356 echo
1436 fi 1357 fi
1358
1359 export CDROM_SET=""
1437 export CDROM_CURRENT_CD=0 1360 export CDROM_CURRENT_CD=0
1438 cdrom_load_next_cd 1361 cdrom_load_next_cd
1439} 1362}
1440 1363
1441# 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.
1442# 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.
1443# 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.
1444# 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.
1445cdrom_load_next_cd() { 1368cdrom_load_next_cd() {
1446 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1447 local var= 1369 local var
1448 1370 ((++CDROM_CURRENT_CD))
1449 if [[ ! -z ${CD_ROOT} ]] ; then
1450 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1451 return
1452 fi
1453 1371
1454 unset CDROM_ROOT 1372 unset CDROM_ROOT
1455 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1373 var=CD_ROOT_${CDROM_CURRENT_CD}
1374 [[ -z ${!var} ]] && var="CD_ROOT"
1456 if [[ -z ${!var} ]] ; then 1375 if [[ -z ${!var} ]] ; then
1457 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1376 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1458 cdrom_locate_file_on_cd ${!var} 1377 _cdrom_locate_file_on_cd ${!var}
1459 else 1378 else
1460 export CDROM_ROOT=${!var} 1379 export CDROM_ROOT=${!var}
1461 fi 1380 fi
1462 1381
1463 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1382 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1468# 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
1469# 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
1470# displayed and we'll hang out here until: 1389# displayed and we'll hang out here until:
1471# (1) the file is found on a mounted cdrom 1390# (1) the file is found on a mounted cdrom
1472# (2) the user hits CTRL+C 1391# (2) the user hits CTRL+C
1473cdrom_locate_file_on_cd() { 1392_cdrom_locate_file_on_cd() {
1393 local mline=""
1394 local showedmsg=0
1395
1474 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
1475 local dir="$(dirname ${@})" 1404 local dir=$(dirname ${cdset[${i}]})
1476 local file="$(basename ${@})" 1405 local file=$(basename ${cdset[${i}]})
1477 local mline=""
1478 local showedmsg=0
1479 1406
1480 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
1481 [[ -d ${mline}/${dir} ]] || continue 1408 [[ -d ${mline}/${dir} ]] || continue
1482 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1409 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1483 && 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))
1484 done 1418 done
1485 1419
1486 if [[ -z ${CDROM_ROOT} ]] ; then
1487 echo 1420 echo
1488 if [[ ${showedmsg} -eq 0 ]] ; then 1421 if [[ ${showedmsg} -eq 0 ]] ; then
1489 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1422 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1490 if [[ -z ${CDROM_NAME} ]] ; then 1423 if [[ -z ${CDROM_NAME} ]] ; then
1491 einfo "Please insert the cdrom for ${PN} now !" 1424 einfo "Please insert+mount the cdrom for ${PN} now !"
1492 else
1493 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1494 fi
1495 else 1425 else
1496 if [[ -z ${CDROM_NAME_1} ]] ; then
1497 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1498 else
1499 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1500 einfo "Please insert+mount the ${!var} cdrom now !" 1426 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1501 fi
1502 fi 1427 fi
1503 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
1504 fi 1435 fi
1436 showedmsg=1
1437 fi
1505 einfo "Press return to scan for the cd again" 1438 einfo "Press return to scan for the cd again"
1506 einfo "or hit CTRL+C to abort the emerge." 1439 einfo "or hit CTRL+C to abort the emerge."
1507 read 1440 echo
1508 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"
1509 done 1446 done
1510} 1447}
1511 1448
1512# Make sure that LINGUAS only contains languages that 1449# Make sure that LINGUAS only contains languages that
1513# a package can support 1450# a package can support
1520# 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
1521# directories and uses the intersection of the lists. 1458# directories and uses the intersection of the lists.
1522# 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
1523# directories and uses the union of the lists. 1460# directories and uses the union of the lists.
1524strip-linguas() { 1461strip-linguas() {
1525 local ls newls 1462 local ls newls nols
1526 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1463 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1527 local op=$1; shift 1464 local op=$1; shift
1528 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1465 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1529 local d f 1466 local d f
1530 for d in "$@" ; do 1467 for d in "$@" ; do
1531 if [[ ${op} == "-u" ]] ; then 1468 if [[ ${op} == "-u" ]] ; then
1532 newls=${ls} 1469 newls=${ls}
1533 else 1470 else
1534 newls="" 1471 newls=""
1535 fi 1472 fi
1536 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1473 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1537 if [[ ${op} == "-i" ]] ; then 1474 if [[ ${op} == "-i" ]] ; then
1538 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1475 hasq ${f} ${ls} && newls="${newls} ${f}"
1539 else 1476 else
1540 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1477 hasq ${f} ${ls} || newls="${newls} ${f}"
1541 fi 1478 fi
1542 done 1479 done
1543 ls=${newls} 1480 ls=${newls}
1544 done 1481 done
1545 ls=${ls//.po}
1546 else 1482 else
1547 ls=$@ 1483 ls="$@"
1548 fi 1484 fi
1549 1485
1550 ls=" ${ls} " 1486 nols=""
1551 newls="" 1487 newls=""
1552 for f in ${LINGUAS} ; do 1488 for f in ${LINGUAS} ; do
1553 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1489 if hasq ${f} ${ls} ; then
1554 newls="${newls} ${f}" 1490 newls="${newls} ${f}"
1555 else 1491 else
1556 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1492 nols="${nols} ${f}"
1557 fi 1493 fi
1558 done 1494 done
1559 if [[ -z ${newls} ]] ; then 1495 [[ -n ${nols} ]] \
1560 export LINGUAS="" 1496 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1561 else
1562 export LINGUAS=${newls:1} 1497 export LINGUAS=${newls:1}
1563 fi
1564} 1498}
1565 1499
1566# moved from kernel.eclass since they are generally useful outside of 1500# moved from kernel.eclass since they are generally useful outside of
1567# kernel.eclass -iggy (20041002) 1501# kernel.eclass -iggy (20041002)
1568 1502
1575 while ((i--)) ; do 1509 while ((i--)) ; do
1576 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1510 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1577 done 1511 done
1578 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1512 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1579 case ${ARCH} in 1513 case ${ARCH} in
1580 x86) export ARCH="i386";; 1514 x86) export ARCH="i386";;
1581 amd64) export ARCH="x86_64";; 1515 amd64) export ARCH="x86_64";;
1582 hppa) export ARCH="parisc";; 1516 hppa) export ARCH="parisc";;
1583 mips) export ARCH="mips";; 1517 mips) export ARCH="mips";;
1584 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!
1585 *) export ARCH="${ARCH}";; 1519 *) export ARCH="${ARCH}";;
1586 esac 1520 esac
1587} 1521}
1588 1522
1589# set's ARCH back to what portage expects 1523# set's ARCH back to what portage expects
1590set_arch_to_portage() { 1524set_arch_to_portage() {
1597 1531
1598# Jeremy Huddleston <eradicator@gentoo.org>: 1532# Jeremy Huddleston <eradicator@gentoo.org>:
1599# preserve_old_lib /path/to/libblah.so.0 1533# preserve_old_lib /path/to/libblah.so.0
1600# preserve_old_lib_notify /path/to/libblah.so.0 1534# preserve_old_lib_notify /path/to/libblah.so.0
1601# 1535#
1602# 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
1603# 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
1604# 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
1605# 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
1606# solution, so instead you can add the following to your ebuilds: 1540# solution, so instead you can add the following to your ebuilds:
1607# 1541#
1634 LIB=$1 1568 LIB=$1
1635 1569
1636 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1570 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1637 SONAME=`basename ${LIB}` 1571 SONAME=`basename ${LIB}`
1638 1572
1639 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."
1640 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"
1641 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,"
1642 einfo "you will need to execute the following command:" 1576 ewarn "you will need to execute the following command:"
1643 einfo " revdep-rebuild --soname ${SONAME}" 1577 ewarn " revdep-rebuild --library ${SONAME}"
1644 einfo 1578 ewarn
1645 einfo "After doing that, you can safely remove ${LIB}" 1579 ewarn "After doing that, you can safely remove ${LIB}"
1646 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1580 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1647 fi 1581 fi
1648} 1582}
1649 1583
1650# 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
1651# certain USE flags 1585# certain USE flags
1659built_with_use() { 1593built_with_use() {
1660 local opt=$1 1594 local opt=$1
1661 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1595 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1662 1596
1663 local PKG=$(best_version $1) 1597 local PKG=$(best_version $1)
1598 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1664 shift 1599 shift
1665 1600
1666 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1601 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1667 [[ ! -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
1668 1620
1669 local USE_BUILT=$(<${USEFILE}) 1621 local USE_BUILT=$(<${USEFILE})
1670 while [[ $# -gt 0 ]] ; do 1622 while [[ $# -gt 0 ]] ; do
1671 if [[ ${opt} = "-o" ]] ; then 1623 if [[ ${opt} = "-o" ]] ; then
1672 has $1 ${USE_BUILT} && return 0 1624 has $1 ${USE_BUILT} && return 0
1697dopamd() { 1649dopamd() {
1698 [[ -z $1 ]] && die "dopamd requires at least one argument" 1650 [[ -z $1 ]] && die "dopamd requires at least one argument"
1699 1651
1700 use pam || return 0 1652 use pam || return 0
1701 1653
1702 insinto /etc/pam.d 1654 INSDESTTREE=/etc/pam.d \
1703 doins "$@" || die "failed to install $@" 1655 doins "$@" || die "failed to install $@"
1704} 1656}
1705# newpamd <old name> <new name> 1657# newpamd <old name> <new name>
1706# 1658#
1707# 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
1708newpamd() { 1660newpamd() {
1709 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1661 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1710 1662
1711 use pam || return 0 1663 use pam || return 0
1712 1664
1713 insinto /etc/pam.d 1665 INSDESTTREE=/etc/pam.d \
1714 newins "$1" "$2" || die "failed to install $1 as $2" 1666 newins "$1" "$2" || die "failed to install $1 as $2"
1715} 1667}
1716 1668
1717# make a wrapper script ... 1669# make a wrapper script ...
1718# 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
1724# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1676# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1725# $5 == path for wrapper 1677# $5 == path for wrapper
1726make_wrapper() { 1678make_wrapper() {
1727 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1679 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1728 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"
1729 cat << EOF > "${tmpwrapper}" 1683 cat << EOF > "${tmpwrapper}"
1730#!/bin/sh 1684#!/bin/sh
1731cd "${chdir}" 1685cd "${chdir:-.}"
1686if [ -n "${libdir}" ] ; then
1687 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1732export 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
1733exec ${bin} "\$@" 1693exec ${bin} "\$@"
1734EOF 1694EOF
1735 chmod go+rx "${tmpwrapper}" 1695 chmod go+rx "${tmpwrapper}"
1736 if [ -n "${5}" ] 1696 if [[ -n ${path} ]] ; then
1737 then
1738 exeinto ${5} 1697 exeinto "${path}"
1739 newexe "${tmpwrapper}" "${wrapper}" 1698 newexe "${tmpwrapper}" "${wrapper}"
1740 else 1699 else
1741 newbin "${tmpwrapper}" "${wrapper}" 1700 newbin "${tmpwrapper}" "${wrapper}"
1742 fi 1701 fi
1743} 1702}

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

  ViewVC Help
Powered by ViewVC 1.1.20