/[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.220
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.220 2005/12/13 14:08:29 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 # 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
669 if [ ! -e "${eshell}" ] 489 if [[ ! -e ${eshell} ]] ; then
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"
673 fi 492 fi
674 else 493 else
675 if [ "${USERLAND}" == "BSD" ] 494 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
676 then 495 [[ -x ${ROOT}${shell} ]] && break
677 eshell="/usr/bin/false" 496 done
678 else 497
679 eshell="/bin/false" 498 if [[ ${shell} == "/dev/null" ]] ; then
499 eerror "Unable to identify the shell to use"
500 die "Unable to identify the shell to use"
680 fi 501 fi
502
503 eshell=${shell}
681 fi 504 fi
682 einfo " - Shell: ${eshell}" 505 einfo " - Shell: ${eshell}"
683 opts="${opts} -s ${eshell}" 506 opts="${opts} -s ${eshell}"
684 507
685 # handle homedir 508 # handle homedir
686 local ehome="$1"; shift 509 local ehome=$1; shift
687 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 510 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
688 then
689 ehome="/dev/null" 511 ehome="/dev/null"
690 fi 512 fi
691 einfo " - Home: ${ehome}" 513 einfo " - Home: ${ehome}"
692 opts="${opts} -d ${ehome}" 514 opts="${opts} -d ${ehome}"
693 515
694 # handle groups 516 # handle groups
695 local egroups="$1"; shift 517 local egroups=$1; shift
696 if [ ! -z "${egroups}" ] 518 if [[ ! -z ${egroups} ]] ; then
697 then
698 local oldifs="${IFS}" 519 local oldifs=${IFS}
699 local defgroup="" exgroups="" 520 local defgroup="" exgroups=""
700 521
701 export IFS="," 522 export IFS=","
702 for g in ${egroups} 523 for g in ${egroups} ; do
703 do
704 export IFS="${oldifs}" 524 export IFS=${oldifs}
705 if [ -z "`egetent group \"${g}\"`" ] 525 if [[ -z $(egetent group "${g}") ]] ; then
706 then
707 eerror "You must add group ${g} to the system first" 526 eerror "You must add group ${g} to the system first"
708 die "${g} is not a valid GID" 527 die "${g} is not a valid GID"
709 fi 528 fi
710 if [ -z "${defgroup}" ] 529 if [[ -z ${defgroup} ]] ; then
711 then
712 defgroup="${g}" 530 defgroup=${g}
713 else 531 else
714 exgroups="${exgroups},${g}" 532 exgroups="${exgroups},${g}"
715 fi 533 fi
716 export IFS="," 534 export IFS=","
717 done 535 done
718 export IFS="${oldifs}" 536 export IFS=${oldifs}
719 537
720 opts="${opts} -g ${defgroup}" 538 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ] 539 if [[ ! -z ${exgroups} ]] ; then
722 then
723 opts="${opts} -G ${exgroups:1}" 540 opts="${opts} -G ${exgroups:1}"
724 fi 541 fi
725 else 542 else
726 egroups="(none)" 543 egroups="(none)"
727 fi 544 fi
728 einfo " - Groups: ${egroups}" 545 einfo " - Groups: ${egroups}"
729 546
730 # handle extra and add the user 547 # handle extra and add the user
731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 548 local oldsandbox=${SANDBOX_ON}
733 export SANDBOX_ON="0" 549 export SANDBOX_ON="0"
734 if useq ppc-macos 550 case ${CHOST} in
735 then 551 *-darwin*)
736 ### Make the user 552 ### Make the user
737 if [ -z "${eextra}" ] 553 if [[ -z $@ ]] ; then
738 then
739 dscl . create /users/${euser} uid ${euid} 554 dscl . create /users/${euser} uid ${euid}
740 dscl . create /users/${euser} shell ${eshell} 555 dscl . create /users/${euser} shell ${eshell}
741 dscl . create /users/${euser} home ${ehome} 556 dscl . create /users/${euser} home ${ehome}
742 dscl . create /users/${euser} realname "added by portage for ${PN}" 557 dscl . create /users/${euser} realname "added by portage for ${PN}"
743 ### Add the user to the groups specified 558 ### Add the user to the groups specified
744 local oldifs="${IFS}" 559 local oldifs=${IFS}
745 export IFS="," 560 export IFS=","
746 for g in ${egroups} 561 for g in ${egroups} ; do
747 do
748 dscl . merge /groups/${g} users ${euser} 562 dscl . merge /groups/${g} users ${euser}
749 done 563 done
750 export IFS="${oldifs}" 564 export IFS=${oldifs}
751 else 565 else
752 einfo "Extra options are not supported on macos yet" 566 einfo "Extra options are not supported on Darwin yet"
753 einfo "Please report the ebuild along with the info below" 567 einfo "Please report the ebuild along with the info below"
754 einfo "eextra: ${eextra}" 568 einfo "eextra: $@"
755 die "Required function missing" 569 die "Required function missing"
756 fi 570 fi
757 elif use x86-fbsd ; then 571 ;;
758 if [ -z "${eextra}" ] 572 *-freebsd*|*-dragonfly*)
759 then 573 if [[ -z $@ ]] ; then
760 pw useradd ${euser} ${opts} \ 574 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \ 575 -c "added by portage for ${PN}" \
762 die "enewuser failed" 576 die "enewuser failed"
763 else 577 else
764 einfo " - Extra: ${eextra}" 578 einfo " - Extra: $@"
765 pw useradd ${euser} ${opts} \ 579 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed" 580 "$@" || die "enewuser failed"
767 fi 581 fi
582 ;;
583
584 *-netbsd*)
585 if [[ -z $@ ]] ; then
586 useradd ${opts} ${euser} || die "enewuser failed"
768 else 587 else
769 if [ -z "${eextra}" ] 588 einfo " - Extra: $@"
770 then 589 useradd ${opts} ${euser} "$@" || die "enewuser failed"
590 fi
591 ;;
592
593 *-openbsd*)
594 if [[ -z $@ ]] ; then
595 useradd -u ${euid} -s ${eshell} \
596 -d ${ehome} -c "Added by portage for ${PN}" \
597 -g ${egroups} ${euser} || die "enewuser failed"
598 else
599 einfo " - Extra: $@"
600 useradd -u ${euid} -s ${eshell} \
601 -d ${ehome} -c "Added by portage for ${PN}" \
602 -g ${egroups} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605
606 *)
607 if [[ -z $@ ]] ; then
771 useradd ${opts} ${euser} \ 608 useradd ${opts} ${euser} \
772 -c "added by portage for ${PN}" \ 609 -c "added by portage for ${PN}" \
773 || die "enewuser failed" 610 || die "enewuser failed"
774 else 611 else
775 einfo " - Extra: ${eextra}" 612 einfo " - Extra: $@"
776 useradd ${opts} ${euser} ${eextra} \ 613 useradd ${opts} ${euser} "$@" \
777 || die "enewuser failed" 614 || die "enewuser failed"
778 fi 615 fi
616 ;;
617 esac
618
619 if [[ ! -e ${ROOT}/${ehome} ]] ; then
620 einfo " - Creating ${ehome} in ${ROOT}"
621 mkdir -p "${ROOT}/${ehome}"
622 chown ${euser} "${ROOT}/${ehome}"
623 chmod 755 "${ROOT}/${ehome}"
779 fi 624 fi
625
780 export SANDBOX_ON="${oldsandbox}" 626 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} 627}
790 628
791# Simplify/standardize adding groups to the system 629# Simplify/standardize adding groups to the system
792# vapier@gentoo.org 630# vapier@gentoo.org
793# 631#
822 then 660 then
823 if [ "${egid}" -gt 0 ] 661 if [ "${egid}" -gt 0 ]
824 then 662 then
825 if [ -z "`egetent group ${egid}`" ] 663 if [ -z "`egetent group ${egid}`" ]
826 then 664 then
827 if useq ppc-macos ; then 665 if [[ "${CHOST}" == *-darwin* ]]; then
828 opts="${opts} ${egid}" 666 opts="${opts} ${egid}"
829 else 667 else
830 opts="${opts} -g ${egid}" 668 opts="${opts} -g ${egid}"
831 fi 669 fi
832 else 670 else
846 opts="${opts} ${eextra}" 684 opts="${opts} ${eextra}"
847 685
848 # add the group 686 # add the group
849 local oldsandbox="${SANDBOX_ON}" 687 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 688 export SANDBOX_ON="0"
851 if useq ppc-macos ; then 689 case ${CHOST} in
690 *-darwin*)
852 if [ ! -z "${eextra}" ]; 691 if [ ! -z "${eextra}" ];
853 then 692 then
854 einfo "Extra options are not supported on macos yet" 693 einfo "Extra options are not supported on Darwin/OS X yet"
855 einfo "Please report the ebuild along with the info below" 694 einfo "Please report the ebuild along with the info below"
856 einfo "eextra: ${eextra}" 695 einfo "eextra: ${eextra}"
857 die "Required function missing" 696 die "Required function missing"
858 fi 697 fi
859 698
860 # If we need the next available 699 # If we need the next available
861 case ${egid} in 700 case ${egid} in
862 *[!0-9]*) # Non numeric 701 *[!0-9]*) # Non numeric
863 for egid in `jot 898 101`; do 702 for egid in $(seq 101 999); do
864 [ -z "`egetent group ${egid}`" ] && break 703 [ -z "`egetent group ${egid}`" ] && break
865 done 704 done
866 esac 705 esac
867 dscl . create /groups/${egroup} gid ${egid} 706 dscl . create /groups/${egroup} gid ${egid}
868 dscl . create /groups/${egroup} passwd '*' 707 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then 708 ;;
709
710 *-freebsd*|*-dragonfly*)
870 case ${egid} in 711 case ${egid} in
871 *[!0-9]*) # Non numeric 712 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do 713 for egid in $(seq 101 999); do
873 [ -z "`egetent group ${egid}`" ] && break 714 [ -z "`egetent group ${egid}`" ] && break
874 done 715 done
875 esac 716 esac
876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 717 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
877 else 718 ;;
719
720 *-netbsd*)
721 case ${egid} in
722 *[!0-9]*) # Non numeric
723 for egid in $(seq 101 999); do
724 [ -z "`egetent group ${egid}`" ] && break
725 done
726 esac
727 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
728 ;;
729
730 *)
878 groupadd ${opts} ${egroup} || die "enewgroup failed" 731 groupadd ${opts} ${egroup} || die "enewgroup failed"
879 fi 732 ;;
733 esac
880 export SANDBOX_ON="${oldsandbox}" 734 export SANDBOX_ON="${oldsandbox}"
881} 735}
882 736
883# Simple script to replace 'dos2unix' binaries 737# Simple script to replace 'dos2unix' binaries
884# vapier@gentoo.org 738# vapier@gentoo.org
909# name: the name that will show up in the menu 763# name: the name that will show up in the menu
910# icon: give your little like a pretty little icon ... 764# icon: give your little like a pretty little icon ...
911# this can be relative (to /usr/share/pixmaps) or 765# this can be relative (to /usr/share/pixmaps) or
912# a full path to an icon 766# a full path to an icon
913# type: what kind of application is this ? for categories: 767# type: what kind of application is this ? for categories:
914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 768# http://www.freedesktop.org/Standards/desktop-entry-spec
915# path: if your app needs to startup in a specific dir 769# path: if your app needs to startup in a specific dir
916make_desktop_entry() { 770make_desktop_entry() {
917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 771 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
918 772
919 local exec="${1}" 773 local exec=${1}
920 local name="${2:-${PN}}" 774 local name=${2:-${PN}}
921 local icon="${3:-${PN}.png}" 775 local icon=${3:-${PN}.png}
922 local type="${4}" 776 local type=${4}
923 local subdir="${6}" 777 local path=${5}
924 local path="${5:-${GAMES_BINDIR}}" 778
925 if [ -z "${type}" ] 779 if [[ -z ${type} ]] ; then
926 then 780 local catmaj=${CATEGORY%%-*}
927 case ${CATEGORY} in 781 local catmin=${CATEGORY##*-}
928 "app-emulation") 782 case ${catmaj} in
929 type=Emulator 783 app)
930 subdir="Emulation" 784 case ${catmin} in
785 admin) type=System;;
786 cdr) type=DiscBurning;;
787 dicts) type=Dictionary;;
788 editors) type=TextEditor;;
789 emacs) type=TextEditor;;
790 emulation) type=Emulator;;
791 laptop) type=HardwareSettings;;
792 office) type=Office;;
793 vim) type=TextEditor;;
794 xemacs) type=TextEditor;;
795 *) type=;;
796 esac
931 ;; 797 ;;
932 "games-"*) 798
933 type=Game 799 dev)
934 subdir="Games" 800 type="Development"
935 ;; 801 ;;
936 "net-"*) 802
937 type=Network 803 games)
938 subdir="${type}" 804 case ${catmin} in
805 action) type=ActionGame;;
806 arcade) type=ArcadeGame;;
807 board) type=BoardGame;;
808 kid) type=KidsGame;;
809 emulation) type=Emulator;;
810 puzzle) type=LogicGame;;
811 rpg) type=RolePlaying;;
812 roguelike) type=RolePlaying;;
813 simulation) type=Simulation;;
814 sports) type=SportsGame;;
815 strategy) type=StrategyGame;;
816 *) type=;;
817 esac
818 type="Game;${type}"
939 ;; 819 ;;
820
821 mail)
822 type="Network;Email"
823 ;;
824
825 media)
826 case ${catmin} in
827 gfx) type=Graphics;;
828 radio) type=Tuner;;
829 sound) type=Audio;;
830 tv) type=TV;;
831 video) type=Video;;
832 *) type=;;
833 esac
834 type="AudioVideo;${type}"
835 ;;
836
837 net)
838 case ${catmin} in
839 dialup) type=Dialup;;
840 ftp) type=FileTransfer;;
841 im) type=InstantMessaging;;
842 irc) type=IRCClient;;
843 mail) type=Email;;
844 news) type=News;;
845 nntp) type=News;;
846 p2p) type=FileTransfer;;
847 *) type=;;
848 esac
849 type="Network;${type}"
850 ;;
851
852 sci)
853 case ${catmin} in
854 astro*) type=Astronomy;;
855 bio*) type=Biology;;
856 calc*) type=Calculator;;
857 chem*) type=Chemistry;;
858 geo*) type=Geology;;
859 math*) type=Math;;
860 *) type=;;
861 esac
862 type="Science;${type}"
863 ;;
864
865 www)
866 case ${catmin} in
867 client) type=WebBrowser;;
868 *) type=;;
869 esac
870 type="Network"
871 ;;
872
940 *) 873 *)
941 type= 874 type=
942 subdir=
943 ;; 875 ;;
944 esac 876 esac
945 fi 877 fi
878 if [ "${SLOT}" == "0" ] ; then
879 local desktop_name="${PN}"
880 else
881 local desktop_name="${PN}-${SLOT}"
882 fi
946 local desktop="${T}/${exec%% *}-${P}.desktop" 883 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
947 884
948echo "[Desktop Entry] 885echo "[Desktop Entry]
949Encoding=UTF-8 886Encoding=UTF-8
950Version=0.9.2 887Version=0.9.2
951Name=${name} 888Name=${name}
954Exec=${exec} 891Exec=${exec}
955Path=${path} 892Path=${path}
956Icon=${icon} 893Icon=${icon}
957Categories=Application;${type};" > "${desktop}" 894Categories=Application;${type};" > "${desktop}"
958 895
896 (
897 # wrap the env here so that the 'insinto' call
898 # doesn't corrupt the env of the caller
959 insinto /usr/share/applications 899 insinto /usr/share/applications
960 doins "${desktop}" 900 doins "${desktop}"
961 901 )
962 return 0
963} 902}
964 903
965# Make a GDM/KDM Session file 904# Make a GDM/KDM Session file
966# 905#
967# make_desktop_entry(<title>, <command>) 906# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager 907# title: File to execute to start the Window Manager
969# command: Name of the Window Manager 908# command: Name of the Window Manager
970 909
971make_session_desktop() { 910make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 911 [[ -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 912 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
975 913
976 local title="${1}" 914 local title=$1
977 local command="${2}" 915 local command=$2
978 local desktop="${T}/${wm}.desktop" 916 local desktop=${T}/${wm}.desktop
979 917
980echo "[Desktop Entry] 918echo "[Desktop Entry]
981Encoding=UTF-8 919Encoding=UTF-8
982Name=${title} 920Name=${title}
983Comment=This session logs you into ${title} 921Comment=This session logs you into ${title}
985TryExec=${command} 923TryExec=${command}
986Type=Application" > "${desktop}" 924Type=Application" > "${desktop}"
987 925
988 insinto /usr/share/xsessions 926 insinto /usr/share/xsessions
989 doins "${desktop}" 927 doins "${desktop}"
990
991 return 0
992} 928}
993 929
994domenu() { 930domenu() {
995 local i 931 local i j
996 local j
997 insinto /usr/share/applications 932 insinto /usr/share/applications
998 for i in ${@} 933 for i in "$@" ; do
999 do
1000 if [ -f "${i}" ]; 934 if [[ -f ${i} ]] ; then
1001 then
1002 doins ${i} 935 doins "${i}"
1003 elif [ -d "${i}" ]; 936 elif [[ -d ${i} ]] ; then
1004 then
1005 for j in ${i}/*.desktop 937 for j in "${i}"/*.desktop ; do
1006 do
1007 doins ${j} 938 doins "${j}"
1008 done 939 done
1009 fi 940 fi
1010 done 941 done
1011} 942}
943newmenu() {
944 insinto /usr/share/applications
945 newins "$1" "$2"
946}
1012 947
1013doicon() { 948doicon() {
1014 local i 949 local i j
1015 local j
1016 insinto /usr/share/pixmaps 950 insinto /usr/share/pixmaps
1017 for i in ${@} 951 for i in "$@" ; do
1018 do
1019 if [ -f "${i}" ]; 952 if [[ -f ${i} ]] ; then
1020 then
1021 doins ${i} 953 doins "${i}"
1022 elif [ -d "${i}" ]; 954 elif [[ -d ${i} ]] ; then
1023 then
1024 for j in ${i}/*.png 955 for j in "${i}"/*.png ; do
1025 do
1026 doins ${j} 956 doins "${j}"
1027 done 957 done
1028 fi 958 fi
1029 done 959 done
960}
961newicon() {
962 insinto /usr/share/pixmaps
963 newins "$1" "$2"
1030} 964}
1031 965
1032############################################################## 966##############################################################
1033# END: Handle .desktop files and menu entries # 967# END: Handle .desktop files and menu entries #
1034############################################################## 968##############################################################
1035 969
1036 970
1037# for internal use only (unpack_pdv and unpack_makeself) 971# for internal use only (unpack_pdv and unpack_makeself)
1038find_unpackable_file() { 972find_unpackable_file() {
1039 local src="$1" 973 local src=$1
1040 if [ -z "${src}" ] 974 if [[ -z ${src} ]] ; then
1041 then
1042 src="${DISTDIR}/${A}" 975 src=${DISTDIR}/${A}
1043 else 976 else
1044 if [ -e "${DISTDIR}/${src}" ] 977 if [[ -e ${DISTDIR}/${src} ]] ; then
1045 then
1046 src="${DISTDIR}/${src}" 978 src=${DISTDIR}/${src}
1047 elif [ -e "${PWD}/${src}" ] 979 elif [[ -e ${PWD}/${src} ]] ; then
1048 then
1049 src="${PWD}/${src}" 980 src=${PWD}/${src}
1050 elif [ -e "${src}" ] 981 elif [[ -e ${src} ]] ; then
1051 then
1052 src="${src}" 982 src=${src}
1053 fi
1054 fi 983 fi
1055 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 984 fi
985 [[ ! -e ${src} ]] && return 1
1056 echo "${src}" 986 echo "${src}"
1057} 987}
1058 988
1059# Unpack those pesky pdv generated files ... 989# Unpack those pesky pdv generated files ...
1060# They're self-unpacking programs with the binary package stuffed in 990# They're self-unpacking programs with the binary package stuffed in
1075# lseek 1005# lseek
1076# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1006# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1077# lseek(3, -4, SEEK_END) = 2981250 1007# lseek(3, -4, SEEK_END) = 2981250
1078# thus we would pass in the value of '4' as the second parameter. 1008# thus we would pass in the value of '4' as the second parameter.
1079unpack_pdv() { 1009unpack_pdv() {
1080 local src="`find_unpackable_file $1`" 1010 local src=$(find_unpackable_file $1)
1081 local sizeoff_t="$2" 1011 local sizeoff_t=$2
1082 1012
1013 [[ -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 :(" 1014 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1084 1015
1085 local shrtsrc="`basename ${src}`" 1016 local shrtsrc=$(basename "${src}")
1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1017 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1018 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\"` 1019 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1089 1020
1090 # grab metadata for debug reasons 1021 # grab metadata for debug reasons
1154# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1085# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1155# - If the file is not specified then unpack will utilize ${A}. 1086# - If the file is not specified then unpack will utilize ${A}.
1156# - If the offset is not specified then we will attempt to extract 1087# - If the offset is not specified then we will attempt to extract
1157# the proper offset from the script itself. 1088# the proper offset from the script itself.
1158unpack_makeself() { 1089unpack_makeself() {
1090 local src_input=${1:-${A}}
1159 local src="$(find_unpackable_file "$1")" 1091 local src=$(find_unpackable_file "${src_input}")
1160 local skip="$2" 1092 local skip=$2
1161 local exe="$3" 1093 local exe=$3
1162 1094
1095 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1096
1163 local shrtsrc="$(basename "${src}")" 1097 local shrtsrc=$(basename "${src}")
1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1098 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1165 if [ -z "${skip}" ] 1099 if [[ -z ${skip} ]] ; then
1166 then
1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1100 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1168 local skip=0 1101 local skip=0
1169 exe=tail 1102 exe=tail
1170 case ${ver} in 1103 case ${ver} in
1171 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1104 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1172 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1105 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1184 ;; 1117 ;;
1185 2.1.3) 1118 2.1.3)
1186 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1119 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1187 let skip="skip + 1" 1120 let skip="skip + 1"
1188 ;; 1121 ;;
1189 2.1.4) 1122 2.1.4|2.1.5)
1190 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1123 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1191 skip=$(head -n ${skip} "${src}" | wc -c) 1124 skip=$(head -n ${skip} "${src}" | wc -c)
1192 exe="dd" 1125 exe="dd"
1193 ;; 1126 ;;
1194 *) 1127 *)
1239check_license() { 1172check_license() {
1240 local lic=$1 1173 local lic=$1
1241 if [ -z "${lic}" ] ; then 1174 if [ -z "${lic}" ] ; then
1242 lic="${PORTDIR}/licenses/${LICENSE}" 1175 lic="${PORTDIR}/licenses/${LICENSE}"
1243 else 1176 else
1244 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1177 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1245 lic="${PORTDIR}/licenses/${src}" 1178 lic="${PORTDIR}/licenses/${lic}"
1246 elif [ -e "${PWD}/${src}" ] ; then 1179 elif [ -e "${PWD}/${lic}" ] ; then
1247 lic="${PWD}/${src}" 1180 lic="${PWD}/${lic}"
1248 elif [ -e "${src}" ] ; then 1181 elif [ -e "${lic}" ] ; then
1249 lic="${src}" 1182 lic="${lic}"
1250 fi
1251 fi 1183 fi
1184 fi
1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1185 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1253 local l="`basename ${lic}`" 1186 local l="`basename ${lic}`"
1254 1187
1255 # here is where we check for the licenses the user already 1188 # 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 1189 # accepted ... if we don't find a match, we make the user accept
1257 local shopts=$- 1190 local shopts=$-
1313 # first we figure out how many cds we're dealing with by 1246 # first we figure out how many cds we're dealing with by
1314 # the # of files they gave us 1247 # the # of files they gave us
1315 local cdcnt=0 1248 local cdcnt=0
1316 local f= 1249 local f=
1317 for f in "$@" ; do 1250 for f in "$@" ; do
1318 cdcnt=$((cdcnt + 1)) 1251 ((++cdcnt))
1319 export CDROM_CHECK_${cdcnt}="$f" 1252 export CDROM_CHECK_${cdcnt}="$f"
1320 done 1253 done
1321 export CDROM_TOTAL_CDS=${cdcnt} 1254 export CDROM_TOTAL_CDS=${cdcnt}
1322 export CDROM_CURRENT_CD=1 1255 export CDROM_CURRENT_CD=1
1323 1256
1324 # now we see if the user gave use CD_ROOT ... 1257 # now we see if the user gave use CD_ROOT ...
1325 # if they did, let's just believe them that it's correct 1258 # 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 1259 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1333 local var= 1260 local var=
1334 cdcnt=0 1261 cdcnt=0
1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1262 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1336 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1337 var="CD_ROOT_${cdcnt}" 1264 var="CD_ROOT_${cdcnt}"
1265 [[ -z ${!var} ]] && var="CD_ROOT"
1338 if [[ -z ${!var} ]] ; then 1266 if [[ -z ${!var} ]] ; then
1339 eerror "You must either use just the CD_ROOT" 1267 eerror "You must either use just the CD_ROOT"
1340 eerror "or specify ALL the CD_ROOT_X variables." 1268 eerror "or specify ALL the CD_ROOT_X variables."
1341 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1269 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1342 die "could not locate CD_ROOT_${cdcnt}" 1270 die "could not locate CD_ROOT_${cdcnt}"
1343 fi 1271 fi
1344 export CDROM_ROOTS_${cdcnt}="${!var}"
1345 done 1272 done
1346 export CDROM_ROOT=${CDROM_ROOTS_1} 1273 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1274 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1275 export CDROM_SET=-1
1276 for f in ${CDROM_CHECK_1//:/ } ; do
1277 ((++CDROM_SET))
1278 [[ -e ${CD_ROOT}/${f} ]] && break
1279 done
1280 export CDROM_MATCH=${f}
1348 return 1281 return
1349 fi 1282 fi
1350 1283
1284 # User didn't help us out so lets make sure they know they can
1285 # simplify the whole process ...
1351 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1286 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1352 einfon "This ebuild will need the " 1287 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 1288 echo
1359 einfo "If you do not have the CD, but have the data files" 1289 einfo "If you do not have the CD, but have the data files"
1360 einfo "mounted somewhere on your filesystem, just export" 1290 einfo "mounted somewhere on your filesystem, just export"
1361 einfo "the variable CD_ROOT so that it points to the" 1291 einfo "the variable CD_ROOT so that it points to the"
1362 einfo "directory containing the files." 1292 einfo "directory containing the files."
1366 echo 1296 echo
1367 else 1297 else
1368 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1298 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1369 cdcnt=0 1299 cdcnt=0
1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1300 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1371 cdcnt=$((cdcnt + 1)) 1301 ((++cdcnt))
1372 var="CDROM_NAME_${cdcnt}" 1302 var="CDROM_NAME_${cdcnt}"
1373 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1303 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1374 done 1304 done
1375 echo 1305 echo
1376 einfo "If you do not have the CDs, but have the data files" 1306 einfo "If you do not have the CDs, but have the data files"
1377 einfo "mounted somewhere on your filesystem, just export" 1307 einfo "mounted somewhere on your filesystem, just export"
1378 einfo "the following variables so they point to the right place:" 1308 einfo "the following variables so they point to the right place:"
1379 einfon "" 1309 einfon ""
1380 cdcnt=0 1310 cdcnt=0
1381 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1311 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1382 cdcnt=$((cdcnt + 1)) 1312 ((++cdcnt))
1383 echo -n " CD_ROOT_${cdcnt}" 1313 echo -n " CD_ROOT_${cdcnt}"
1384 done 1314 done
1385 echo 1315 echo
1386 einfo "Or, if you have all the files in the same place, or" 1316 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" 1317 einfo "you only have one cdrom, you can export CD_ROOT"
1390 echo 1320 echo
1391 einfo "For example:" 1321 einfo "For example:"
1392 einfo "export CD_ROOT_1=/mnt/cdrom" 1322 einfo "export CD_ROOT_1=/mnt/cdrom"
1393 echo 1323 echo
1394 fi 1324 fi
1325
1326 export CDROM_SET=""
1395 export CDROM_CURRENT_CD=0 1327 export CDROM_CURRENT_CD=0
1396 cdrom_load_next_cd 1328 cdrom_load_next_cd
1397} 1329}
1398 1330
1399# this is only used when you need access to more than one cd. 1331# 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. 1332# 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. 1333# 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. 1334# remember, you can only go forward in the cd chain, you can't go back.
1403cdrom_load_next_cd() { 1335cdrom_load_next_cd() {
1404 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1405 local var= 1336 local var
1406 1337 ((++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 1338
1412 unset CDROM_ROOT 1339 unset CDROM_ROOT
1413 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1340 var=CD_ROOT_${CDROM_CURRENT_CD}
1341 [[ -z ${!var} ]] && var="CD_ROOT"
1414 if [[ -z ${!var} ]] ; then 1342 if [[ -z ${!var} ]] ; then
1415 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1343 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1416 cdrom_locate_file_on_cd ${!var} 1344 _cdrom_locate_file_on_cd ${!var}
1417 else 1345 else
1418 export CDROM_ROOT=${!var} 1346 export CDROM_ROOT=${!var}
1419 fi 1347 fi
1420 1348
1421 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1349 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 1354# 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 1355# found, then a message asking for the user to insert the cdrom will be
1428# displayed and we'll hang out here until: 1356# displayed and we'll hang out here until:
1429# (1) the file is found on a mounted cdrom 1357# (1) the file is found on a mounted cdrom
1430# (2) the user hits CTRL+C 1358# (2) the user hits CTRL+C
1431cdrom_locate_file_on_cd() { 1359_cdrom_locate_file_on_cd() {
1360 local mline=""
1361 local showedmsg=0
1362
1432 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local i=0
1365 local -a cdset=(${*//:/ })
1366 if [[ -n ${CDROM_SET} ]] ; then
1367 cdset=(${cdset[${CDROM_SET}]})
1368 fi
1369
1370 while [[ -n ${cdset[${i}]} ]] ; do
1433 local dir="$(dirname ${@})" 1371 local dir=$(dirname ${cdset[${i}]})
1434 local file="$(basename ${@})" 1372 local file=$(basename ${cdset[${i}]})
1435 local mline=""
1436 local showedmsg=0
1437 1373
1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1374 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do
1439 [[ -d ${mline}/${dir} ]] || continue 1375 [[ -d ${mline}/${dir} ]] || continue
1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1376 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1441 && export CDROM_ROOT=${mline} 1377 export CDROM_ROOT=${mline}
1378 export CDROM_SET=${i}
1379 export CDROM_MATCH=${cdset[${i}]}
1380 return
1381 fi
1382 done
1383
1384 ((++i))
1442 done 1385 done
1443 1386
1444 if [[ -z ${CDROM_ROOT} ]] ; then
1445 echo 1387 echo
1446 if [[ ${showedmsg} -eq 0 ]] ; then 1388 if [[ ${showedmsg} -eq 0 ]] ; then
1447 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1389 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1448 if [[ -z ${CDROM_NAME} ]] ; then 1390 if [[ -z ${CDROM_NAME} ]] ; then
1449 einfo "Please insert the cdrom for ${PN} now !" 1391 einfo "Please insert+mount the cdrom for ${PN} now !"
1450 else
1451 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1452 fi
1453 else 1392 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 !" 1393 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1459 fi
1460 fi 1394 fi
1461 showedmsg=1 1395 else
1396 if [[ -z ${CDROM_NAME_1} ]] ; then
1397 einfo "Please insert+mount cd #${CDROM_CURRENT_CD} for ${PN} now !"
1398 else
1399 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1400 einfo "Please insert+mount the ${!var} cdrom now !"
1401 fi
1462 fi 1402 fi
1403 showedmsg=1
1404 fi
1463 einfo "Press return to scan for the cd again" 1405 einfo "Press return to scan for the cd again"
1464 einfo "or hit CTRL+C to abort the emerge." 1406 einfo "or hit CTRL+C to abort the emerge."
1407 echo
1408 einfo "If you are having trouble with the detection"
1409 einfo "of your CD, it is possible that you do not have"
1410 einfo "Joliet support enabled in your kernel. Please"
1411 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1465 read 1412 read
1466 fi
1467 done 1413 done
1468} 1414}
1469 1415
1470# Make sure that LINGUAS only contains languages that 1416# Make sure that LINGUAS only contains languages that
1471# a package can support 1417# a package can support
1513 else 1459 else
1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1460 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1515 fi 1461 fi
1516 done 1462 done
1517 if [[ -z ${newls} ]] ; then 1463 if [[ -z ${newls} ]] ; then
1518 unset LINGUAS 1464 export LINGUAS=""
1519 else 1465 else
1520 export LINGUAS=${newls:1} 1466 export LINGUAS=${newls:1}
1521 fi 1467 fi
1522} 1468}
1523 1469
1533 while ((i--)) ; do 1479 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1480 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done 1481 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1482 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in 1483 case ${ARCH} in
1538 x86) export ARCH="i386";; 1484 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";; 1485 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";; 1486 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";; 1487 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! 1488 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}";; 1489 *) export ARCH="${ARCH}";;
1544 esac 1490 esac
1545} 1491}
1546 1492
1547# set's ARCH back to what portage expects 1493# set's ARCH back to what portage expects
1548set_arch_to_portage() { 1494set_arch_to_portage() {
1592 LIB=$1 1538 LIB=$1
1593 1539
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1540 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}` 1541 SONAME=`basename ${LIB}`
1596 1542
1597 einfo "An old version of an installed library was detected on your system." 1543 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" 1544 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," 1545 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:" 1546 ewarn "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}" 1547 ewarn " revdep-rebuild --soname ${SONAME}"
1602 einfo 1548 ewarn
1603 einfo "After doing that, you can safely remove ${LIB}" 1549 ewarn "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1550 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 fi 1551 fi
1606} 1552}
1607 1553
1608# Hack for people to figure out if a package was built with 1554# Hack for people to figure out if a package was built with
1609# certain USE flags 1555# certain USE flags
1619 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1565 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1620 1566
1621 local PKG=$(best_version $1) 1567 local PKG=$(best_version $1)
1622 shift 1568 shift
1623 1569
1624 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1570 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1571
1572 # if the USE file doesnt exist, assume the $PKG is either
1573 # injected or package.provided
1625 [[ ! -e ${USEFILE} ]] && return 1 1574 [[ ! -e ${USEFILE} ]] && return 0
1626 1575
1627 local USE_BUILT=$(<${USEFILE}) 1576 local USE_BUILT=$(<${USEFILE})
1628 while [[ $# -gt 0 ]] ; do 1577 while [[ $# -gt 0 ]] ; do
1629 if [[ ${opt} = "-o" ]] ; then 1578 if [[ ${opt} = "-o" ]] ; then
1630 has $1 ${USE_BUILT} && return 0 1579 has $1 ${USE_BUILT} && return 0
1655dopamd() { 1604dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument" 1605 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657 1606
1658 use pam || return 0 1607 use pam || return 0
1659 1608
1660 insinto /etc/pam.d 1609 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 $@" 1610 doins "$@" || die "failed to install $@"
1664} 1611}
1665# newpamd <old name> <new name> 1612# newpamd <old name> <new name>
1666# 1613#
1667# Install pam file <old name> as <new name> in /etc/pam.d 1614# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() { 1615newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1616 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670 1617
1671 use pam || return 0 1618 use pam || return 0
1672 1619
1673 insinto /etc/pam.d 1620 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" 1621 newins "$1" "$2" || die "failed to install $1 as $2"
1677} 1622}
1623
1624# make a wrapper script ...
1625# NOTE: this was originally games_make_wrapper, but I noticed other places where
1626# this could be used, so I have moved it here and made it not games-specific
1627# -- wolf31o2
1628# $1 == wrapper name
1629# $2 == binary to run
1630# $3 == directory to chdir before running binary
1631# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1632# $5 == path for wrapper
1633make_wrapper() {
1634 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1635 local tmpwrapper=$(emktemp)
1636 # We don't want to quote ${bin} so that people can pass complex
1637 # things as $bin ... "./someprog --args"
1638 cat << EOF > "${tmpwrapper}"
1639#!/bin/sh
1640cd "${chdir:-.}"
1641if [ -n "${libdir}" ] ; then
1642 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1643 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1644 else
1645 export LD_LIBRARY_PATH="${libdir}"
1646 fi
1647fi
1648exec ${bin} "\$@"
1649EOF
1650 chmod go+rx "${tmpwrapper}"
1651 if [[ -n ${path} ]] ; then
1652 exeinto "${path}"
1653 newexe "${tmpwrapper}" "${wrapper}"
1654 else
1655 newbin "${tmpwrapper}" "${wrapper}"
1656 fi
1657}

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

  ViewVC Help
Powered by ViewVC 1.1.20