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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20