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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20