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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.147  
changed lines
  Added in v.1.248

  ViewVC Help
Powered by ViewVC 1.1.20