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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20