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

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

  ViewVC Help
Powered by ViewVC 1.1.20