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

Diff of /eclass/eutils.eclass

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

Revision 1.157 Revision 1.221
1# Copyright 1999-2005 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.157 2005/03/07 17:45:07 carlo Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.221 2005/12/31 14:11:39 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
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 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63 18
64# 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
65# 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
66# 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
67# must be an integer greater than zero. 22# must be an integer greater than zero.
105# to point to the latest version of the library present. 60# to point to the latest version of the library present.
106# 61#
107# <azarah@gentoo.org> (26 Oct 2002) 62# <azarah@gentoo.org> (26 Oct 2002)
108# 63#
109gen_usr_ldscript() { 64gen_usr_ldscript() {
110 local libdir="$(get_libdir)" 65 local lib libdir=$(get_libdir)
111 # Just make sure it exists 66 # Just make sure it exists
112 dodir /usr/${libdir} 67 dodir /usr/${libdir}
113 68
69 for lib in "${@}" ; do
114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
115/* GNU ld script 71 /* GNU ld script
116 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
117 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
118 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
119 otherwise we run into linking problems. 75 otherwise we run into linking problems.
120 See bug #4411 on http://bugs.gentoo.org/ for 76
121 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
122GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
123END_LDSCRIPT 80 END_LDSCRIPT
124 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
125}
126
127# Simple function to draw a line consisting of '=' the same length as $*
128#
129# <azarah@gentoo.org> (11 Nov 2002)
130#
131draw_line() {
132 local i=0
133 local str_length=""
134
135 # Handle calls that do not have args, or wc not being installed ...
136 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
137 then
138 echo "==============================================================="
139 return 0
140 fi
141
142 # Get the length of $*
143 str_length="$(echo -n "$*" | wc -m)"
144
145 while [ "$i" -lt "${str_length}" ]
146 do
147 echo -n "="
148
149 i=$((i + 1))
150 done 82 done
151
152 echo
153
154 return 0
155} 83}
84
156 85
157# Default directory where patches are located 86# Default directory where patches are located
158EPATCH_SOURCE="${WORKDIR}/patch" 87EPATCH_SOURCE="${WORKDIR}/patch"
159# Default extension for patches 88# Default extension for patches
160EPATCH_SUFFIX="patch.bz2" 89EPATCH_SUFFIX="patch.bz2"
161# Default options for patch 90# Default options for patch
162# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 91# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
163EPATCH_OPTS="-g0" 92# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
93EPATCH_OPTS="-g0 --no-backup-if-mismatch"
164# List of patches not to apply. Not this is only file names, 94# List of patches not to apply. Not this is only file names,
165# and not the full path .. 95# and not the full path ..
166EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
167# Change the printed message for a single patch. 97# Change the printed message for a single patch.
168EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
169# Force applying bulk patches even if not following the style: 101# Force applying bulk patches even if not following the style:
170# 102#
171# ??_${ARCH}_foo.${EPATCH_SUFFIX} 103# ??_${ARCH}_foo.${EPATCH_SUFFIX}
172# 104#
173EPATCH_FORCE="no" 105EPATCH_FORCE="no"
204# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
205# 137#
206# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
207# 139#
208epatch() { 140epatch() {
141 _epatch_draw_line() {
142 local i=0 str_length="" str_out=""
143
144 # Handle calls that do not have args, or wc not being installed ...
145 if [[ -z $1 ]] || ! type -p wc >/dev/null ; then
146 str_length=65
147 else
148 str_length=$(echo -n "$*" | wc -m)
149 fi
150
151 while ((i++ < ${str_length})) ; do
152 str_out="${str_out}="
153 done
154 echo ${str_out}
155
156 return 0
157 }
158 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
209 local PIPE_CMD="" 159 local PIPE_CMD=""
210 local STDERR_TARGET="${T}/$$.out" 160 local STDERR_TARGET="${T}/$$.out"
211 local PATCH_TARGET="${T}/$$.patch" 161 local PATCH_TARGET="${T}/$$.patch"
212 local PATCH_SUFFIX="" 162 local PATCH_SUFFIX=""
213 local SINGLE_PATCH="no" 163 local SINGLE_PATCH="no"
214 local x="" 164 local x=""
215 165
166 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
167
216 if [ "$#" -gt 1 ] 168 if [ "$#" -gt 1 ]
217 then 169 then
218 local m="" 170 local m=""
219 einfo "${#} patches to apply ..."
220 for m in "$@" ; do 171 for m in "$@" ; do
221 epatch "${m}" 172 epatch "${m}"
222 done 173 done
223 return 0 174 return 0
224 fi 175 fi
278 ;; 229 ;;
279 esac 230 esac
280 231
281 if [ "${SINGLE_PATCH}" = "no" ] 232 if [ "${SINGLE_PATCH}" = "no" ]
282 then 233 then
283 einfo "Applying various patches (bugfixes/updates) ..." 234 einfo "${EPATCH_MULTI_MSG}"
284 fi 235 fi
285 for x in ${EPATCH_SOURCE} 236 for x in ${EPATCH_SOURCE}
286 do 237 do
287 # New ARCH dependant patch naming scheme ... 238 # New ARCH dependant patch naming scheme ...
288 # 239 #
289 # ???_arch_foo.patch 240 # ???_arch_foo.patch
290 # 241 #
291 if [ -f ${x} ] && \ 242 if [ -f ${x} ] && \
292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 243 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
293 [ "${EPATCH_FORCE}" = "yes" ]) 244 [ "${EPATCH_FORCE}" = "yes" ])
294 then 245 then
295 local count=0 246 local count=0
296 local popts="${EPATCH_OPTS}" 247 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/} 248 local patchname=${x##*/}
321 272
322 # Allow for prefix to differ ... im lazy, so shoot me :/ 273 # Allow for prefix to differ ... im lazy, so shoot me :/
323 while [ "${count}" -lt 5 ] 274 while [ "${count}" -lt 5 ]
324 do 275 do
325 # Generate some useful debug info ... 276 # Generate some useful debug info ...
326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 277 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 279
329 if [ "${PATCH_SUFFIX}" != "patch" ] 280 if [ "${PATCH_SUFFIX}" != "patch" ]
330 then 281 then
331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 287
337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 288 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 289 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 290
340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 292 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342 293
343 if [ "${PATCH_SUFFIX}" != "patch" ] 294 if [ "${PATCH_SUFFIX}" != "patch" ]
344 then 295 then
345 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 296 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
346 then 297 then
350 count=5 301 count=5
351 break 302 break
352 fi 303 fi
353 fi 304 fi
354 305
355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1 306 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
356 then 307 then
357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 308 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 309 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 310 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 311 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 312 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 313
363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1 314 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
315 _epatch_assert
364 316
365 if [ "$?" -ne 0 ] 317 if [ "$?" -ne 0 ]
366 then 318 then
367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 319 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
368 echo 320 echo
386 fi 338 fi
387 339
388 if [ "${count}" -eq 5 ] 340 if [ "${count}" -eq 5 ]
389 then 341 then
390 echo 342 echo
391 eerror "Failed Patch: ${patchname}!" 343 eerror "Failed Patch: ${patchname} !"
344 eerror " ( ${PATCH_TARGET} )"
392 eerror 345 eerror
393 eerror "Include in your bugreport the contents of:" 346 eerror "Include in your bugreport the contents of:"
394 eerror 347 eerror
395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}" 348 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
396 echo 349 echo
406 then 359 then
407 einfo "Done with patching" 360 einfo "Done with patching"
408 fi 361 fi
409} 362}
410 363
411# This function return true if we are using the NPTL pthreads
412# implementation.
413#
414# <azarah@gentoo.org> (06 March 2003)
415#
416have_NPTL() {
417 cat > ${T}/test-nptl.c <<-"END"
418 #define _XOPEN_SOURCE
419 #include <unistd.h>
420 #include <stdio.h>
421
422 int main()
423 {
424 char buf[255];
425 char *str = buf;
426
427 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
428 if (NULL != str) {
429 printf("%s\n", str);
430 if (NULL != strstr(str, "NPTL"))
431 return 0;
432 }
433
434 return 1;
435 }
436 END
437
438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
440 then
441 echo "yes"
442 einfon "Checking what PTHREADS implementation we have ..."
443 if ${T}/nptl
444 then
445 return 0
446 else
447 return 1
448 fi
449 else
450 echo "no"
451 fi
452
453 return 1
454}
455
456# This function check how many cpu's are present, and then set
457# -j in MAKEOPTS accordingly.
458#
459# Thanks to nall <nall@gentoo.org> for this.
460#
461get_number_of_jobs() {
462 local jobs=0
463
464 if [ ! -r /proc/cpuinfo ]
465 then
466 return 1
467 fi
468
469 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
470 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
471 then
472 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
473 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
474 ADMINPARAM="${ADMINPARAM/-j}"
475 fi
476
477 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
478
479 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
480 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
481 then
482 # these archs will always have "[Pp]rocessor"
483 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
484
485 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
486 then
487 # sparc always has "ncpus active"
488 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
489
490 elif [ "${ARCH}" = "alpha" ]
491 then
492 # alpha has "cpus active", but only when compiled with SMP
493 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
494 then
495 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
496 else
497 jobs=2
498 fi
499
500 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
501 then
502 # ppc has "processor", but only when compiled with SMP
503 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
504 then
505 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
506 else
507 jobs=2
508 fi
509 elif [ "${ARCH}" = "s390" ]
510 then
511 # s390 has "# processors : "
512 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
513 else
514 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
515 die "Unknown ARCH -- ${ARCH}!"
516 fi
517
518 # Make sure the number is valid ...
519 if [ "${jobs}" -lt 1 ]
520 then
521 jobs=1
522 fi
523
524 if [ -n "${ADMINPARAM}" ]
525 then
526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
527 then
528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
530 else
531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
533 fi
534 fi
535}
536
537# Cheap replacement for when debianutils (and thus mktemp) 364# Cheap replacement for when debianutils (and thus mktemp)
538# does not exist on the users system 365# does not exist on the users system
539# vapier@gentoo.org 366# vapier@gentoo.org
540# 367#
541# Takes just 1 optional parameter (the directory to create tmpfile in) 368# Takes just 1 optional parameter (the directory to create tmpfile in)
542emktemp() { 369emktemp() {
543 local exe="touch" 370 local exe="touch"
544 [ "$1" == "-d" ] && exe="mkdir" && shift 371 [[ $1 == -d ]] && exe="mkdir" && shift
545 local topdir="$1" 372 local topdir=$1
546 373
547 if [ -z "${topdir}" ] 374 if [[ -z ${topdir} ]] ; then
548 then
549 [ -z "${T}" ] \ 375 [[ -z ${T} ]] \
550 && topdir="/tmp" \ 376 && topdir="/tmp" \
551 || topdir="${T}" 377 || topdir=${T}
552 fi 378 fi
553 379
554 if [ -z "$(type -p mktemp)" ] 380 if [[ -z $(type -p mktemp) ]] ; then
555 then
556 local tmp=/ 381 local tmp=/
557 while [ -e "${tmp}" ] ; do 382 while [[ -e ${tmp} ]] ; do
558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 383 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
559 done 384 done
560 ${exe} "${tmp}" 385 ${exe} "${tmp}" || ${exe} -p "${tmp}"
561 echo "${tmp}" 386 echo "${tmp}"
562 else 387 else
563 [ "${exe}" == "touch" ] \ 388 [[ ${exe} == "touch" ]] \
564 && exe="-p" \ 389 && exe="-p" \
565 || exe="-d" 390 || exe="-d"
566 mktemp ${exe} "${topdir}" 391 mktemp ${exe} "${topdir}"
567 fi 392 fi
568} 393}
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 397# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 398# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 399#
575# egetent(database, key) 400# egetent(database, key)
576egetent() { 401egetent() {
577 if useq ppc-macos ; then 402 case ${CHOST} in
403 *-darwin*)
578 case "$2" in 404 case "$2" in
579 *[!0-9]*) # Non numeric 405 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 406 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 407 ;;
582 *) # Numeric 408 *) # Numeric
583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 409 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
584 ;; 410 ;;
585 esac 411 esac
586 elif useq x86-fbsd ; then 412 ;;
587 local action 413 *-freebsd*|*-dragonfly*)
588 if [ "$1" == "passwd" ] 414 local opts action="user"
589 then 415 [[ $1 == "passwd" ]] || action="group"
590 action="user" 416
591 else 417 # lookup by uid/gid
592 action="group" 418 if [[ $2 == [[:digit:]]* ]] ; then
419 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
593 fi 420 fi
421
594 pw show "${action}" "$2" -q 422 pw show ${action} ${opts} "$2" -q
595 else 423 ;;
424 *-netbsd*|*-openbsd*)
425 grep "$2:\*:" /etc/$1
426 ;;
427 *)
596 which nscd >& /dev/null && nscd -i "$1" 428 type -p nscd >& /dev/null && nscd -i "$1"
597 getent "$1" "$2" 429 getent "$1" "$2"
598 fi 430 ;;
431 esac
599} 432}
600 433
601# Simplify/standardize adding users to the system 434# Simplify/standardize adding users to the system
602# vapier@gentoo.org 435# vapier@gentoo.org
603# 436#
611# homedir: /dev/null 444# homedir: /dev/null
612# groups: none 445# groups: none
613# extra: comment of 'added by portage for ${PN}' 446# extra: comment of 'added by portage for ${PN}'
614enewuser() { 447enewuser() {
615 # get the username 448 # get the username
616 local euser="$1"; shift 449 local euser=$1; shift
617 if [ -z "${euser}" ] 450 if [[ -z ${euser} ]] ; then
618 then
619 eerror "No username specified !" 451 eerror "No username specified !"
620 die "Cannot call enewuser without a username" 452 die "Cannot call enewuser without a username"
621 fi 453 fi
622 454
623 # lets see if the username already exists 455 # lets see if the username already exists
624 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 456 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
625 then
626 return 0 457 return 0
627 fi 458 fi
628 einfo "Adding user '${euser}' to your system ..." 459 einfo "Adding user '${euser}' to your system ..."
629 460
630 # options to pass to useradd 461 # options to pass to useradd
631 local opts= 462 local opts=
632 463
633 # handle uid 464 # handle uid
634 local euid="$1"; shift 465 local euid=$1; shift
635 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 466 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
636 then
637 if [ "${euid}" -gt 0 ] 467 if [[ ${euid} -gt 0 ]] ; then
638 then
639 if [ ! -z "`egetent passwd ${euid}`" ] 468 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
640 then
641 euid="next" 469 euid="next"
642 fi 470 fi
643 else 471 else
644 eerror "Userid given but is not greater than 0 !" 472 eerror "Userid given but is not greater than 0 !"
645 die "${euid} is not a valid UID" 473 die "${euid} is not a valid UID"
646 fi 474 fi
647 else 475 else
648 euid="next" 476 euid="next"
649 fi 477 fi
650 if [ "${euid}" == "next" ] 478 if [[ ${euid} == "next" ]] ; then
651 then 479 for euid in $(seq 101 999) ; do
652 local pwrange
653 if [ "${USERLAND}" == "BSD" ] ; then
654 pwrange="`jot 898 101`"
655 else
656 pwrange="`seq 101 999`"
657 fi
658 for euid in ${pwrange} ; do
659 [ -z "`egetent passwd ${euid}`" ] && break 480 [[ -z $(egetent passwd ${euid}) ]] && break
660 done 481 done
661 fi 482 fi
662 opts="${opts} -u ${euid}" 483 opts="${opts} -u ${euid}"
663 einfo " - Userid: ${euid}" 484 einfo " - Userid: ${euid}"
664 485
665 # handle shell 486 # handle shell
666 local eshell="$1"; shift 487 local eshell=$1; shift
667 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 488 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
668 then 489 if [[ ! -e ${ROOT}${eshell} ]] ; then
669 if [ ! -e "${eshell}" ]
670 then
671 eerror "A shell was specified but it does not exist !" 490 eerror "A shell was specified but it does not exist !"
672 die "${eshell} does not exist" 491 die "${eshell} does not exist in ${ROOT}"
673 fi 492 fi
674 else 493 if [[ ${eshell} == */false || ${eshell} == */nologin ]] ; then
675 if [ "${USERLAND}" == "BSD" ] 494 eerror "Do not specify ${eshell} yourself, use -1"
676 then 495 die "Pass '-1' as the shell parameter"
677 eshell="/usr/bin/false" 496 fi
678 else 497 else
679 eshell="/bin/false" 498 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
499 [[ -x ${ROOT}${shell} ]] && break
500 done
501
502 if [[ ${shell} == "/dev/null" ]] ; then
503 eerror "Unable to identify the shell to use"
504 die "Unable to identify the shell to use"
680 fi 505 fi
506
507 eshell=${shell}
681 fi 508 fi
682 einfo " - Shell: ${eshell}" 509 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 510 opts="${opts} -s ${eshell}"
684 511
685 # handle homedir 512 # handle homedir
686 local ehome="$1"; shift 513 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 514 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 515 ehome="/dev/null"
690 fi 516 fi
691 einfo " - Home: ${ehome}" 517 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 518 opts="${opts} -d ${ehome}"
693 519
694 # handle groups 520 # handle groups
695 local egroups="$1"; shift 521 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 522 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 523 local oldifs=${IFS}
699 local defgroup="" exgroups="" 524 local defgroup="" exgroups=""
700 525
701 export IFS="," 526 export IFS=","
702 for g in ${egroups} 527 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 528 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 529 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 530 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 531 die "${g} is not a valid GID"
709 fi 532 fi
710 if [ -z "${defgroup}" ] 533 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 534 defgroup=${g}
713 else 535 else
714 exgroups="${exgroups},${g}" 536 exgroups="${exgroups},${g}"
715 fi 537 fi
716 export IFS="," 538 export IFS=","
717 done 539 done
718 export IFS="${oldifs}" 540 export IFS=${oldifs}
719 541
720 opts="${opts} -g ${defgroup}" 542 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 543 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 544 opts="${opts} -G ${exgroups:1}"
724 fi 545 fi
725 else 546 else
726 egroups="(none)" 547 egroups="(none)"
727 fi 548 fi
728 einfo " - Groups: ${egroups}" 549 einfo " - Groups: ${egroups}"
729 550
730 # handle extra and add the user 551 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 552 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 553 export SANDBOX_ON="0"
734 if useq ppc-macos 554 case ${CHOST} in
735 then 555 *-darwin*)
736 ### Make the user 556 ### Make the user
737 if [ -z "${eextra}" ] 557 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 558 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 559 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 560 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 561 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 562 ### Add the user to the groups specified
744 local oldifs="${IFS}" 563 local oldifs=${IFS}
745 export IFS="," 564 export IFS=","
746 for g in ${egroups} 565 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 566 dscl . merge /groups/${g} users ${euser}
749 done 567 done
750 export IFS="${oldifs}" 568 export IFS=${oldifs}
751 else 569 else
752 einfo "Extra options are not supported on macos yet" 570 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 571 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 572 einfo "eextra: $@"
755 die "Required function missing" 573 die "Required function missing"
756 fi 574 fi
757 elif use x86-fbsd ; then 575 ;;
758 if [ -z "${eextra}" ] 576 *-freebsd*|*-dragonfly*)
759 then 577 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 579 -c "added by portage for ${PN}" \
762 die "enewuser failed" 580 die "enewuser failed"
763 else 581 else
764 einfo " - Extra: ${eextra}" 582 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 584 "$@" || die "enewuser failed"
767 fi 585 fi
586 ;;
587
588 *-netbsd*)
589 if [[ -z $@ ]] ; then
590 useradd ${opts} ${euser} || die "enewuser failed"
768 else 591 else
769 if [ -z "${eextra}" ] 592 einfo " - Extra: $@"
770 then 593 useradd ${opts} ${euser} "$@" || die "enewuser failed"
594 fi
595 ;;
596
597 *-openbsd*)
598 if [[ -z $@ ]] ; then
599 useradd -u ${euid} -s ${eshell} \
600 -d ${ehome} -c "Added by portage for ${PN}" \
601 -g ${egroups} ${euser} || die "enewuser failed"
602 else
603 einfo " - Extra: $@"
604 useradd -u ${euid} -s ${eshell} \
605 -d ${ehome} -c "Added by portage for ${PN}" \
606 -g ${egroups} ${euser} "$@" || die "enewuser failed"
607 fi
608 ;;
609
610 *)
611 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 612 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 613 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 614 || die "enewuser failed"
774 else 615 else
775 einfo " - Extra: ${eextra}" 616 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 617 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 618 || die "enewuser failed"
778 fi 619 fi
620 ;;
621 esac
622
623 if [[ ! -e ${ROOT}/${ehome} ]] ; then
624 einfo " - Creating ${ehome} in ${ROOT}"
625 mkdir -p "${ROOT}/${ehome}"
626 chown ${euser} "${ROOT}/${ehome}"
627 chmod 755 "${ROOT}/${ehome}"
779 fi 628 fi
629
780 export SANDBOX_ON="${oldsandbox}" 630 export SANDBOX_ON=${oldsandbox}
781
782 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
783 then
784 einfo " - Creating ${ehome} in ${D}"
785 dodir ${ehome}
786 fowners ${euser} ${ehome}
787 fperms 755 ${ehome}
788 fi
789} 631}
790 632
791# Simplify/standardize adding groups to the system 633# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 634# vapier@gentoo.org
793# 635#
822 then 664 then
823 if [ "${egid}" -gt 0 ] 665 if [ "${egid}" -gt 0 ]
824 then 666 then
825 if [ -z "`egetent group ${egid}`" ] 667 if [ -z "`egetent group ${egid}`" ]
826 then 668 then
827 if useq ppc-macos ; then 669 if [[ "${CHOST}" == *-darwin* ]]; then
828 opts="${opts} ${egid}" 670 opts="${opts} ${egid}"
829 else 671 else
830 opts="${opts} -g ${egid}" 672 opts="${opts} -g ${egid}"
831 fi 673 fi
832 else 674 else
846 opts="${opts} ${eextra}" 688 opts="${opts} ${eextra}"
847 689
848 # add the group 690 # add the group
849 local oldsandbox="${SANDBOX_ON}" 691 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 692 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 693 case ${CHOST} in
694 *-darwin*)
852 if [ ! -z "${eextra}" ]; 695 if [ ! -z "${eextra}" ];
853 then 696 then
854 einfo "Extra options are not supported on macos yet" 697 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 698 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 699 einfo "eextra: ${eextra}"
857 die "Required function missing" 700 die "Required function missing"
858 fi 701 fi
859 702
860 # If we need the next available 703 # If we need the next available
861 case ${egid} in 704 case ${egid} in
862 *[!0-9]*) # Non numeric 705 *[!0-9]*) # Non numeric
863 for egid in `jot 898 101`; do 706 for egid in $(seq 101 999); do
864 [ -z "`egetent group ${egid}`" ] && break 707 [ -z "`egetent group ${egid}`" ] && break
865 done 708 done
866 esac 709 esac
867 dscl . create /groups/${egroup} gid ${egid} 710 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 711 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 712 ;;
713
714 *-freebsd*|*-dragonfly*)
870 case ${egid} in 715 case ${egid} in
871 *[!0-9]*) # Non numeric 716 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 717 for egid in $(seq 101 999); do
873 [ -z "`egetent group ${egid}`" ] && break 718 [ -z "`egetent group ${egid}`" ] && break
874 done 719 done
875 esac 720 esac
876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 721 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
877 else 722 ;;
723
724 *-netbsd*)
725 case ${egid} in
726 *[!0-9]*) # Non numeric
727 for egid in $(seq 101 999); do
728 [ -z "`egetent group ${egid}`" ] && break
729 done
730 esac
731 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
732 ;;
733
734 *)
878 groupadd ${opts} ${egroup} || die "enewgroup failed" 735 groupadd ${opts} ${egroup} || die "enewgroup failed"
879 fi 736 ;;
737 esac
880 export SANDBOX_ON="${oldsandbox}" 738 export SANDBOX_ON="${oldsandbox}"
881} 739}
882 740
883# Simple script to replace 'dos2unix' binaries 741# Simple script to replace 'dos2unix' binaries
884# vapier@gentoo.org 742# vapier@gentoo.org
909# name: the name that will show up in the menu 767# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 768# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 769# this can be relative (to /usr/share/pixmaps) or
912# a full path to an icon 770# a full path to an icon
913# type: what kind of application is this ? for categories: 771# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 772# http://www.freedesktop.org/Standards/desktop-entry-spec
915# path: if your app needs to startup in a specific dir 773# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 774make_desktop_entry() {
917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 775 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
918 776
919 local exec="${1}" 777 local exec=${1}
920 local name="${2:-${PN}}" 778 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 779 local icon=${3:-${PN}.png}
922 local type="${4}" 780 local type=${4}
923 local subdir="${6}" 781 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 782
925 if [ -z "${type}" ] 783 if [[ -z ${type} ]] ; then
926 then 784 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 785 local catmin=${CATEGORY##*-}
928 "app-emulation") 786 case ${catmaj} in
929 type=Emulator 787 app)
930 subdir="Emulation" 788 case ${catmin} in
789 admin) type=System;;
790 cdr) type=DiscBurning;;
791 dicts) type=Dictionary;;
792 editors) type=TextEditor;;
793 emacs) type=TextEditor;;
794 emulation) type=Emulator;;
795 laptop) type=HardwareSettings;;
796 office) type=Office;;
797 vim) type=TextEditor;;
798 xemacs) type=TextEditor;;
799 *) type=;;
800 esac
931 ;; 801 ;;
932 "games-"*) 802
933 type=Game 803 dev)
934 subdir="Games" 804 type="Development"
935 ;; 805 ;;
936 "net-"*) 806
937 type=Network 807 games)
938 subdir="${type}" 808 case ${catmin} in
809 action) type=ActionGame;;
810 arcade) type=ArcadeGame;;
811 board) type=BoardGame;;
812 kid) type=KidsGame;;
813 emulation) type=Emulator;;
814 puzzle) type=LogicGame;;
815 rpg) type=RolePlaying;;
816 roguelike) type=RolePlaying;;
817 simulation) type=Simulation;;
818 sports) type=SportsGame;;
819 strategy) type=StrategyGame;;
820 *) type=;;
821 esac
822 type="Game;${type}"
939 ;; 823 ;;
824
825 mail)
826 type="Network;Email"
827 ;;
828
829 media)
830 case ${catmin} in
831 gfx) type=Graphics;;
832 radio) type=Tuner;;
833 sound) type=Audio;;
834 tv) type=TV;;
835 video) type=Video;;
836 *) type=;;
837 esac
838 type="AudioVideo;${type}"
839 ;;
840
841 net)
842 case ${catmin} in
843 dialup) type=Dialup;;
844 ftp) type=FileTransfer;;
845 im) type=InstantMessaging;;
846 irc) type=IRCClient;;
847 mail) type=Email;;
848 news) type=News;;
849 nntp) type=News;;
850 p2p) type=FileTransfer;;
851 *) type=;;
852 esac
853 type="Network;${type}"
854 ;;
855
856 sci)
857 case ${catmin} in
858 astro*) type=Astronomy;;
859 bio*) type=Biology;;
860 calc*) type=Calculator;;
861 chem*) type=Chemistry;;
862 geo*) type=Geology;;
863 math*) type=Math;;
864 *) type=;;
865 esac
866 type="Science;${type}"
867 ;;
868
869 www)
870 case ${catmin} in
871 client) type=WebBrowser;;
872 *) type=;;
873 esac
874 type="Network"
875 ;;
876
940 *) 877 *)
941 type= 878 type=
942 subdir=
943 ;; 879 ;;
944 esac 880 esac
945 fi 881 fi
882 if [ "${SLOT}" == "0" ] ; then
883 local desktop_name="${PN}"
884 else
885 local desktop_name="${PN}-${SLOT}"
886 fi
946 local desktop="${T}/${exec%% *}-${P}.desktop" 887 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
947 888
948echo "[Desktop Entry] 889echo "[Desktop Entry]
949Encoding=UTF-8 890Encoding=UTF-8
950Version=0.9.2 891Version=0.9.2
951Name=${name} 892Name=${name}
954Exec=${exec} 895Exec=${exec}
955Path=${path} 896Path=${path}
956Icon=${icon} 897Icon=${icon}
957Categories=Application;${type};" > "${desktop}" 898Categories=Application;${type};" > "${desktop}"
958 899
900 (
901 # wrap the env here so that the 'insinto' call
902 # doesn't corrupt the env of the caller
959 insinto /usr/share/applications 903 insinto /usr/share/applications
960 doins "${desktop}" 904 doins "${desktop}"
961 905 )
962 return 0
963} 906}
964 907
965# Make a GDM/KDM Session file 908# Make a GDM/KDM Session file
966# 909#
967# make_desktop_entry(<title>, <command>) 910# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 911# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 912# command: Name of the Window Manager
970 913
971make_session_desktop() { 914make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 915 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
974 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 916 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
975 917
976 local title="${1}" 918 local title=$1
977 local command="${2}" 919 local command=$2
978 local desktop="${T}/${wm}.desktop" 920 local desktop=${T}/${wm}.desktop
979 921
980echo "[Desktop Entry] 922echo "[Desktop Entry]
981Encoding=UTF-8 923Encoding=UTF-8
982Name=${title} 924Name=${title}
983Comment=This session logs you into ${title} 925Comment=This session logs you into ${title}
985TryExec=${command} 927TryExec=${command}
986Type=Application" > "${desktop}" 928Type=Application" > "${desktop}"
987 929
988 insinto /usr/share/xsessions 930 insinto /usr/share/xsessions
989 doins "${desktop}" 931 doins "${desktop}"
990
991 return 0
992} 932}
993 933
994domenu() { 934domenu() {
995 local i 935 local i j
996 local j
997 insinto /usr/share/applications 936 insinto /usr/share/applications
998 for i in ${@} 937 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 938 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 939 doins "${i}"
1003 elif [ -d "${i}" ]; 940 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 941 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 942 doins "${j}"
1008 done 943 done
1009 fi 944 fi
1010 done 945 done
1011} 946}
947newmenu() {
948 insinto /usr/share/applications
949 newins "$1" "$2"
950}
1012 951
1013doicon() { 952doicon() {
1014 local i 953 local i j
1015 local j
1016 insinto /usr/share/pixmaps 954 insinto /usr/share/pixmaps
1017 for i in ${@} 955 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 956 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 957 doins "${i}"
1022 elif [ -d "${i}" ]; 958 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 959 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 960 doins "${j}"
1027 done 961 done
1028 fi 962 fi
1029 done 963 done
964}
965newicon() {
966 insinto /usr/share/pixmaps
967 newins "$1" "$2"
1030} 968}
1031 969
1032############################################################## 970##############################################################
1033# END: Handle .desktop files and menu entries # 971# END: Handle .desktop files and menu entries #
1034############################################################## 972##############################################################
1035 973
1036 974
1037# for internal use only (unpack_pdv and unpack_makeself) 975# for internal use only (unpack_pdv and unpack_makeself)
1038find_unpackable_file() { 976find_unpackable_file() {
1039 local src="$1" 977 local src=$1
1040 if [ -z "${src}" ] 978 if [[ -z ${src} ]] ; then
1041 then
1042 src="${DISTDIR}/${A}" 979 src=${DISTDIR}/${A}
1043 else 980 else
1044 if [ -e "${DISTDIR}/${src}" ] 981 if [[ -e ${DISTDIR}/${src} ]] ; then
1045 then
1046 src="${DISTDIR}/${src}" 982 src=${DISTDIR}/${src}
1047 elif [ -e "${PWD}/${src}" ] 983 elif [[ -e ${PWD}/${src} ]] ; then
1048 then
1049 src="${PWD}/${src}" 984 src=${PWD}/${src}
1050 elif [ -e "${src}" ] 985 elif [[ -e ${src} ]] ; then
1051 then
1052 src="${src}" 986 src=${src}
1053 fi
1054 fi 987 fi
1055 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 988 fi
989 [[ ! -e ${src} ]] && return 1
1056 echo "${src}" 990 echo "${src}"
1057} 991}
1058 992
1059# Unpack those pesky pdv generated files ... 993# Unpack those pesky pdv generated files ...
1060# They're self-unpacking programs with the binary package stuffed in 994# They're self-unpacking programs with the binary package stuffed in
1075# lseek 1009# lseek
1076# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1010# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1077# lseek(3, -4, SEEK_END) = 2981250 1011# lseek(3, -4, SEEK_END) = 2981250
1078# thus we would pass in the value of '4' as the second parameter. 1012# thus we would pass in the value of '4' as the second parameter.
1079unpack_pdv() { 1013unpack_pdv() {
1080 local src="`find_unpackable_file $1`" 1014 local src=$(find_unpackable_file $1)
1081 local sizeoff_t="$2" 1015 local sizeoff_t=$2
1082 1016
1017 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1018 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1084 1019
1085 local shrtsrc="`basename ${src}`" 1020 local shrtsrc=$(basename "${src}")
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1021 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1022 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1088 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1023 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1089 1024
1090 # grab metadata for debug reasons 1025 # grab metadata for debug reasons
1154# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1089# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1155# - If the file is not specified then unpack will utilize ${A}. 1090# - If the file is not specified then unpack will utilize ${A}.
1156# - If the offset is not specified then we will attempt to extract 1091# - If the offset is not specified then we will attempt to extract
1157# the proper offset from the script itself. 1092# the proper offset from the script itself.
1158unpack_makeself() { 1093unpack_makeself() {
1094 local src_input=${1:-${A}}
1159 local src="$(find_unpackable_file "$1")" 1095 local src=$(find_unpackable_file "${src_input}")
1160 local skip="$2" 1096 local skip=$2
1161 local exe="$3" 1097 local exe=$3
1162 1098
1099 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1100
1163 local shrtsrc="$(basename "${src}")" 1101 local shrtsrc=$(basename "${src}")
1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1102 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1165 if [ -z "${skip}" ] 1103 if [[ -z ${skip} ]] ; then
1166 then
1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1104 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1168 local skip=0 1105 local skip=0
1169 exe=tail 1106 exe=tail
1170 case ${ver} in 1107 case ${ver} in
1171 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1108 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1172 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1109 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1184 ;; 1121 ;;
1185 2.1.3) 1122 2.1.3)
1186 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1123 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1187 let skip="skip + 1" 1124 let skip="skip + 1"
1188 ;; 1125 ;;
1189 2.1.4) 1126 2.1.4|2.1.5)
1190 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1127 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1191 skip=$(head -n ${skip} "${src}" | wc -c) 1128 skip=$(head -n ${skip} "${src}" | wc -c)
1192 exe="dd" 1129 exe="dd"
1193 ;; 1130 ;;
1194 *) 1131 *)
1239check_license() { 1176check_license() {
1240 local lic=$1 1177 local lic=$1
1241 if [ -z "${lic}" ] ; then 1178 if [ -z "${lic}" ] ; then
1242 lic="${PORTDIR}/licenses/${LICENSE}" 1179 lic="${PORTDIR}/licenses/${LICENSE}"
1243 else 1180 else
1244 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1181 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1245 lic="${PORTDIR}/licenses/${src}" 1182 lic="${PORTDIR}/licenses/${lic}"
1246 elif [ -e "${PWD}/${src}" ] ; then 1183 elif [ -e "${PWD}/${lic}" ] ; then
1247 lic="${PWD}/${src}" 1184 lic="${PWD}/${lic}"
1248 elif [ -e "${src}" ] ; then 1185 elif [ -e "${lic}" ] ; then
1249 lic="${src}" 1186 lic="${lic}"
1250 fi
1251 fi 1187 fi
1188 fi
1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1189 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1253 local l="`basename ${lic}`" 1190 local l="`basename ${lic}`"
1254 1191
1255 # here is where we check for the licenses the user already 1192 # here is where we check for the licenses the user already
1256 # accepted ... if we don't find a match, we make the user accept 1193 # accepted ... if we don't find a match, we make the user accept
1257 local shopts=$- 1194 local shopts=$-
1313 # first we figure out how many cds we're dealing with by 1250 # first we figure out how many cds we're dealing with by
1314 # the # of files they gave us 1251 # the # of files they gave us
1315 local cdcnt=0 1252 local cdcnt=0
1316 local f= 1253 local f=
1317 for f in "$@" ; do 1254 for f in "$@" ; do
1318 cdcnt=$((cdcnt + 1)) 1255 ((++cdcnt))
1319 export CDROM_CHECK_${cdcnt}="$f" 1256 export CDROM_CHECK_${cdcnt}="$f"
1320 done 1257 done
1321 export CDROM_TOTAL_CDS=${cdcnt} 1258 export CDROM_TOTAL_CDS=${cdcnt}
1322 export CDROM_CURRENT_CD=1 1259 export CDROM_CURRENT_CD=1
1323 1260
1324 # now we see if the user gave use CD_ROOT ... 1261 # now we see if the user gave use CD_ROOT ...
1325 # if they did, let's just believe them that it's correct 1262 # if they did, let's just believe them that it's correct
1326 if [[ ! -z ${CD_ROOT} ]] ; then
1327 export CDROM_ROOT=${CD_ROOT}
1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1329 return
1330 fi
1331 # do the same for CD_ROOT_X
1332 if [[ ! -z ${CD_ROOT_1} ]] ; then 1263 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1333 local var= 1264 local var=
1334 cdcnt=0 1265 cdcnt=0
1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1266 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1336 cdcnt=$((cdcnt + 1)) 1267 ((++cdcnt))
1337 var="CD_ROOT_${cdcnt}" 1268 var="CD_ROOT_${cdcnt}"
1269 [[ -z ${!var} ]] && var="CD_ROOT"
1338 if [[ -z ${!var} ]] ; then 1270 if [[ -z ${!var} ]] ; then
1339 eerror "You must either use just the CD_ROOT" 1271 eerror "You must either use just the CD_ROOT"
1340 eerror "or specify ALL the CD_ROOT_X variables." 1272 eerror "or specify ALL the CD_ROOT_X variables."
1341 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1273 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1342 die "could not locate CD_ROOT_${cdcnt}" 1274 die "could not locate CD_ROOT_${cdcnt}"
1343 fi 1275 fi
1344 export CDROM_ROOTS_${cdcnt}="${!var}"
1345 done 1276 done
1346 export CDROM_ROOT=${CDROM_ROOTS_1} 1277 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1278 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1279 export CDROM_SET=-1
1280 for f in ${CDROM_CHECK_1//:/ } ; do
1281 ((++CDROM_SET))
1282 [[ -e ${CD_ROOT}/${f} ]] && break
1283 done
1284 export CDROM_MATCH=${f}
1348 return 1285 return
1349 fi 1286 fi
1350 1287
1288 # User didn't help us out so lets make sure they know they can
1289 # simplify the whole process ...
1351 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1290 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1352 einfon "This ebuild will need the " 1291 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1353 if [[ -z ${CDROM_NAME} ]] ; then
1354 echo "cdrom for ${PN}."
1355 else
1356 echo "${CDROM_NAME}."
1357 fi
1358 echo 1292 echo
1359 einfo "If you do not have the CD, but have the data files" 1293 einfo "If you do not have the CD, but have the data files"
1360 einfo "mounted somewhere on your filesystem, just export" 1294 einfo "mounted somewhere on your filesystem, just export"
1361 einfo "the variable CD_ROOT so that it points to the" 1295 einfo "the variable CD_ROOT so that it points to the"
1362 einfo "directory containing the files." 1296 einfo "directory containing the files."
1366 echo 1300 echo
1367 else 1301 else
1368 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1369 cdcnt=0 1303 cdcnt=0
1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1304 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1371 cdcnt=$((cdcnt + 1)) 1305 ((++cdcnt))
1372 var="CDROM_NAME_${cdcnt}" 1306 var="CDROM_NAME_${cdcnt}"
1373 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1307 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1374 done 1308 done
1375 echo 1309 echo
1376 einfo "If you do not have the CDs, but have the data files" 1310 einfo "If you do not have the CDs, but have the data files"
1377 einfo "mounted somewhere on your filesystem, just export" 1311 einfo "mounted somewhere on your filesystem, just export"
1378 einfo "the following variables so they point to the right place:" 1312 einfo "the following variables so they point to the right place:"
1379 einfon "" 1313 einfon ""
1380 cdcnt=0 1314 cdcnt=0
1381 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1315 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1382 cdcnt=$((cdcnt + 1)) 1316 ((++cdcnt))
1383 echo -n " CD_ROOT_${cdcnt}" 1317 echo -n " CD_ROOT_${cdcnt}"
1384 done 1318 done
1385 echo 1319 echo
1386 einfo "Or, if you have all the files in the same place, or" 1320 einfo "Or, if you have all the files in the same place, or"
1387 einfo "you only have one cdrom, you can export CD_ROOT" 1321 einfo "you only have one cdrom, you can export CD_ROOT"
1390 echo 1324 echo
1391 einfo "For example:" 1325 einfo "For example:"
1392 einfo "export CD_ROOT_1=/mnt/cdrom" 1326 einfo "export CD_ROOT_1=/mnt/cdrom"
1393 echo 1327 echo
1394 fi 1328 fi
1329
1330 export CDROM_SET=""
1395 export CDROM_CURRENT_CD=0 1331 export CDROM_CURRENT_CD=0
1396 cdrom_load_next_cd 1332 cdrom_load_next_cd
1397} 1333}
1398 1334
1399# this is only used when you need access to more than one cd. 1335# this is only used when you need access to more than one cd.
1400# when you have finished using the first cd, just call this function. 1336# when you have finished using the first cd, just call this function.
1401# when it returns, CDROM_ROOT will be pointing to the second cd. 1337# when it returns, CDROM_ROOT will be pointing to the second cd.
1402# remember, you can only go forward in the cd chain, you can't go back. 1338# remember, you can only go forward in the cd chain, you can't go back.
1403cdrom_load_next_cd() { 1339cdrom_load_next_cd() {
1404 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1405 local var= 1340 local var
1406 1341 ((++CDROM_CURRENT_CD))
1407 if [[ ! -z ${CD_ROOT} ]] ; then
1408 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1409 return
1410 fi
1411 1342
1412 unset CDROM_ROOT 1343 unset CDROM_ROOT
1413 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1344 var=CD_ROOT_${CDROM_CURRENT_CD}
1345 [[ -z ${!var} ]] && var="CD_ROOT"
1414 if [[ -z ${!var} ]] ; then 1346 if [[ -z ${!var} ]] ; then
1415 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1347 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1416 cdrom_locate_file_on_cd ${!var} 1348 _cdrom_locate_file_on_cd ${!var}
1417 else 1349 else
1418 export CDROM_ROOT=${!var} 1350 export CDROM_ROOT=${!var}
1419 fi 1351 fi
1420 1352
1421 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1353 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1426# all it does is try to locate a give file on a cd ... if the cd isn't 1358# all it does is try to locate a give file on a cd ... if the cd isn't
1427# found, then a message asking for the user to insert the cdrom will be 1359# found, then a message asking for the user to insert the cdrom will be
1428# displayed and we'll hang out here until: 1360# displayed and we'll hang out here until:
1429# (1) the file is found on a mounted cdrom 1361# (1) the file is found on a mounted cdrom
1430# (2) the user hits CTRL+C 1362# (2) the user hits CTRL+C
1431cdrom_locate_file_on_cd() { 1363_cdrom_locate_file_on_cd() {
1364 local mline=""
1365 local showedmsg=0
1366
1432 while [[ -z ${CDROM_ROOT} ]] ; do 1367 while [[ -z ${CDROM_ROOT} ]] ; do
1368 local i=0
1369 local -a cdset=(${*//:/ })
1370 if [[ -n ${CDROM_SET} ]] ; then
1371 cdset=(${cdset[${CDROM_SET}]})
1372 fi
1373
1374 while [[ -n ${cdset[${i}]} ]] ; do
1433 local dir="$(dirname ${@})" 1375 local dir=$(dirname ${cdset[${i}]})
1434 local file="$(basename ${@})" 1376 local file=$(basename ${cdset[${i}]})
1435 local mline=""
1436 local showedmsg=0
1437 1377
1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1378 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1439 [[ -d ${mline}/${dir} ]] || continue 1379 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1380 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1441 && export CDROM_ROOT=${mline} 1381 export CDROM_ROOT=${mline}
1382 export CDROM_SET=${i}
1383 export CDROM_MATCH=${cdset[${i}]}
1384 return
1385 fi
1386 done
1387
1388 ((++i))
1442 done 1389 done
1443 1390
1444 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1391 echo
1446 if [[ ${showedmsg} -eq 0 ]] ; then 1392 if [[ ${showedmsg} -eq 0 ]] ; then
1447 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1393 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1448 if [[ -z ${CDROM_NAME} ]] ; then 1394 if [[ -z ${CDROM_NAME} ]] ; then
1449 einfo "Please insert the cdrom for ${PN} now !" 1395 einfo "Please insert+mount the cdrom for ${PN} now !"
1450 else
1451 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1452 fi
1453 else 1396 else
1454 if [[ -z ${CDROM_NAME_1} ]] ; then
1455 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1456 else
1457 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1458 einfo "Please insert+mount the ${!var} cdrom now !" 1397 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1459 fi
1460 fi 1398 fi
1461 showedmsg=1 1399 else
1400 if [[ -z ${CDROM_NAME_1} ]] ; then
1401 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1402 else
1403 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1404 einfo "Please insert+mount the ${!var} cdrom now !"
1405 fi
1462 fi 1406 fi
1407 showedmsg=1
1408 fi
1463 einfo "Press return to scan for the cd again" 1409 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1410 einfo "or hit CTRL+C to abort the emerge."
1411 echo
1412 einfo "If you are having trouble with the detection"
1413 einfo "of your CD, it is possible that you do not have"
1414 einfo "Joliet support enabled in your kernel. Please"
1415 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1465 read 1416 read
1466 fi
1467 done 1417 done
1468} 1418}
1469 1419
1470# Make sure that LINGUAS only contains languages that 1420# Make sure that LINGUAS only contains languages that
1471# a package can support 1421# a package can support
1513 else 1463 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1464 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1465 fi
1516 done 1466 done
1517 if [[ -z ${newls} ]] ; then 1467 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1468 export LINGUAS=""
1519 else 1469 else
1520 export LINGUAS=${newls:1} 1470 export LINGUAS=${newls:1}
1521 fi 1471 fi
1522} 1472}
1523 1473
1533 while ((i--)) ; do 1483 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1484 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1485 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1486 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1487 case ${ARCH} in
1538 x86) export ARCH="i386";; 1488 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1489 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1490 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1491 mips) export ARCH="mips";;
1542 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! 1492 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!
1543 *) export ARCH="${ARCH}";; 1493 *) export ARCH="${ARCH}";;
1544 esac 1494 esac
1545} 1495}
1546 1496
1547# set's ARCH back to what portage expects 1497# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1498set_arch_to_portage() {
1592 LIB=$1 1542 LIB=$1
1593 1543
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1544 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}` 1545 SONAME=`basename ${LIB}`
1596 1546
1597 einfo "An old version of an installed library was detected on your system." 1547 ewarn "An old version of an installed library was detected on your system."
1598 einfo "In order to avoid breaking packages that link against is, this older version" 1548 ewarn "In order to avoid breaking packages that link against it, this older version"
1599 einfo "is not being removed. In order to make full use of this newer version," 1549 ewarn "is not being removed. In order to make full use of this newer version,"
1600 einfo "you will need to execute the following command:" 1550 ewarn "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1551 ewarn " revdep-rebuild --soname ${SONAME}"
1602 einfo 1552 ewarn
1603 einfo "After doing that, you can safely remove ${LIB}" 1553 ewarn "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1554 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 fi 1555 fi
1606} 1556}
1607 1557
1608# Hack for people to figure out if a package was built with 1558# Hack for people to figure out if a package was built with
1609# certain USE flags 1559# certain USE flags
1619 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1569 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1620 1570
1621 local PKG=$(best_version $1) 1571 local PKG=$(best_version $1)
1622 shift 1572 shift
1623 1573
1624 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1574 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1575
1576 # if the USE file doesnt exist, assume the $PKG is either
1577 # injected or package.provided
1625 [[ ! -e ${USEFILE} ]] && return 1 1578 [[ ! -e ${USEFILE} ]] && return 0
1626 1579
1627 local USE_BUILT=$(<${USEFILE}) 1580 local USE_BUILT=$(<${USEFILE})
1628 while [[ $# -gt 0 ]] ; do 1581 while [[ $# -gt 0 ]] ; do
1629 if [[ ${opt} = "-o" ]] ; then 1582 if [[ ${opt} = "-o" ]] ; then
1630 has $1 ${USE_BUILT} && return 0 1583 has $1 ${USE_BUILT} && return 0
1655dopamd() { 1608dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1609 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1610
1658 use pam || return 0 1611 use pam || return 0
1659 1612
1660 insinto /etc/pam.d 1613 INSDESTTREE=/etc/pam.d \
1661 # these are the default doins options, but be explicit just in case
1662 insopts -m 0644 -o root -g root
1663 doins "$@" || die "failed to install $@" 1614 doins "$@" || die "failed to install $@"
1664} 1615}
1665# newpamd <old name> <new name> 1616# newpamd <old name> <new name>
1666# 1617#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1618# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1619newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1620 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1621
1671 use pam || return 0 1622 use pam || return 0
1672 1623
1673 insinto /etc/pam.d 1624 INSDESTTREE=/etc/pam.d \
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1676 newins "$1" "$2" || die "failed to install $1 as $2" 1625 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1626}
1627
1628# make a wrapper script ...
1629# NOTE: this was originally games_make_wrapper, but I noticed other places where
1630# this could be used, so I have moved it here and made it not games-specific
1631# -- wolf31o2
1632# $1 == wrapper name
1633# $2 == binary to run
1634# $3 == directory to chdir before running binary
1635# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1636# $5 == path for wrapper
1637make_wrapper() {
1638 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1639 local tmpwrapper=$(emktemp)
1640 # We don't want to quote ${bin} so that people can pass complex
1641 # things as $bin ... "./someprog --args"
1642 cat << EOF > "${tmpwrapper}"
1643#!/bin/sh
1644cd "${chdir:-.}"
1645if [ -n "${libdir}" ] ; then
1646 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1647 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1648 else
1649 export LD_LIBRARY_PATH="${libdir}"
1650 fi
1651fi
1652exec ${bin} "\$@"
1653EOF
1654 chmod go+rx "${tmpwrapper}"
1655 if [[ -n ${path} ]] ; then
1656 exeinto "${path}"
1657 newexe "${tmpwrapper}" "${wrapper}"
1658 else
1659 newbin "${tmpwrapper}" "${wrapper}"
1660 fi
1661}

Legend:
Removed from v.1.157  
changed lines
  Added in v.1.221

  ViewVC Help
Powered by ViewVC 1.1.20