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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.152  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20