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

Diff of /eclass/eutils.eclass

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

Revision 1.147 Revision 1.182
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.147 2005/02/03 23:46:40 azarah Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.182 2005/06/11 00:02:26 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.
11 11
12inherit multilib 12inherit multilib
13ECLASS=eutils 13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
15 15
16DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch userland_GNU? ( sys-apps/shadow ) )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 18
18DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="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 if [ $CROSSCOMPILE -eq 1 ] || [ ! -e /proc/cpuinfo ]
38 then
39 :
40 else
41 CPU_FLAGS=$1
42 USER_CPU=`grep "flags" /proc/cpuinfo`
43
44 for flags in `seq 1 ${#CPU_FLAGS[@]}`
45 do
46 if has ${CPU_FLAGS[$flags - 1]} $USER_CPU && ! has ${CPU_FLAGS[$flags - 1]} $USE
47 then
48 ewarn "Your system is ${CPU_FLAGS[$flags - 1]} capable but you don't have it enabled!"
49 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
50 fi
51
52 if ! has ${CPU_FLAGS[$flags - 1]} $USER_CPU && has ${CPU_FLAGS[$flags -1]} $USE
53 then
54 ewarn "You have ${CPU_FLAGS[$flags - 1]} support enabled but your processor doesn't"
55 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
56 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
57 fi
58 done
59 fi
60}
61 20
62# Wait for the supplied number of seconds. If no argument is supplied, defaults 21# Wait for the supplied number of seconds. If no argument is supplied, defaults
63# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 22# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
64# outputting to a terminal, don't wait. For compatability purposes, the argument 23# outputting to a terminal, don't wait. For compatability purposes, the argument
65# must be an integer greater than zero. 24# must be an integer greater than zero.
107gen_usr_ldscript() { 66gen_usr_ldscript() {
108 local libdir="$(get_libdir)" 67 local libdir="$(get_libdir)"
109 # Just make sure it exists 68 # Just make sure it exists
110 dodir /usr/${libdir} 69 dodir /usr/${libdir}
111 70
71 for lib in "${@}" ; do
112 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
113/* GNU ld script 73 /* GNU ld script
114 Because Gentoo have critical dynamic libraries 74 Since Gentoo has critical dynamic libraries
115 in /lib, and the static versions in /usr/lib, we 75 in /lib, and the static versions in /usr/lib,
116 need to have a "fake" dynamic lib in /usr/lib, 76 we need to have a "fake" dynamic lib in /usr/lib,
117 otherwise we run into linking problems. 77 otherwise we run into linking problems.
118 See bug #4411 on http://bugs.gentoo.org/ for 78
119 more info. */ 79 See bug http://bugs.gentoo.org/4411 for more info.
80 */
120GROUP ( /${libdir}/${1} ) 81 GROUP ( /${libdir}/${lib} )
121END_LDSCRIPT 82 END_LDSCRIPT
122 fperms a+x "/usr/${libdir}/${1}" 83 fperms a+x "/usr/${libdir}/${lib}"
84 done
123} 85}
124 86
125# Simple function to draw a line consisting of '=' the same length as $* 87# Simple function to draw a line consisting of '=' the same length as $*
88# - only to be used by epatch()
126# 89#
127# <azarah@gentoo.org> (11 Nov 2002) 90# <azarah@gentoo.org> (11 Nov 2002)
128# 91#
129draw_line() { 92draw_line() {
130 local i=0 93 local i=0
156EPATCH_SOURCE="${WORKDIR}/patch" 119EPATCH_SOURCE="${WORKDIR}/patch"
157# Default extension for patches 120# Default extension for patches
158EPATCH_SUFFIX="patch.bz2" 121EPATCH_SUFFIX="patch.bz2"
159# Default options for patch 122# Default options for patch
160# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 123# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
161EPATCH_OPTS="-g0" 124# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
125EPATCH_OPTS="-g0 --no-backup-if-mismatch"
162# List of patches not to apply. Not this is only file names, 126# List of patches not to apply. Not this is only file names,
163# and not the full path .. 127# and not the full path ..
164EPATCH_EXCLUDE="" 128EPATCH_EXCLUDE=""
165# Change the printed message for a single patch. 129# Change the printed message for a single patch.
166EPATCH_SINGLE_MSG="" 130EPATCH_SINGLE_MSG=""
131# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
167# Force applying bulk patches even if not following the style: 133# Force applying bulk patches even if not following the style:
168# 134#
169# ??_${ARCH}_foo.${EPATCH_SUFFIX} 135# ??_${ARCH}_foo.${EPATCH_SUFFIX}
170# 136#
171EPATCH_FORCE="no" 137EPATCH_FORCE="no"
212 local x="" 178 local x=""
213 179
214 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
215 then 181 then
216 local m="" 182 local m=""
217 einfo "${#} patches to apply ..."
218 for m in "$@" ; do 183 for m in "$@" ; do
219 epatch "${m}" 184 epatch "${m}"
220 done 185 done
221 return 0 186 return 0
222 fi 187 fi
276 ;; 241 ;;
277 esac 242 esac
278 243
279 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
280 then 245 then
281 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
282 fi 247 fi
283 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
284 do 249 do
285 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
286 # 251 #
287 # ???_arch_foo.patch 252 # ???_arch_foo.patch
288 # 253 #
289 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
290 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
291 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
292 then 257 then
293 local count=0 258 local count=0
294 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
295 261
296 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
297 then 263 then
298 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
299 then 265 then
300 continue 266 continue
301 fi 267 fi
302 fi 268 fi
303 269
305 then 271 then
306 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
307 then 273 then
308 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
309 else 275 else
310 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
311 fi 277 fi
312 else 278 else
313 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
314 fi 280 fi
315 281
316 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
317 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
318 284
319 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
320 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
321 do 287 do
322 # Generate some useful debug info ... 288 # Generate some useful debug info ...
323 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 291
326 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
327 then 293 then
328 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 else 296 else
331 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
332 fi 298 fi
333 299
334 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
335 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 302
337 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 305
340 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
341 then 307 then
342 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
343 then 309 then
344 echo 310 echo
345 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
346 #die "Could not extract patch!" 312 #die "Could not extract patch!"
347 count=5 313 count=5
348 break 314 break
349 fi 315 fi
350 fi 316 fi
351 317
352 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
353 then 319 then
354 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
355 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
356 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
357 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
358 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 325
360 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
361 327
362 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
363 then 329 then
364 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
365 echo 331 echo
366 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
367 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
368 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
369 count=5 335 count=5
370 fi 336 fi
371 337
372 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
373 339
374 break 340 break
375 fi 341 fi
376 342
377 count=$((count + 1)) 343 count=$((count + 1))
383 fi 349 fi
384 350
385 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
386 then 352 then
387 echo 353 echo
388 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
389 eerror 356 eerror
390 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
391 eerror 358 eerror
392 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
393 echo 360 echo
394 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
395 fi 362 fi
396 363
397 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
398 365
399 eend 0 366 eend 0
400 fi 367 fi
401 done 368 done
402 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
403 then 370 then
404 einfo "Done with patching" 371 einfo "Done with patching"
405 fi
406}
407
408# This function return true if we are using the NPTL pthreads
409# implementation.
410#
411# <azarah@gentoo.org> (06 March 2003)
412#
413have_NPTL() {
414 cat > ${T}/test-nptl.c <<-"END"
415 #define _XOPEN_SOURCE
416 #include <unistd.h>
417 #include <stdio.h>
418
419 int main()
420 {
421 char buf[255];
422 char *str = buf;
423
424 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
425 if (NULL != str) {
426 printf("%s\n", str);
427 if (NULL != strstr(str, "NPTL"))
428 return 0;
429 }
430
431 return 1;
432 }
433 END
434
435 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
436 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
437 then
438 echo "yes"
439 einfon "Checking what PTHREADS implementation we have ..."
440 if ${T}/nptl
441 then
442 return 0
443 else
444 return 1
445 fi
446 else
447 echo "no"
448 fi
449
450 return 1
451}
452
453# This function check how many cpu's are present, and then set
454# -j in MAKEOPTS accordingly.
455#
456# Thanks to nall <nall@gentoo.org> for this.
457#
458get_number_of_jobs() {
459 local jobs=0
460
461 if [ ! -r /proc/cpuinfo ]
462 then
463 return 1
464 fi
465
466 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
467 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
468 then
469 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
470 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
471 ADMINPARAM="${ADMINPARAM/-j}"
472 fi
473
474 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
475
476 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
477 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
478 then
479 # these archs will always have "[Pp]rocessor"
480 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
481
482 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
483 then
484 # sparc always has "ncpus active"
485 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
486
487 elif [ "${ARCH}" = "alpha" ]
488 then
489 # alpha has "cpus active", but only when compiled with SMP
490 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
491 then
492 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
493 else
494 jobs=2
495 fi
496
497 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
498 then
499 # ppc has "processor", but only when compiled with SMP
500 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
501 then
502 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
503 else
504 jobs=2
505 fi
506 elif [ "${ARCH}" = "s390" ]
507 then
508 # s390 has "# processors : "
509 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
510 else
511 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
512 die "Unknown ARCH -- ${ARCH}!"
513 fi
514
515 # Make sure the number is valid ...
516 if [ "${jobs}" -lt 1 ]
517 then
518 jobs=1
519 fi
520
521 if [ -n "${ADMINPARAM}" ]
522 then
523 if [ "${jobs}" -gt "${ADMINPARAM}" ]
524 then
525 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
526 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
527 else
528 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
529 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
530 fi
531 fi 372 fi
532} 373}
533 374
534# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
535# does not exist on the users system 376# does not exist on the users system
569# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
570# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
571# 412#
572# egetent(database, key) 413# egetent(database, key)
573egetent() { 414egetent() {
574 if useq ppc-macos ; then 415 if [[ "${USERLAND}" == "Darwin" ]] ; then
575 case "$2" in 416 case "$2" in
576 *[!0-9]*) # Non numeric 417 *[!0-9]*) # Non numeric
577 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
578 ;; 419 ;;
579 *) # Numeric 420 *) # Numeric
580 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
581 ;; 422 ;;
582 esac 423 esac
583 elif useq x86-fbsd ; then 424 elif [[ "${USERLAND}" == "BSD" ]] ; then
584 local action 425 local action
585 if [ "$1" == "passwd" ] 426 if [ "$1" == "passwd" ]
586 then 427 then
587 action="user" 428 action="user"
588 else 429 else
608# homedir: /dev/null 449# homedir: /dev/null
609# groups: none 450# groups: none
610# extra: comment of 'added by portage for ${PN}' 451# extra: comment of 'added by portage for ${PN}'
611enewuser() { 452enewuser() {
612 # get the username 453 # get the username
613 local euser="$1"; shift 454 local euser=$1; shift
614 if [ -z "${euser}" ] 455 if [[ -z ${euser} ]] ; then
615 then
616 eerror "No username specified !" 456 eerror "No username specified !"
617 die "Cannot call enewuser without a username" 457 die "Cannot call enewuser without a username"
618 fi 458 fi
619 459
620 # lets see if the username already exists 460 # lets see if the username already exists
621 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
622 then
623 return 0 462 return 0
624 fi 463 fi
625 einfo "Adding user '${euser}' to your system ..." 464 einfo "Adding user '${euser}' to your system ..."
626 465
627 # options to pass to useradd 466 # options to pass to useradd
628 local opts= 467 local opts=
629 468
630 # handle uid 469 # handle uid
631 local euid="$1"; shift 470 local euid=$1; shift
632 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
633 then
634 if [ "${euid}" -gt 0 ] 472 if [[ ${euid} -gt 0 ]] ; then
635 then
636 if [ ! -z "`egetent passwd ${euid}`" ] 473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
637 then
638 euid="next" 474 euid="next"
639 fi 475 fi
640 else 476 else
641 eerror "Userid given but is not greater than 0 !" 477 eerror "Userid given but is not greater than 0 !"
642 die "${euid} is not a valid UID" 478 die "${euid} is not a valid UID"
643 fi 479 fi
644 else 480 else
645 euid="next" 481 euid="next"
646 fi 482 fi
647 if [ "${euid}" == "next" ] 483 if [[ ${euid} == "next" ]] ; then
648 then
649 local pwrange 484 local pwrange
650 if [ "${USERLAND}" == "BSD" ] ; then 485 if [[ ${USERLAND} == "BSD" ]] ; then
651 pwrange="`jot 898 101`" 486 pwrange=$(jot 898 101)
652 else 487 else
653 pwrange="`seq 101 999`" 488 pwrange=$(seq 101 999)
654 fi 489 fi
655 for euid in ${pwrange} ; do 490 for euid in ${pwrange} ; do
656 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
657 done 492 done
658 fi 493 fi
659 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
660 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
661 496
662 # handle shell 497 # handle shell
663 local eshell="$1"; shift 498 local eshell=$1; shift
664 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
665 then
666 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
667 then
668 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
669 die "${eshell} does not exist" 502 die "${eshell} does not exist"
670 fi 503 fi
671 else 504 else
672 if [ "${USERLAND}" == "BSD" ] 505 case ${USERLAND} in
673 then
674 eshell="/usr/bin/false" 506 Darwin) eshell="/usr/bin/false";;
675 else 507 BSD) eshell="/usr/sbin/nologin";;
676 eshell="/bin/false" 508 *) eshell="/bin/false";;
677 fi 509 esac
678 fi 510 fi
679 einfo " - Shell: ${eshell}" 511 einfo " - Shell: ${eshell}"
680 opts="${opts} -s ${eshell}" 512 opts="${opts} -s ${eshell}"
681 513
682 # handle homedir 514 # handle homedir
683 local ehome="$1"; shift 515 local ehome=$1; shift
684 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 516 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
685 then
686 ehome="/dev/null" 517 ehome="/dev/null"
687 fi 518 fi
688 einfo " - Home: ${ehome}" 519 einfo " - Home: ${ehome}"
689 opts="${opts} -d ${ehome}" 520 opts="${opts} -d ${ehome}"
690 521
691 # handle groups 522 # handle groups
692 local egroups="$1"; shift 523 local egroups=$1; shift
693 if [ ! -z "${egroups}" ] 524 if [[ ! -z ${egroups} ]] ; then
694 then
695 local oldifs="${IFS}" 525 local oldifs=${IFS}
696 local defgroup="" exgroups="" 526 local defgroup="" exgroups=""
697 527
698 export IFS="," 528 export IFS=","
699 for g in ${egroups} 529 for g in ${egroups} ; do
700 do
701 export IFS="${oldifs}" 530 export IFS=${oldifs}
702 if [ -z "`egetent group \"${g}\"`" ] 531 if [[ -z $(egetent group "${g}") ]] ; then
703 then
704 eerror "You must add group ${g} to the system first" 532 eerror "You must add group ${g} to the system first"
705 die "${g} is not a valid GID" 533 die "${g} is not a valid GID"
706 fi 534 fi
707 if [ -z "${defgroup}" ] 535 if [[ -z ${defgroup} ]] ; then
708 then
709 defgroup="${g}" 536 defgroup=${g}
710 else 537 else
711 exgroups="${exgroups},${g}" 538 exgroups="${exgroups},${g}"
712 fi 539 fi
713 export IFS="," 540 export IFS=","
714 done 541 done
715 export IFS="${oldifs}" 542 export IFS=${oldifs}
716 543
717 opts="${opts} -g ${defgroup}" 544 opts="${opts} -g ${defgroup}"
718 if [ ! -z "${exgroups}" ] 545 if [[ ! -z ${exgroups} ]] ; then
719 then
720 opts="${opts} -G ${exgroups:1}" 546 opts="${opts} -G ${exgroups:1}"
721 fi 547 fi
722 else 548 else
723 egroups="(none)" 549 egroups="(none)"
724 fi 550 fi
725 einfo " - Groups: ${egroups}" 551 einfo " - Groups: ${egroups}"
726 552
727 # handle extra and add the user 553 # handle extra and add the user
728 local eextra="$@"
729 local oldsandbox="${SANDBOX_ON}" 554 local oldsandbox=${SANDBOX_ON}
730 export SANDBOX_ON="0" 555 export SANDBOX_ON="0"
731 if useq ppc-macos 556 case ${USERLAND} in
732 then 557 Darwin)
733 ### Make the user 558 ### Make the user
734 if [ -z "${eextra}" ] 559 if [[ -z $@ ]] ; then
735 then
736 dscl . create /users/${euser} uid ${euid} 560 dscl . create /users/${euser} uid ${euid}
737 dscl . create /users/${euser} shell ${eshell} 561 dscl . create /users/${euser} shell ${eshell}
738 dscl . create /users/${euser} home ${ehome} 562 dscl . create /users/${euser} home ${ehome}
739 dscl . create /users/${euser} realname "added by portage for ${PN}" 563 dscl . create /users/${euser} realname "added by portage for ${PN}"
740 ### Add the user to the groups specified 564 ### Add the user to the groups specified
741 local oldifs="${IFS}" 565 local oldifs=${IFS}
742 export IFS="," 566 export IFS=","
743 for g in ${egroups} 567 for g in ${egroups} ; do
744 do
745 dscl . merge /groups/${g} users ${euser} 568 dscl . merge /groups/${g} users ${euser}
746 done 569 done
747 export IFS="${oldifs}" 570 export IFS=${oldifs}
748 else 571 else
749 einfo "Extra options are not supported on macos yet" 572 einfo "Extra options are not supported on Darwin yet"
750 einfo "Please report the ebuild along with the info below" 573 einfo "Please report the ebuild along with the info below"
751 einfo "eextra: ${eextra}" 574 einfo "eextra: $@"
752 die "Required function missing" 575 die "Required function missing"
753 fi 576 fi
754 elif use x86-fbsd ; then 577 ;;
755 if [ -z "${eextra}" ] 578 BSD)
756 then 579 if [[ -z $@ ]] ; then
757 pw useradd ${euser} ${opts} \ 580 pw useradd ${euser} ${opts} \
758 -c "added by portage for ${PN}" \ 581 -c "added by portage for ${PN}" \
759 die "enewuser failed" 582 die "enewuser failed"
760 else 583 else
761 einfo " - Extra: ${eextra}" 584 einfo " - Extra: $@"
762 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
763 -c ${eextra} || die "enewuser failed" 586 "$@" || die "enewuser failed"
764 fi 587 fi
765 else 588 ;;
766 if [ -z "${eextra}" ] 589 *)
767 then 590 if [[ -z $@ ]] ; then
768 useradd ${opts} ${euser} \ 591 useradd ${opts} ${euser} \
769 -c "added by portage for ${PN}" \ 592 -c "added by portage for ${PN}" \
770 || die "enewuser failed" 593 || die "enewuser failed"
771 else 594 else
772 einfo " - Extra: ${eextra}" 595 einfo " - Extra: $@"
773 useradd ${opts} ${euser} ${eextra} \ 596 useradd ${opts} ${euser} "$@" \
774 || die "enewuser failed" 597 || die "enewuser failed"
775 fi 598 fi
776 fi 599 ;;
600 esac
777 export SANDBOX_ON="${oldsandbox}" 601 export SANDBOX_ON=${oldsandbox}
778 602
779 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
780 then 604 then
781 einfo " - Creating ${ehome} in ${D}" 605 einfo " - Creating ${ehome} in ${D}"
782 dodir ${ehome} 606 dodir ${ehome}
819 then 643 then
820 if [ "${egid}" -gt 0 ] 644 if [ "${egid}" -gt 0 ]
821 then 645 then
822 if [ -z "`egetent group ${egid}`" ] 646 if [ -z "`egetent group ${egid}`" ]
823 then 647 then
824 if useq ppc-macos ; then 648 if [[ "${USERLAND}" == "Darwin" ]]; then
825 opts="${opts} ${egid}" 649 opts="${opts} ${egid}"
826 else 650 else
827 opts="${opts} -g ${egid}" 651 opts="${opts} -g ${egid}"
828 fi 652 fi
829 else 653 else
843 opts="${opts} ${eextra}" 667 opts="${opts} ${eextra}"
844 668
845 # add the group 669 # add the group
846 local oldsandbox="${SANDBOX_ON}" 670 local oldsandbox="${SANDBOX_ON}"
847 export SANDBOX_ON="0" 671 export SANDBOX_ON="0"
848 if useq ppc-macos ; then 672 if [[ "${USERLAND}" == "Darwin" ]]; then
849 if [ ! -z "${eextra}" ]; 673 if [ ! -z "${eextra}" ];
850 then 674 then
851 einfo "Extra options are not supported on macos yet" 675 einfo "Extra options are not supported on Darwin/OS X yet"
852 einfo "Please report the ebuild along with the info below" 676 einfo "Please report the ebuild along with the info below"
853 einfo "eextra: ${eextra}" 677 einfo "eextra: ${eextra}"
854 die "Required function missing" 678 die "Required function missing"
855 fi 679 fi
856 680
861 [ -z "`egetent group ${egid}`" ] && break 685 [ -z "`egetent group ${egid}`" ] && break
862 done 686 done
863 esac 687 esac
864 dscl . create /groups/${egroup} gid ${egid} 688 dscl . create /groups/${egroup} gid ${egid}
865 dscl . create /groups/${egroup} passwd '*' 689 dscl . create /groups/${egroup} passwd '*'
866 elif use x86-fbsd ; then 690 elif [[ "${USERLAND}" == "BSD" ]] ; then
867 case ${egid} in 691 case ${egid} in
868 *[!0-9]*) # Non numeric 692 *[!0-9]*) # Non numeric
869 for egid in `jot 898 101`; do 693 for egid in `jot 898 101`; do
870 [ -z "`egetent group ${egid}`" ] && break 694 [ -z "`egetent group ${egid}`" ] && break
871 done 695 done
906# name: the name that will show up in the menu 730# name: the name that will show up in the menu
907# icon: give your little like a pretty little icon ... 731# icon: give your little like a pretty little icon ...
908# this can be relative (to /usr/share/pixmaps) or 732# this can be relative (to /usr/share/pixmaps) or
909# a full path to an icon 733# a full path to an icon
910# type: what kind of application is this ? for categories: 734# type: what kind of application is this ? for categories:
911# http://www.freedesktop.org/standards/menu-spec/ 735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
912# path: if your app needs to startup in a specific dir 736# path: if your app needs to startup in a specific dir
913make_desktop_entry() { 737make_desktop_entry() {
914 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
915 739
916 local exec="${1}" 740 local exec=${1}
917 local name="${2:-${PN}}" 741 local name=${2:-${PN}}
918 local icon="${3:-${PN}.png}" 742 local icon=${3:-${PN}.png}
919 local type="${4}" 743 local type=${4}
920 local subdir="${6}" 744 local path=${5}
921 local path="${5:-${GAMES_BINDIR}}" 745
922 if [ -z "${type}" ] 746 if [[ -z ${type} ]] ; then
923 then 747 local catmaj=${CATEGORY%%-*}
924 case ${CATEGORY} in 748 local catmin=${CATEGORY##*-}
925 "app-emulation") 749 case ${catmaj} in
926 type=Emulator 750 app)
927 subdir="Emulation" 751 case ${catmin} in
752 admin) type=System;;
753 cdr) type=DiscBurning;;
754 dicts) type=Dictionary;;
755 editors) type=TextEditor;;
756 emacs) type=TextEditor;;
757 emulation) type=Emulator;;
758 laptop) type=HardwareSettings;;
759 office) type=Office;;
760 vim) type=TextEditor;;
761 xemacs) type=TextEditor;;
762 *) type=;;
763 esac
928 ;; 764 ;;
929 "games-"*) 765
930 type=Game 766 dev)
931 subdir="Games" 767 type="Development"
932 ;; 768 ;;
933 "net-"*) 769
934 type=Network 770 games)
935 subdir="${type}" 771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in
774 action) type=ActionGame;;
775 arcade) type=ArcadeGame;;
776 board) type=BoardGame;;
777 kid) type=KidsGame;;
778 emulation) type=Emulator;;
779 puzzle) type=LogicGame;;
780 rpg) type=RolePlaying;;
781 roguelike) type=RolePlaying;;
782 simulation) type=Simulation;;
783 sports) type=SportsGame;;
784 strategy) type=StrategyGame;;
785 *) type=;;
786 esac
787 type="Game;${type}"
936 ;; 788 ;;
789
790 mail)
791 type="Network;Email"
792 ;;
793
794 media)
795 case ${catmin} in
796 gfx) type=Graphics;;
797 radio) type=Tuner;;
798 sound) type=Audio;;
799 tv) type=TV;;
800 video) type=Video;;
801 *) type=;;
802 esac
803 type="AudioVideo;${type}"
804 ;;
805
806 net)
807 case ${catmin} in
808 dialup) type=Dialup;;
809 ftp) type=FileTransfer;;
810 im) type=InstantMessaging;;
811 irc) type=IRCClient;;
812 mail) type=Email;;
813 news) type=News;;
814 nntp) type=News;;
815 p2p) type=FileTransfer;;
816 *) type=;;
817 esac
818 type="Network;${type}"
819 ;;
820
821 sci)
822 case ${catmin} in
823 astro*) type=Astronomoy;;
824 bio*) type=Biology;;
825 calc*) type=Calculator;;
826 chem*) type=Chemistry;;
827 geo*) type=Geology;;
828 math*) type=Math;;
829 *) type=;;
830 esac
831 type="Science;${type}"
832 ;;
833
834 www)
835 case ${catmin} in
836 client) type=WebBrowser;;
837 *) type=;;
838 esac
839 type="Network"
840 ;;
841
937 *) 842 *)
938 type= 843 type=
939 subdir=
940 ;; 844 ;;
941 esac 845 esac
942 fi 846 fi
847 if [ "${SLOT}" == "0" ] ; then
848 local desktop_name="${PN}"
849 else
850 local desktop_name="${PN}-${SLOT}"
851 fi
943 local desktop="${T}/${exec}.desktop" 852 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
944 853
945echo "[Desktop Entry] 854echo "[Desktop Entry]
946Encoding=UTF-8 855Encoding=UTF-8
947Version=0.9.2 856Version=0.9.2
948Name=${name} 857Name=${name}
964# make_desktop_entry(<title>, <command>) 873# make_desktop_entry(<title>, <command>)
965# title: File to execute to start the Window Manager 874# title: File to execute to start the Window Manager
966# command: Name of the Window Manager 875# command: Name of the Window Manager
967 876
968make_session_desktop() { 877make_session_desktop() {
969
970 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 878 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
971 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 879 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
972 880
973 local title="${1}" 881 local title=$1
974 local command="${2}" 882 local command=$2
975 local desktop="${T}/${wm}.desktop" 883 local desktop=${T}/${wm}.desktop
976 884
977echo "[Desktop Entry] 885echo "[Desktop Entry]
978Encoding=UTF-8 886Encoding=UTF-8
979Name=${title} 887Name=${title}
980Comment=This session logs you into ${title} 888Comment=This session logs you into ${title}
982TryExec=${command} 890TryExec=${command}
983Type=Application" > "${desktop}" 891Type=Application" > "${desktop}"
984 892
985 insinto /usr/share/xsessions 893 insinto /usr/share/xsessions
986 doins "${desktop}" 894 doins "${desktop}"
987
988 return 0
989} 895}
990 896
991domenu() { 897domenu() {
992 local i 898 local i j
993 local j
994 insinto /usr/share/applications 899 insinto /usr/share/applications
995 for i in ${@} 900 for i in "$@" ; do
996 do
997 if [ -f "${i}" ]; 901 if [[ -f ${i} ]] ; then
998 then
999 doins ${i} 902 doins "${i}"
1000 elif [ -d "${i}" ]; 903 elif [[ -d ${i} ]] ; then
1001 then
1002 for j in ${i}/*.desktop 904 for j in "${i}"/*.desktop ; do
1003 do
1004 doins ${j} 905 doins "${j}"
1005 done 906 done
1006 fi 907 fi
1007 done 908 done
1008} 909}
910newmenu() {
911 insinto /usr/share/applications
912 newins "$1" "$2"
913}
1009 914
1010doicon() { 915doicon() {
1011 local i 916 local i j
1012 local j
1013 insinto /usr/share/pixmaps 917 insinto /usr/share/pixmaps
1014 for i in ${@} 918 for i in "$@" ; do
1015 do
1016 if [ -f "${i}" ]; 919 if [[ -f ${i} ]] ; then
1017 then
1018 doins ${i} 920 doins "${i}"
1019 elif [ -d "${i}" ]; 921 elif [[ -d ${i} ]] ; then
1020 then
1021 for j in ${i}/*.png 922 for j in "${i}"/*.png ; do
1022 do
1023 doins ${j} 923 doins "${j}"
1024 done 924 done
1025 fi 925 fi
1026 done 926 done
927}
928newicon() {
929 insinto /usr/share/pixmaps
930 newins "$1" "$2"
1027} 931}
1028 932
1029############################################################## 933##############################################################
1030# END: Handle .desktop files and menu entries # 934# END: Handle .desktop files and menu entries #
1031############################################################## 935##############################################################
1432 local mline="" 1336 local mline=""
1433 local showedmsg=0 1337 local showedmsg=0
1434 1338
1435 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1436 [[ -d ${mline}/${dir} ]] || continue 1340 [[ -d ${mline}/${dir} ]] || continue
1437 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1438 && export CDROM_ROOT=${mline} 1342 && export CDROM_ROOT=${mline}
1439 done 1343 done
1440 1344
1441 if [[ -z ${CDROM_ROOT} ]] ; then 1345 if [[ -z ${CDROM_ROOT} ]] ; then
1442 echo 1346 echo
1476# directories and uses the intersection of the lists. 1380# directories and uses the intersection of the lists.
1477# The -u builds a list of po files found in all the 1381# The -u builds a list of po files found in all the
1478# directories and uses the union of the lists. 1382# directories and uses the union of the lists.
1479strip-linguas() { 1383strip-linguas() {
1480 local ls newls 1384 local ls newls
1481 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1385 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1482 local op="$1"; shift 1386 local op=$1; shift
1483 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1387 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1484 local d f 1388 local d f
1485 for d in "$@" ; do 1389 for d in "$@" ; do
1486 if [ "${op}" == "-u" ] ; then 1390 if [[ ${op} == "-u" ]] ; then
1487 newls="${ls}" 1391 newls=${ls}
1488 else 1392 else
1489 newls="" 1393 newls=""
1490 fi 1394 fi
1491 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1395 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1492 if [ "${op}" == "-i" ] ; then 1396 if [[ ${op} == "-i" ]] ; then
1493 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1397 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1494 else 1398 else
1495 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1399 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1496 fi 1400 fi
1497 done 1401 done
1498 ls="${newls}" 1402 ls=${newls}
1499 done 1403 done
1500 ls="${ls//.po}" 1404 ls=${ls//.po}
1501 else 1405 else
1502 ls="$@" 1406 ls=$@
1503 fi 1407 fi
1504 1408
1505 ls=" ${ls} " 1409 ls=" ${ls} "
1506 newls="" 1410 newls=""
1507 for f in ${LINGUAS} ; do 1411 for f in ${LINGUAS} ; do
1508 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1412 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1509 newls="${newls} ${f}" 1413 newls="${newls} ${f}"
1510 else 1414 else
1511 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1415 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1512 fi 1416 fi
1513 done 1417 done
1514 if [ -z "${newls}" ] ; then 1418 if [[ -z ${newls} ]] ; then
1515 unset LINGUAS 1419 export LINGUAS=""
1516 else 1420 else
1517 export LINGUAS="${newls}" 1421 export LINGUAS=${newls:1}
1518 fi 1422 fi
1519} 1423}
1520 1424
1521# moved from kernel.eclass since they are generally useful outside of 1425# moved from kernel.eclass since they are generally useful outside of
1522# kernel.eclass -iggy (20041002) 1426# kernel.eclass -iggy (20041002)
1530 while ((i--)) ; do 1434 while ((i--)) ; do
1531 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1435 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1532 done 1436 done
1533 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1437 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1534 case ${ARCH} in 1438 case ${ARCH} in
1535 x86) export ARCH="i386";; 1439 x86) export ARCH="i386";;
1536 amd64) export ARCH="x86_64";; 1440 amd64) export ARCH="x86_64";;
1537 hppa) export ARCH="parisc";; 1441 hppa) export ARCH="parisc";;
1538 mips) export ARCH="mips";; 1442 mips) export ARCH="mips";;
1539 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! 1443 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!
1540 *) export ARCH="${ARCH}";; 1444 *) export ARCH="${ARCH}";;
1541 esac 1445 esac
1542} 1446}
1543 1447
1544# set's ARCH back to what portage expects 1448# set's ARCH back to what portage expects
1545set_arch_to_portage() { 1449set_arch_to_portage() {
1644 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1548 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1645 done 1549 done
1646 eend 0 1550 eend 0
1647} 1551}
1648 1552
1649# dopamd [ file ] [ new file ] 1553# dopamd <file> [more files]
1650# 1554#
1651# Install pam auth config file in /etc/pam.d 1555# Install pam auth config file in /etc/pam.d
1652#
1653# The first argument, 'file' is required. Install as 'new file', if
1654# specified.
1655
1656dopamd() { 1556dopamd() {
1657 local pamd="$1" newpamd="${2:-$1}"
1658 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1557 [[ -z $1 ]] && die "dopamd requires at least one argument"
1659 1558
1660 use pam || return 0 1559 use pam || return 0
1661 1560
1662 insinto /etc/pam.d 1561 INSDESTTREE=/etc/pam.d \
1663 # these are the default doins options, but be explicit just in case 1562 doins "$@" || die "failed to install $@"
1664 insopts -m 0644 -o root -g root
1665 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1666} 1563}
1564# newpamd <old name> <new name>
1565#
1566# Install pam file <old name> as <new name> in /etc/pam.d
1567newpamd() {
1568 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1569
1570 use pam || return 0
1571
1572 INSDESTTREE=/etc/pam.d \
1573 newins "$1" "$2" || die "failed to install $1 as $2"
1574}
1575
1576# make a wrapper script ...
1577# NOTE: this was originally games_make_wrapper, but I noticed other places where
1578# this could be used, so I have moved it here and made it not games-specific
1579# -- wolf31o2
1580# $1 == wrapper name
1581# $2 == binary to run
1582# $3 == directory to chdir before running binary
1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper
1585make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp)
1588 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh
1590cd "${chdir}"
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1592exec ${bin} "\$@"
1593EOF
1594 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ]
1596 then
1597 exeinto ${5}
1598 newexe "${tmpwrapper}" "${wrapper}"
1599 else
1600 newbin "${tmpwrapper}" "${wrapper}"
1601 fi
1602}

Legend:
Removed from v.1.147  
changed lines
  Added in v.1.182

  ViewVC Help
Powered by ViewVC 1.1.20