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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20