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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.162  
changed lines
  Added in v.1.279

  ViewVC Help
Powered by ViewVC 1.1.20