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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.167  
changed lines
  Added in v.1.237

  ViewVC Help
Powered by ViewVC 1.1.20