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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.130  
changed lines
  Added in v.1.252

  ViewVC Help
Powered by ViewVC 1.1.20