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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.162  
changed lines
  Added in v.1.228

  ViewVC Help
Powered by ViewVC 1.1.20