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

Diff of /eclass/eutils.eclass

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

Revision 1.148 Revision 1.279
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2006 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.148 2005/02/03 23:55:05 azarah 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 -eq 1 ] || [ ! -e /proc/cpuinfo ]
42 then
43 :
44 else
45 CPU_FLAGS=$1
46 USER_CPU=`grep "flags" /proc/cpuinfo`
47
48 for flags in `seq 1 ${#CPU_FLAGS[@]}`
49 do
50 if has ${CPU_FLAGS[$flags - 1]} $USER_CPU && ! has ${CPU_FLAGS[$flags - 1]} $USE
51 then
52 ewarn "Your system is ${CPU_FLAGS[$flags - 1]} capable but you don't have it enabled!"
53 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
54 fi
55
56 if ! has ${CPU_FLAGS[$flags - 1]} $USER_CPU && has ${CPU_FLAGS[$flags -1]} $USE
57 then
58 ewarn "You have ${CPU_FLAGS[$flags - 1]} support enabled but your processor doesn't"
59 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
60 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
61 fi
62 done
63 fi
64}
65 15
66# 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
67# 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
68# 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
69# must be an integer greater than zero. 19# must be an integer greater than zero.
70# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
71epause() { 21epause() {
72 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
73 sleep ${1:-5}
74 fi
75} 23}
76 24
77# 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
78# 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,
79# don't beep. 27# don't beep.
80# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
81ebeep() { 29ebeep() {
82 local n 30 local n
83 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
84 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
85 echo -ne "\a" 33 echo -ne "\a"
86 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
87 echo -ne "\a" 35 echo -ne "\a"
88 sleep 1 36 sleep 1
89 done 37 done
90 fi 38 fi
91} 39}
92 40
93# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
94# 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
95# 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
96# 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
97# 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
98# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
99# See bug #4411 for more info. 47# See bug #4411 for more info.
100# 48#
101# To use, simply call: 49# To use, simply call:
102# 50#
103# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
104# 52#
105# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
106# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
107# to point to the latest version of the library present. 55# to point to the latest version of the library present.
108# 56#
109# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
110# 58#
111gen_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
112 local libdir="$(get_libdir)" 68 local lib libdir=$(get_libdir)
113 # Just make sure it exists 69 # Just make sure it exists
114 dodir /usr/${libdir} 70 dodir /usr/${libdir}
115 71
72 for lib in "${@}" ; do
116 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 73 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
117/* GNU ld script 74 /* GNU ld script
118 Because Gentoo have critical dynamic libraries 75 Since Gentoo has critical dynamic libraries
119 in /lib, and the static versions in /usr/lib, we 76 in /lib, and the static versions in /usr/lib,
120 need to have a "fake" dynamic lib in /usr/lib, 77 we need to have a "fake" dynamic lib in /usr/lib,
121 otherwise we run into linking problems. 78 otherwise we run into linking problems.
122 See bug #4411 on http://bugs.gentoo.org/ for 79
123 more info. */ 80 See bug http://bugs.gentoo.org/4411 for more info.
81 */
124GROUP ( /${libdir}/${1} ) 82 GROUP ( /${libdir}/${lib} )
125END_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}
128
129# Simple function to draw a line consisting of '=' the same length as $*
130#
131# <azarah@gentoo.org> (11 Nov 2002)
132#
133draw_line() {
134 local i=0
135 local str_length=""
136
137 # Handle calls that do not have args, or wc not being installed ...
138 if [ -z "$1" -o ! -x "$(which wc 2>/dev/null)" ]
139 then
140 echo "==============================================================="
141 return 0
142 fi
143
144 # Get the length of $*
145 str_length="$(echo -n "$*" | wc -m)"
146
147 while [ "$i" -lt "${str_length}" ]
148 do
149 echo -n "="
150
151 i=$((i + 1))
152 done 85 done
153
154 echo
155
156 return 0
157} 86}
87
158 88
159# Default directory where patches are located 89# Default directory where patches are located
160EPATCH_SOURCE="${WORKDIR}/patch" 90EPATCH_SOURCE="${WORKDIR}/patch"
161# Default extension for patches 91# Default extension for patches
162EPATCH_SUFFIX="patch.bz2" 92EPATCH_SUFFIX="patch.bz2"
163# Default options for patch 93# Default options for patch
164# 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
165EPATCH_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"
166# 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,
167# and not the full path .. 99# and not the full path ..
168EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
169# Change the printed message for a single patch. 101# Change the printed message for a single patch.
170EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
103# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
171# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
172# 106#
173# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
174# 108#
175EPATCH_FORCE="no" 109EPATCH_FORCE="no"
176 110
177# 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
178# or two patches. 112# or two patches.
189# 123#
190# Patches are applied in current directory. 124# Patches are applied in current directory.
191# 125#
192# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
193# 127#
194# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
195# 129#
196# For example: 130# For example:
197# 131#
198# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
199# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
200# 134#
201# 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
202# specific patches. 136# specific patches.
203# 137#
204# 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
206# hand its a directory, it will set EPATCH_SOURCE to this. 140# hand its a directory, it will set EPATCH_SOURCE to this.
207# 141#
208# <azarah@gentoo.org> (10 Nov 2002) 142# <azarah@gentoo.org> (10 Nov 2002)
209# 143#
210epatch() { 144epatch() {
145 _epatch_draw_line() {
146 [[ -z $1 ]] && set "$(printf "%65s" '')"
147 echo "${1//?/=}"
148 }
149 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
211 local PIPE_CMD="" 150 local PIPE_CMD=""
212 local STDERR_TARGET="${T}/$$.out" 151 local STDERR_TARGET="${T}/$$.out"
213 local PATCH_TARGET="${T}/$$.patch" 152 local PATCH_TARGET="${T}/$$.patch"
214 local PATCH_SUFFIX="" 153 local PATCH_SUFFIX=""
215 local SINGLE_PATCH="no" 154 local SINGLE_PATCH="no"
216 local x="" 155 local x=""
217 156
157 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
158
218 if [ "$#" -gt 1 ] 159 if [ "$#" -gt 1 ]
219 then 160 then
220 local m="" 161 local m=""
221 einfo "${#} patches to apply ..."
222 for m in "$@" ; do 162 for m in "$@" ; do
223 epatch "${m}" 163 epatch "${m}"
224 done 164 done
225 return 0 165 return 0
226 fi 166 fi
280 ;; 220 ;;
281 esac 221 esac
282 222
283 if [ "${SINGLE_PATCH}" = "no" ] 223 if [ "${SINGLE_PATCH}" = "no" ]
284 then 224 then
285 einfo "Applying various patches (bugfixes/updates) ..." 225 einfo "${EPATCH_MULTI_MSG}"
286 fi 226 fi
287 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
288 do 228 do
289 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
290 # 230 #
291 # ???_arch_foo.patch 231 # ???_arch_foo.patch
292 # 232 #
293 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
294 ([ "${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}" ] || \
295 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
296 then 236 then
297 local count=0 237 local count=0
298 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
239 local patchname=${x##*/}
299 240
300 if [ -n "${EPATCH_EXCLUDE}" ] 241 if [ -n "${EPATCH_EXCLUDE}" ]
301 then 242 then
302 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 243 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
303 then 244 then
304 continue 245 continue
305 fi 246 fi
306 fi 247 fi
307 248
309 then 250 then
310 if [ -n "${EPATCH_SINGLE_MSG}" ] 251 if [ -n "${EPATCH_SINGLE_MSG}" ]
311 then 252 then
312 einfo "${EPATCH_SINGLE_MSG}" 253 einfo "${EPATCH_SINGLE_MSG}"
313 else 254 else
314 einfo "Applying ${x##*/} ..." 255 einfo "Applying ${patchname} ..."
315 fi 256 fi
316 else 257 else
317 einfo " ${x##*/} ..." 258 einfo " ${patchname} ..."
318 fi 259 fi
319 260
320 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 261 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
321 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 262 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
322 263
323 # Allow for prefix to differ ... im lazy, so shoot me :/ 264 # Allow for prefix to differ ... im lazy, so shoot me :/
324 while [ "${count}" -lt 5 ] 265 while [ "${count}" -lt 5 ]
325 do 266 do
326 # Generate some useful debug info ... 267 # Generate some useful debug info ...
327 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
329 270
330 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
331 then 272 then
332 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 else 275 else
335 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
336 fi 277 fi
337 278
338 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 281
341 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 284
344 if [ "${PATCH_SUFFIX}" != "patch" ] 285 if [ "${PATCH_SUFFIX}" != "patch" ]
345 then 286 then
346 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 287 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
347 then 288 then
348 echo 289 echo
349 eerror "Could not extract patch!" 290 eerror "Could not extract patch!"
350 #die "Could not extract patch!" 291 #die "Could not extract patch!"
351 count=5 292 count=5
352 break 293 break
353 fi 294 fi
354 fi 295 fi
355 296
356 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 297 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
357 then 298 then
358 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 299 _epatch_draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
359 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 300 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
360 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 301 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
361 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
362 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 303 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 304
364 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 305 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
306 _epatch_assert
365 307
366 if [ "$?" -ne 0 ] 308 if [ "$?" -ne 0 ]
367 then 309 then
368 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 310 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
369 echo 311 echo
370 eerror "A dry-run of patch command succeeded, but actually" 312 eerror "A dry-run of patch command succeeded, but actually"
371 eerror "applying the patch failed!" 313 eerror "applying the patch failed!"
372 #die "Real world sux compared to the dreamworld!" 314 #die "Real world sux compared to the dreamworld!"
373 count=5 315 count=5
374 fi 316 fi
375 317
376 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 319
378 break 320 break
379 fi 321 fi
380 322
381 count=$((count + 1)) 323 count=$((count + 1))
387 fi 329 fi
388 330
389 if [ "${count}" -eq 5 ] 331 if [ "${count}" -eq 5 ]
390 then 332 then
391 echo 333 echo
392 eerror "Failed Patch: ${x##*/}!" 334 eerror "Failed Patch: ${patchname} !"
335 eerror " ( ${PATCH_TARGET} )"
393 eerror 336 eerror
394 eerror "Include in your bugreport the contents of:" 337 eerror "Include in your bugreport the contents of:"
395 eerror 338 eerror
396 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 339 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
397 echo 340 echo
398 die "Failed Patch: ${x##*/}!" 341 die "Failed Patch: ${patchname}!"
399 fi 342 fi
400 343
401 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 344 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
402 345
403 eend 0 346 eend 0
404 fi 347 fi
405 done 348 done
406 if [ "${SINGLE_PATCH}" = "no" ] 349 if [ "${SINGLE_PATCH}" = "no" ]
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/standards/menu-spec/ 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}
921 local name="${2:-${PN}}" 788 local name=${2:-${PN}}
922 local icon="${3:-${PN}.png}" 789 local icon=${3:-${PN}.png}
923 local type="${4}" 790 local type=${4}
924 local subdir="${6}" 791 local path=${5}
925 local path="${5:-${GAMES_BINDIR}}" 792
926 if [ -z "${type}" ] 793 if [[ -z ${type} ]] ; then
927 then 794 local catmaj=${CATEGORY%%-*}
928 case ${CATEGORY} in 795 local catmin=${CATEGORY##*-}
929 "app-emulation") 796 case ${catmaj} in
930 type=Emulator 797 app)
931 subdir="Emulation" 798 case ${catmin} in
799 admin) type=System;;
800 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;;
802 editors) type=TextEditor;;
803 emacs) type=TextEditor;;
804 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;;
806 office) type=Office;;
807 vim) type=TextEditor;;
808 xemacs) type=TextEditor;;
809 *) type=;;
810 esac
932 ;; 811 ;;
933 "games-"*) 812
934 type=Game 813 dev)
935 subdir="Games" 814 type="Development"
936 ;; 815 ;;
937 "net-"*) 816
938 type=Network 817 games)
939 subdir="${type}" 818 case ${catmin} in
819 action|fps) type=ActionGame;;
820 arcade) type=ArcadeGame;;
821 board) type=BoardGame;;
822 kids) type=KidsGame;;
823 emulation) type=Emulator;;
824 puzzle) type=LogicGame;;
825 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;;
828 sports) type=SportsGame;;
829 strategy) type=StrategyGame;;
830 *) type=;;
831 esac
832 type="Game;${type}"
940 ;; 833 ;;
834
835 mail)
836 type="Network;Email"
837 ;;
838
839 media)
840 case ${catmin} in
841 gfx) type=Graphics;;
842 radio) type=Tuner;;
843 sound) type=Audio;;
844 tv) type=TV;;
845 video) type=Video;;
846 *) type=;;
847 esac
848 type="AudioVideo;${type}"
849 ;;
850
851 net)
852 case ${catmin} in
853 dialup) type=Dialup;;
854 ftp) type=FileTransfer;;
855 im) type=InstantMessaging;;
856 irc) type=IRCClient;;
857 mail) type=Email;;
858 news) type=News;;
859 nntp) type=News;;
860 p2p) type=FileTransfer;;
861 *) type=;;
862 esac
863 type="Network;${type}"
864 ;;
865
866 sci)
867 case ${catmin} in
868 astro*) type=Astronomy;;
869 bio*) type=Biology;;
870 calc*) type=Calculator;;
871 chem*) type=Chemistry;;
872 geo*) type=Geology;;
873 math*) type=Math;;
874 *) type=;;
875 esac
876 type="Science;${type}"
877 ;;
878
879 www)
880 case ${catmin} in
881 client) type=WebBrowser;;
882 *) type=;;
883 esac
884 type="Network"
885 ;;
886
941 *) 887 *)
942 type= 888 type=
943 subdir=
944 ;; 889 ;;
945 esac 890 esac
946 fi 891 fi
947 local desktop="${T}/${exec}.desktop" 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"
898 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
948 899
900 cat <<-EOF > "${desktop}"
949echo "[Desktop Entry] 901 [Desktop Entry]
950Encoding=UTF-8 902 Encoding=UTF-8
951Version=0.9.2 903 Version=0.9.2
952Name=${name} 904 Name=${name}
953Type=Application 905 Type=Application
954Comment=${DESCRIPTION} 906 Comment=${DESCRIPTION}
955Exec=${exec} 907 Exec=${exec}
908 TryExec=${exec%% *}
956Path=${path} 909 Path=${path}
957Icon=${icon} 910 Icon=${icon}
958Categories=Application;${type};" > "${desktop}" 911 Categories=Application;${type};
912 EOF
959 913
914 (
915 # wrap the env here so that the 'insinto' call
916 # doesn't corrupt the env of the caller
960 insinto /usr/share/applications 917 insinto /usr/share/applications
961 doins "${desktop}" 918 doins "${desktop}"
962 919 )
963 return 0
964} 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
965 950
966# Make a GDM/KDM Session file 951# Make a GDM/KDM Session file
967# 952#
968# make_desktop_entry(<title>, <command>) 953# make_session_desktop(<title>, <command>)
969# title: File to execute to start the Window Manager 954# title: File to execute to start the Window Manager
970# command: Name of the Window Manager 955# command: Name of the Window Manager
971 956
972make_session_desktop() { 957make_session_desktop() {
973
974 [ -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
975 [ -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
976 960
977 local title="${1}" 961 local title=$1
978 local command="${2}" 962 local command=$2
979 local desktop="${T}/${wm}.desktop" 963 local desktop=${T}/${wm}.desktop
980 964
965 cat <<-EOF > "${desktop}"
981echo "[Desktop Entry] 966 [Desktop Entry]
982Encoding=UTF-8 967 Encoding=UTF-8
983Name=${title} 968 Name=${title}
984Comment=This session logs you into ${title} 969 Comment=This session logs you into ${title}
985Exec=${command} 970 Exec=${command}
986TryExec=${command} 971 TryExec=${command}
987Type=Application" > "${desktop}" 972 Type=Application
973 EOF
988 974
975 (
976 # wrap the env here so that the 'insinto' call
977 # doesn't corrupt the env of the caller
989 insinto /usr/share/xsessions 978 insinto /usr/share/xsessions
990 doins "${desktop}" 979 doins "${desktop}"
991 980 )
992 return 0
993} 981}
994 982
995domenu() { 983domenu() {
996 local i 984 (
997 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
998 insinto /usr/share/applications 988 insinto /usr/share/applications
999 for i in ${@} 989 for i in "$@" ; do
1000 do
1001 if [ -f "${i}" ]; 990 if [[ -f ${i} ]] ; then
1002 then
1003 doins ${i} 991 doins "${i}"
992 ((ret+=$?))
1004 elif [ -d "${i}" ]; 993 elif [[ -d ${i} ]] ; then
1005 then
1006 for j in ${i}/*.desktop 994 for j in "${i}"/*.desktop ; do
1007 do
1008 doins ${j} 995 doins "${j}"
996 ((ret+=$?))
1009 done 997 done
1010 fi 998 fi
1011 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 )
1012} 1010}
1013 1011
1014doicon() { 1012doicon() {
1015 local i 1013 (
1016 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
1017 insinto /usr/share/pixmaps 1017 insinto /usr/share/pixmaps
1018 for i in ${@} 1018 for i in "$@" ; do
1019 do
1020 if [ -f "${i}" ]; 1019 if [[ -f ${i} ]] ; then
1021 then
1022 doins ${i} 1020 doins "${i}"
1021 ((ret+=$?))
1023 elif [ -d "${i}" ]; 1022 elif [[ -d ${i} ]] ; then
1024 then
1025 for j in ${i}/*.png 1023 for j in "${i}"/*.png ; do
1026 do
1027 doins ${j} 1024 doins "${j}"
1025 ((ret+=$?))
1028 done 1026 done
1029 fi 1027 fi
1030 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 )
1031} 1039}
1032 1040
1033############################################################## 1041##############################################################
1034# END: Handle .desktop files and menu entries # 1042# END: Handle .desktop files and menu entries #
1035############################################################## 1043##############################################################
1036 1044
1037 1045
1038# for internal use only (unpack_pdv and unpack_makeself) 1046# for internal use only (unpack_pdv and unpack_makeself)
1039find_unpackable_file() { 1047find_unpackable_file() {
1040 local src="$1" 1048 local src=$1
1041 if [ -z "${src}" ] 1049 if [[ -z ${src} ]] ; then
1042 then
1043 src="${DISTDIR}/${A}" 1050 src=${DISTDIR}/${A}
1044 else 1051 else
1045 if [ -e "${DISTDIR}/${src}" ] 1052 if [[ -e ${DISTDIR}/${src} ]] ; then
1046 then
1047 src="${DISTDIR}/${src}" 1053 src=${DISTDIR}/${src}
1048 elif [ -e "${PWD}/${src}" ] 1054 elif [[ -e ${PWD}/${src} ]] ; then
1049 then
1050 src="${PWD}/${src}" 1055 src=${PWD}/${src}
1051 elif [ -e "${src}" ] 1056 elif [[ -e ${src} ]] ; then
1052 then
1053 src="${src}" 1057 src=${src}
1054 fi
1055 fi 1058 fi
1056 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 1059 fi
1060 [[ ! -e ${src} ]] && return 1
1057 echo "${src}" 1061 echo "${src}"
1058} 1062}
1059 1063
1060# Unpack those pesky pdv generated files ... 1064# Unpack those pesky pdv generated files ...
1061# They're self-unpacking programs with the binary package stuffed in 1065# They're self-unpacking programs with the binary package stuffed in
1062# 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
1063# 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.
1064# 1068#
1065# Usage: unpack_pdv [file to unpack] [size of off_t] 1069# Usage: unpack_pdv [file to unpack] [size of off_t]
1066# - 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
1067# information out of the binary executable myself. basically you pass in 1071# information out of the binary executable myself. basically you pass in
1068# 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
1069# 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:
1070# strings <pdv archive> | grep lseek 1074# strings <pdv archive> | grep lseek
1071# strace -elseek <pdv archive> 1075# strace -elseek <pdv archive>
1072# 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
1073# 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
1074# parameter. here is an example: 1078# parameter. here is an example:
1075# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1079# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1076# lseek 1080# lseek
1077# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1081# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1078# lseek(3, -4, SEEK_END) = 2981250 1082# lseek(3, -4, SEEK_END) = 2981250
1079# 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.
1080unpack_pdv() { 1084unpack_pdv() {
1081 local src="`find_unpackable_file $1`" 1085 local src=$(find_unpackable_file "$1")
1082 local sizeoff_t="$2" 1086 local sizeoff_t=$2
1083 1087
1088 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1084 [ -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 :("
1085 1090
1086 local shrtsrc="`basename ${src}`" 1091 local shrtsrc=$(basename "${src}")
1087 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1092 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1088 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1093 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1089 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\")
1090 1095
1091 # grab metadata for debug reasons 1096 # grab metadata for debug reasons
1092 local metafile="$(emktemp)" 1097 local metafile=$(emktemp)
1093 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1098 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1094 1099
1095 # rip out the final file name from the metadata 1100 # rip out the final file name from the metadata
1096 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1101 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1097 datafile="`basename ${datafile}`" 1102 datafile=$(basename "${datafile}")
1098 1103
1099 # now lets uncompress/untar the file if need be 1104 # now lets uncompress/untar the file if need be
1100 local tmpfile="$(emktemp)" 1105 local tmpfile=$(emktemp)
1101 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}
1102 1107
1103 local iscompressed="`file -b ${tmpfile}`" 1108 local iscompressed=$(file -b "${tmpfile}")
1104 if [ "${iscompressed:0:8}" == "compress" ] ; then 1109 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1105 iscompressed=1 1110 iscompressed=1
1106 mv ${tmpfile}{,.Z} 1111 mv ${tmpfile}{,.Z}
1107 gunzip ${tmpfile} 1112 gunzip ${tmpfile}
1108 else 1113 else
1109 iscompressed=0 1114 iscompressed=0
1110 fi 1115 fi
1111 local istar="`file -b ${tmpfile}`" 1116 local istar=$(file -b "${tmpfile}")
1112 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1117 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1113 istar=1 1118 istar=1
1114 else 1119 else
1115 istar=0 1120 istar=0
1116 fi 1121 fi
1117 1122
1153# many other game companies. 1158# many other game companies.
1154# 1159#
1155# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1160# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1156# - If the file is not specified then unpack will utilize ${A}. 1161# - If the file is not specified then unpack will utilize ${A}.
1157# - 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
1158# the proper offset from the script itself. 1163# the proper offset from the script itself.
1159unpack_makeself() { 1164unpack_makeself() {
1165 local src_input=${1:-${A}}
1160 local src="$(find_unpackable_file "$1")" 1166 local src=$(find_unpackable_file "${src_input}")
1161 local skip="$2" 1167 local skip=$2
1162 local exe="$3" 1168 local exe=$3
1163 1169
1170 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1171
1164 local shrtsrc="$(basename "${src}")" 1172 local shrtsrc=$(basename "${src}")
1165 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1173 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1166 if [ -z "${skip}" ] 1174 if [[ -z ${skip} ]] ; then
1167 then
1168 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1175 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1169 local skip=0 1176 local skip=0
1170 exe=tail 1177 exe=tail
1171 case ${ver} in 1178 case ${ver} in
1172 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
1173 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1180 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1174 ;; 1181 ;;
1175 2.0|2.0.1) 1182 2.0|2.0.1)
1176 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1183 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1177 ;; 1184 ;;
1185 ;; 1192 ;;
1186 2.1.3) 1193 2.1.3)
1187 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1194 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1188 let skip="skip + 1" 1195 let skip="skip + 1"
1189 ;; 1196 ;;
1190 2.1.4) 1197 2.1.4|2.1.5)
1191 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)
1192 skip=$(head -n ${skip} "${src}" | wc -c) 1199 skip=$(head -n ${skip} "${src}" | wc -c)
1193 exe="dd" 1200 exe="dd"
1194 ;; 1201 ;;
1195 *) 1202 *)
1207 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}'";;
1208 *) die "makeself cant handle exe '${exe}'" 1215 *) die "makeself cant handle exe '${exe}'"
1209 esac 1216 esac
1210 1217
1211 # 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
1212 local tmpfile="$(emktemp)" 1219 local tmpfile=$(emktemp)
1213 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1220 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1214 local filetype="$(file -b "${tmpfile}")" 1221 local filetype=$(file -b "${tmpfile}")
1215 case ${filetype} in 1222 case ${filetype} in
1216 *tar\ archive) 1223 *tar\ archive*)
1217 eval ${exe} | tar --no-same-owner -xf - 1224 eval ${exe} | tar --no-same-owner -xf -
1218 ;; 1225 ;;
1219 bzip2*) 1226 bzip2*)
1220 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1227 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1221 ;; 1228 ;;
1240check_license() { 1247check_license() {
1241 local lic=$1 1248 local lic=$1
1242 if [ -z "${lic}" ] ; then 1249 if [ -z "${lic}" ] ; then
1243 lic="${PORTDIR}/licenses/${LICENSE}" 1250 lic="${PORTDIR}/licenses/${LICENSE}"
1244 else 1251 else
1245 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1252 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1246 lic="${PORTDIR}/licenses/${src}" 1253 lic="${PORTDIR}/licenses/${lic}"
1247 elif [ -e "${PWD}/${src}" ] ; then 1254 elif [ -e "${PWD}/${lic}" ] ; then
1248 lic="${PWD}/${src}" 1255 lic="${PWD}/${lic}"
1249 elif [ -e "${src}" ] ; then 1256 elif [ -e "${lic}" ] ; then
1250 lic="${src}" 1257 lic="${lic}"
1251 fi
1252 fi 1258 fi
1259 fi
1253 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1260 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1254 local l="`basename ${lic}`" 1261 local l="`basename ${lic}`"
1255 1262
1256 # here is where we check for the licenses the user already 1263 # here is where we check for the licenses the user already
1257 # 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
1258 local shopts=$- 1265 local shopts=$-
1259 local alic 1266 local alic
1260 set -o noglob #so that bash doesn't expand "*" 1267 set -o noglob #so that bash doesn't expand "*"
1261 for alic in ${ACCEPT_LICENSE} ; do 1268 for alic in ${ACCEPT_LICENSE} ; do
1262 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1269 if [[ ${alic} == ${l} ]]; then
1263 set +o noglob; set -${shopts} #reset old shell opts 1270 set +o noglob; set -${shopts} #reset old shell opts
1264 return 0 1271 return 0
1265 fi 1272 fi
1266 done 1273 done
1267 set +o noglob; set -$shopts #reset old shell opts 1274 set +o noglob; set -$shopts #reset old shell opts
1268 1275
1269 local licmsg="$(emktemp)" 1276 local licmsg=$(emktemp)
1270 cat << EOF > ${licmsg} 1277 cat <<-EOF > ${licmsg}
1271********************************************************** 1278 **********************************************************
1272The following license outlines the terms of use of this 1279 The following license outlines the terms of use of this
1273package. You MUST accept this license for installation to 1280 package. You MUST accept this license for installation to
1274continue. When you are done viewing, hit 'q'. If you 1281 continue. When you are done viewing, hit 'q'. If you
1275CTRL+C out of this, the install will not run! 1282 CTRL+C out of this, the install will not run!
1276********************************************************** 1283 **********************************************************
1277 1284
1278EOF 1285 EOF
1279 cat ${lic} >> ${licmsg} 1286 cat ${lic} >> ${licmsg}
1280 ${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}"
1281 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] "
1282 read alic 1289 read alic
1283 case ${alic} in 1290 case ${alic} in
1300# 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
1301# found at CDROM_ROOT. 1308# found at CDROM_ROOT.
1302# 1309#
1303# 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',
1304# 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
1305# 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_#
1306# 1317#
1307# 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.
1308# 1319#
1309# 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] [...]
1310# - 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
1311# 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
1312# the cdrom functions will handle 1323# the cdrom functions will handle
1313cdrom_get_cds() { 1324cdrom_get_cds() {
1314 # 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
1315 # the # of files they gave us 1326 # the # of files they gave us
1316 local cdcnt=0 1327 local cdcnt=0
1317 local f= 1328 local f=
1318 for f in "$@" ; do 1329 for f in "$@" ; do
1319 cdcnt=$((cdcnt + 1)) 1330 ((++cdcnt))
1320 export CDROM_CHECK_${cdcnt}="$f" 1331 export CDROM_CHECK_${cdcnt}="$f"
1321 done 1332 done
1322 export CDROM_TOTAL_CDS=${cdcnt} 1333 export CDROM_TOTAL_CDS=${cdcnt}
1323 export CDROM_CURRENT_CD=1 1334 export CDROM_CURRENT_CD=1
1324 1335
1325 # now we see if the user gave use CD_ROOT ... 1336 # now we see if the user gave use CD_ROOT ...
1326 # 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
1327 if [[ ! -z ${CD_ROOT} ]] ; then
1328 export CDROM_ROOT=${CD_ROOT}
1329 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1330 return
1331 fi
1332 # do the same for CD_ROOT_X
1333 if [[ ! -z ${CD_ROOT_1} ]] ; then 1338 if [[ -n ${CD_ROOT}${CD_ROOT_1} ]] ; then
1334 local var= 1339 local var=
1335 cdcnt=0 1340 cdcnt=0
1336 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1341 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1337 cdcnt=$((cdcnt + 1)) 1342 ((++cdcnt))
1338 var="CD_ROOT_${cdcnt}" 1343 var="CD_ROOT_${cdcnt}"
1344 [[ -z ${!var} ]] && var="CD_ROOT"
1339 if [[ -z ${!var} ]] ; then 1345 if [[ -z ${!var} ]] ; then
1340 eerror "You must either use just the CD_ROOT" 1346 eerror "You must either use just the CD_ROOT"
1341 eerror "or specify ALL the CD_ROOT_X variables." 1347 eerror "or specify ALL the CD_ROOT_X variables."
1342 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."
1343 die "could not locate CD_ROOT_${cdcnt}" 1349 die "could not locate CD_ROOT_${cdcnt}"
1344 fi 1350 fi
1345 export CDROM_ROOTS_${cdcnt}="${!var}"
1346 done 1351 done
1347 export CDROM_ROOT=${CDROM_ROOTS_1} 1352 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1348 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}
1349 return 1360 return
1350 fi 1361 fi
1351 1362
1363 # User didn't help us out so lets make sure they know they can
1364 # simplify the whole process ...
1352 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1365 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1353 einfon "This ebuild will need the " 1366 einfo "This ebuild will need the ${CDROM_NAME:-cdrom for ${PN}}"
1354 if [[ -z ${CDROM_NAME} ]] ; then
1355 echo "cdrom for ${PN}."
1356 else
1357 echo "${CDROM_NAME}."
1358 fi
1359 echo 1367 echo
1360 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"
1361 einfo "mounted somewhere on your filesystem, just export" 1369 einfo "mounted somewhere on your filesystem, just export"
1362 einfo "the variable CD_ROOT so that it points to the" 1370 einfo "the variable CD_ROOT so that it points to the"
1363 einfo "directory containing the files." 1371 einfo "directory containing the files."
1364 echo 1372 echo
1365 einfo "For example:" 1373 einfo "For example:"
1366 einfo "export CD_ROOT=/mnt/cdrom" 1374 einfo "export CD_ROOT=/mnt/cdrom"
1367 echo 1375 echo
1368 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
1369 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1386 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1370 cdcnt=0 1387 cdcnt=0
1371 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1388 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1372 cdcnt=$((cdcnt + 1)) 1389 ((++cdcnt))
1373 var="CDROM_NAME_${cdcnt}" 1390 var="CDROM_NAME_${cdcnt}"
1374 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}" 1391 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1375 done 1392 done
1376 echo 1393 echo
1377 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"
1378 einfo "mounted somewhere on your filesystem, just export" 1395 einfo "mounted somewhere on your filesystem, just export"
1379 einfo "the following variables so they point to the right place:" 1396 einfo "the following variables so they point to the right place:"
1380 einfon "" 1397 einfon ""
1381 cdcnt=0 1398 cdcnt=0
1382 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1399 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1383 cdcnt=$((cdcnt + 1)) 1400 ((++cdcnt))
1384 echo -n " CD_ROOT_${cdcnt}" 1401 echo -n " CD_ROOT_${cdcnt}"
1385 done 1402 done
1386 echo 1403 echo
1387 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"
1388 einfo "you only have one cdrom, you can export CD_ROOT" 1405 einfo "you only have one cdrom, you can export CD_ROOT"
1391 echo 1408 echo
1392 einfo "For example:" 1409 einfo "For example:"
1393 einfo "export CD_ROOT_1=/mnt/cdrom" 1410 einfo "export CD_ROOT_1=/mnt/cdrom"
1394 echo 1411 echo
1395 fi 1412 fi
1413
1414 export CDROM_SET=""
1396 export CDROM_CURRENT_CD=0 1415 export CDROM_CURRENT_CD=0
1397 cdrom_load_next_cd 1416 cdrom_load_next_cd
1398} 1417}
1399 1418
1400# 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.
1401# 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.
1402# 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.
1403# 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.
1404cdrom_load_next_cd() { 1423cdrom_load_next_cd() {
1405 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1406 local var= 1424 local var
1407 1425 ((++CDROM_CURRENT_CD))
1408 if [[ ! -z ${CD_ROOT} ]] ; then
1409 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1410 return
1411 fi
1412 1426
1413 unset CDROM_ROOT 1427 unset CDROM_ROOT
1414 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1428 var=CD_ROOT_${CDROM_CURRENT_CD}
1429 [[ -z ${!var} ]] && var="CD_ROOT"
1415 if [[ -z ${!var} ]] ; then 1430 if [[ -z ${!var} ]] ; then
1416 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1431 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1417 cdrom_locate_file_on_cd ${!var} 1432 _cdrom_locate_file_on_cd ${!var}
1418 else 1433 else
1419 export CDROM_ROOT=${!var} 1434 export CDROM_ROOT=${!var}
1420 fi 1435 fi
1421 1436
1422 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1437 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1427# 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
1428# 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
1429# displayed and we'll hang out here until: 1444# displayed and we'll hang out here until:
1430# (1) the file is found on a mounted cdrom 1445# (1) the file is found on a mounted cdrom
1431# (2) the user hits CTRL+C 1446# (2) the user hits CTRL+C
1432cdrom_locate_file_on_cd() { 1447_cdrom_locate_file_on_cd() {
1448 local mline=""
1449 local showedmsg=0
1450
1433 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
1434 local dir="$(dirname ${@})" 1459 local dir=$(dirname ${cdset[${i}]})
1435 local file="$(basename ${@})" 1460 local file=$(basename ${cdset[${i}]})
1436 local mline=""
1437 local showedmsg=0
1438 1461
1439 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1462 local point= node= fs= foo=
1440 [[ -d ${mline}/${dir} ]] || continue 1463 while read point node fs foo ; do
1441 [[ ! -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
1442 && 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))
1443 done 1476 done
1444 1477
1445 if [[ -z ${CDROM_ROOT} ]] ; then
1446 echo 1478 echo
1447 if [[ ${showedmsg} -eq 0 ]] ; then 1479 if [[ ${showedmsg} -eq 0 ]] ; then
1448 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then 1480 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1449 if [[ -z ${CDROM_NAME} ]] ; then 1481 if [[ -z ${CDROM_NAME} ]] ; then
1450 einfo "Please insert the cdrom for ${PN} now !" 1482 einfo "Please insert+mount the cdrom for ${PN} now !"
1451 else
1452 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1453 fi
1454 else 1483 else
1455 if [[ -z ${CDROM_NAME_1} ]] ; then
1456 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1457 else
1458 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1459 einfo "Please insert+mount the ${!var} cdrom now !" 1484 einfo "Please insert+mount the ${CDROM_NAME} cdrom now !"
1460 fi
1461 fi 1485 fi
1462 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
1463 fi 1493 fi
1494 showedmsg=1
1495 fi
1464 einfo "Press return to scan for the cd again" 1496 einfo "Press return to scan for the cd again"
1465 einfo "or hit CTRL+C to abort the emerge." 1497 einfo "or hit CTRL+C to abort the emerge."
1466 read 1498 echo
1467 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"
1468 done 1504 done
1469} 1505}
1470 1506
1471# Make sure that LINGUAS only contains languages that 1507# Make sure that LINGUAS only contains languages that
1472# a package can support 1508# a package can support
1473# 1509#
1474# usage: strip-linguas <allow LINGUAS> 1510# usage: strip-linguas <allow LINGUAS>
1475# strip-linguas -i <directories of .po files> 1511# strip-linguas -i <directories of .po files>
1476# strip-linguas -u <directories of .po files> 1512# strip-linguas -u <directories of .po files>
1477# 1513#
1478# The first form allows you to specify a list of LINGUAS. 1514# The first form allows you to specify a list of LINGUAS.
1479# 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
1480# directories and uses the intersection of the lists. 1516# directories and uses the intersection of the lists.
1481# 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
1482# directories and uses the union of the lists. 1518# directories and uses the union of the lists.
1483strip-linguas() { 1519strip-linguas() {
1484 local ls newls 1520 local ls newls nols
1485 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1521 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1486 local op="$1"; shift 1522 local op=$1; shift
1487 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1523 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1488 local d f 1524 local d f
1489 for d in "$@" ; do 1525 for d in "$@" ; do
1490 if [ "${op}" == "-u" ] ; then 1526 if [[ ${op} == "-u" ]] ; then
1491 newls="${ls}" 1527 newls=${ls}
1492 else 1528 else
1493 newls="" 1529 newls=""
1494 fi 1530 fi
1495 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1531 for f in $(find "$d" -name '*.po' -exec basename {} .po \;) ; do
1496 if [ "${op}" == "-i" ] ; then 1532 if [[ ${op} == "-i" ]] ; then
1497 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1533 hasq ${f} ${ls} && newls="${newls} ${f}"
1498 else 1534 else
1499 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1535 hasq ${f} ${ls} || newls="${newls} ${f}"
1500 fi 1536 fi
1501 done 1537 done
1502 ls="${newls}" 1538 ls=${newls}
1503 done 1539 done
1504 ls="${ls//.po}"
1505 else 1540 else
1506 ls="$@" 1541 ls="$@"
1507 fi 1542 fi
1508 1543
1509 ls=" ${ls} " 1544 nols=""
1510 newls="" 1545 newls=""
1511 for f in ${LINGUAS} ; do 1546 for f in ${LINGUAS} ; do
1512 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1547 if hasq ${f} ${ls} ; then
1513 newls="${newls} ${f}" 1548 newls="${newls} ${f}"
1514 else 1549 else
1515 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1550 nols="${nols} ${f}"
1516 fi 1551 fi
1517 done 1552 done
1518 if [ -z "${newls}" ] ; then 1553 [[ -n ${nols} ]] \
1519 unset LINGUAS 1554 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1520 else
1521 export LINGUAS="${newls}" 1555 export LINGUAS=${newls:1}
1522 fi
1523} 1556}
1524 1557
1525# moved from kernel.eclass since they are generally useful outside of 1558# moved from kernel.eclass since they are generally useful outside of
1526# kernel.eclass -iggy (20041002) 1559# kernel.eclass -iggy (20041002)
1527 1560
1539 x86) export ARCH="i386";; 1572 x86) export ARCH="i386";;
1540 amd64) export ARCH="x86_64";; 1573 amd64) export ARCH="x86_64";;
1541 hppa) export ARCH="parisc";; 1574 hppa) export ARCH="parisc";;
1542 mips) export ARCH="mips";; 1575 mips) export ARCH="mips";;
1543 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!
1544 *) export ARCH="${ARCH}";; 1577 *) export ARCH="${ARCH}";;
1545 esac 1578 esac
1546} 1579}
1547 1580
1548# set's ARCH back to what portage expects 1581# set's ARCH back to what portage expects
1549set_arch_to_portage() { 1582set_arch_to_portage() {
1556 1589
1557# Jeremy Huddleston <eradicator@gentoo.org>: 1590# Jeremy Huddleston <eradicator@gentoo.org>:
1558# preserve_old_lib /path/to/libblah.so.0 1591# preserve_old_lib /path/to/libblah.so.0
1559# preserve_old_lib_notify /path/to/libblah.so.0 1592# preserve_old_lib_notify /path/to/libblah.so.0
1560# 1593#
1561# 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
1562# 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
1563# 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
1564# 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
1565# solution, so instead you can add the following to your ebuilds: 1598# solution, so instead you can add the following to your ebuilds:
1566# 1599#
1567# src_install() { 1600# pkg_preinst() {
1568# ... 1601# ...
1569# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1602# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1570# ... 1603# ...
1571# } 1604# }
1572# 1605#
1575# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1608# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1576# ... 1609# ...
1577# } 1610# }
1578 1611
1579preserve_old_lib() { 1612preserve_old_lib() {
1580 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]"
1581 1618
1582 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1619 local lib dir
1583 SONAME=`basename ${LIB}` 1620 for lib in "$@" ; do
1584 DIRNAME=`dirname ${LIB}` 1621 [[ -e ${ROOT}/${lib} ]] || continue
1585 1622 dir=${lib%/*}
1586 dodir ${DIRNAME} 1623 dodir ${dir} || die "dodir ${dir} failed"
1587 cp ${ROOT}${LIB} ${D}${DIRNAME} 1624 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1588 touch ${D}${LIB} 1625 touch "${D}"/${lib}
1589 fi 1626 done
1590} 1627}
1591 1628
1592preserve_old_lib_notify() { 1629preserve_old_lib_notify() {
1593 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
1594 1634
1595 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1635 local lib notice=0
1596 SONAME=`basename ${LIB}` 1636 for lib in "$@" ; do
1597 1637 [[ -e ${ROOT}/${lib} ]] || continue
1638 if [[ ${notice} -eq 0 ]] ; then
1639 notice=1
1598 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."
1599 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,"
1600 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"
1601 einfo "you will need to execute the following command:" 1643 ewarn "in order to remove these old dependencies. If you do not have this"
1602 einfo " revdep-rebuild --soname ${SONAME}" 1644 ewarn "helper program, simply emerge the 'gentoolkit' package."
1603 einfo 1645 ewarn
1604 einfo "After doing that, you can safely remove ${LIB}"
1605 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1606 fi 1646 fi
1647 ewarn " # revdep-rebuild --library ${lib##*/}"
1648 done
1607} 1649}
1608 1650
1609# 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
1610# certain USE flags 1652# certain USE flags
1611# 1653#
1612# 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>
1613# ex: built_with_use xchat gtk2 1655# ex: built_with_use xchat gtk2
1614# 1656#
1615# Flags: -a all USE flags should be utilized 1657# Flags: -a all USE flags should be utilized
1616# -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
1617# Note: the default flag is '-a' 1661# Note: the default flag is '-a'
1618built_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
1619 local opt=$1 1679 local opt=$1
1620 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1680 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1621 1681
1622 local PKG=$(best_version $1) 1682 local PKG=$(best_version $1)
1683 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1623 shift 1684 shift
1624 1685
1625 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1686 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1626 [[ ! -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
1627 1719
1628 local USE_BUILT=$(<${USEFILE}) 1720 local USE_BUILT=$(<${USEFILE})
1629 while [[ $# -gt 0 ]] ; do 1721 while [[ $# -gt 0 ]] ; do
1630 if [[ ${opt} = "-o" ]] ; then 1722 if [[ ${opt} = "-o" ]] ; then
1631 has $1 ${USE_BUILT} && return 0 1723 has $1 ${USE_BUILT} && return 0
1648 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
1649 done 1741 done
1650 eend 0 1742 eend 0
1651} 1743}
1652 1744
1653# dopamd [ file ] [ new file ] 1745# make a wrapper script ...
1654# 1746# NOTE: this was originally games_make_wrapper, but I noticed other places where
1655# Install pam auth config file in /etc/pam.d 1747# this could be used, so I have moved it here and made it not games-specific
1656# 1748# -- wolf31o2
1657# The first argument, 'file' is required. Install as 'new file', if 1749# $1 == wrapper name
1658# specified. 1750# $2 == binary to run
1659 1751# $3 == directory to chdir before running binary
1660dopamd() { 1752# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1661 local pamd="$1" newpamd="${2:-$1}" 1753# $5 == path for wrapper
1662 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1754make_wrapper() {
1663 1755 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1664 use pam || return 0 1756 local tmpwrapper=$(emktemp)
1665 1757 # We don't want to quote ${bin} so that people can pass complex
1666 insinto /etc/pam.d 1758 # things as $bin ... "./someprog --args"
1667 # these are the default doins options, but be explicit just in case 1759 cat << EOF > "${tmpwrapper}"
1668 insopts -m 0644 -o root -g root 1760#!/bin/sh
1669 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}" 1761cd "${chdir:-.}"
1762if [ -n "${libdir}" ] ; then
1763 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1764 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1765 else
1766 export LD_LIBRARY_PATH="${libdir}"
1767 fi
1768fi
1769exec ${bin} "\$@"
1770EOF
1771 chmod go+rx "${tmpwrapper}"
1772 if [[ -n ${path} ]] ; then
1773 exeinto "${path}"
1774 newexe "${tmpwrapper}" "${wrapper}"
1775 else
1776 newbin "${tmpwrapper}" "${wrapper}"
1777 fi
1670} 1778}

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

  ViewVC Help
Powered by ViewVC 1.1.20