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

Diff of /eclass/eutils.eclass

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

Revision 1.164 Revision 1.237
1# Copyright 1999-2005 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.164 2005/03/30 14:12:25 wolf31o2 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
114 for lib in "${@}" ; do 68 for lib in "${@}" ; do
115 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT 69 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
116 /* GNU ld script 70 /* GNU ld script
117 Since Gentoo has critical dynamic libraries 71 Since Gentoo has critical dynamic libraries
118 in /lib, and the static versions in /usr/lib, 72 in /lib, and the static versions in /usr/lib,
119 we need to have a "fake" dynamic lib in /usr/lib, 73 we need to have a "fake" dynamic lib in /usr/lib,
120 otherwise we run into linking problems. 74 otherwise we run into linking problems.
121 75
122 See bug http://bugs.gentoo.org/4411 for more info. 76 See bug http://bugs.gentoo.org/4411 for more info.
123 */ 77 */
124 GROUP ( /${libdir}/${lib} ) 78 GROUP ( /${libdir}/${lib} )
125 END_LDSCRIPT 79 END_LDSCRIPT
126 fperms a+x "/usr/${libdir}/${lib}" 80 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
127 done 81 done
128} 82}
129 83
130# Simple function to draw a line consisting of '=' the same length as $*
131#
132# <azarah@gentoo.org> (11 Nov 2002)
133#
134draw_line() {
135 local i=0
136 local str_length=""
137
138 # Handle calls that do not have args, or wc not being installed ...
139 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
140 then
141 echo "==============================================================="
142 return 0
143 fi
144
145 # Get the length of $*
146 str_length="$(echo -n "$*" | wc -m)"
147
148 while [ "$i" -lt "${str_length}" ]
149 do
150 echo -n "="
151
152 i=$((i + 1))
153 done
154
155 echo
156
157 return 0
158}
159 84
160# Default directory where patches are located 85# Default directory where patches are located
161EPATCH_SOURCE="${WORKDIR}/patch" 86EPATCH_SOURCE="${WORKDIR}/patch"
162# Default extension for patches 87# Default extension for patches
163EPATCH_SUFFIX="patch.bz2" 88EPATCH_SUFFIX="patch.bz2"
164# Default options for patch 89# Default options for patch
165# 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
166EPATCH_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"
167# 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,
168# and not the full path .. 95# and not the full path ..
169EPATCH_EXCLUDE="" 96EPATCH_EXCLUDE=""
170# Change the printed message for a single patch. 97# Change the printed message for a single patch.
171EPATCH_SINGLE_MSG="" 98EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
172# Force applying bulk patches even if not following the style: 101# Force applying bulk patches even if not following the style:
173# 102#
174# ??_${ARCH}_foo.${EPATCH_SUFFIX} 103# ??_${ARCH}_foo.${EPATCH_SUFFIX}
175# 104#
176EPATCH_FORCE="no" 105EPATCH_FORCE="no"
207# hand its a directory, it will set EPATCH_SOURCE to this. 136# hand its a directory, it will set EPATCH_SOURCE to this.
208# 137#
209# <azarah@gentoo.org> (10 Nov 2002) 138# <azarah@gentoo.org> (10 Nov 2002)
210# 139#
211epatch() { 140epatch() {
141 _epatch_draw_line() {
142 [[ -z $1 ]] && set "$(printf "%65s" '')"
143 echo "${1//?/=}"
144 }
145 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
212 local PIPE_CMD="" 146 local PIPE_CMD=""
213 local STDERR_TARGET="${T}/$$.out" 147 local STDERR_TARGET="${T}/$$.out"
214 local PATCH_TARGET="${T}/$$.patch" 148 local PATCH_TARGET="${T}/$$.patch"
215 local PATCH_SUFFIX="" 149 local PATCH_SUFFIX=""
216 local SINGLE_PATCH="no" 150 local SINGLE_PATCH="no"
217 local x="" 151 local x=""
218 152
153 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
154
219 if [ "$#" -gt 1 ] 155 if [ "$#" -gt 1 ]
220 then 156 then
221 local m="" 157 local m=""
222 einfo "${#} patches to apply ..."
223 for m in "$@" ; do 158 for m in "$@" ; do
224 epatch "${m}" 159 epatch "${m}"
225 done 160 done
226 return 0 161 return 0
227 fi 162 fi
281 ;; 216 ;;
282 esac 217 esac
283 218
284 if [ "${SINGLE_PATCH}" = "no" ] 219 if [ "${SINGLE_PATCH}" = "no" ]
285 then 220 then
286 einfo "Applying various patches (bugfixes/updates) ..." 221 einfo "${EPATCH_MULTI_MSG}"
287 fi 222 fi
288 for x in ${EPATCH_SOURCE} 223 for x in ${EPATCH_SOURCE}
289 do 224 do
290 # New ARCH dependant patch naming scheme ... 225 # New ARCH dependant patch naming scheme ...
291 # 226 #
292 # ???_arch_foo.patch 227 # ???_arch_foo.patch
293 # 228 #
294 if [ -f ${x} ] && \ 229 if [ -f ${x} ] && \
295 ([ "${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}" ] || \
296 [ "${EPATCH_FORCE}" = "yes" ]) 231 [ "${EPATCH_FORCE}" = "yes" ])
297 then 232 then
298 local count=0 233 local count=0
299 local popts="${EPATCH_OPTS}" 234 local popts="${EPATCH_OPTS}"
300 local patchname=${x##*/} 235 local patchname=${x##*/}
324 259
325 # Allow for prefix to differ ... im lazy, so shoot me :/ 260 # Allow for prefix to differ ... im lazy, so shoot me :/
326 while [ "${count}" -lt 5 ] 261 while [ "${count}" -lt 5 ]
327 do 262 do
328 # Generate some useful debug info ... 263 # Generate some useful debug info ...
329 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 266
332 if [ "${PATCH_SUFFIX}" != "patch" ] 267 if [ "${PATCH_SUFFIX}" != "patch" ]
333 then 268 then
334 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 274
340 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 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##*/}
342 277
343 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
345 280
346 if [ "${PATCH_SUFFIX}" != "patch" ] 281 if [ "${PATCH_SUFFIX}" != "patch" ]
347 then 282 then
348 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
349 then 284 then
353 count=5 288 count=5
354 break 289 break
355 fi 290 fi
356 fi 291 fi
357 292
358 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
359 then 294 then
360 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 295 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 296 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 297 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 298 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 300
366 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
367 303
368 if [ "$?" -ne 0 ] 304 if [ "$?" -ne 0 ]
369 then 305 then
370 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##*/}
371 echo 307 echo
410 then 346 then
411 einfo "Done with patching" 347 einfo "Done with patching"
412 fi 348 fi
413} 349}
414 350
415# This function return true if we are using the NPTL pthreads
416# implementation.
417#
418# <azarah@gentoo.org> (06 March 2003)
419#
420have_NPTL() {
421 cat > ${T}/test-nptl.c <<-"END"
422 #define _XOPEN_SOURCE
423 #include <unistd.h>
424 #include <stdio.h>
425
426 int main()
427 {
428 char buf[255];
429 char *str = buf;
430
431 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
432 if (NULL != str) {
433 printf("%s\n", str);
434 if (NULL != strstr(str, "NPTL"))
435 return 0;
436 }
437
438 return 1;
439 }
440 END
441
442 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
443 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
444 then
445 echo "yes"
446 einfon "Checking what PTHREADS implementation we have ..."
447 if ${T}/nptl
448 then
449 return 0
450 else
451 return 1
452 fi
453 else
454 echo "no"
455 fi
456
457 return 1
458}
459
460# This function check how many cpu's are present, and then set
461# -j in MAKEOPTS accordingly.
462#
463# Thanks to nall <nall@gentoo.org> for this.
464#
465get_number_of_jobs() {
466 local jobs=0
467
468 if [ ! -r /proc/cpuinfo ]
469 then
470 return 1
471 fi
472
473 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
474 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
475 then
476 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
477 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
478 ADMINPARAM="${ADMINPARAM/-j}"
479 fi
480
481 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
482
483 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
484 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
485 then
486 # these archs will always have "[Pp]rocessor"
487 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
488
489 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
490 then
491 # sparc always has "ncpus active"
492 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
493
494 elif [ "${ARCH}" = "alpha" ]
495 then
496 # alpha has "cpus active", but only when compiled with SMP
497 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
498 then
499 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
500 else
501 jobs=2
502 fi
503
504 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
505 then
506 # ppc has "processor", but only when compiled with SMP
507 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
508 then
509 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
510 else
511 jobs=2
512 fi
513 elif [ "${ARCH}" = "s390" ]
514 then
515 # s390 has "# processors : "
516 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
517 else
518 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
519 die "Unknown ARCH -- ${ARCH}!"
520 fi
521
522 # Make sure the number is valid ...
523 if [ "${jobs}" -lt 1 ]
524 then
525 jobs=1
526 fi
527
528 if [ -n "${ADMINPARAM}" ]
529 then
530 if [ "${jobs}" -gt "${ADMINPARAM}" ]
531 then
532 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
533 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
534 else
535 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
536 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
537 fi
538 fi
539}
540
541# Cheap replacement for when debianutils (and thus mktemp) 351# Cheap replacement for when debianutils (and thus mktemp)
542# does not exist on the users system 352# does not exist on the users system
543# vapier@gentoo.org 353# vapier@gentoo.org
544# 354#
545# Takes just 1 optional parameter (the directory to create tmpfile in) 355# Takes just 1 optional parameter (the directory to create tmpfile in)
546emktemp() { 356emktemp() {
547 local exe="touch" 357 local exe="touch"
548 [ "$1" == "-d" ] && exe="mkdir" && shift 358 [[ $1 == -d ]] && exe="mkdir" && shift
549 local topdir="$1" 359 local topdir=$1
550 360
551 if [ -z "${topdir}" ] 361 if [[ -z ${topdir} ]] ; then
552 then
553 [ -z "${T}" ] \ 362 [[ -z ${T} ]] \
554 && topdir="/tmp" \ 363 && topdir="/tmp" \
555 || topdir="${T}" 364 || topdir=${T}
556 fi 365 fi
557 366
558 if [ -z "$(type -p mktemp)" ] 367 if [[ -z $(type -p mktemp) ]] ; then
559 then
560 local tmp=/ 368 local tmp=/
561 while [ -e "${tmp}" ] ; do 369 while [[ -e ${tmp} ]] ; do
562 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
563 done 371 done
564 ${exe} "${tmp}" 372 ${exe} "${tmp}" || ${exe} -p "${tmp}"
565 echo "${tmp}" 373 echo "${tmp}"
566 else 374 else
567 [ "${exe}" == "touch" ] \ 375 if [[ ${exe} == "touch" ]] ; then
568 && exe="-p" \ 376 [[ ${USERLAND} == "GNU" ]] \
569 || exe="-d" 377 && mktemp -p "${topdir}" \
570 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
571 fi 384 fi
572} 385}
573 386
574# Small wrapper for getent (Linux), nidump (Mac OS X), 387# Small wrapper for getent (Linux), nidump (Mac OS X),
575# and pw (FreeBSD) used in enewuser()/enewgroup() 388# and pw (FreeBSD) used in enewuser()/enewgroup()
576# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 389# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
577# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 390# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
578# 391#
579# egetent(database, key) 392# egetent(database, key)
580egetent() { 393egetent() {
581 if useq ppc-macos ; then 394 case ${CHOST} in
395 *-darwin*)
582 case "$2" in 396 case "$2" in
583 *[!0-9]*) # Non numeric 397 *[!0-9]*) # Non numeric
584 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 398 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
585 ;; 399 ;;
586 *) # Numeric 400 *) # Numeric
587 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 401 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
588 ;; 402 ;;
589 esac 403 esac
590 elif useq x86-fbsd ; then 404 ;;
591 local action 405 *-freebsd*|*-dragonfly*)
592 if [ "$1" == "passwd" ] 406 local opts action="user"
593 then 407 [[ $1 == "passwd" ]] || action="group"
594 action="user" 408
595 else 409 # lookup by uid/gid
596 action="group" 410 if [[ $2 == [[:digit:]]* ]] ; then
411 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
597 fi 412 fi
413
598 pw show "${action}" "$2" -q 414 pw show ${action} ${opts} "$2" -q
599 else 415 ;;
416 *-netbsd*|*-openbsd*)
417 grep "$2:\*:" /etc/$1
418 ;;
419 *)
600 which nscd >& /dev/null && nscd -i "$1" 420 type -p nscd >& /dev/null && nscd -i "$1"
601 getent "$1" "$2" 421 getent "$1" "$2"
602 fi 422 ;;
423 esac
603} 424}
604 425
605# Simplify/standardize adding users to the system 426# Simplify/standardize adding users to the system
606# vapier@gentoo.org 427# vapier@gentoo.org
607# 428#
614# shell: /bin/false 435# shell: /bin/false
615# homedir: /dev/null 436# homedir: /dev/null
616# groups: none 437# groups: none
617# extra: comment of 'added by portage for ${PN}' 438# extra: comment of 'added by portage for ${PN}'
618enewuser() { 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
619 # get the username 447 # get the username
620 local euser="$1"; shift 448 local euser=$1; shift
621 if [ -z "${euser}" ] 449 if [[ -z ${euser} ]] ; then
622 then
623 eerror "No username specified !" 450 eerror "No username specified !"
624 die "Cannot call enewuser without a username" 451 die "Cannot call enewuser without a username"
625 fi 452 fi
626 453
627 # lets see if the username already exists 454 # lets see if the username already exists
628 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 455 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
629 then
630 return 0 456 return 0
631 fi 457 fi
632 einfo "Adding user '${euser}' to your system ..." 458 einfo "Adding user '${euser}' to your system ..."
633 459
634 # options to pass to useradd 460 # options to pass to useradd
635 local opts= 461 local opts=
636 462
637 # handle uid 463 # handle uid
638 local euid="$1"; shift 464 local euid=$1; shift
639 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 465 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
640 then
641 if [ "${euid}" -gt 0 ] 466 if [[ ${euid} -gt 0 ]] ; then
642 then
643 if [ ! -z "`egetent passwd ${euid}`" ] 467 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
644 then
645 euid="next" 468 euid="next"
646 fi 469 fi
647 else 470 else
648 eerror "Userid given but is not greater than 0 !" 471 eerror "Userid given but is not greater than 0 !"
649 die "${euid} is not a valid UID" 472 die "${euid} is not a valid UID"
650 fi 473 fi
651 else 474 else
652 euid="next" 475 euid="next"
653 fi 476 fi
654 if [ "${euid}" == "next" ] 477 if [[ ${euid} == "next" ]] ; then
655 then 478 for euid in $(seq 101 999) ; do
656 local pwrange
657 if [ "${USERLAND}" == "BSD" ] ; then
658 pwrange="`jot 898 101`"
659 else
660 pwrange="`seq 101 999`"
661 fi
662 for euid in ${pwrange} ; do
663 [ -z "`egetent passwd ${euid}`" ] && break 479 [[ -z $(egetent passwd ${euid}) ]] && break
664 done 480 done
665 fi 481 fi
666 opts="${opts} -u ${euid}" 482 opts="${opts} -u ${euid}"
667 einfo " - Userid: ${euid}" 483 einfo " - Userid: ${euid}"
668 484
669 # handle shell 485 # handle shell
670 local eshell="$1"; shift 486 local eshell=$1; shift
671 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 487 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
672 then 488 if [[ ! -e ${ROOT}${eshell} ]] ; then
673 if [ ! -e "${eshell}" ]
674 then
675 eerror "A shell was specified but it does not exist !" 489 eerror "A shell was specified but it does not exist !"
676 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"
677 fi 495 fi
678 else 496 else
679 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
680 then 498 [[ -x ${ROOT}${shell} ]] && break
681 eshell="/usr/bin/false" 499 done
682 else 500
683 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"
684 fi 504 fi
505
506 eshell=${shell}
685 fi 507 fi
686 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
687 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
688 510
689 # handle homedir 511 # handle homedir
690 local ehome="$1"; shift 512 local ehome=$1; shift
691 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
692 then
693 ehome="/dev/null" 514 ehome="/dev/null"
694 fi 515 fi
695 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
696 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
697 518
698 # handle groups 519 # handle groups
699 local egroups="$1"; shift 520 local egroups=$1; shift
700 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
701 then
702 local oldifs="${IFS}" 522 local oldifs=${IFS}
703 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
704 524
705 export IFS="," 525 export IFS=","
706 for g in ${egroups} 526 for g in ${egroups} ; do
707 do
708 export IFS="${oldifs}" 527 export IFS=${oldifs}
709 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
710 then
711 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
712 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
713 fi 531 fi
714 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
715 then
716 defgroup="${g}" 533 defgroup=${g}
717 else 534 else
718 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
719 fi 536 fi
720 export IFS="," 537 export IFS=","
721 done 538 done
722 export IFS="${oldifs}" 539 export IFS=${oldifs}
723 540
724 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
725 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
726 then
727 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
728 fi 544 fi
729 else 545 else
730 egroups="(none)" 546 egroups="(none)"
731 fi 547 fi
732 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
733 549
734 # handle extra and add the user 550 # handle extra and add the user
735 local eextra="$@"
736 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
737 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
738 if useq ppc-macos 553 case ${CHOST} in
739 then 554 *-darwin*)
740 ### Make the user 555 ### Make the user
741 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
742 then
743 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
744 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
745 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
746 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
747 ### Add the user to the groups specified 561 ### Add the user to the groups specified
748 local oldifs="${IFS}" 562 local oldifs=${IFS}
749 export IFS="," 563 export IFS=","
750 for g in ${egroups} 564 for g in ${egroups} ; do
751 do
752 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
753 done 566 done
754 export IFS="${oldifs}" 567 export IFS=${oldifs}
755 else 568 else
756 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
757 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
758 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
759 die "Required function missing" 572 die "Required function missing"
760 fi 573 fi
761 elif use x86-fbsd ; then 574 ;;
762 if [ -z "${eextra}" ] 575 *-freebsd*|*-dragonfly*)
763 then 576 if [[ -z $@ ]] ; then
764 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
765 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
766 die "enewuser failed" 579 die "enewuser failed"
767 else 580 else
768 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
769 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
770 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
771 fi 584 fi
585 ;;
586
587 *-netbsd*)
588 if [[ -z $@ ]] ; then
589 useradd ${opts} ${euser} || die "enewuser failed"
772 else 590 else
773 if [ -z "${eextra}" ] 591 einfo " - Extra: $@"
774 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
775 useradd ${opts} ${euser} \ 611 useradd ${opts} ${euser} \
776 -c "added by portage for ${PN}" \ 612 -c "added by portage for ${PN}" \
777 || die "enewuser failed" 613 || die "enewuser failed"
778 else 614 else
779 einfo " - Extra: ${eextra}" 615 einfo " - Extra: $@"
780 useradd ${opts} ${euser} ${eextra} \ 616 useradd ${opts} ${euser} "$@" \
781 || die "enewuser failed" 617 || die "enewuser failed"
782 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}"
783 fi 627 fi
628
784 export SANDBOX_ON="${oldsandbox}" 629 export SANDBOX_ON=${oldsandbox}
785
786 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
787 then
788 einfo " - Creating ${ehome} in ${D}"
789 dodir ${ehome}
790 fowners ${euser} ${ehome}
791 fperms 755 ${ehome}
792 fi
793} 630}
794 631
795# Simplify/standardize adding groups to the system 632# Simplify/standardize adding groups to the system
796# vapier@gentoo.org 633# vapier@gentoo.org
797# 634#
800# Default values if you do not specify any: 637# Default values if you do not specify any:
801# groupname: REQUIRED ! 638# groupname: REQUIRED !
802# gid: next available (see groupadd(8)) 639# gid: next available (see groupadd(8))
803# extra: none 640# extra: none
804enewgroup() { 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
805 # get the group 649 # get the group
806 local egroup="$1"; shift 650 local egroup="$1"; shift
807 if [ -z "${egroup}" ] 651 if [ -z "${egroup}" ]
808 then 652 then
809 eerror "No group specified !" 653 eerror "No group specified !"
826 then 670 then
827 if [ "${egid}" -gt 0 ] 671 if [ "${egid}" -gt 0 ]
828 then 672 then
829 if [ -z "`egetent group ${egid}`" ] 673 if [ -z "`egetent group ${egid}`" ]
830 then 674 then
831 if useq ppc-macos ; then 675 if [[ "${CHOST}" == *-darwin* ]]; then
832 opts="${opts} ${egid}" 676 opts="${opts} ${egid}"
833 else 677 else
834 opts="${opts} -g ${egid}" 678 opts="${opts} -g ${egid}"
835 fi 679 fi
836 else 680 else
850 opts="${opts} ${eextra}" 694 opts="${opts} ${eextra}"
851 695
852 # add the group 696 # add the group
853 local oldsandbox="${SANDBOX_ON}" 697 local oldsandbox="${SANDBOX_ON}"
854 export SANDBOX_ON="0" 698 export SANDBOX_ON="0"
855 if useq ppc-macos ; then 699 case ${CHOST} in
700 *-darwin*)
856 if [ ! -z "${eextra}" ]; 701 if [ ! -z "${eextra}" ];
857 then 702 then
858 einfo "Extra options are not supported on macos yet" 703 einfo "Extra options are not supported on Darwin/OS X yet"
859 einfo "Please report the ebuild along with the info below" 704 einfo "Please report the ebuild along with the info below"
860 einfo "eextra: ${eextra}" 705 einfo "eextra: ${eextra}"
861 die "Required function missing" 706 die "Required function missing"
862 fi 707 fi
863 708
864 # If we need the next available 709 # If we need the next available
865 case ${egid} in 710 case ${egid} in
866 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
867 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
868 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
869 done 714 done
870 esac 715 esac
871 dscl . create /groups/${egroup} gid ${egid} 716 dscl . create /groups/${egroup} gid ${egid}
872 dscl . create /groups/${egroup} passwd '*' 717 dscl . create /groups/${egroup} passwd '*'
873 elif use x86-fbsd ; then 718 ;;
719
720 *-freebsd*|*-dragonfly*)
874 case ${egid} in 721 case ${egid} in
875 *[!0-9]*) # Non numeric 722 *[!0-9]*) # Non numeric
876 for egid in `jot 898 101`; do 723 for egid in $(seq 101 999); do
877 [ -z "`egetent group ${egid}`" ] && break 724 [ -z "`egetent group ${egid}`" ] && break
878 done 725 done
879 esac 726 esac
880 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
881 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 *)
882 groupadd ${opts} ${egroup} || die "enewgroup failed" 741 groupadd ${opts} ${egroup} || die "enewgroup failed"
883 fi 742 ;;
743 esac
884 export SANDBOX_ON="${oldsandbox}" 744 export SANDBOX_ON="${oldsandbox}"
885} 745}
886 746
887# Simple script to replace 'dos2unix' binaries 747# Simple script to replace 'dos2unix' binaries
888# vapier@gentoo.org 748# vapier@gentoo.org
913# name: the name that will show up in the menu 773# name: the name that will show up in the menu
914# icon: give your little like a pretty little icon ... 774# icon: give your little like a pretty little icon ...
915# this can be relative (to /usr/share/pixmaps) or 775# this can be relative (to /usr/share/pixmaps) or
916# a full path to an icon 776# a full path to an icon
917# type: what kind of application is this ? for categories: 777# type: what kind of application is this ? for categories:
918# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec 778# http://www.freedesktop.org/Standards/desktop-entry-spec
919# path: if your app needs to startup in a specific dir 779# path: if your app needs to startup in a specific dir
920make_desktop_entry() { 780make_desktop_entry() {
921 [[ -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
922 782
923 local exec=${1} 783 local exec=${1}
949 dev) 809 dev)
950 type="Development" 810 type="Development"
951 ;; 811 ;;
952 812
953 games) 813 games)
954 [[ -z ${path} ]] && path=${GAMES_BINDIR}
955
956 case ${catmin} in 814 case ${catmin} in
957 action) type=ActionGame;; 815 action) type=ActionGame;;
958 arcade) type=ArcadeGame;; 816 arcade) type=ArcadeGame;;
959 board) type=BoardGame;; 817 board) type=BoardGame;;
960 kid) type=KidsGame;; 818 kid) type=KidsGame;;
1001 type="Network;${type}" 859 type="Network;${type}"
1002 ;; 860 ;;
1003 861
1004 sci) 862 sci)
1005 case ${catmin} in 863 case ${catmin} in
1006 astro*) type=Astronomoy;; 864 astro*) type=Astronomy;;
1007 bio*) type=Biology;; 865 bio*) type=Biology;;
1008 calc*) type=Calculator;; 866 calc*) type=Calculator;;
1009 chem*) type=Chemistry;; 867 chem*) type=Chemistry;;
1010 geo*) type=Geology;; 868 geo*) type=Geology;;
1011 math*) type=Math;; 869 math*) type=Math;;
1025 *) 883 *)
1026 type= 884 type=
1027 ;; 885 ;;
1028 esac 886 esac
1029 fi 887 fi
1030 888 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}"
890 else
891 local desktop_name="${PN}-${SLOT}"
892 fi
1031 local desktop=${T}/${exec%% *}-${P}.desktop 893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
1032 895
1033echo "[Desktop Entry] 896echo "[Desktop Entry]
1034Encoding=UTF-8 897Encoding=UTF-8
1035Version=0.9.2 898Version=0.9.2
1036Name=${name} 899Name=${name}
1037Type=Application 900Type=Application
1038Comment=${DESCRIPTION} 901Comment=${DESCRIPTION}
1039Exec=${exec} 902Exec=${exec}
903TryExec=${exec}
1040Path=${path} 904Path=${path}
1041Icon=${icon} 905Icon=${icon}
1042Categories=Application;${type};" > "${desktop}" 906Categories=Application;${type};" > "${desktop}"
1043 907
908 (
909 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller
1044 insinto /usr/share/applications 911 insinto /usr/share/applications
1045 doins "${desktop}" 912 doins "${desktop}"
1046 913 )
1047 return 0
1048} 914}
1049 915
1050# Make a GDM/KDM Session file 916# Make a GDM/KDM Session file
1051# 917#
1052# make_desktop_entry(<title>, <command>) 918# make_desktop_entry(<title>, <command>)
1053# title: File to execute to start the Window Manager 919# title: File to execute to start the Window Manager
1054# command: Name of the Window Manager 920# command: Name of the Window Manager
1055 921
1056make_session_desktop() { 922make_session_desktop() {
1057
1058 [ -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
1059 [ -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
1060 925
1061 local title="${1}" 926 local title=$1
1062 local command="${2}" 927 local command=$2
1063 local desktop="${T}/${wm}.desktop" 928 local desktop=${T}/${wm}.desktop
1064 929
1065echo "[Desktop Entry] 930echo "[Desktop Entry]
1066Encoding=UTF-8 931Encoding=UTF-8
1067Name=${title} 932Name=${title}
1068Comment=This session logs you into ${title} 933Comment=This session logs you into ${title}
1070TryExec=${command} 935TryExec=${command}
1071Type=Application" > "${desktop}" 936Type=Application" > "${desktop}"
1072 937
1073 insinto /usr/share/xsessions 938 insinto /usr/share/xsessions
1074 doins "${desktop}" 939 doins "${desktop}"
1075
1076 return 0
1077} 940}
1078 941
1079domenu() { 942domenu() {
1080 local i 943 local i j
1081 local j
1082 insinto /usr/share/applications 944 insinto /usr/share/applications
1083 for i in ${@} 945 for i in "$@" ; do
1084 do
1085 if [ -f "${i}" ]; 946 if [[ -f ${i} ]] ; then
1086 then
1087 doins ${i} 947 doins "${i}"
1088 elif [ -d "${i}" ]; 948 elif [[ -d ${i} ]] ; then
1089 then
1090 for j in ${i}/*.desktop 949 for j in "${i}"/*.desktop ; do
1091 do
1092 doins ${j} 950 doins "${j}"
1093 done 951 done
1094 fi 952 fi
1095 done 953 done
1096} 954}
955newmenu() {
956 insinto /usr/share/applications
957 newins "$1" "$2"
958}
1097 959
1098doicon() { 960doicon() {
1099 local i 961 local i j
1100 local j
1101 insinto /usr/share/pixmaps 962 insinto /usr/share/pixmaps
1102 for i in ${@} 963 for i in "$@" ; do
1103 do
1104 if [ -f "${i}" ]; 964 if [[ -f ${i} ]] ; then
1105 then
1106 doins ${i} 965 doins "${i}"
1107 elif [ -d "${i}" ]; 966 elif [[ -d ${i} ]] ; then
1108 then
1109 for j in ${i}/*.png 967 for j in "${i}"/*.png ; do
1110 do
1111 doins ${j} 968 doins "${j}"
1112 done 969 done
1113 fi 970 fi
1114 done 971 done
972}
973newicon() {
974 insinto /usr/share/pixmaps
975 newins "$1" "$2"
1115} 976}
1116 977
1117############################################################## 978##############################################################
1118# END: Handle .desktop files and menu entries # 979# END: Handle .desktop files and menu entries #
1119############################################################## 980##############################################################
1120 981
1121 982
1122# for internal use only (unpack_pdv and unpack_makeself) 983# for internal use only (unpack_pdv and unpack_makeself)
1123find_unpackable_file() { 984find_unpackable_file() {
1124 local src="$1" 985 local src=$1
1125 if [ -z "${src}" ] 986 if [[ -z ${src} ]] ; then
1126 then
1127 src="${DISTDIR}/${A}" 987 src=${DISTDIR}/${A}
1128 else 988 else
1129 if [ -e "${DISTDIR}/${src}" ] 989 if [[ -e ${DISTDIR}/${src} ]] ; then
1130 then
1131 src="${DISTDIR}/${src}" 990 src=${DISTDIR}/${src}
1132 elif [ -e "${PWD}/${src}" ] 991 elif [[ -e ${PWD}/${src} ]] ; then
1133 then
1134 src="${PWD}/${src}" 992 src=${PWD}/${src}
1135 elif [ -e "${src}" ] 993 elif [[ -e ${src} ]] ; then
1136 then
1137 src="${src}" 994 src=${src}
1138 fi
1139 fi 995 fi
1140 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 996 fi
997 [[ ! -e ${src} ]] && return 1
1141 echo "${src}" 998 echo "${src}"
1142} 999}
1143 1000
1144# Unpack those pesky pdv generated files ... 1001# Unpack those pesky pdv generated files ...
1145# They're self-unpacking programs with the binary package stuffed in 1002# They're self-unpacking programs with the binary package stuffed in
1160# lseek 1017# lseek
1161# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1162# lseek(3, -4, SEEK_END) = 2981250 1019# lseek(3, -4, SEEK_END) = 2981250
1163# 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.
1164unpack_pdv() { 1021unpack_pdv() {
1165 local src="`find_unpackable_file $1`" 1022 local src=$(find_unpackable_file $1)
1166 local sizeoff_t="$2" 1023 local sizeoff_t=$2
1167 1024
1025 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1168 [ -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 :("
1169 1027
1170 local shrtsrc="`basename ${src}`" 1028 local shrtsrc=$(basename "${src}")
1171 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1172 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1173 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\"`
1174 1032
1175 # grab metadata for debug reasons 1033 # grab metadata for debug reasons
1239# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1240# - If the file is not specified then unpack will utilize ${A}. 1098# - If the file is not specified then unpack will utilize ${A}.
1241# - 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
1242# the proper offset from the script itself. 1100# the proper offset from the script itself.
1243unpack_makeself() { 1101unpack_makeself() {
1102 local src_input=${1:-${A}}
1244 local src="$(find_unpackable_file "$1")" 1103 local src=$(find_unpackable_file "${src_input}")
1245 local skip="$2" 1104 local skip=$2
1246 local exe="$3" 1105 local exe=$3
1247 1106
1107 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1108
1248 local shrtsrc="$(basename "${src}")" 1109 local shrtsrc=$(basename "${src}")
1249 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1110 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1250 if [ -z "${skip}" ] 1111 if [[ -z ${skip} ]] ; then
1251 then
1252 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1253 local skip=0 1113 local skip=0
1254 exe=tail 1114 exe=tail
1255 case ${ver} in 1115 case ${ver} in
1256 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
1257 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1269 ;; 1129 ;;
1270 2.1.3) 1130 2.1.3)
1271 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1131 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1272 let skip="skip + 1" 1132 let skip="skip + 1"
1273 ;; 1133 ;;
1274 2.1.4) 1134 2.1.4|2.1.5)
1275 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)
1276 skip=$(head -n ${skip} "${src}" | wc -c) 1136 skip=$(head -n ${skip} "${src}" | wc -c)
1277 exe="dd" 1137 exe="dd"
1278 ;; 1138 ;;
1279 *) 1139 *)
1324check_license() { 1184check_license() {
1325 local lic=$1 1185 local lic=$1
1326 if [ -z "${lic}" ] ; then 1186 if [ -z "${lic}" ] ; then
1327 lic="${PORTDIR}/licenses/${LICENSE}" 1187 lic="${PORTDIR}/licenses/${LICENSE}"
1328 else 1188 else
1329 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1189 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1330 lic="${PORTDIR}/licenses/${src}" 1190 lic="${PORTDIR}/licenses/${lic}"
1331 elif [ -e "${PWD}/${src}" ] ; then 1191 elif [ -e "${PWD}/${lic}" ] ; then
1332 lic="${PWD}/${src}" 1192 lic="${PWD}/${lic}"
1333 elif [ -e "${src}" ] ; then 1193 elif [ -e "${lic}" ] ; then
1334 lic="${src}" 1194 lic="${lic}"
1335 fi
1336 fi 1195 fi
1196 fi
1337 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1197 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1338 local l="`basename ${lic}`" 1198 local l="`basename ${lic}`"
1339 1199
1340 # here is where we check for the licenses the user already 1200 # here is where we check for the licenses the user already
1341 # 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
1342 local shopts=$- 1202 local shopts=$-
1398 # 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
1399 # the # of files they gave us 1259 # the # of files they gave us
1400 local cdcnt=0 1260 local cdcnt=0
1401 local f= 1261 local f=
1402 for f in "$@" ; do 1262 for f in "$@" ; do
1403 cdcnt=$((cdcnt + 1)) 1263 ((++cdcnt))
1404 export CDROM_CHECK_${cdcnt}="$f" 1264 export CDROM_CHECK_${cdcnt}="$f"
1405 done 1265 done
1406 export CDROM_TOTAL_CDS=${cdcnt} 1266 export CDROM_TOTAL_CDS=${cdcnt}
1407 export CDROM_CURRENT_CD=1 1267 export CDROM_CURRENT_CD=1
1408 1268
1409 # now we see if the user gave use CD_ROOT ... 1269 # now we see if the user gave use CD_ROOT ...
1410 # 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
1411 if [[ ! -z ${CD_ROOT} ]] ; then
1412 export CDROM_ROOT=${CD_ROOT}
1413 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1414 return
1415 fi
1416 # do the same for CD_ROOT_X
1417 if [[ ! -z ${CD_ROOT_1} ]] ; then 1271 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1418 local var= 1272 local var=
1419 cdcnt=0 1273 cdcnt=0
1420 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1274 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1421 cdcnt=$((cdcnt + 1)) 1275 ((++cdcnt))
1422 var="CD_ROOT_${cdcnt}" 1276 var="CD_ROOT_${cdcnt}"
1277 [[ -z ${!var} ]] && var="CD_ROOT"
1423 if [[ -z ${!var} ]] ; then 1278 if [[ -z ${!var} ]] ; then
1424 eerror "You must either use just the CD_ROOT" 1279 eerror "You must either use just the CD_ROOT"
1425 eerror "or specify ALL the CD_ROOT_X variables." 1280 eerror "or specify ALL the CD_ROOT_X variables."
1426 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."
1427 die "could not locate CD_ROOT_${cdcnt}" 1282 die "could not locate CD_ROOT_${cdcnt}"
1428 fi 1283 fi
1429 export CDROM_ROOTS_${cdcnt}="${!var}"
1430 done 1284 done
1431 export CDROM_ROOT=${CDROM_ROOTS_1} 1285 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1432 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}
1433 return 1293 return
1434 fi 1294 fi
1435 1295
1296 # User didn't help us out so lets make sure they know they can
1297 # simplify the whole process ...
1436 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1298 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1437 einfon "This ebuild will need the " 1299 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1438 if [[ -z ${CDROM_NAME} ]] ; then
1439 echo "cdrom for ${PN}."
1440 else
1441 echo "${CDROM_NAME}."
1442 fi
1443 echo 1300 echo
1444 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"
1445 einfo "mounted somewhere on your filesystem, just export" 1302 einfo "mounted somewhere on your filesystem, just export"
1446 einfo "the variable CD_ROOT so that it points to the" 1303 einfo "the variable CD_ROOT so that it points to the"
1447 einfo "directory containing the files." 1304 einfo "directory containing the files."
1451 echo 1308 echo
1452 else 1309 else
1453 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1454 cdcnt=0 1311 cdcnt=0
1455 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1456 cdcnt=$((cdcnt + 1)) 1313 ((++cdcnt))
1457 var="CDROM_NAME_${cdcnt}" 1314 var="CDROM_NAME_${cdcnt}"
1458 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1315 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1459 done 1316 done
1460 echo 1317 echo
1461 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"
1462 einfo "mounted somewhere on your filesystem, just export" 1319 einfo "mounted somewhere on your filesystem, just export"
1463 einfo "the following variables so they point to the right place:" 1320 einfo "the following variables so they point to the right place:"
1464 einfon "" 1321 einfon ""
1465 cdcnt=0 1322 cdcnt=0
1466 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1323 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1467 cdcnt=$((cdcnt + 1)) 1324 ((++cdcnt))
1468 echo -n " CD_ROOT_${cdcnt}" 1325 echo -n " CD_ROOT_${cdcnt}"
1469 done 1326 done
1470 echo 1327 echo
1471 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"
1472 einfo "you only have one cdrom, you can export CD_ROOT" 1329 einfo "you only have one cdrom, you can export CD_ROOT"
1475 echo 1332 echo
1476 einfo "For example:" 1333 einfo "For example:"
1477 einfo "export CD_ROOT_1=/mnt/cdrom" 1334 einfo "export CD_ROOT_1=/mnt/cdrom"
1478 echo 1335 echo
1479 fi 1336 fi
1337
1338 export CDROM_SET=""
1480 export CDROM_CURRENT_CD=0 1339 export CDROM_CURRENT_CD=0
1481 cdrom_load_next_cd 1340 cdrom_load_next_cd
1482} 1341}
1483 1342
1484# 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.
1485# 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.
1486# 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.
1487# 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.
1488cdrom_load_next_cd() { 1347cdrom_load_next_cd() {
1489 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1490 local var= 1348 local var
1491 1349 ((++CDROM_CURRENT_CD))
1492 if [[ ! -z ${CD_ROOT} ]] ; then
1493 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1494 return
1495 fi
1496 1350
1497 unset CDROM_ROOT 1351 unset CDROM_ROOT
1498 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1352 var=CD_ROOT_${CDROM_CURRENT_CD}
1353 [[ -z ${!var} ]] && var="CD_ROOT"
1499 if [[ -z ${!var} ]] ; then 1354 if [[ -z ${!var} ]] ; then
1500 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1355 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1501 cdrom_locate_file_on_cd ${!var} 1356 _cdrom_locate_file_on_cd ${!var}
1502 else 1357 else
1503 export CDROM_ROOT=${!var} 1358 export CDROM_ROOT=${!var}
1504 fi 1359 fi
1505 1360
1506 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1361 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1511# 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
1512# 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
1513# displayed and we'll hang out here until: 1368# displayed and we'll hang out here until:
1514# (1) the file is found on a mounted cdrom 1369# (1) the file is found on a mounted cdrom
1515# (2) the user hits CTRL+C 1370# (2) the user hits CTRL+C
1516cdrom_locate_file_on_cd() { 1371_cdrom_locate_file_on_cd() {
1372 local mline=""
1373 local showedmsg=0
1374
1517 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
1518 local dir="$(dirname ${@})" 1383 local dir=$(dirname ${cdset[${i}]})
1519 local file="$(basename ${@})" 1384 local file=$(basename ${cdset[${i}]})
1520 local mline=""
1521 local showedmsg=0
1522 1385
1523 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
1524 [[ -d ${mline}/${dir} ]] || continue 1387 [[ -d ${mline}/${dir} ]] || continue
1525 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then
1526 && 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))
1527 done 1397 done
1528 1398
1529 if [[ -z ${CDROM_ROOT} ]] ; then
1530 echo 1399 echo
1531 if [[ ${showedmsg} -eq 0 ]] ; then 1400 if [[ ${showedmsg} -eq 0 ]] ; then
1532 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1401 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1533 if [[ -z ${CDROM_NAME} ]] ; then 1402 if [[ -z ${CDROM_NAME} ]] ; then
1534 einfo "Please insert the cdrom for ${PN} now !" 1403 einfo "Please insert+mount the cdrom for ${PN} now !"
1535 else
1536 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1537 fi
1538 else 1404 else
1539 if [[ -z ${CDROM_NAME_1} ]] ; then
1540 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1541 else
1542 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1543 einfo "Please insert+mount the ${!var} cdrom now !" 1405 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1544 fi
1545 fi 1406 fi
1546 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
1547 fi 1414 fi
1415 showedmsg=1
1416 fi
1548 einfo "Press return to scan for the cd again" 1417 einfo "Press return to scan for the cd again"
1549 einfo "or hit CTRL+C to abort the emerge." 1418 einfo "or hit CTRL+C to abort the emerge."
1550 read 1419 echo
1551 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"
1552 done 1425 done
1553} 1426}
1554 1427
1555# Make sure that LINGUAS only contains languages that 1428# Make sure that LINGUAS only contains languages that
1556# a package can support 1429# a package can support
1566# directories and uses the union of the lists. 1439# directories and uses the union of the lists.
1567strip-linguas() { 1440strip-linguas() {
1568 local ls newls 1441 local ls newls
1569 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1570 local op=$1; shift 1443 local op=$1; shift
1571 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1572 local d f 1445 local d f
1573 for d in "$@" ; do 1446 for d in "$@" ; do
1574 if [[ ${op} == "-u" ]] ; then 1447 if [[ ${op} == "-u" ]] ; then
1575 newls=${ls} 1448 newls=${ls}
1576 else 1449 else
1577 newls="" 1450 newls=""
1578 fi 1451 fi
1579 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1452 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1580 if [[ ${op} == "-i" ]] ; then 1453 if [[ ${op} == "-i" ]] ; then
1581 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}" 1454 hasq ${f} ${ls} && newls="${newls} ${f}"
1582 else 1455 else
1583 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}" 1456 hasq ${f} ${ls} || newls="${newls} ${f}"
1584 fi 1457 fi
1585 done 1458 done
1586 ls=${newls} 1459 ls=${newls}
1587 done 1460 done
1588 ls=${ls//.po}
1589 else 1461 else
1590 ls=$@ 1462 ls="$@"
1591 fi 1463 fi
1592 1464
1593 ls=" ${ls} "
1594 newls="" 1465 newls=""
1595 for f in ${LINGUAS} ; do 1466 for f in ${LINGUAS} ; do
1596 if [[ ${ls/ ${f} /} != ${ls} ]] ; then 1467 if hasq ${f} ${ls} ; then
1597 newls="${newls} ${f}" 1468 newls="${newls} ${f}"
1598 else 1469 else
1599 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1600 fi 1471 fi
1601 done 1472 done
1602 if [[ -z ${newls} ]] ; then
1603 unset LINGUAS
1604 else
1605 export LINGUAS=${newls:1} 1473 export LINGUAS=${newls:1}
1606 fi
1607} 1474}
1608 1475
1609# moved from kernel.eclass since they are generally useful outside of 1476# moved from kernel.eclass since they are generally useful outside of
1610# kernel.eclass -iggy (20041002) 1477# kernel.eclass -iggy (20041002)
1611 1478
1618 while ((i--)) ; do 1485 while ((i--)) ; do
1619 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1486 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1620 done 1487 done
1621 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1488 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1622 case ${ARCH} in 1489 case ${ARCH} in
1623 x86) export ARCH="i386";; 1490 x86) export ARCH="i386";;
1624 amd64) export ARCH="x86_64";; 1491 amd64) export ARCH="x86_64";;
1625 hppa) export ARCH="parisc";; 1492 hppa) export ARCH="parisc";;
1626 mips) export ARCH="mips";; 1493 mips) export ARCH="mips";;
1627 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!
1628 *) export ARCH="${ARCH}";; 1495 *) export ARCH="${ARCH}";;
1629 esac 1496 esac
1630} 1497}
1631 1498
1632# set's ARCH back to what portage expects 1499# set's ARCH back to what portage expects
1633set_arch_to_portage() { 1500set_arch_to_portage() {
1640 1507
1641# Jeremy Huddleston <eradicator@gentoo.org>: 1508# Jeremy Huddleston <eradicator@gentoo.org>:
1642# preserve_old_lib /path/to/libblah.so.0 1509# preserve_old_lib /path/to/libblah.so.0
1643# preserve_old_lib_notify /path/to/libblah.so.0 1510# preserve_old_lib_notify /path/to/libblah.so.0
1644# 1511#
1645# 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
1646# 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
1647# 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
1648# 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
1649# solution, so instead you can add the following to your ebuilds: 1516# solution, so instead you can add the following to your ebuilds:
1650# 1517#
1677 LIB=$1 1544 LIB=$1
1678 1545
1679 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1546 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1680 SONAME=`basename ${LIB}` 1547 SONAME=`basename ${LIB}`
1681 1548
1682 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."
1683 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"
1684 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,"
1685 einfo "you will need to execute the following command:" 1552 ewarn "you will need to execute the following command:"
1686 einfo " revdep-rebuild --soname ${SONAME}" 1553 ewarn " revdep-rebuild --library ${SONAME}"
1687 einfo 1554 ewarn
1688 einfo "After doing that, you can safely remove ${LIB}" 1555 ewarn "After doing that, you can safely remove ${LIB}"
1689 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1690 fi 1557 fi
1691} 1558}
1692 1559
1693# 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
1694# certain USE flags 1561# certain USE flags
1704 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1705 1572
1706 local PKG=$(best_version $1) 1573 local PKG=$(best_version $1)
1707 shift 1574 shift
1708 1575
1709 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
1710 [[ ! -e ${USEFILE} ]] && return 1 1580 [[ ! -e ${USEFILE} ]] && return 0
1711 1581
1712 local USE_BUILT=$(<${USEFILE}) 1582 local USE_BUILT=$(<${USEFILE})
1713 while [[ $# -gt 0 ]] ; do 1583 while [[ $# -gt 0 ]] ; do
1714 if [[ ${opt} = "-o" ]] ; then 1584 if [[ ${opt} = "-o" ]] ; then
1715 has $1 ${USE_BUILT} && return 0 1585 has $1 ${USE_BUILT} && return 0
1740dopamd() { 1610dopamd() {
1741 [[ -z $1 ]] && die "dopamd requires at least one argument" 1611 [[ -z $1 ]] && die "dopamd requires at least one argument"
1742 1612
1743 use pam || return 0 1613 use pam || return 0
1744 1614
1745 insinto /etc/pam.d 1615 INSDESTTREE=/etc/pam.d \
1746 doins "$@" || die "failed to install $@" 1616 doins "$@" || die "failed to install $@"
1747} 1617}
1748# newpamd <old name> <new name> 1618# newpamd <old name> <new name>
1749# 1619#
1750# 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
1751newpamd() { 1621newpamd() {
1752 [[ $# -ne 2 ]] && die "newpamd requires two arguements" 1622 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1753 1623
1754 use pam || return 0 1624 use pam || return 0
1755 1625
1756 insinto /etc/pam.d 1626 INSDESTTREE=/etc/pam.d \
1757 newins "$1" "$2" || die "failed to install $1 as $2" 1627 newins "$1" "$2" || die "failed to install $1 as $2"
1758} 1628}
1759 1629
1760# make a wrapper script ... 1630# make a wrapper script ...
1761# NOTE: this was originally games_make_wrapper, but I noticed other places where 1631# NOTE: this was originally games_make_wrapper, but I noticed other places where
1767# $4 == extra LD_LIBRARY_PATH's (make it : delimited) 1637# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1768# $5 == path for wrapper 1638# $5 == path for wrapper
1769make_wrapper() { 1639make_wrapper() {
1770 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5 1640 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1771 local tmpwrapper=$(emktemp) 1641 local tmpwrapper=$(emktemp)
1642 # We don't want to quote ${bin} so that people can pass complex
1643 # things as $bin ... "./someprog --args"
1772 cat << EOF > "${tmpwrapper}" 1644 cat << EOF > "${tmpwrapper}"
1773#!/bin/sh 1645#!/bin/sh
1774cd "${chdir}" 1646cd "${chdir:-.}"
1647if [ -n "${libdir}" ] ; then
1648 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1775export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}" 1649 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1650 else
1651 export LD_LIBRARY_PATH="${libdir}"
1652 fi
1653fi
1776exec ${bin} "\$@" 1654exec ${bin} "\$@"
1777EOF 1655EOF
1778 chmod go+rx "${tmpwrapper}" 1656 chmod go+rx "${tmpwrapper}"
1779 if [ -n "${5}" ] 1657 if [[ -n ${path} ]] ; then
1780 then
1781 exeinto ${5} 1658 exeinto "${path}"
1782 newexe "${tmpwrapper}" "${wrapper}" 1659 newexe "${tmpwrapper}" "${wrapper}"
1783 else 1660 else
1784 newbin "${tmpwrapper}" "${wrapper}" 1661 newbin "${tmpwrapper}" "${wrapper}"
1785 fi 1662 fi
1786} 1663}

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

  ViewVC Help
Powered by ViewVC 1.1.20