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

Legend:
Removed from v.1.144  
changed lines
  Added in v.1.186

  ViewVC Help
Powered by ViewVC 1.1.20