/[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.181
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.181 2005/06/09 15:25:56 azarah 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
662 then 508 then
663 eerror "A shell was specified but it does not exist !" 509 eerror "A shell was specified but it does not exist !"
664 die "${eshell} does not exist" 510 die "${eshell} does not exist"
665 fi 511 fi
666 else 512 else
667 if [ "${USERLAND}" == "BSD" ] 513 if [[ "${USERLAND}" == "Darwin" ]]; then
668 then
669 eshell="/usr/bin/false" 514 eshell="/usr/bin/false"
515 elif [[ "${USERLAND}" == "BSD" ]]; then
516 eshell="/usr/sbin/nologin"
670 else 517 else
671 eshell="/bin/false" 518 eshell="/bin/false"
672 fi 519 fi
673 fi 520 fi
674 einfo " - Shell: ${eshell}" 521 einfo " - Shell: ${eshell}"
675 opts="${opts} -s ${eshell}" 522 opts="${opts} -s ${eshell}"
676 523
677 # handle homedir 524 # handle homedir
678 local ehome="$1"; shift 525 local ehome="$1"; shift
679 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 526 if [ -z "${ehome}" ] || [ "${ehome}" == "-1" ]
680 then 527 then
681 ehome="/dev/null" 528 ehome="/dev/null"
682 fi 529 fi
683 einfo " - Home: ${ehome}" 530 einfo " - Home: ${ehome}"
684 opts="${opts} -d ${ehome}" 531 opts="${opts} -d ${ehome}"
721 568
722 # handle extra and add the user 569 # handle extra and add the user
723 local eextra="$@" 570 local eextra="$@"
724 local oldsandbox="${SANDBOX_ON}" 571 local oldsandbox="${SANDBOX_ON}"
725 export SANDBOX_ON="0" 572 export SANDBOX_ON="0"
726 if useq ppc-macos 573 if [[ "${USERLAND}" == "Darwin" ]]
727 then 574 then
728 ### Make the user 575 ### Make the user
729 if [ -z "${eextra}" ] 576 if [ -z "${eextra}" ]
730 then 577 then
731 dscl . create /users/${euser} uid ${euid} 578 dscl . create /users/${euser} uid ${euid}
744 einfo "Extra options are not supported on macos yet" 591 einfo "Extra options are not supported on macos yet"
745 einfo "Please report the ebuild along with the info below" 592 einfo "Please report the ebuild along with the info below"
746 einfo "eextra: ${eextra}" 593 einfo "eextra: ${eextra}"
747 die "Required function missing" 594 die "Required function missing"
748 fi 595 fi
749 elif use x86-fbsd ; then 596 elif [[ "${USERLAND}" == "BSD" ]] ; then
750 if [ -z "${eextra}" ] 597 if [ -z "${eextra}" ]
751 then 598 then
752 pw useradd ${euser} ${opts} \ 599 pw useradd ${euser} ${opts} \
753 -c "added by portage for ${PN}" \ 600 -c "added by portage for ${PN}" \
754 die "enewuser failed" 601 die "enewuser failed"
814 then 661 then
815 if [ "${egid}" -gt 0 ] 662 if [ "${egid}" -gt 0 ]
816 then 663 then
817 if [ -z "`egetent group ${egid}`" ] 664 if [ -z "`egetent group ${egid}`" ]
818 then 665 then
819 if useq ppc-macos ; then 666 if [[ "${USERLAND}" == "Darwin" ]]; then
820 opts="${opts} ${egid}" 667 opts="${opts} ${egid}"
821 else 668 else
822 opts="${opts} -g ${egid}" 669 opts="${opts} -g ${egid}"
823 fi 670 fi
824 else 671 else
838 opts="${opts} ${eextra}" 685 opts="${opts} ${eextra}"
839 686
840 # add the group 687 # add the group
841 local oldsandbox="${SANDBOX_ON}" 688 local oldsandbox="${SANDBOX_ON}"
842 export SANDBOX_ON="0" 689 export SANDBOX_ON="0"
843 if useq ppc-macos ; then 690 if [[ "${USERLAND}" == "Darwin" ]]; then
844 if [ ! -z "${eextra}" ]; 691 if [ ! -z "${eextra}" ];
845 then 692 then
846 einfo "Extra options are not supported on macos yet" 693 einfo "Extra options are not supported on Darwin/OS X yet"
847 einfo "Please report the ebuild along with the info below" 694 einfo "Please report the ebuild along with the info below"
848 einfo "eextra: ${eextra}" 695 einfo "eextra: ${eextra}"
849 die "Required function missing" 696 die "Required function missing"
850 fi 697 fi
851 698
856 [ -z "`egetent group ${egid}`" ] && break 703 [ -z "`egetent group ${egid}`" ] && break
857 done 704 done
858 esac 705 esac
859 dscl . create /groups/${egroup} gid ${egid} 706 dscl . create /groups/${egroup} gid ${egid}
860 dscl . create /groups/${egroup} passwd '*' 707 dscl . create /groups/${egroup} passwd '*'
861 elif use x86-fbsd ; then 708 elif [[ "${USERLAND}" == "BSD" ]] ; then
862 case ${egid} in 709 case ${egid} in
863 *[!0-9]*) # Non numeric 710 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 711 for egid in `jot 898 101`; do
865 [ -z "`egetent group ${egid}`" ] && break 712 [ -z "`egetent group ${egid}`" ] && break
866 done 713 done
901# name: the name that will show up in the menu 748# name: the name that will show up in the menu
902# icon: give your little like a pretty little icon ... 749# icon: give your little like a pretty little icon ...
903# this can be relative (to /usr/share/pixmaps) or 750# this can be relative (to /usr/share/pixmaps) or
904# a full path to an icon 751# a full path to an icon
905# type: what kind of application is this ? for categories: 752# type: what kind of application is this ? for categories:
906# http://www.freedesktop.org/standards/menu-spec/ 753# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
907# path: if your app needs to startup in a specific dir 754# path: if your app needs to startup in a specific dir
908make_desktop_entry() { 755make_desktop_entry() {
909 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 756 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
910 757
911 local exec="${1}" 758 local exec=${1}
912 local name="${2:-${PN}}" 759 local name=${2:-${PN}}
913 local icon="${3:-${PN}.png}" 760 local icon=${3:-${PN}.png}
914 local type="${4}" 761 local type=${4}
915 local subdir="${6}" 762 local path=${5}
916 local path="${5:-${GAMES_BINDIR}}" 763
917 if [ -z "${type}" ] 764 if [[ -z ${type} ]] ; then
918 then 765 local catmaj=${CATEGORY%%-*}
919 case ${CATEGORY} in 766 local catmin=${CATEGORY##*-}
920 "app-emulation") 767 case ${catmaj} in
921 type=Emulator 768 app)
922 subdir="Emulation" 769 case ${catmin} in
770 admin) type=System;;
771 cdr) type=DiscBurning;;
772 dicts) type=Dictionary;;
773 editors) type=TextEditor;;
774 emacs) type=TextEditor;;
775 emulation) type=Emulator;;
776 laptop) type=HardwareSettings;;
777 office) type=Office;;
778 vim) type=TextEditor;;
779 xemacs) type=TextEditor;;
780 *) type=;;
781 esac
923 ;; 782 ;;
924 "games-"*) 783
925 type=Game 784 dev)
926 subdir="Games" 785 type="Development"
927 ;; 786 ;;
928 "net-"*) 787
929 type=Network 788 games)
930 subdir="${type}" 789 [[ -z ${path} ]] && path=${GAMES_BINDIR}
790
791 case ${catmin} in
792 action) type=ActionGame;;
793 arcade) type=ArcadeGame;;
794 board) type=BoardGame;;
795 kid) type=KidsGame;;
796 emulation) type=Emulator;;
797 puzzle) type=LogicGame;;
798 rpg) type=RolePlaying;;
799 roguelike) type=RolePlaying;;
800 simulation) type=Simulation;;
801 sports) type=SportsGame;;
802 strategy) type=StrategyGame;;
803 *) type=;;
804 esac
805 type="Game;${type}"
931 ;; 806 ;;
807
808 mail)
809 type="Network;Email"
810 ;;
811
812 media)
813 case ${catmin} in
814 gfx) type=Graphics;;
815 radio) type=Tuner;;
816 sound) type=Audio;;
817 tv) type=TV;;
818 video) type=Video;;
819 *) type=;;
820 esac
821 type="AudioVideo;${type}"
822 ;;
823
824 net)
825 case ${catmin} in
826 dialup) type=Dialup;;
827 ftp) type=FileTransfer;;
828 im) type=InstantMessaging;;
829 irc) type=IRCClient;;
830 mail) type=Email;;
831 news) type=News;;
832 nntp) type=News;;
833 p2p) type=FileTransfer;;
834 *) type=;;
835 esac
836 type="Network;${type}"
837 ;;
838
839 sci)
840 case ${catmin} in
841 astro*) type=Astronomoy;;
842 bio*) type=Biology;;
843 calc*) type=Calculator;;
844 chem*) type=Chemistry;;
845 geo*) type=Geology;;
846 math*) type=Math;;
847 *) type=;;
848 esac
849 type="Science;${type}"
850 ;;
851
852 www)
853 case ${catmin} in
854 client) type=WebBrowser;;
855 *) type=;;
856 esac
857 type="Network"
858 ;;
859
932 *) 860 *)
933 type= 861 type=
934 subdir=
935 ;; 862 ;;
936 esac 863 esac
937 fi 864 fi
865 if [ "${SLOT}" == "0" ] ; then
866 local desktop_name="${PN}"
867 else
868 local desktop_name="${PN}-${SLOT}"
869 fi
938 local desktop="${T}/${exec}.desktop" 870 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
939 871
940echo "[Desktop Entry] 872echo "[Desktop Entry]
941Encoding=UTF-8 873Encoding=UTF-8
942Version=0.9.2 874Version=0.9.2
943Name=${name} 875Name=${name}
959# make_desktop_entry(<title>, <command>) 891# make_desktop_entry(<title>, <command>)
960# title: File to execute to start the Window Manager 892# title: File to execute to start the Window Manager
961# command: Name of the Window Manager 893# command: Name of the Window Manager
962 894
963make_session_desktop() { 895make_session_desktop() {
964
965 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 896 [[ -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 897 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
967 898
968 local title="${1}" 899 local title=$1
969 local command="${2}" 900 local command=$2
970 local desktop="${T}/${wm}.desktop" 901 local desktop=${T}/${wm}.desktop
971 902
972echo "[Desktop Entry] 903echo "[Desktop Entry]
973Encoding=UTF-8 904Encoding=UTF-8
974Name=${title} 905Name=${title}
975Comment=This session logs you into ${title} 906Comment=This session logs you into ${title}
977TryExec=${command} 908TryExec=${command}
978Type=Application" > "${desktop}" 909Type=Application" > "${desktop}"
979 910
980 insinto /usr/share/xsessions 911 insinto /usr/share/xsessions
981 doins "${desktop}" 912 doins "${desktop}"
982
983 return 0
984} 913}
985 914
986domenu() { 915domenu() {
987 local i 916 local i j
988 local j
989 insinto /usr/share/applications 917 insinto /usr/share/applications
990 for i in ${@} 918 for i in "$@" ; do
991 do
992 if [ -f "${i}" ]; 919 if [[ -f ${i} ]] ; then
993 then
994 doins ${i} 920 doins "${i}"
995 elif [ -d "${i}" ]; 921 elif [[ -d ${i} ]] ; then
996 then
997 for j in ${i}/*.desktop 922 for j in "${i}"/*.desktop ; do
998 do
999 doins ${j} 923 doins "${j}"
1000 done 924 done
1001 fi 925 fi
1002 done 926 done
1003} 927}
928newmenu() {
929 insinto /usr/share/applications
930 newins "$1" "$2"
931}
1004 932
1005doicon() { 933doicon() {
1006 local i 934 local i j
1007 local j
1008 insinto /usr/share/pixmaps 935 insinto /usr/share/pixmaps
1009 for i in ${@} 936 for i in "$@" ; do
1010 do
1011 if [ -f "${i}" ]; 937 if [[ -f ${i} ]] ; then
1012 then
1013 doins ${i} 938 doins "${i}"
1014 elif [ -d "${i}" ]; 939 elif [[ -d ${i} ]] ; then
1015 then
1016 for j in ${i}/*.png 940 for j in "${i}"/*.png ; do
1017 do
1018 doins ${j} 941 doins "${j}"
1019 done 942 done
1020 fi 943 fi
1021 done 944 done
945}
946newicon() {
947 insinto /usr/share/pixmaps
948 newins "$1" "$2"
1022} 949}
1023 950
1024############################################################## 951##############################################################
1025# END: Handle .desktop files and menu entries # 952# END: Handle .desktop files and menu entries #
1026############################################################## 953##############################################################
1427 local mline="" 1354 local mline=""
1428 local showedmsg=0 1355 local showedmsg=0
1429 1356
1430 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1357 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1431 [[ -d ${mline}/${dir} ]] || continue 1358 [[ -d ${mline}/${dir} ]] || continue
1432 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1359 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1433 && export CDROM_ROOT=${mline} 1360 && export CDROM_ROOT=${mline}
1434 done 1361 done
1435 1362
1436 if [[ -z ${CDROM_ROOT} ]] ; then 1363 if [[ -z ${CDROM_ROOT} ]] ; then
1437 echo 1364 echo
1471# directories and uses the intersection of the lists. 1398# directories and uses the intersection of the lists.
1472# The -u builds a list of po files found in all the 1399# The -u builds a list of po files found in all the
1473# directories and uses the union of the lists. 1400# directories and uses the union of the lists.
1474strip-linguas() { 1401strip-linguas() {
1475 local ls newls 1402 local ls newls
1476 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1403 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1477 local op="$1"; shift 1404 local op=$1; shift
1478 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1405 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1479 local d f 1406 local d f
1480 for d in "$@" ; do 1407 for d in "$@" ; do
1481 if [ "${op}" == "-u" ] ; then 1408 if [[ ${op} == "-u" ]] ; then
1482 newls="${ls}" 1409 newls=${ls}
1483 else 1410 else
1484 newls="" 1411 newls=""
1485 fi 1412 fi
1486 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1413 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1487 if [ "${op}" == "-i" ] ; then 1414 if [[ ${op} == "-i" ]] ; then
1488 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1415 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1489 else 1416 else
1490 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1417 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1491 fi 1418 fi
1492 done 1419 done
1493 ls="${newls}" 1420 ls=${newls}
1494 done 1421 done
1495 ls="${ls//.po}" 1422 ls=${ls//.po}
1496 else 1423 else
1497 ls="$@" 1424 ls=$@
1498 fi 1425 fi
1499 1426
1500 ls=" ${ls} " 1427 ls=" ${ls} "
1501 newls="" 1428 newls=""
1502 for f in ${LINGUAS} ; do 1429 for f in ${LINGUAS} ; do
1503 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1430 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1504 newls="${newls} ${f}" 1431 newls="${newls} ${f}"
1505 else 1432 else
1506 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1433 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1507 fi 1434 fi
1508 done 1435 done
1509 if [ -z "${newls}" ] ; then 1436 if [[ -z ${newls} ]] ; then
1510 unset LINGUAS 1437 export LINGUAS=""
1511 else 1438 else
1512 export LINGUAS="${newls}" 1439 export LINGUAS=${newls:1}
1513 fi 1440 fi
1514} 1441}
1515 1442
1516# moved from kernel.eclass since they are generally useful outside of 1443# moved from kernel.eclass since they are generally useful outside of
1517# kernel.eclass -iggy (20041002) 1444# kernel.eclass -iggy (20041002)
1525 while ((i--)) ; do 1452 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1453 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done 1454 done
1528 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1455 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1529 case ${ARCH} in 1456 case ${ARCH} in
1530 x86) export ARCH="i386";; 1457 x86) export ARCH="i386";;
1531 amd64) export ARCH="x86_64";; 1458 amd64) export ARCH="x86_64";;
1532 hppa) export ARCH="parisc";; 1459 hppa) export ARCH="parisc";;
1533 mips) export ARCH="mips";; 1460 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! 1461 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}";; 1462 *) export ARCH="${ARCH}";;
1536 esac 1463 esac
1537} 1464}
1538 1465
1539# set's ARCH back to what portage expects 1466# set's ARCH back to what portage expects
1540set_arch_to_portage() { 1467set_arch_to_portage() {
1639 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1566 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1640 done 1567 done
1641 eend 0 1568 eend 0
1642} 1569}
1643 1570
1644# dopamd [ file ] [ new file ] 1571# dopamd <file> [more files]
1645# 1572#
1646# Install pam auth config file in /etc/pam.d 1573# 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() { 1574dopamd() {
1652 local pamd="$1" newpamd="${2:-$1}"
1653 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1575 [[ -z $1 ]] && die "dopamd requires at least one argument"
1654 1576
1655 use pam || return 0 1577 use pam || return 0
1656 1578
1657 insinto /etc/pam.d 1579 INSDESTTREE=/etc/pam.d \
1658 # these are the default doins options, but be explicit just in case 1580 doins "$@" || die "failed to install $@"
1659 insopts -m 0644 -o root -g root
1660 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1661} 1581}
1582# newpamd <old name> <new name>
1583#
1584# Install pam file <old name> as <new name> in /etc/pam.d
1585newpamd() {
1586 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1587
1588 use pam || return 0
1589
1590 INSDESTTREE=/etc/pam.d \
1591 newins "$1" "$2" || die "failed to install $1 as $2"
1592}
1593
1594# make a wrapper script ...
1595# NOTE: this was originally games_make_wrapper, but I noticed other places where
1596# this could be used, so I have moved it here and made it not games-specific
1597# -- wolf31o2
1598# $1 == wrapper name
1599# $2 == binary to run
1600# $3 == directory to chdir before running binary
1601# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1602# $5 == path for wrapper
1603make_wrapper() {
1604 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1605 local tmpwrapper=$(emktemp)
1606 cat << EOF > "${tmpwrapper}"
1607#!/bin/sh
1608cd "${chdir}"
1609export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1610exec ${bin} "\$@"
1611EOF
1612 chmod go+rx "${tmpwrapper}"
1613 if [ -n "${5}" ]
1614 then
1615 exeinto ${5}
1616 newexe "${tmpwrapper}" "${wrapper}"
1617 else
1618 newbin "${tmpwrapper}" "${wrapper}"
1619 fi
1620}

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

  ViewVC Help
Powered by ViewVC 1.1.20