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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.134  
changed lines
  Added in v.1.245

  ViewVC Help
Powered by ViewVC 1.1.20