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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20