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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.157  
changed lines
  Added in v.1.234

  ViewVC Help
Powered by ViewVC 1.1.20