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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.160  
changed lines
  Added in v.1.275

  ViewVC Help
Powered by ViewVC 1.1.20