/[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.205
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.205 2005/10/07 15:31:46 flameeyes 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 portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="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 18
57# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# 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 20# 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 21# outputting to a terminal, don't wait. For compatability purposes, the argument
60# must be an integer greater than zero. 22# must be an integer greater than zero.
102gen_usr_ldscript() { 64gen_usr_ldscript() {
103 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
104 # Just make sure it exists 66 # Just make sure it exists
105 dodir /usr/${libdir} 67 dodir /usr/${libdir}
106 68
69 for lib in "${@}" ; do
107 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
108/* GNU ld script 71 /* GNU ld script
109 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
110 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
111 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
112 otherwise we run into linking problems. 75 otherwise we run into linking problems.
113 See bug #4411 on http://bugs.gentoo.org/ for 76
114 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
115GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
116END_LDSCRIPT 80 END_LDSCRIPT
117 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
118} 83}
119 84
120# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
121# 87#
122# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
123# 89#
124draw_line() { 90draw_line() {
125 local i=0 91 local i=0
151EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
152# Default extension for patches 118# Default extension for patches
153EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
154# Default options for patch 120# Default options for patch
155# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
156EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
157# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
158# and not the full path .. 125# and not the full path ..
159EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
160# Change the printed message for a single patch. 127# Change the printed message for a single patch.
161EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
162# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
163# 132#
164# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
165# 134#
166EPATCH_FORCE="no" 135EPATCH_FORCE="no"
204 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
205 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
206 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
207 local x="" 176 local x=""
208 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
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 372 fi
401} 373}
402 374
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
527}
528
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
531# vapier@gentoo.org 377# vapier@gentoo.org
532# 378#
533# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
534emktemp() { 380emktemp() {
535 local exe="touch" 381 local exe="touch"
536 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
537 local topdir="$1" 383 local topdir=$1
538 384
539 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
540 then
541 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
542 && topdir="/tmp" \ 387 && topdir="/tmp" \
543 || topdir="${T}" 388 || topdir=${T}
544 fi 389 fi
545 390
546 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
547 then
548 local tmp=/ 392 local tmp=/
549 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
550 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
551 done 395 done
552 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
553 echo "${tmp}" 397 echo "${tmp}"
554 else 398 else
555 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
556 && exe="-p" \ 400 && exe="-p" \
557 || exe="-d" 401 || exe="-d"
558 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
559 fi 403 fi
560} 404}
564# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
565# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
566# 410#
567# egetent(database, key) 411# egetent(database, key)
568egetent() { 412egetent() {
569 if useq ppc-macos ; then 413 case ${CHOST} in
414 *-darwin*)
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 ;;
579 local action 424 *-freebsd*)
580 if [ "$1" == "passwd" ] 425 local opts action="user"
581 then 426 [[ $1 == "passwd" ]] || action="group"
582 action="user" 427
583 else 428 # lookup by uid/gid
584 action="group" 429 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
585 fi 431 fi
432
586 pw show "${action}" "$2" -q 433 pw show ${action} ${opts} "$2" -q
587 else 434 ;;
435 *)
588 which nscd >& /dev/null && nscd -i "$1" 436 type -p nscd >& /dev/null && nscd -i "$1"
589 getent "$1" "$2" 437 getent "$1" "$2"
590 fi 438 ;;
439 esac
591} 440}
592 441
593# Simplify/standardize adding users to the system 442# Simplify/standardize adding users to the system
594# vapier@gentoo.org 443# vapier@gentoo.org
595# 444#
603# homedir: /dev/null 452# homedir: /dev/null
604# groups: none 453# groups: none
605# extra: comment of 'added by portage for ${PN}' 454# extra: comment of 'added by portage for ${PN}'
606enewuser() { 455enewuser() {
607 # get the username 456 # get the username
608 local euser="$1"; shift 457 local euser=$1; shift
609 if [ -z "${euser}" ] 458 if [[ -z ${euser} ]] ; then
610 then
611 eerror "No username specified !" 459 eerror "No username specified !"
612 die "Cannot call enewuser without a username" 460 die "Cannot call enewuser without a username"
613 fi 461 fi
614 462
615 # lets see if the username already exists 463 # lets see if the username already exists
616 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 464 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
617 then
618 return 0 465 return 0
619 fi 466 fi
620 einfo "Adding user '${euser}' to your system ..." 467 einfo "Adding user '${euser}' to your system ..."
621 468
622 # options to pass to useradd 469 # options to pass to useradd
623 local opts= 470 local opts=
624 471
625 # handle uid 472 # handle uid
626 local euid="$1"; shift 473 local euid=$1; shift
627 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 474 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
628 then
629 if [ "${euid}" -gt 0 ] 475 if [[ ${euid} -gt 0 ]] ; then
630 then
631 if [ ! -z "`egetent passwd ${euid}`" ] 476 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
632 then
633 euid="next" 477 euid="next"
634 fi 478 fi
635 else 479 else
636 eerror "Userid given but is not greater than 0 !" 480 eerror "Userid given but is not greater than 0 !"
637 die "${euid} is not a valid UID" 481 die "${euid} is not a valid UID"
638 fi 482 fi
639 else 483 else
640 euid="next" 484 euid="next"
641 fi 485 fi
642 if [ "${euid}" == "next" ] 486 if [[ ${euid} == "next" ]] ; then
643 then 487 for euid in $(seq 101 999) ; do
644 local pwrange
645 if [ "${USERLAND}" == "BSD" ] ; then
646 pwrange="`jot 898 101`"
647 else
648 pwrange="`seq 101 999`"
649 fi
650 for euid in ${pwrange} ; do
651 [ -z "`egetent passwd ${euid}`" ] && break 488 [[ -z $(egetent passwd ${euid}) ]] && break
652 done 489 done
653 fi 490 fi
654 opts="${opts} -u ${euid}" 491 opts="${opts} -u ${euid}"
655 einfo " - Userid: ${euid}" 492 einfo " - Userid: ${euid}"
656 493
657 # handle shell 494 # handle shell
658 local eshell="$1"; shift 495 local eshell=$1; shift
659 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 496 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
660 then
661 if [ ! -e "${eshell}" ] 497 if [[ ! -e ${eshell} ]] ; then
662 then
663 eerror "A shell was specified but it does not exist !" 498 eerror "A shell was specified but it does not exist !"
664 die "${eshell} does not exist" 499 die "${eshell} does not exist"
665 fi 500 fi
666 else 501 else
667 if [ "${USERLAND}" == "BSD" ] 502 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
668 then 503 [[ -x ${ROOT}${shell} ]] && break
669 eshell="/usr/bin/false" 504 done
670 else 505
671 eshell="/bin/false" 506 if [[ ${shell} == "/dev/null" ]] ; then
507 eerror "Unable to identify the shell to use"
508 die "Unable to identify the shell to use"
672 fi 509 fi
510
511 eshell=${shell}
673 fi 512 fi
674 einfo " - Shell: ${eshell}" 513 einfo " - Shell: ${eshell}"
675 opts="${opts} -s ${eshell}" 514 opts="${opts} -s ${eshell}"
676 515
677 # handle homedir 516 # handle homedir
678 local ehome="$1"; shift 517 local ehome=$1; shift
679 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 518 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
680 then
681 ehome="/dev/null" 519 ehome="/dev/null"
682 fi 520 fi
683 einfo " - Home: ${ehome}" 521 einfo " - Home: ${ehome}"
684 opts="${opts} -d ${ehome}" 522 opts="${opts} -d ${ehome}"
685 523
686 # handle groups 524 # handle groups
687 local egroups="$1"; shift 525 local egroups=$1; shift
688 if [ ! -z "${egroups}" ] 526 if [[ ! -z ${egroups} ]] ; then
689 then
690 local oldifs="${IFS}" 527 local oldifs=${IFS}
691 local defgroup="" exgroups="" 528 local defgroup="" exgroups=""
692 529
693 export IFS="," 530 export IFS=","
694 for g in ${egroups} 531 for g in ${egroups} ; do
695 do
696 export IFS="${oldifs}" 532 export IFS=${oldifs}
697 if [ -z "`egetent group \"${g}\"`" ] 533 if [[ -z $(egetent group "${g}") ]] ; then
698 then
699 eerror "You must add group ${g} to the system first" 534 eerror "You must add group ${g} to the system first"
700 die "${g} is not a valid GID" 535 die "${g} is not a valid GID"
701 fi 536 fi
702 if [ -z "${defgroup}" ] 537 if [[ -z ${defgroup} ]] ; then
703 then
704 defgroup="${g}" 538 defgroup=${g}
705 else 539 else
706 exgroups="${exgroups},${g}" 540 exgroups="${exgroups},${g}"
707 fi 541 fi
708 export IFS="," 542 export IFS=","
709 done 543 done
710 export IFS="${oldifs}" 544 export IFS=${oldifs}
711 545
712 opts="${opts} -g ${defgroup}" 546 opts="${opts} -g ${defgroup}"
713 if [ ! -z "${exgroups}" ] 547 if [[ ! -z ${exgroups} ]] ; then
714 then
715 opts="${opts} -G ${exgroups:1}" 548 opts="${opts} -G ${exgroups:1}"
716 fi 549 fi
717 else 550 else
718 egroups="(none)" 551 egroups="(none)"
719 fi 552 fi
720 einfo " - Groups: ${egroups}" 553 einfo " - Groups: ${egroups}"
721 554
722 # handle extra and add the user 555 # handle extra and add the user
723 local eextra="$@"
724 local oldsandbox="${SANDBOX_ON}" 556 local oldsandbox=${SANDBOX_ON}
725 export SANDBOX_ON="0" 557 export SANDBOX_ON="0"
726 if useq ppc-macos 558 case ${CHOST} in
727 then 559 *-darwin*)
728 ### Make the user 560 ### Make the user
729 if [ -z "${eextra}" ] 561 if [[ -z $@ ]] ; then
730 then
731 dscl . create /users/${euser} uid ${euid} 562 dscl . create /users/${euser} uid ${euid}
732 dscl . create /users/${euser} shell ${eshell} 563 dscl . create /users/${euser} shell ${eshell}
733 dscl . create /users/${euser} home ${ehome} 564 dscl . create /users/${euser} home ${ehome}
734 dscl . create /users/${euser} realname "added by portage for ${PN}" 565 dscl . create /users/${euser} realname "added by portage for ${PN}"
735 ### Add the user to the groups specified 566 ### Add the user to the groups specified
736 local oldifs="${IFS}" 567 local oldifs=${IFS}
737 export IFS="," 568 export IFS=","
738 for g in ${egroups} 569 for g in ${egroups} ; do
739 do
740 dscl . merge /groups/${g} users ${euser} 570 dscl . merge /groups/${g} users ${euser}
741 done 571 done
742 export IFS="${oldifs}" 572 export IFS=${oldifs}
743 else 573 else
744 einfo "Extra options are not supported on macos yet" 574 einfo "Extra options are not supported on Darwin yet"
745 einfo "Please report the ebuild along with the info below" 575 einfo "Please report the ebuild along with the info below"
746 einfo "eextra: ${eextra}" 576 einfo "eextra: $@"
747 die "Required function missing" 577 die "Required function missing"
748 fi 578 fi
749 elif use x86-fbsd ; then 579 ;;
750 if [ -z "${eextra}" ] 580 *-freebsd*)
751 then 581 if [[ -z $@ ]] ; then
752 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
753 -c "added by portage for ${PN}" \ 583 -c "added by portage for ${PN}" \
754 die "enewuser failed" 584 die "enewuser failed"
755 else 585 else
756 einfo " - Extra: ${eextra}" 586 einfo " - Extra: $@"
757 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
758 -c ${eextra} || die "enewuser failed" 588 "$@" || die "enewuser failed"
759 fi 589 fi
760 else 590 ;;
761 if [ -z "${eextra}" ] 591 *)
762 then 592 if [[ -z $@ ]] ; then
763 useradd ${opts} ${euser} \ 593 useradd ${opts} ${euser} \
764 -c "added by portage for ${PN}" \ 594 -c "added by portage for ${PN}" \
765 || die "enewuser failed" 595 || die "enewuser failed"
766 else 596 else
767 einfo " - Extra: ${eextra}" 597 einfo " - Extra: $@"
768 useradd ${opts} ${euser} ${eextra} \ 598 useradd ${opts} ${euser} "$@" \
769 || die "enewuser failed" 599 || die "enewuser failed"
770 fi 600 fi
601 ;;
602 esac
603
604 if [[ ! -e ${ROOT}/${ehome} ]] ; then
605 einfo " - Creating ${ehome} in ${ROOT}"
606 mkdir -p "${ROOT}/${ehome}"
607 chown ${euser} "${ROOT}/${ehome}"
608 chmod 755 "${ROOT}/${ehome}"
771 fi 609 fi
610
772 export SANDBOX_ON="${oldsandbox}" 611 export SANDBOX_ON=${oldsandbox}
773
774 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
775 then
776 einfo " - Creating ${ehome} in ${D}"
777 dodir ${ehome}
778 fowners ${euser} ${ehome}
779 fperms 755 ${ehome}
780 fi
781} 612}
782 613
783# Simplify/standardize adding groups to the system 614# Simplify/standardize adding groups to the system
784# vapier@gentoo.org 615# vapier@gentoo.org
785# 616#
814 then 645 then
815 if [ "${egid}" -gt 0 ] 646 if [ "${egid}" -gt 0 ]
816 then 647 then
817 if [ -z "`egetent group ${egid}`" ] 648 if [ -z "`egetent group ${egid}`" ]
818 then 649 then
819 if useq ppc-macos ; then 650 if [[ "${CHOST}" == *-darwin* ]]; then
820 opts="${opts} ${egid}" 651 opts="${opts} ${egid}"
821 else 652 else
822 opts="${opts} -g ${egid}" 653 opts="${opts} -g ${egid}"
823 fi 654 fi
824 else 655 else
838 opts="${opts} ${eextra}" 669 opts="${opts} ${eextra}"
839 670
840 # add the group 671 # add the group
841 local oldsandbox="${SANDBOX_ON}" 672 local oldsandbox="${SANDBOX_ON}"
842 export SANDBOX_ON="0" 673 export SANDBOX_ON="0"
843 if useq ppc-macos ; then 674 case ${CHOST} in
675 *-darwin*)
844 if [ ! -z "${eextra}" ]; 676 if [ ! -z "${eextra}" ];
845 then 677 then
846 einfo "Extra options are not supported on macos yet" 678 einfo "Extra options are not supported on Darwin/OS X yet"
847 einfo "Please report the ebuild along with the info below" 679 einfo "Please report the ebuild along with the info below"
848 einfo "eextra: ${eextra}" 680 einfo "eextra: ${eextra}"
849 die "Required function missing" 681 die "Required function missing"
850 fi 682 fi
851 683
852 # If we need the next available 684 # If we need the next available
853 case ${egid} in 685 case ${egid} in
854 *[!0-9]*) # Non numeric 686 *[!0-9]*) # Non numeric
855 for egid in `jot 898 101`; do 687 for egid in $(seq 101 999); do
856 [ -z "`egetent group ${egid}`" ] && break 688 [ -z "`egetent group ${egid}`" ] && break
857 done 689 done
858 esac 690 esac
859 dscl . create /groups/${egroup} gid ${egid} 691 dscl . create /groups/${egroup} gid ${egid}
860 dscl . create /groups/${egroup} passwd '*' 692 dscl . create /groups/${egroup} passwd '*'
861 elif use x86-fbsd ; then 693 ;;
694
695 *-freebsd*)
862 case ${egid} in 696 case ${egid} in
863 *[!0-9]*) # Non numeric 697 *[!0-9]*) # Non numeric
864 for egid in `jot 898 101`; do 698 for egid in $(seq 101 999); do
865 [ -z "`egetent group ${egid}`" ] && break 699 [ -z "`egetent group ${egid}`" ] && break
866 done 700 done
867 esac 701 esac
868 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 702 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
869 else 703 ;;
704 *)
870 groupadd ${opts} ${egroup} || die "enewgroup failed" 705 groupadd ${opts} ${egroup} || die "enewgroup failed"
871 fi 706 ;;
707 esac
872 export SANDBOX_ON="${oldsandbox}" 708 export SANDBOX_ON="${oldsandbox}"
873} 709}
874 710
875# Simple script to replace 'dos2unix' binaries 711# Simple script to replace 'dos2unix' binaries
876# vapier@gentoo.org 712# vapier@gentoo.org
901# name: the name that will show up in the menu 737# name: the name that will show up in the menu
902# icon: give your little like a pretty little icon ... 738# icon: give your little like a pretty little icon ...
903# this can be relative (to /usr/share/pixmaps) or 739# this can be relative (to /usr/share/pixmaps) or
904# a full path to an icon 740# a full path to an icon
905# type: what kind of application is this ? for categories: 741# type: what kind of application is this ? for categories:
906# http://www.freedesktop.org/standards/menu-spec/ 742# http://www.freedesktop.org/Standards/desktop-entry-spec
907# path: if your app needs to startup in a specific dir 743# path: if your app needs to startup in a specific dir
908make_desktop_entry() { 744make_desktop_entry() {
909 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 745 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
910 746
911 local exec="${1}" 747 local exec=${1}
912 local name="${2:-${PN}}" 748 local name=${2:-${PN}}
913 local icon="${3:-${PN}.png}" 749 local icon=${3:-${PN}.png}
914 local type="${4}" 750 local type=${4}
915 local subdir="${6}" 751 local path=${5}
916 local path="${5:-${GAMES_BINDIR}}" 752
917 if [ -z "${type}" ] 753 if [[ -z ${type} ]] ; then
918 then 754 local catmaj=${CATEGORY%%-*}
919 case ${CATEGORY} in 755 local catmin=${CATEGORY##*-}
920 "app-emulation") 756 case ${catmaj} in
921 type=Emulator 757 app)
922 subdir="Emulation" 758 case ${catmin} in
759 admin) type=System;;
760 cdr) type=DiscBurning;;
761 dicts) type=Dictionary;;
762 editors) type=TextEditor;;
763 emacs) type=TextEditor;;
764 emulation) type=Emulator;;
765 laptop) type=HardwareSettings;;
766 office) type=Office;;
767 vim) type=TextEditor;;
768 xemacs) type=TextEditor;;
769 *) type=;;
770 esac
923 ;; 771 ;;
924 "games-"*) 772
925 type=Game 773 dev)
926 subdir="Games" 774 type="Development"
927 ;; 775 ;;
928 "net-"*) 776
929 type=Network 777 games)
930 subdir="${type}" 778 case ${catmin} in
779 action) type=ActionGame;;
780 arcade) type=ArcadeGame;;
781 board) type=BoardGame;;
782 kid) type=KidsGame;;
783 emulation) type=Emulator;;
784 puzzle) type=LogicGame;;
785 rpg) type=RolePlaying;;
786 roguelike) type=RolePlaying;;
787 simulation) type=Simulation;;
788 sports) type=SportsGame;;
789 strategy) type=StrategyGame;;
790 *) type=;;
791 esac
792 type="Game;${type}"
931 ;; 793 ;;
794
795 mail)
796 type="Network;Email"
797 ;;
798
799 media)
800 case ${catmin} in
801 gfx) type=Graphics;;
802 radio) type=Tuner;;
803 sound) type=Audio;;
804 tv) type=TV;;
805 video) type=Video;;
806 *) type=;;
807 esac
808 type="AudioVideo;${type}"
809 ;;
810
811 net)
812 case ${catmin} in
813 dialup) type=Dialup;;
814 ftp) type=FileTransfer;;
815 im) type=InstantMessaging;;
816 irc) type=IRCClient;;
817 mail) type=Email;;
818 news) type=News;;
819 nntp) type=News;;
820 p2p) type=FileTransfer;;
821 *) type=;;
822 esac
823 type="Network;${type}"
824 ;;
825
826 sci)
827 case ${catmin} in
828 astro*) type=Astronomoy;;
829 bio*) type=Biology;;
830 calc*) type=Calculator;;
831 chem*) type=Chemistry;;
832 geo*) type=Geology;;
833 math*) type=Math;;
834 *) type=;;
835 esac
836 type="Science;${type}"
837 ;;
838
839 www)
840 case ${catmin} in
841 client) type=WebBrowser;;
842 *) type=;;
843 esac
844 type="Network"
845 ;;
846
932 *) 847 *)
933 type= 848 type=
934 subdir=
935 ;; 849 ;;
936 esac 850 esac
937 fi 851 fi
852 if [ "${SLOT}" == "0" ] ; then
853 local desktop_name="${PN}"
854 else
855 local desktop_name="${PN}-${SLOT}"
856 fi
938 local desktop="${T}/${exec}.desktop" 857 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
939 858
940echo "[Desktop Entry] 859echo "[Desktop Entry]
941Encoding=UTF-8 860Encoding=UTF-8
942Version=0.9.2 861Version=0.9.2
943Name=${name} 862Name=${name}
946Exec=${exec} 865Exec=${exec}
947Path=${path} 866Path=${path}
948Icon=${icon} 867Icon=${icon}
949Categories=Application;${type};" > "${desktop}" 868Categories=Application;${type};" > "${desktop}"
950 869
870 (
871 # wrap the env here so that the 'insinto' call
872 # doesn't corrupt the env of the caller
951 insinto /usr/share/applications 873 insinto /usr/share/applications
952 doins "${desktop}" 874 doins "${desktop}"
953 875 )
954 return 0
955} 876}
956 877
957# Make a GDM/KDM Session file 878# Make a GDM/KDM Session file
958# 879#
959# make_desktop_entry(<title>, <command>) 880# make_desktop_entry(<title>, <command>)
960# title: File to execute to start the Window Manager 881# title: File to execute to start the Window Manager
961# command: Name of the Window Manager 882# command: Name of the Window Manager
962 883
963make_session_desktop() { 884make_session_desktop() {
964
965 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 885 [[ -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 886 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
967 887
968 local title="${1}" 888 local title=$1
969 local command="${2}" 889 local command=$2
970 local desktop="${T}/${wm}.desktop" 890 local desktop=${T}/${wm}.desktop
971 891
972echo "[Desktop Entry] 892echo "[Desktop Entry]
973Encoding=UTF-8 893Encoding=UTF-8
974Name=${title} 894Name=${title}
975Comment=This session logs you into ${title} 895Comment=This session logs you into ${title}
977TryExec=${command} 897TryExec=${command}
978Type=Application" > "${desktop}" 898Type=Application" > "${desktop}"
979 899
980 insinto /usr/share/xsessions 900 insinto /usr/share/xsessions
981 doins "${desktop}" 901 doins "${desktop}"
982
983 return 0
984} 902}
985 903
986domenu() { 904domenu() {
987 local i 905 local i j
988 local j
989 insinto /usr/share/applications 906 insinto /usr/share/applications
990 for i in ${@} 907 for i in "$@" ; do
991 do
992 if [ -f "${i}" ]; 908 if [[ -f ${i} ]] ; then
993 then
994 doins ${i} 909 doins "${i}"
995 elif [ -d "${i}" ]; 910 elif [[ -d ${i} ]] ; then
996 then
997 for j in ${i}/*.desktop 911 for j in "${i}"/*.desktop ; do
998 do
999 doins ${j} 912 doins "${j}"
1000 done 913 done
1001 fi 914 fi
1002 done 915 done
1003} 916}
917newmenu() {
918 insinto /usr/share/applications
919 newins "$1" "$2"
920}
1004 921
1005doicon() { 922doicon() {
1006 local i 923 local i j
1007 local j
1008 insinto /usr/share/pixmaps 924 insinto /usr/share/pixmaps
1009 for i in ${@} 925 for i in "$@" ; do
1010 do
1011 if [ -f "${i}" ]; 926 if [[ -f ${i} ]] ; then
1012 then
1013 doins ${i} 927 doins "${i}"
1014 elif [ -d "${i}" ]; 928 elif [[ -d ${i} ]] ; then
1015 then
1016 for j in ${i}/*.png 929 for j in "${i}"/*.png ; do
1017 do
1018 doins ${j} 930 doins "${j}"
1019 done 931 done
1020 fi 932 fi
1021 done 933 done
934}
935newicon() {
936 insinto /usr/share/pixmaps
937 newins "$1" "$2"
1022} 938}
1023 939
1024############################################################## 940##############################################################
1025# END: Handle .desktop files and menu entries # 941# END: Handle .desktop files and menu entries #
1026############################################################## 942##############################################################
1027 943
1028 944
1029# for internal use only (unpack_pdv and unpack_makeself) 945# for internal use only (unpack_pdv and unpack_makeself)
1030find_unpackable_file() { 946find_unpackable_file() {
1031 local src="$1" 947 local src=$1
1032 if [ -z "${src}" ] 948 if [[ -z ${src} ]] ; then
1033 then
1034 src="${DISTDIR}/${A}" 949 src=${DISTDIR}/${A}
1035 else 950 else
1036 if [ -e "${DISTDIR}/${src}" ] 951 if [[ -e ${DISTDIR}/${src} ]] ; then
1037 then
1038 src="${DISTDIR}/${src}" 952 src=${DISTDIR}/${src}
1039 elif [ -e "${PWD}/${src}" ] 953 elif [[ -e ${PWD}/${src} ]] ; then
1040 then
1041 src="${PWD}/${src}" 954 src=${PWD}/${src}
1042 elif [ -e "${src}" ] 955 elif [[ -e ${src} ]] ; then
1043 then
1044 src="${src}" 956 src=${src}
1045 fi
1046 fi 957 fi
1047 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 958 fi
959 [[ ! -e ${src} ]] && return 1
1048 echo "${src}" 960 echo "${src}"
1049} 961}
1050 962
1051# Unpack those pesky pdv generated files ... 963# Unpack those pesky pdv generated files ...
1052# They're self-unpacking programs with the binary package stuffed in 964# They're self-unpacking programs with the binary package stuffed in
1067# lseek 979# lseek
1068# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 980# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1069# lseek(3, -4, SEEK_END) = 2981250 981# lseek(3, -4, SEEK_END) = 2981250
1070# thus we would pass in the value of '4' as the second parameter. 982# thus we would pass in the value of '4' as the second parameter.
1071unpack_pdv() { 983unpack_pdv() {
1072 local src="`find_unpackable_file $1`" 984 local src=$(find_unpackable_file $1)
1073 local sizeoff_t="$2" 985 local sizeoff_t=$2
1074 986
987 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1075 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 988 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1076 989
1077 local shrtsrc="`basename ${src}`" 990 local shrtsrc="`basename ${src}`"
1078 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 991 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1079 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 992 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1080 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 993 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1146# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1059# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1147# - If the file is not specified then unpack will utilize ${A}. 1060# - If the file is not specified then unpack will utilize ${A}.
1148# - If the offset is not specified then we will attempt to extract 1061# - If the offset is not specified then we will attempt to extract
1149# the proper offset from the script itself. 1062# the proper offset from the script itself.
1150unpack_makeself() { 1063unpack_makeself() {
1151 local src="$(find_unpackable_file "$1")" 1064 local src=$(find_unpackable_file "$1")
1152 local skip="$2" 1065 local skip=$2
1153 local exe="$3" 1066 local exe=$3
1154 1067
1068 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1069
1155 local shrtsrc="$(basename "${src}")" 1070 local shrtsrc=$(basename "${src}")
1156 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1071 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1157 if [ -z "${skip}" ] 1072 if [ -z "${skip}" ]
1158 then 1073 then
1159 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1074 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1160 local skip=0 1075 local skip=0
1231check_license() { 1146check_license() {
1232 local lic=$1 1147 local lic=$1
1233 if [ -z "${lic}" ] ; then 1148 if [ -z "${lic}" ] ; then
1234 lic="${PORTDIR}/licenses/${LICENSE}" 1149 lic="${PORTDIR}/licenses/${LICENSE}"
1235 else 1150 else
1236 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1151 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1237 lic="${PORTDIR}/licenses/${src}" 1152 lic="${PORTDIR}/licenses/${lic}"
1238 elif [ -e "${PWD}/${src}" ] ; then 1153 elif [ -e "${PWD}/${lic}" ] ; then
1239 lic="${PWD}/${src}" 1154 lic="${PWD}/${lic}"
1240 elif [ -e "${src}" ] ; then 1155 elif [ -e "${lic}" ] ; then
1241 lic="${src}" 1156 lic="${lic}"
1242 fi
1243 fi 1157 fi
1158 fi
1244 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1159 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1245 local l="`basename ${lic}`" 1160 local l="`basename ${lic}`"
1246 1161
1247 # here is where we check for the licenses the user already 1162 # here is where we check for the licenses the user already
1248 # accepted ... if we don't find a match, we make the user accept 1163 # accepted ... if we don't find a match, we make the user accept
1249 local shopts=$- 1164 local shopts=$-
1420# displayed and we'll hang out here until: 1335# displayed and we'll hang out here until:
1421# (1) the file is found on a mounted cdrom 1336# (1) the file is found on a mounted cdrom
1422# (2) the user hits CTRL+C 1337# (2) the user hits CTRL+C
1423cdrom_locate_file_on_cd() { 1338cdrom_locate_file_on_cd() {
1424 while [[ -z ${CDROM_ROOT} ]] ; do 1339 while [[ -z ${CDROM_ROOT} ]] ; do
1425 local dir="$(dirname ${@})" 1340 local dir=$(dirname "$*")
1426 local file="$(basename ${@})" 1341 local file=$(basename "$*")
1427 local mline="" 1342 local mline=""
1428 local showedmsg=0 1343 local showedmsg=0
1429 1344
1430 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1345 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1431 [[ -d ${mline}/${dir} ]] || continue 1346 [[ -d ${mline}/${dir} ]] || continue
1432 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1347 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1433 && export CDROM_ROOT=${mline} 1348 && export CDROM_ROOT=${mline}
1434 done 1349 done
1435 1350
1436 if [[ -z ${CDROM_ROOT} ]] ; then 1351 if [[ -z ${CDROM_ROOT} ]] ; then
1437 echo 1352 echo
1452 fi 1367 fi
1453 showedmsg=1 1368 showedmsg=1
1454 fi 1369 fi
1455 einfo "Press return to scan for the cd again" 1370 einfo "Press return to scan for the cd again"
1456 einfo "or hit CTRL+C to abort the emerge." 1371 einfo "or hit CTRL+C to abort the emerge."
1372 echo
1373 einfo "If you are having trouble with the detection"
1374 einfo "of your CD, it is possible that you do not have"
1375 einfo "Joliet support enabled in your kernel. Please"
1376 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1457 read 1377 read
1458 fi 1378 fi
1459 done 1379 done
1460} 1380}
1461 1381
1471# directories and uses the intersection of the lists. 1391# directories and uses the intersection of the lists.
1472# The -u builds a list of po files found in all the 1392# The -u builds a list of po files found in all the
1473# directories and uses the union of the lists. 1393# directories and uses the union of the lists.
1474strip-linguas() { 1394strip-linguas() {
1475 local ls newls 1395 local ls newls
1476 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1396 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1477 local op="$1"; shift 1397 local op=$1; shift
1478 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1398 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1479 local d f 1399 local d f
1480 for d in "$@" ; do 1400 for d in "$@" ; do
1481 if [ "${op}" == "-u" ] ; then 1401 if [[ ${op} == "-u" ]] ; then
1482 newls="${ls}" 1402 newls=${ls}
1483 else 1403 else
1484 newls="" 1404 newls=""
1485 fi 1405 fi
1486 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1406 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1487 if [ "${op}" == "-i" ] ; then 1407 if [[ ${op} == "-i" ]] ; then
1488 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1408 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1489 else 1409 else
1490 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1410 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1491 fi 1411 fi
1492 done 1412 done
1493 ls="${newls}" 1413 ls=${newls}
1494 done 1414 done
1495 ls="${ls//.po}" 1415 ls=${ls//.po}
1496 else 1416 else
1497 ls="$@" 1417 ls=$@
1498 fi 1418 fi
1499 1419
1500 ls=" ${ls} " 1420 ls=" ${ls} "
1501 newls="" 1421 newls=""
1502 for f in ${LINGUAS} ; do 1422 for f in ${LINGUAS} ; do
1503 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1423 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1504 newls="${newls} ${f}" 1424 newls="${newls} ${f}"
1505 else 1425 else
1506 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1426 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1507 fi 1427 fi
1508 done 1428 done
1509 if [ -z "${newls}" ] ; then 1429 if [[ -z ${newls} ]] ; then
1510 unset LINGUAS 1430 export LINGUAS=""
1511 else 1431 else
1512 export LINGUAS="${newls}" 1432 export LINGUAS=${newls:1}
1513 fi 1433 fi
1514} 1434}
1515 1435
1516# moved from kernel.eclass since they are generally useful outside of 1436# moved from kernel.eclass since they are generally useful outside of
1517# kernel.eclass -iggy (20041002) 1437# kernel.eclass -iggy (20041002)
1525 while ((i--)) ; do 1445 while ((i--)) ; do
1526 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1446 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1527 done 1447 done
1528 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1529 case ${ARCH} in 1449 case ${ARCH} in
1530 x86) export ARCH="i386";; 1450 x86) export ARCH="i386";;
1531 amd64) export ARCH="x86_64";; 1451 amd64) export ARCH="x86_64";;
1532 hppa) export ARCH="parisc";; 1452 hppa) export ARCH="parisc";;
1533 mips) export ARCH="mips";; 1453 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! 1454 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}";; 1455 *) export ARCH="${ARCH}";;
1536 esac 1456 esac
1537} 1457}
1538 1458
1539# set's ARCH back to what portage expects 1459# set's ARCH back to what portage expects
1540set_arch_to_portage() { 1460set_arch_to_portage() {
1584 LIB=$1 1504 LIB=$1
1585 1505
1586 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1506 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1587 SONAME=`basename ${LIB}` 1507 SONAME=`basename ${LIB}`
1588 1508
1589 einfo "An old version of an installed library was detected on your system." 1509 ewarn "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" 1510 ewarn "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," 1511 ewarn "is not being removed. In order to make full use of this newer version,"
1592 einfo "you will need to execute the following command:" 1512 ewarn "you will need to execute the following command:"
1593 einfo " revdep-rebuild --soname ${SONAME}" 1513 ewarn " revdep-rebuild --soname ${SONAME}"
1594 einfo 1514 ewarn
1595 einfo "After doing that, you can safely remove ${LIB}" 1515 ewarn "After doing that, you can safely remove ${LIB}"
1596 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1516 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1597 fi 1517 fi
1598} 1518}
1599 1519
1600# Hack for people to figure out if a package was built with 1520# Hack for people to figure out if a package was built with
1601# certain USE flags 1521# certain USE flags
1639 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1559 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1640 done 1560 done
1641 eend 0 1561 eend 0
1642} 1562}
1643 1563
1644# dopamd [ file ] [ new file ] 1564# dopamd <file> [more files]
1645# 1565#
1646# Install pam auth config file in /etc/pam.d 1566# 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() { 1567dopamd() {
1652 local pamd="$1" newpamd="${2:-$1}"
1653 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1568 [[ -z $1 ]] && die "dopamd requires at least one argument"
1654 1569
1655 use pam || return 0 1570 use pam || return 0
1656 1571
1657 insinto /etc/pam.d 1572 INSDESTTREE=/etc/pam.d \
1658 # these are the default doins options, but be explicit just in case 1573 doins "$@" || die "failed to install $@"
1659 insopts -m 0644 -o root -g root
1660 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1661} 1574}
1575# newpamd <old name> <new name>
1576#
1577# Install pam file <old name> as <new name> in /etc/pam.d
1578newpamd() {
1579 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1580
1581 use pam || return 0
1582
1583 INSDESTTREE=/etc/pam.d \
1584 newins "$1" "$2" || die "failed to install $1 as $2"
1585}
1586
1587# make a wrapper script ...
1588# NOTE: this was originally games_make_wrapper, but I noticed other places where
1589# this could be used, so I have moved it here and made it not games-specific
1590# -- wolf31o2
1591# $1 == wrapper name
1592# $2 == binary to run
1593# $3 == directory to chdir before running binary
1594# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1595# $5 == path for wrapper
1596make_wrapper() {
1597 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1598 local tmpwrapper=$(emktemp)
1599 # We don't want to quote ${bin} so that people can pass complex
1600 # things as $bin ... "./someprog --args"
1601 cat << EOF > "${tmpwrapper}"
1602#!/bin/sh
1603cd "${chdir:-.}"
1604if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1605 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1606fi
1607exec ${bin} "\$@"
1608EOF
1609 chmod go+rx "${tmpwrapper}"
1610 if [[ -n ${path} ]] ; then
1611 exeinto "${path}"
1612 newexe "${tmpwrapper}" "${wrapper}"
1613 else
1614 newbin "${tmpwrapper}" "${wrapper}"
1615 fi
1616}

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

  ViewVC Help
Powered by ViewVC 1.1.20