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

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

  ViewVC Help
Powered by ViewVC 1.1.20