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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.165  
changed lines
  Added in v.1.245

  ViewVC Help
Powered by ViewVC 1.1.20