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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.159  
changed lines
  Added in v.1.223

  ViewVC Help
Powered by ViewVC 1.1.20