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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20