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

Diff of /eclass/eutils.eclass

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

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