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

Diff of /eclass/eutils.eclass

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

Revision 1.158 Revision 1.237
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.158 2005/03/17 02:45:10 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.237 2006/06/04 15:18:12 vapier Exp $
4#
5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 4#
7# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 6# have to implement themselves.
9# 7#
10# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
11 9
12inherit multilib 10inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 11
16DEPEND="!bootstrap? ( sys-devel/patch )" 12DEPEND="!bootstrap? ( sys-devel/patch )"
13RDEPEND=""
14# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 15
18DESCRIPTION="Based on the ${ECLASS} eclass" 16DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63 17
64# Wait for the supplied number of seconds. If no argument is supplied, defaults 18# Wait for the supplied number of seconds. If no argument is supplied, defaults
65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 19# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
66# outputting to a terminal, don't wait. For compatability purposes, the argument 20# outputting to a terminal, don't wait. For compatability purposes, the argument
67# must be an integer greater than zero. 21# must be an integer greater than zero.
105# to point to the latest version of the library present. 59# to point to the latest version of the library present.
106# 60#
107# <azarah@gentoo.org> (26 Oct 2002) 61# <azarah@gentoo.org> (26 Oct 2002)
108# 62#
109gen_usr_ldscript() { 63gen_usr_ldscript() {
110 local libdir="$(get_libdir)" 64 local lib libdir=$(get_libdir)
111 # Just make sure it exists 65 # Just make sure it exists
112 dodir /usr/${libdir} 66 dodir /usr/${libdir}
113 67
68 for lib in "${@}" ; do
114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 69 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
115/* GNU ld script 70 /* GNU ld script
116 Because Gentoo have critical dynamic libraries 71 Since Gentoo has critical dynamic libraries
117 in /lib, and the static versions in /usr/lib, we 72 in /lib, and the static versions in /usr/lib,
118 need to have a "fake" dynamic lib in /usr/lib, 73 we need to have a "fake" dynamic lib in /usr/lib,
119 otherwise we run into linking problems. 74 otherwise we run into linking problems.
120 See bug #4411 on http://bugs.gentoo.org/ for 75
121 more info. */ 76 See bug http://bugs.gentoo.org/4411 for more info.
77 */
122GROUP ( /${libdir}/${1} ) 78 GROUP ( /${libdir}/${lib} )
123END_LDSCRIPT 79 END_LDSCRIPT
124 fperms a+x "/usr/${libdir}/${1}" 80 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
125}
126
127# Simple function to draw a line consisting of '=' the same length as $*
128#
129# <azarah@gentoo.org> (11 Nov 2002)
130#
131draw_line() {
132 local i=0
133 local str_length=""
134
135 # Handle calls that do not have args, or wc not being installed ...
136 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
137 then
138 echo "==============================================================="
139 return 0
140 fi
141
142 # Get the length of $*
143 str_length="$(echo -n "$*" | wc -m)"
144
145 while [ "$i" -lt "${str_length}" ]
146 do
147 echo -n "="
148
149 i=$((i + 1))
150 done 81 done
151
152 echo
153
154 return 0
155} 82}
83
156 84
157# Default directory where patches are located 85# Default directory where patches are located
158EPATCH_SOURCE="${WORKDIR}/patch" 86EPATCH_SOURCE="${WORKDIR}/patch"
159# Default extension for patches 87# Default extension for patches
160EPATCH_SUFFIX="patch.bz2" 88EPATCH_SUFFIX="patch.bz2"
161# Default options for patch 89# Default options for patch
162# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 90# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
163EPATCH_OPTS="-g0" 91# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
92# Set -E to automatically remove empty files.
93EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
164# List of patches not to apply. Not this is only file names, 94# List of patches not to apply. Not this is only file names,
165# and not the full path .. 95# and not the full path ..
166EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
167# Change the printed message for a single patch. 97# Change the printed message for a single patch.
168EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
169# Force applying bulk patches even if not following the style: 101# Force applying bulk patches even if not following the style:
170# 102#
171# ??_${ARCH}_foo.${EPATCH_SUFFIX} 103# ??_${ARCH}_foo.${EPATCH_SUFFIX}
172# 104#
173EPATCH_FORCE="no" 105EPATCH_FORCE="no"
204# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
205# 137#
206# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
207# 139#
208epatch() { 140epatch() {
141 _epatch_draw_line() {
142 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
209 local PIPE_CMD="" 146 local PIPE_CMD=""
210 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
211 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
212 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
213 local SINGLE_PATCH="no" 150 local SINGLE_PATCH="no"
214 local x="" 151 local x=""
215 152
153 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
154
216 if [ "$#" -gt 1 ] 155 if [ "$#" -gt 1 ]
217 then 156 then
218 local m="" 157 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 158 for m in "$@" ; do
221 epatch "${m}" 159 epatch "${m}"
222 done 160 done
223 return 0 161 return 0
224 fi 162 fi
278 ;; 216 ;;
279 esac 217 esac
280 218
281 if [ "${SINGLE_PATCH}" = "no" ] 219 if [ "${SINGLE_PATCH}" = "no" ]
282 then 220 then
283 einfo "Applying various patches (bugfixes/updates) ..." 221 einfo "${EPATCH_MULTI_MSG}"
284 fi 222 fi
285 for x in ${EPATCH_SOURCE} 223 for x in ${EPATCH_SOURCE}
286 do 224 do
287 # New ARCH dependant patch naming scheme ... 225 # New ARCH dependant patch naming scheme ...
288 # 226 #
289 # ???_arch_foo.patch 227 # ???_arch_foo.patch
290 # 228 #
291 if [ -f ${x} ] && \ 229 if [ -f ${x} ] && \
292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 230 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 231 [ "${EPATCH_FORCE}" = "yes" ])
294 then 232 then
295 local count=0 233 local count=0
296 local popts="${EPATCH_OPTS}" 234 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/} 235 local patchname=${x##*/}
321 259
322 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
323 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
324 do 262 do
325 # Generate some useful debug info ... 263 # Generate some useful debug info ...
326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 266
329 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
330 then 268 then
331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 274
337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 276 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 277
340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342 280
343 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
344 then 282 then
345 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 283 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
346 then 284 then
350 count=5 288 count=5
351 break 289 break
352 fi 290 fi
353 fi 291 fi
354 292
355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 293 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
356 then 294 then
357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 300
363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 301 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
302 _epatch_assert
364 303
365 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
366 then 305 then
367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 306 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
368 echo 307 echo
407 then 346 then
408 einfo "Done with patching" 347 einfo "Done with patching"
409 fi 348 fi
410} 349}
411 350
412# This function return true if we are using the NPTL pthreads
413# implementation.
414#
415# <azarah@gentoo.org> (06 March 2003)
416#
417have_NPTL() {
418 cat > ${T}/test-nptl.c <<-"END"
419 #define _XOPEN_SOURCE
420 #include <unistd.h>
421 #include <stdio.h>
422
423 int main()
424 {
425 char buf[255];
426 char *str = buf;
427
428 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
429 if (NULL != str) {
430 printf("%s\n", str);
431 if (NULL != strstr(str, "NPTL"))
432 return 0;
433 }
434
435 return 1;
436 }
437 END
438
439 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
440 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
441 then
442 echo "yes"
443 einfon "Checking what PTHREADS implementation we have ..."
444 if ${T}/nptl
445 then
446 return 0
447 else
448 return 1
449 fi
450 else
451 echo "no"
452 fi
453
454 return 1
455}
456
457# This function check how many cpu's are present, and then set
458# -j in MAKEOPTS accordingly.
459#
460# Thanks to nall <nall@gentoo.org> for this.
461#
462get_number_of_jobs() {
463 local jobs=0
464
465 if [ ! -r /proc/cpuinfo ]
466 then
467 return 1
468 fi
469
470 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
471 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
472 then
473 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
474 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
475 ADMINPARAM="${ADMINPARAM/-j}"
476 fi
477
478 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
479
480 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
481 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
482 then
483 # these archs will always have "[Pp]rocessor"
484 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
485
486 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
487 then
488 # sparc always has "ncpus active"
489 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
490
491 elif [ "${ARCH}" = "alpha" ]
492 then
493 # alpha has "cpus active", but only when compiled with SMP
494 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
495 then
496 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
497 else
498 jobs=2
499 fi
500
501 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
502 then
503 # ppc has "processor", but only when compiled with SMP
504 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
505 then
506 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
507 else
508 jobs=2
509 fi
510 elif [ "${ARCH}" = "s390" ]
511 then
512 # s390 has "# processors : "
513 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
514 else
515 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
516 die "Unknown ARCH -- ${ARCH}!"
517 fi
518
519 # Make sure the number is valid ...
520 if [ "${jobs}" -lt 1 ]
521 then
522 jobs=1
523 fi
524
525 if [ -n "${ADMINPARAM}" ]
526 then
527 if [ "${jobs}" -gt "${ADMINPARAM}" ]
528 then
529 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
530 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
531 else
532 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
534 fi
535 fi
536}
537
538# Cheap replacement for when debianutils (and thus mktemp) 351# Cheap replacement for when debianutils (and thus mktemp)
539# does not exist on the users system 352# does not exist on the users system
540# vapier@gentoo.org 353# vapier@gentoo.org
541# 354#
542# Takes just 1 optional parameter (the directory to create tmpfile in) 355# Takes just 1 optional parameter (the directory to create tmpfile in)
543emktemp() { 356emktemp() {
544 local exe="touch" 357 local exe="touch"
545 [ "$1" == "-d" ] && exe="mkdir" && shift 358 [[ $1 == -d ]] && exe="mkdir" && shift
546 local topdir="$1" 359 local topdir=$1
547 360
548 if [ -z "${topdir}" ] 361 if [[ -z ${topdir} ]] ; then
549 then
550 [ -z "${T}" ] \ 362 [[ -z ${T} ]] \
551 && topdir="/tmp" \ 363 && topdir="/tmp" \
552 || topdir="${T}" 364 || topdir=${T}
553 fi 365 fi
554 366
555 if [ -z "$(type -p mktemp)" ] 367 if [[ -z $(type -p mktemp) ]] ; then
556 then
557 local tmp=/ 368 local tmp=/
558 while [ -e "${tmp}" ] ; do 369 while [[ -e ${tmp} ]] ; do
559 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
560 done 371 done
561 ${exe} "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
562 echo "${tmp}" 373 echo "${tmp}"
563 else 374 else
564 [ "${exe}" == "touch" ] \ 375 if [[ ${exe} == "touch" ]] ; then
565 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
566 || exe="-d" 377 && mktemp -p "${topdir}" \
567 mktemp ${exe} "${topdir}" 378 || TMPDIR="${topdir}" mktemp -t tmp
379 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp
383 fi
568 fi 384 fi
569} 385}
570 386
571# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
572# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
573# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 389# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
574# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 390# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
575# 391#
576# egetent(database, key) 392# egetent(database, key)
577egetent() { 393egetent() {
578 if useq ppc-macos ; then 394 case ${CHOST} in
395 *-darwin*)
579 case "$2" in 396 case "$2" in
580 *[!0-9]*) # Non numeric 397 *[!0-9]*) # Non numeric
581 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 398 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
582 ;; 399 ;;
583 *) # Numeric 400 *) # Numeric
584 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
585 ;; 402 ;;
586 esac 403 esac
587 elif useq x86-fbsd ; then 404 ;;
588 local action 405 *-freebsd*|*-dragonfly*)
589 if [ "$1" == "passwd" ] 406 local opts action="user"
590 then 407 [[ $1 == "passwd" ]] || action="group"
591 action="user" 408
592 else 409 # lookup by uid/gid
593 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
594 fi 412 fi
413
595 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
596 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
597 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
598 getent "$1" "$2" 421 getent "$1" "$2"
599 fi 422 ;;
423 esac
600} 424}
601 425
602# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
603# vapier@gentoo.org 427# vapier@gentoo.org
604# 428#
611# shell: /bin/false 435# shell: /bin/false
612# homedir: /dev/null 436# homedir: /dev/null
613# groups: none 437# groups: none
614# extra: comment of 'added by portage for ${PN}' 438# extra: comment of 'added by portage for ${PN}'
615enewuser() { 439enewuser() {
440 case ${EBUILD_PHASE} in
441 unpack|compile|test|install)
442 eerror "'enewuser()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
443 eerror "Package fails at QA and at life. Please file a bug."
444 die "Bad package! enewuser is only for use in pkg_* functions!"
445 esac
446
616 # get the username 447 # get the username
617 local euser="$1"; shift 448 local euser=$1; shift
618 if [ -z "${euser}" ] 449 if [[ -z ${euser} ]] ; then
619 then
620 eerror "No username specified !" 450 eerror "No username specified !"
621 die "Cannot call enewuser without a username" 451 die "Cannot call enewuser without a username"
622 fi 452 fi
623 453
624 # lets see if the username already exists 454 # lets see if the username already exists
625 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 455 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
626 then
627 return 0 456 return 0
628 fi 457 fi
629 einfo "Adding user '${euser}' to your system ..." 458 einfo "Adding user '${euser}' to your system ..."
630 459
631 # options to pass to useradd 460 # options to pass to useradd
632 local opts= 461 local opts=
633 462
634 # handle uid 463 # handle uid
635 local euid="$1"; shift 464 local euid=$1; shift
636 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 465 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
637 then
638 if [ "${euid}" -gt 0 ] 466 if [[ ${euid} -gt 0 ]] ; then
639 then
640 if [ ! -z "`egetent passwd ${euid}`" ] 467 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
641 then
642 euid="next" 468 euid="next"
643 fi 469 fi
644 else 470 else
645 eerror "Userid given but is not greater than 0 !" 471 eerror "Userid given but is not greater than 0 !"
646 die "${euid} is not a valid UID" 472 die "${euid} is not a valid UID"
647 fi 473 fi
648 else 474 else
649 euid="next" 475 euid="next"
650 fi 476 fi
651 if [ "${euid}" == "next" ] 477 if [[ ${euid} == "next" ]] ; then
652 then 478 for euid in $(seq 101 999) ; do
653 local pwrange
654 if [ "${USERLAND}" == "BSD" ] ; then
655 pwrange="`jot 898 101`"
656 else
657 pwrange="`seq 101 999`"
658 fi
659 for euid in ${pwrange} ; do
660 [ -z "`egetent passwd ${euid}`" ] && break 479 [[ -z $(egetent passwd ${euid}) ]] && break
661 done 480 done
662 fi 481 fi
663 opts="${opts} -u ${euid}" 482 opts="${opts} -u ${euid}"
664 einfo " - Userid: ${euid}" 483 einfo " - Userid: ${euid}"
665 484
666 # handle shell 485 # handle shell
667 local eshell="$1"; shift 486 local eshell=$1; shift
668 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 487 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
669 then 488 if [[ ! -e ${ROOT}${eshell} ]] ; then
670 if [ ! -e "${eshell}" ]
671 then
672 eerror "A shell was specified but it does not exist !" 489 eerror "A shell was specified but it does not exist !"
673 die "${eshell} does not exist" 490 die "${eshell} does not exist in ${ROOT}"
491 fi
492 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
493 eerror "Do not specify ${eshell} yourself, use -1"
494 die "Pass '-1' as the shell parameter"
674 fi 495 fi
675 else 496 else
676 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
677 then 498 [[ -x ${ROOT}${shell} ]] && break
678 eshell="/usr/bin/false" 499 done
679 else 500
680 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
681 fi 504 fi
505
506 eshell=${shell}
682 fi 507 fi
683 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
684 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
685 510
686 # handle homedir 511 # handle homedir
687 local ehome="$1"; shift 512 local ehome=$1; shift
688 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
689 then
690 ehome="/dev/null" 514 ehome="/dev/null"
691 fi 515 fi
692 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
693 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
694 518
695 # handle groups 519 # handle groups
696 local egroups="$1"; shift 520 local egroups=$1; shift
697 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
698 then
699 local oldifs="${IFS}" 522 local oldifs=${IFS}
700 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
701 524
702 export IFS="," 525 export IFS=","
703 for g in ${egroups} 526 for g in ${egroups} ; do
704 do
705 export IFS="${oldifs}" 527 export IFS=${oldifs}
706 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
707 then
708 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
709 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
710 fi 531 fi
711 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
712 then
713 defgroup="${g}" 533 defgroup=${g}
714 else 534 else
715 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
716 fi 536 fi
717 export IFS="," 537 export IFS=","
718 done 538 done
719 export IFS="${oldifs}" 539 export IFS=${oldifs}
720 540
721 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
722 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
723 then
724 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
725 fi 544 fi
726 else 545 else
727 egroups="(none)" 546 egroups="(none)"
728 fi 547 fi
729 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
730 549
731 # handle extra and add the user 550 # handle extra and add the user
732 local eextra="$@"
733 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
734 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
735 if useq ppc-macos 553 case ${CHOST} in
736 then 554 *-darwin*)
737 ### Make the user 555 ### Make the user
738 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
739 then
740 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
741 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
742 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
743 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
744 ### Add the user to the groups specified 561 ### Add the user to the groups specified
745 local oldifs="${IFS}" 562 local oldifs=${IFS}
746 export IFS="," 563 export IFS=","
747 for g in ${egroups} 564 for g in ${egroups} ; do
748 do
749 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
750 done 566 done
751 export IFS="${oldifs}" 567 export IFS=${oldifs}
752 else 568 else
753 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
754 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
755 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
756 die "Required function missing" 572 die "Required function missing"
757 fi 573 fi
758 elif use x86-fbsd ; then 574 ;;
759 if [ -z "${eextra}" ] 575 *-freebsd*|*-dragonfly*)
760 then 576 if [[ -z $@ ]] ; then
761 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
762 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
763 die "enewuser failed" 579 die "enewuser failed"
764 else 580 else
765 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
766 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
767 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
768 fi 584 fi
585 ;;
586
587 *-netbsd*)
588 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} || die "enewuser failed"
769 else 590 else
770 if [ -z "${eextra}" ] 591 einfo " - Extra: $@"
771 then 592 useradd ${opts} ${euser} "$@" || die "enewuser failed"
593 fi
594 ;;
595
596 *-openbsd*)
597 if [[ -z $@ ]] ; then
598 useradd -u ${euid} -s ${eshell} \
599 -d ${ehome} -c "Added by portage for ${PN}" \
600 -g ${egroups} ${euser} || die "enewuser failed"
601 else
602 einfo " - Extra: $@"
603 useradd -u ${euid} -s ${eshell} \
604 -d ${ehome} -c "Added by portage for ${PN}" \
605 -g ${egroups} ${euser} "$@" || die "enewuser failed"
606 fi
607 ;;
608
609 *)
610 if [[ -z $@ ]] ; then
772 useradd ${opts} ${euser} \ 611 useradd ${opts} ${euser} \
773 -c "added by portage for ${PN}" \ 612 -c "added by portage for ${PN}" \
774 || die "enewuser failed" 613 || die "enewuser failed"
775 else 614 else
776 einfo " - Extra: ${eextra}" 615 einfo " - Extra: $@"
777 useradd ${opts} ${euser} ${eextra} \ 616 useradd ${opts} ${euser} "$@" \
778 || die "enewuser failed" 617 || die "enewuser failed"
779 fi 618 fi
619 ;;
620 esac
621
622 if [[ ! -e ${ROOT}/${ehome} ]] ; then
623 einfo " - Creating ${ehome} in ${ROOT}"
624 mkdir -p "${ROOT}/${ehome}"
625 chown ${euser} "${ROOT}/${ehome}"
626 chmod 755 "${ROOT}/${ehome}"
780 fi 627 fi
628
781 export SANDBOX_ON="${oldsandbox}" 629 export SANDBOX_ON=${oldsandbox}
782
783 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
784 then
785 einfo " - Creating ${ehome} in ${D}"
786 dodir ${ehome}
787 fowners ${euser} ${ehome}
788 fperms 755 ${ehome}
789 fi
790} 630}
791 631
792# Simplify/standardize adding groups to the system 632# Simplify/standardize adding groups to the system
793# vapier@gentoo.org 633# vapier@gentoo.org
794# 634#
797# Default values if you do not specify any: 637# Default values if you do not specify any:
798# groupname: REQUIRED ! 638# groupname: REQUIRED !
799# gid: next available (see groupadd(8)) 639# gid: next available (see groupadd(8))
800# extra: none 640# extra: none
801enewgroup() { 641enewgroup() {
642 case ${EBUILD_PHASE} in
643 unpack|compile|test|install)
644 eerror "'enewgroup()' called from '${EBUILD_PHASE}()' which is not a pkg_* function."
645 eerror "Package fails at QA and at life. Please file a bug."
646 die "Bad package! enewgroup is only for use in pkg_* functions!"
647 esac
648
802 # get the group 649 # get the group
803 local egroup="$1"; shift 650 local egroup="$1"; shift
804 if [ -z "${egroup}" ] 651 if [ -z "${egroup}" ]
805 then 652 then
806 eerror "No group specified !" 653 eerror "No group specified !"
823 then 670 then
824 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
825 then 672 then
826 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
827 then 674 then
828 if useq ppc-macos ; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
829 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
830 else 677 else
831 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
832 fi 679 fi
833 else 680 else
847 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
848 695
849 # add the group 696 # add the group
850 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
851 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
852 if useq ppc-macos ; then 699 case ${CHOST} in
700 *-darwin*)
853 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
854 then 702 then
855 einfo "Extra options are not supported on macos yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
856 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
858 die "Required function missing" 706 die "Required function missing"
859 fi 707 fi
860 708
861 # If we need the next available 709 # If we need the next available
862 case ${egid} in 710 case ${egid} in
863 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
866 done 714 done
867 esac 715 esac
868 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
869 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
870 elif use x86-fbsd ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
871 case ${egid} in 721 case ${egid} in
872 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
873 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
874 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
875 done 725 done
876 esac 726 esac
877 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
878 else 728 ;;
729
730 *-netbsd*)
731 case ${egid} in
732 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do
734 [ -z "`egetent group ${egid}`" ] && break
735 done
736 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;;
739
740 *)
879 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
880 fi 742 ;;
743 esac
881 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
882} 745}
883 746
884# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 748# vapier@gentoo.org
910# name: the name that will show up in the menu 773# name: the name that will show up in the menu
911# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
912# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
913# a full path to an icon 776# a full path to an icon
914# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
915# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 778# http://www.freedesktop.org/Standards/desktop-entry-spec
916# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
917make_desktop_entry() { 780make_desktop_entry() {
918 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 781 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
919 782
920 local exec=${1} 783 local exec=${1}
942 *) type=;; 805 *) type=;;
943 esac 806 esac
944 ;; 807 ;;
945 808
946 dev) 809 dev)
947 type=Development 810 type="Development"
948 ;; 811 ;;
949 812
950 games) 813 games)
951 [[ -z ${path} ]] && path=${GAMES_BINDIR}
952
953 case ${catmin} in 814 case ${catmin} in
954 action) type=ActionGame;; 815 action) type=ActionGame;;
955 arcade) type=ArcadeGame;; 816 arcade) type=ArcadeGame;;
956 board) type=BoardGame;; 817 board) type=BoardGame;;
957 kid) type=KidsGame;; 818 kid) type=KidsGame;;
962 simulation) type=Simulation;; 823 simulation) type=Simulation;;
963 sports) type=SportsGame;; 824 sports) type=SportsGame;;
964 strategy) type=StrategyGame;; 825 strategy) type=StrategyGame;;
965 *) type=;; 826 *) type=;;
966 esac 827 esac
967 type=Game;${type} 828 type="Game;${type}"
968 ;; 829 ;;
969 830
970 mail) 831 mail)
971 type=Network;Email 832 type="Network;Email"
972 ;; 833 ;;
973 834
974 media) 835 media)
975 case ${catmin} in 836 case ${catmin} in
976 gfx) type=Graphics;; 837 gfx) type=Graphics;;
978 sound) type=Audio;; 839 sound) type=Audio;;
979 tv) type=TV;; 840 tv) type=TV;;
980 video) type=Video;; 841 video) type=Video;;
981 *) type=;; 842 *) type=;;
982 esac 843 esac
983 type=AudioVideo;${type} 844 type="AudioVideo;${type}"
984 ;; 845 ;;
985 846
986 net) 847 net)
987 case ${catmin} in 848 case ${catmin} in
988 dialup) type=Dialup;; 849 dialup) type=Dialup;;
993 news) type=News;; 854 news) type=News;;
994 nntp) type=News;; 855 nntp) type=News;;
995 p2p) type=FileTransfer;; 856 p2p) type=FileTransfer;;
996 *) type=;; 857 *) type=;;
997 esac 858 esac
998 type=Network;${type} 859 type="Network;${type}"
999 ;; 860 ;;
1000 861
1001 sci) 862 sci)
1002 case ${catmin} in 863 case ${catmin} in
1003 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
1004 bio*) type=Biology;; 865 bio*) type=Biology;;
1005 calc*) type=Calculator;; 866 calc*) type=Calculator;;
1006 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
1007 geo*) type=Geology;; 868 geo*) type=Geology;;
1008 math*) type=Math;; 869 math*) type=Math;;
1009 *) type=;; 870 *) type=;;
1010 esac 871 esac
1011 type=Science;${type} 872 type="Science;${type}"
1012 ;; 873 ;;
1013 874
1014 www) 875 www)
1015 case ${catmin} in 876 case ${catmin} in
1016 client) type=WebBrowser;; 877 client) type=WebBrowser;;
1017 *) type=;; 878 *) type=;;
1018 esac 879 esac
1019 type=Network 880 type="Network"
1020 ;; 881 ;;
1021 882
1022 *) 883 *)
1023 type= 884 type=
1024 ;; 885 ;;
1025 esac 886 esac
1026 fi 887 fi
1027 888 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}"
890 else
891 local desktop_name="${PN}-${SLOT}"
892 fi
1028 local desktop=${T}/${exec%% *}-${P}.desktop 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
1029 895
1030echo "[Desktop Entry] 896echo "[Desktop Entry]
1031Encoding=UTF-8 897Encoding=UTF-8
1032Version=0.9.2 898Version=0.9.2
1033Name=${name} 899Name=${name}
1034Type=Application 900Type=Application
1035Comment=${DESCRIPTION} 901Comment=${DESCRIPTION}
1036Exec=${exec} 902Exec=${exec}
903TryExec=${exec}
1037Path=${path} 904Path=${path}
1038Icon=${icon} 905Icon=${icon}
1039Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
1040 907
908 (
909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
1041 insinto /usr/share/applications 911 insinto /usr/share/applications
1042 doins "${desktop}" 912 doins "${desktop}"
1043 913 )
1044 return 0
1045} 914}
1046 915
1047# Make a GDM/KDM Session file 916# Make a GDM/KDM Session file
1048# 917#
1049# make_desktop_entry(<title>, <command>) 918# make_desktop_entry(<title>, <command>)
1050# title: File to execute to start the Window Manager 919# title: File to execute to start the Window Manager
1051# command: Name of the Window Manager 920# command: Name of the Window Manager
1052 921
1053make_session_desktop() { 922make_session_desktop() {
1054
1055 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 923 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1056 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 924 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1057 925
1058 local title="${1}" 926 local title=$1
1059 local command="${2}" 927 local command=$2
1060 local desktop="${T}/${wm}.desktop" 928 local desktop=${T}/${wm}.desktop
1061 929
1062echo "[Desktop Entry] 930echo "[Desktop Entry]
1063Encoding=UTF-8 931Encoding=UTF-8
1064Name=${title} 932Name=${title}
1065Comment=This session logs you into ${title} 933Comment=This session logs you into ${title}
1067TryExec=${command} 935TryExec=${command}
1068Type=Application" > "${desktop}" 936Type=Application" > "${desktop}"
1069 937
1070 insinto /usr/share/xsessions 938 insinto /usr/share/xsessions
1071 doins "${desktop}" 939 doins "${desktop}"
1072
1073 return 0
1074} 940}
1075 941
1076domenu() { 942domenu() {
1077 local i 943 local i j
1078 local j
1079 insinto /usr/share/applications 944 insinto /usr/share/applications
1080 for i in ${@} 945 for i in "$@" ; do
1081 do
1082 if [ -f "${i}" ]; 946 if [[ -f ${i} ]] ; then
1083 then
1084 doins ${i} 947 doins "${i}"
1085 elif [ -d "${i}" ]; 948 elif [[ -d ${i} ]] ; then
1086 then
1087 for j in ${i}/*.desktop 949 for j in "${i}"/*.desktop ; do
1088 do
1089 doins ${j} 950 doins "${j}"
1090 done 951 done
1091 fi 952 fi
1092 done 953 done
1093} 954}
955newmenu() {
956 insinto /usr/share/applications
957 newins "$1" "$2"
958}
1094 959
1095doicon() { 960doicon() {
1096 local i 961 local i j
1097 local j
1098 insinto /usr/share/pixmaps 962 insinto /usr/share/pixmaps
1099 for i in ${@} 963 for i in "$@" ; do
1100 do
1101 if [ -f "${i}" ]; 964 if [[ -f ${i} ]] ; then
1102 then
1103 doins ${i} 965 doins "${i}"
1104 elif [ -d "${i}" ]; 966 elif [[ -d ${i} ]] ; then
1105 then
1106 for j in ${i}/*.png 967 for j in "${i}"/*.png ; do
1107 do
1108 doins ${j} 968 doins "${j}"
1109 done 969 done
1110 fi 970 fi
1111 done 971 done
972}
973newicon() {
974 insinto /usr/share/pixmaps
975 newins "$1" "$2"
1112} 976}
1113 977
1114############################################################## 978##############################################################
1115# END: Handle .desktop files and menu entries # 979# END: Handle .desktop files and menu entries #
1116############################################################## 980##############################################################
1117 981
1118 982
1119# for internal use only (unpack_pdv and unpack_makeself) 983# for internal use only (unpack_pdv and unpack_makeself)
1120find_unpackable_file() { 984find_unpackable_file() {
1121 local src="$1" 985 local src=$1
1122 if [ -z "${src}" ] 986 if [[ -z ${src} ]] ; then
1123 then
1124 src="${DISTDIR}/${A}" 987 src=${DISTDIR}/${A}
1125 else 988 else
1126 if [ -e "${DISTDIR}/${src}" ] 989 if [[ -e ${DISTDIR}/${src} ]] ; then
1127 then
1128 src="${DISTDIR}/${src}" 990 src=${DISTDIR}/${src}
1129 elif [ -e "${PWD}/${src}" ] 991 elif [[ -e ${PWD}/${src} ]] ; then
1130 then
1131 src="${PWD}/${src}" 992 src=${PWD}/${src}
1132 elif [ -e "${src}" ] 993 elif [[ -e ${src} ]] ; then
1133 then
1134 src="${src}" 994 src=${src}
1135 fi
1136 fi 995 fi
1137 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 996 fi
997 [[ ! -e ${src} ]] && return 1
1138 echo "${src}" 998 echo "${src}"
1139} 999}
1140 1000
1141# Unpack those pesky pdv generated files ... 1001# Unpack those pesky pdv generated files ...
1142# They're self-unpacking programs with the binary package stuffed in 1002# They're self-unpacking programs with the binary package stuffed in
1157# lseek 1017# lseek
1158# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1159# lseek(3, -4, SEEK_END) = 2981250 1019# lseek(3, -4, SEEK_END) = 2981250
1160# thus we would pass in the value of '4' as the second parameter. 1020# thus we would pass in the value of '4' as the second parameter.
1161unpack_pdv() { 1021unpack_pdv() {
1162 local src="`find_unpackable_file $1`" 1022 local src=$(find_unpackable_file $1)
1163 local sizeoff_t="$2" 1023 local sizeoff_t=$2
1164 1024
1025 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1165 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1026 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1166 1027
1167 local shrtsrc="`basename ${src}`" 1028 local shrtsrc=$(basename "${src}")
1168 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1169 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1170 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1031 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1171 1032
1172 # grab metadata for debug reasons 1033 # grab metadata for debug reasons
1236# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1237# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1238# - If the offset is not specified then we will attempt to extract 1099# - If the offset is not specified then we will attempt to extract
1239# the proper offset from the script itself. 1100# the proper offset from the script itself.
1240unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1241 local src="$(find_unpackable_file "$1")" 1103 local src=$(find_unpackable_file "${src_input}")
1242 local skip="$2" 1104 local skip=$2
1243 local exe="$3" 1105 local exe=$3
1244 1106
1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1108
1245 local shrtsrc="$(basename "${src}")" 1109 local shrtsrc=$(basename "${src}")
1246 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1247 if [ -z "${skip}" ] 1111 if [[ -z ${skip} ]] ; then
1248 then
1249 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1250 local skip=0 1113 local skip=0
1251 exe=tail 1114 exe=tail
1252 case ${ver} in 1115 case ${ver} in
1253 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1116 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1254 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1266 ;; 1129 ;;
1267 2.1.3) 1130 2.1.3)
1268 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1131 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1269 let skip="skip + 1" 1132 let skip="skip + 1"
1270 ;; 1133 ;;
1271 2.1.4) 1134 2.1.4|2.1.5)
1272 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1135 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1273 skip=$(head -n ${skip} "${src}" | wc -c) 1136 skip=$(head -n ${skip} "${src}" | wc -c)
1274 exe="dd" 1137 exe="dd"
1275 ;; 1138 ;;
1276 *) 1139 *)
1321check_license() { 1184check_license() {
1322 local lic=$1 1185 local lic=$1
1323 if [ -z "${lic}" ] ; then 1186 if [ -z "${lic}" ] ; then
1324 lic="${PORTDIR}/licenses/${LICENSE}" 1187 lic="${PORTDIR}/licenses/${LICENSE}"
1325 else 1188 else
1326 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1189 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1327 lic="${PORTDIR}/licenses/${src}" 1190 lic="${PORTDIR}/licenses/${lic}"
1328 elif [ -e "${PWD}/${src}" ] ; then 1191 elif [ -e "${PWD}/${lic}" ] ; then
1329 lic="${PWD}/${src}" 1192 lic="${PWD}/${lic}"
1330 elif [ -e "${src}" ] ; then 1193 elif [ -e "${lic}" ] ; then
1331 lic="${src}" 1194 lic="${lic}"
1332 fi
1333 fi 1195 fi
1196 fi
1334 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1197 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1335 local l="`basename ${lic}`" 1198 local l="`basename ${lic}`"
1336 1199
1337 # here is where we check for the licenses the user already 1200 # here is where we check for the licenses the user already
1338 # accepted ... if we don't find a match, we make the user accept 1201 # accepted ... if we don't find a match, we make the user accept
1339 local shopts=$- 1202 local shopts=$-
1395 # first we figure out how many cds we're dealing with by 1258 # first we figure out how many cds we're dealing with by
1396 # the # of files they gave us 1259 # the # of files they gave us
1397 local cdcnt=0 1260 local cdcnt=0
1398 local f= 1261 local f=
1399 for f in "$@" ; do 1262 for f in "$@" ; do
1400 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1401 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1402 done 1265 done
1403 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1404 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1405 1268
1406 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1407 # if they did, let's just believe them that it's correct 1270 # if they did, let's just believe them that it's correct
1408 if [[ ! -z ${CD_ROOT} ]] ; then
1409 export CDROM_ROOT=${CD_ROOT}
1410 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1411 return
1412 fi
1413 # do the same for CD_ROOT_X
1414 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1415 local var= 1272 local var=
1416 cdcnt=0 1273 cdcnt=0
1417 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1418 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1419 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1420 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1421 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1422 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1423 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1281 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1424 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1425 fi 1283 fi
1426 export CDROM_ROOTS_${cdcnt}="${!var}"
1427 done 1284 done
1428 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1429 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1286 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1287 export CDROM_SET=-1
1288 for f in ${CDROM_CHECK_1//:/ } ; do
1289 ((++CDROM_SET))
1290 [[ -e ${CD_ROOT}/${f} ]] && break
1291 done
1292 export CDROM_MATCH=${f}
1430 return 1293 return
1431 fi 1294 fi
1432 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1433 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1434 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1435 if [[ -z ${CDROM_NAME} ]] ; then
1436 echo "cdrom for ${PN}."
1437 else
1438 echo "${CDROM_NAME}."
1439 fi
1440 echo 1300 echo
1441 einfo "If you do not have the CD, but have the data files" 1301 einfo "If you do not have the CD, but have the data files"
1442 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1443 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1444 einfo "directory containing the files." 1304 einfo "directory containing the files."
1448 echo 1308 echo
1449 else 1309 else
1450 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1451 cdcnt=0 1311 cdcnt=0
1452 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1453 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1454 var="CDROM_NAME_${cdcnt}" 1314 var="CDROM_NAME_${cdcnt}"
1455 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1315 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1456 done 1316 done
1457 echo 1317 echo
1458 einfo "If you do not have the CDs, but have the data files" 1318 einfo "If you do not have the CDs, but have the data files"
1459 einfo "mounted somewhere on your filesystem, just export" 1319 einfo "mounted somewhere on your filesystem, just export"
1460 einfo "the following variables so they point to the right place:" 1320 einfo "the following variables so they point to the right place:"
1461 einfon "" 1321 einfon ""
1462 cdcnt=0 1322 cdcnt=0
1463 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1464 cdcnt=$((cdcnt + 1)) 1324 ((++cdcnt))
1465 echo -n " CD_ROOT_${cdcnt}" 1325 echo -n " CD_ROOT_${cdcnt}"
1466 done 1326 done
1467 echo 1327 echo
1468 einfo "Or, if you have all the files in the same place, or" 1328 einfo "Or, if you have all the files in the same place, or"
1469 einfo "you only have one cdrom, you can export CD_ROOT" 1329 einfo "you only have one cdrom, you can export CD_ROOT"
1472 echo 1332 echo
1473 einfo "For example:" 1333 einfo "For example:"
1474 einfo "export CD_ROOT_1=/mnt/cdrom" 1334 einfo "export CD_ROOT_1=/mnt/cdrom"
1475 echo 1335 echo
1476 fi 1336 fi
1337
1338 export CDROM_SET=""
1477 export CDROM_CURRENT_CD=0 1339 export CDROM_CURRENT_CD=0
1478 cdrom_load_next_cd 1340 cdrom_load_next_cd
1479} 1341}
1480 1342
1481# this is only used when you need access to more than one cd. 1343# this is only used when you need access to more than one cd.
1482# when you have finished using the first cd, just call this function. 1344# when you have finished using the first cd, just call this function.
1483# when it returns, CDROM_ROOT will be pointing to the second cd. 1345# when it returns, CDROM_ROOT will be pointing to the second cd.
1484# remember, you can only go forward in the cd chain, you can't go back. 1346# remember, you can only go forward in the cd chain, you can't go back.
1485cdrom_load_next_cd() { 1347cdrom_load_next_cd() {
1486 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1487 local var= 1348 local var
1488 1349 ((++CDROM_CURRENT_CD))
1489 if [[ ! -z ${CD_ROOT} ]] ; then
1490 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1491 return
1492 fi
1493 1350
1494 unset CDROM_ROOT 1351 unset CDROM_ROOT
1495 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1352 var=CD_ROOT_${CDROM_CURRENT_CD}
1353 [[ -z ${!var} ]] && var="CD_ROOT"
1496 if [[ -z ${!var} ]] ; then 1354 if [[ -z ${!var} ]] ; then
1497 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1355 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1498 cdrom_locate_file_on_cd ${!var} 1356 _cdrom_locate_file_on_cd ${!var}
1499 else 1357 else
1500 export CDROM_ROOT=${!var} 1358 export CDROM_ROOT=${!var}
1501 fi 1359 fi
1502 1360
1503 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1361 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1508# all it does is try to locate a give file on a cd ... if the cd isn't 1366# all it does is try to locate a give file on a cd ... if the cd isn't
1509# found, then a message asking for the user to insert the cdrom will be 1367# found, then a message asking for the user to insert the cdrom will be
1510# displayed and we'll hang out here until: 1368# displayed and we'll hang out here until:
1511# (1) the file is found on a mounted cdrom 1369# (1) the file is found on a mounted cdrom
1512# (2) the user hits CTRL+C 1370# (2) the user hits CTRL+C
1513cdrom_locate_file_on_cd() { 1371_cdrom_locate_file_on_cd() {
1372 local mline=""
1373 local showedmsg=0
1374
1514 while [[ -z ${CDROM_ROOT} ]] ; do 1375 while [[ -z ${CDROM_ROOT} ]] ; do
1376 local i=0
1377 local -a cdset=(${*//:/ })
1378 if [[ -n ${CDROM_SET} ]] ; then
1379 cdset=(${cdset[${CDROM_SET}]})
1380 fi
1381
1382 while [[ -n ${cdset[${i}]} ]] ; do
1515 local dir="$(dirname ${@})" 1383 local dir=$(dirname ${cdset[${i}]})
1516 local file="$(basename ${@})" 1384 local file=$(basename ${cdset[${i}]})
1517 local mline=""
1518 local showedmsg=0
1519 1385
1520 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1386 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1521 [[ -d ${mline}/${dir} ]] || continue 1387 [[ -d ${mline}/${dir} ]] || continue
1522 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1523 && export CDROM_ROOT=${mline} 1389 export CDROM_ROOT=${mline}
1390 export CDROM_SET=${i}
1391 export CDROM_MATCH=${cdset[${i}]}
1392 return
1393 fi
1394 done
1395
1396 ((++i))
1524 done 1397 done
1525 1398
1526 if [[ -z ${CDROM_ROOT} ]] ; then
1527 echo 1399 echo
1528 if [[ ${showedmsg} -eq 0 ]] ; then 1400 if [[ ${showedmsg} -eq 0 ]] ; then
1529 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1530 if [[ -z ${CDROM_NAME} ]] ; then 1402 if [[ -z ${CDROM_NAME} ]] ; then
1531 einfo "Please insert the cdrom for ${PN} now !" 1403 einfo "Please insert+mount the cdrom for ${PN} now !"
1532 else
1533 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1534 fi
1535 else 1404 else
1536 if [[ -z ${CDROM_NAME_1} ]] ; then
1537 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1538 else
1539 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1540 einfo "Please insert+mount the ${!var} cdrom now !" 1405 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1541 fi
1542 fi 1406 fi
1543 showedmsg=1 1407 else
1408 if [[ -z ${CDROM_NAME_1} ]] ; then
1409 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1410 else
1411 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1412 einfo "Please insert+mount the ${!var} cdrom now !"
1413 fi
1544 fi 1414 fi
1415 showedmsg=1
1416 fi
1545 einfo "Press return to scan for the cd again" 1417 einfo "Press return to scan for the cd again"
1546 einfo "or hit CTRL+C to abort the emerge." 1418 einfo "or hit CTRL+C to abort the emerge."
1547 read 1419 echo
1548 fi 1420 einfo "If you are having trouble with the detection"
1421 einfo "of your CD, it is possible that you do not have"
1422 einfo "Joliet support enabled in your kernel. Please"
1423 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1424 read || die "something is screwed with your system"
1549 done 1425 done
1550} 1426}
1551 1427
1552# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1553# a package can support 1429# a package can support
1563# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1564strip-linguas() { 1440strip-linguas() {
1565 local ls newls 1441 local ls newls
1566 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1567 local op=$1; shift 1443 local op=$1; shift
1568 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1569 local d f 1445 local d f
1570 for d in "$@" ; do 1446 for d in "$@" ; do
1571 if [[ ${op} == "-u" ]] ; then 1447 if [[ ${op} == "-u" ]] ; then
1572 newls=${ls} 1448 newls=${ls}
1573 else 1449 else
1574 newls="" 1450 newls=""
1575 fi 1451 fi
1576 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1577 if [[ ${op} == "-i" ]] ; then 1453 if [[ ${op} == "-i" ]] ; then
1578 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1454 hasq ${f} ${ls} && newls="${newls} ${f}"
1579 else 1455 else
1580 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1456 hasq ${f} ${ls} || newls="${newls} ${f}"
1581 fi 1457 fi
1582 done 1458 done
1583 ls=${newls} 1459 ls=${newls}
1584 done 1460 done
1585 ls=${ls//.po}
1586 else 1461 else
1587 ls=$@ 1462 ls="$@"
1588 fi 1463 fi
1589 1464
1590 ls=" ${ls} "
1591 newls="" 1465 newls=""
1592 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1593 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1467 if hasq ${f} ${ls} ; then
1594 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1595 else 1469 else
1596 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1597 fi 1471 fi
1598 done 1472 done
1599 if [[ -z ${newls} ]] ; then
1600 unset LINGUAS
1601 else
1602 export LINGUAS=${newls:1} 1473 export LINGUAS=${newls:1}
1603 fi
1604} 1474}
1605 1475
1606# moved from kernel.eclass since they are generally useful outside of 1476# moved from kernel.eclass since they are generally useful outside of
1607# kernel.eclass -iggy (20041002) 1477# kernel.eclass -iggy (20041002)
1608 1478
1615 while ((i--)) ; do 1485 while ((i--)) ; do
1616 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1486 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1617 done 1487 done
1618 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1488 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1619 case ${ARCH} in 1489 case ${ARCH} in
1620 x86) export ARCH="i386";; 1490 x86) export ARCH="i386";;
1621 amd64) export ARCH="x86_64";; 1491 amd64) export ARCH="x86_64";;
1622 hppa) export ARCH="parisc";; 1492 hppa) export ARCH="parisc";;
1623 mips) export ARCH="mips";; 1493 mips) export ARCH="mips";;
1624 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! 1494 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!
1625 *) export ARCH="${ARCH}";; 1495 *) export ARCH="${ARCH}";;
1626 esac 1496 esac
1627} 1497}
1628 1498
1629# set's ARCH back to what portage expects 1499# set's ARCH back to what portage expects
1630set_arch_to_portage() { 1500set_arch_to_portage() {
1637 1507
1638# Jeremy Huddleston <eradicator@gentoo.org>: 1508# Jeremy Huddleston <eradicator@gentoo.org>:
1639# preserve_old_lib /path/to/libblah.so.0 1509# preserve_old_lib /path/to/libblah.so.0
1640# preserve_old_lib_notify /path/to/libblah.so.0 1510# preserve_old_lib_notify /path/to/libblah.so.0
1641# 1511#
1642# These functions are useful when a lib in your package changes --soname. Such 1512# These functions are useful when a lib in your package changes --library. Such
1643# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1513# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1644# would break packages that link against it. Most people get around this 1514# would break packages that link against it. Most people get around this
1645# by using the portage SLOT mechanism, but that is not always a relevant 1515# by using the portage SLOT mechanism, but that is not always a relevant
1646# solution, so instead you can add the following to your ebuilds: 1516# solution, so instead you can add the following to your ebuilds:
1647# 1517#
1674 LIB=$1 1544 LIB=$1
1675 1545
1676 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1546 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1677 SONAME=`basename ${LIB}` 1547 SONAME=`basename ${LIB}`
1678 1548
1679 einfo "An old version of an installed library was detected on your system." 1549 ewarn "An old version of an installed library was detected on your system."
1680 einfo "In order to avoid breaking packages that link against is, this older version" 1550 ewarn "In order to avoid breaking packages that link against it, this older version"
1681 einfo "is not being removed. In order to make full use of this newer version," 1551 ewarn "is not being removed. In order to make full use of this newer version,"
1682 einfo "you will need to execute the following command:" 1552 ewarn "you will need to execute the following command:"
1683 einfo " revdep-rebuild --soname ${SONAME}" 1553 ewarn " revdep-rebuild --library ${SONAME}"
1684 einfo 1554 ewarn
1685 einfo "After doing that, you can safely remove ${LIB}" 1555 ewarn "After doing that, you can safely remove ${LIB}"
1686 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1687 fi 1557 fi
1688} 1558}
1689 1559
1690# Hack for people to figure out if a package was built with 1560# Hack for people to figure out if a package was built with
1691# certain USE flags 1561# certain USE flags
1701 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1702 1572
1703 local PKG=$(best_version $1) 1573 local PKG=$(best_version $1)
1704 shift 1574 shift
1705 1575
1706 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1576 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1577
1578 # if the USE file doesnt exist, assume the $PKG is either
1579 # injected or package.provided
1707 [[ ! -e ${USEFILE} ]] && return 1 1580 [[ ! -e ${USEFILE} ]] && return 0
1708 1581
1709 local USE_BUILT=$(<${USEFILE}) 1582 local USE_BUILT=$(<${USEFILE})
1710 while [[ $# -gt 0 ]] ; do 1583 while [[ $# -gt 0 ]] ; do
1711 if [[ ${opt} = "-o" ]] ; then 1584 if [[ ${opt} = "-o" ]] ; then
1712 has $1 ${USE_BUILT} && return 0 1585 has $1 ${USE_BUILT} && return 0
1737dopamd() { 1610dopamd() {
1738 [[ -z $1 ]] && die "dopamd requires at least one argument" 1611 [[ -z $1 ]] && die "dopamd requires at least one argument"
1739 1612
1740 use pam || return 0 1613 use pam || return 0
1741 1614
1742 insinto /etc/pam.d 1615 INSDESTTREE=/etc/pam.d \
1743 # these are the default doins options, but be explicit just in case
1744 insopts -m 0644 -o root -g root
1745 doins "$@" || die "failed to install $@" 1616 doins "$@" || die "failed to install $@"
1746} 1617}
1747# newpamd <old name> <new name> 1618# newpamd <old name> <new name>
1748# 1619#
1749# Install pam file <old name> as <new name> in /etc/pam.d 1620# Install pam file <old name> as <new name> in /etc/pam.d
1750newpamd() { 1621newpamd() {
1751 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1622 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1752 1623
1753 use pam || return 0 1624 use pam || return 0
1754 1625
1755 insinto /etc/pam.d 1626 INSDESTTREE=/etc/pam.d \
1756 # these are the default doins options, but be explicit just in case
1757 insopts -m 0644 -o root -g root
1758 newins "$1" "$2" || die "failed to install $1 as $2" 1627 newins "$1" "$2" || die "failed to install $1 as $2"
1759} 1628}
1629
1630# make a wrapper script ...
1631# NOTE: this was originally games_make_wrapper, but I noticed other places where
1632# this could be used, so I have moved it here and made it not games-specific
1633# -- wolf31o2
1634# $1 == wrapper name
1635# $2 == binary to run
1636# $3 == directory to chdir before running binary
1637# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1638# $5 == path for wrapper
1639make_wrapper() {
1640 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1641 local tmpwrapper=$(emktemp)
1642 # We don't want to quote ${bin} so that people can pass complex
1643 # things as $bin ... "./someprog --args"
1644 cat << EOF > "${tmpwrapper}"
1645#!/bin/sh
1646cd "${chdir:-.}"
1647if [ -n "${libdir}" ] ; then
1648 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1649 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1650 else
1651 export LD_LIBRARY_PATH="${libdir}"
1652 fi
1653fi
1654exec ${bin} "\$@"
1655EOF
1656 chmod go+rx "${tmpwrapper}"
1657 if [[ -n ${path} ]] ; then
1658 exeinto "${path}"
1659 newexe "${tmpwrapper}" "${wrapper}"
1660 else
1661 newbin "${tmpwrapper}" "${wrapper}"
1662 fi
1663}

Legend:
Removed from v.1.158  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20