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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20