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

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

  ViewVC Help
Powered by ViewVC 1.1.20