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

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

  ViewVC Help
Powered by ViewVC 1.1.20