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

Diff of /eclass/eutils.eclass

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

Revision 1.138 Revision 1.212
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 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.138 2005/01/07 12:04:40 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.212 2005/10/22 02:32:48 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# 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 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
64gen_usr_ldscript() { 64gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
66 # Just make sure it exists 66 # Just make sure it exists
67 dodir /usr/${libdir} 67 dodir /usr/${libdir}
68 68
69 for lib in "${@}" ; do
69 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
70/* GNU ld script 71 /* GNU ld script
71 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
72 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
73 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
74 otherwise we run into linking problems. 75 otherwise we run into linking problems.
75 See bug #4411 on http://bugs.gentoo.org/ for 76
76 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
77GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
78END_LDSCRIPT 80 END_LDSCRIPT
79 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
80} 83}
81 84
82# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
83# 87#
84# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
85# 89#
86draw_line() { 90draw_line() {
87 local i=0 91 local i=0
113EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
114# Default extension for patches 118# Default extension for patches
115EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
116# Default options for patch 120# Default options for patch
117# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
118EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
119# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
120# and not the full path .. 125# and not the full path ..
121EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
122# Change the printed message for a single patch. 127# Change the printed message for a single patch.
123EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
124# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
125# 132#
126# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
127# 134#
128EPATCH_FORCE="no" 135EPATCH_FORCE="no"
159# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
160# 167#
161# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
162# 169#
163epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
164 local PIPE_CMD="" 172 local PIPE_CMD=""
165 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
166 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
167 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
168 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
169 local x="" 177 local x=""
170 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
171 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
172 then 182 then
173 local m="" 183 local m=""
174 einfo "${#} patches to apply ..."
175 for m in "$@" ; do 184 for m in "$@" ; do
176 epatch "${m}" 185 epatch "${m}"
177 done 186 done
178 return 0 187 return 0
179 fi 188 fi
204 213
205 echo 214 echo
206 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 215 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
207 eerror 216 eerror
208 eerror " ${EPATCH_SOURCE}" 217 eerror " ${EPATCH_SOURCE}"
218 eerror " ( ${EPATCH_SOURCE##*/} )"
209 echo 219 echo
210 die "Cannot find \$EPATCH_SOURCE!" 220 die "Cannot find \$EPATCH_SOURCE!"
211 fi 221 fi
212 222
213 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 223 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
232 ;; 242 ;;
233 esac 243 esac
234 244
235 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
236 then 246 then
237 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
238 fi 248 fi
239 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
240 do 250 do
241 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
242 # 252 #
243 # ???_arch_foo.patch 253 # ???_arch_foo.patch
244 # 254 #
245 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
246 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
247 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
248 then 258 then
249 local count=0 259 local count=0
250 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/}
251 262
252 if [ -n "${EPATCH_EXCLUDE}" ] 263 if [ -n "${EPATCH_EXCLUDE}" ]
253 then 264 then
254 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 265 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
255 then 266 then
256 continue 267 continue
257 fi 268 fi
258 fi 269 fi
259 270
261 then 272 then
262 if [ -n "${EPATCH_SINGLE_MSG}" ] 273 if [ -n "${EPATCH_SINGLE_MSG}" ]
263 then 274 then
264 einfo "${EPATCH_SINGLE_MSG}" 275 einfo "${EPATCH_SINGLE_MSG}"
265 else 276 else
266 einfo "Applying ${x##*/} ..." 277 einfo "Applying ${patchname} ..."
267 fi 278 fi
268 else 279 else
269 einfo " ${x##*/} ..." 280 einfo " ${patchname} ..."
270 fi 281 fi
271 282
272 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
273 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 284 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 285
275 # Allow for prefix to differ ... im lazy, so shoot me :/ 286 # Allow for prefix to differ ... im lazy, so shoot me :/
276 while [ "${count}" -lt 5 ] 287 while [ "${count}" -lt 5 ]
277 do 288 do
278 # Generate some useful debug info ... 289 # Generate some useful debug info ...
279 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 292
282 if [ "${PATCH_SUFFIX}" != "patch" ] 293 if [ "${PATCH_SUFFIX}" != "patch" ]
283 then 294 then
284 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
285 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 else 297 else
287 PATCH_TARGET="${x}" 298 PATCH_TARGET="${x}"
288 fi 299 fi
289 300
290 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
291 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 303
293 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 306
296 if [ "${PATCH_SUFFIX}" != "patch" ] 307 if [ "${PATCH_SUFFIX}" != "patch" ]
297 then 308 then
298 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
299 then 310 then
300 echo 311 echo
301 eerror "Could not extract patch!" 312 eerror "Could not extract patch!"
302 #die "Could not extract patch!" 313 #die "Could not extract patch!"
303 count=5 314 count=5
304 break 315 break
305 fi 316 fi
306 fi 317 fi
307 318
308 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
309 then 320 then
310 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
311 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
312 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 326
316 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
317 329
318 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
319 then 331 then
320 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
321 echo 333 echo
322 eerror "A dry-run of patch command succeeded, but actually" 334 eerror "A dry-run of patch command succeeded, but actually"
323 eerror "applying the patch failed!" 335 eerror "applying the patch failed!"
324 #die "Real world sux compared to the dreamworld!" 336 #die "Real world sux compared to the dreamworld!"
325 count=5 337 count=5
326 fi 338 fi
327 339
328 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
329 341
330 break 342 break
331 fi 343 fi
332 344
333 count=$((count + 1)) 345 count=$((count + 1))
339 fi 351 fi
340 352
341 if [ "${count}" -eq 5 ] 353 if [ "${count}" -eq 5 ]
342 then 354 then
343 echo 355 echo
344 eerror "Failed Patch: ${x##*/}!" 356 eerror "Failed Patch: ${patchname} !"
357 eerror " ( ${PATCH_TARGET} )"
345 eerror 358 eerror
346 eerror "Include in your bugreport the contents of:" 359 eerror "Include in your bugreport the contents of:"
347 eerror 360 eerror
348 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 361 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
349 echo 362 echo
350 die "Failed Patch: ${x##*/}!" 363 die "Failed Patch: ${patchname}!"
351 fi 364 fi
352 365
353 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 366 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 367
355 eend 0 368 eend 0
356 fi 369 fi
357 done 370 done
358 if [ "${SINGLE_PATCH}" = "no" ] 371 if [ "${SINGLE_PATCH}" = "no" ]
359 then 372 then
360 einfo "Done with patching" 373 einfo "Done with patching"
361 fi 374 fi
362} 375}
363 376
364# This function return true if we are using the NPTL pthreads
365# implementation.
366#
367# <azarah@gentoo.org> (06 March 2003)
368#
369have_NPTL() {
370 cat > ${T}/test-nptl.c <<-"END"
371 #define _XOPEN_SOURCE
372 #include <unistd.h>
373 #include <stdio.h>
374
375 int main()
376 {
377 char buf[255];
378 char *str = buf;
379
380 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
381 if (NULL != str) {
382 printf("%s\n", str);
383 if (NULL != strstr(str, "NPTL"))
384 return 0;
385 }
386
387 return 1;
388 }
389 END
390
391 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
392 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
393 then
394 echo "yes"
395 einfon "Checking what PTHREADS implementation we have ..."
396 if ${T}/nptl
397 then
398 return 0
399 else
400 return 1
401 fi
402 else
403 echo "no"
404 fi
405
406 return 1
407}
408
409# This function check how many cpu's are present, and then set
410# -j in MAKEOPTS accordingly.
411#
412# Thanks to nall <nall@gentoo.org> for this.
413#
414get_number_of_jobs() {
415 local jobs=0
416
417 if [ ! -r /proc/cpuinfo ]
418 then
419 return 1
420 fi
421
422 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
423 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
424 then
425 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
426 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
427 ADMINPARAM="${ADMINPARAM/-j}"
428 fi
429
430 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
431
432 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
433 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
434 then
435 # these archs will always have "[Pp]rocessor"
436 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
437
438 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
439 then
440 # sparc always has "ncpus active"
441 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
442
443 elif [ "${ARCH}" = "alpha" ]
444 then
445 # alpha has "cpus active", but only when compiled with SMP
446 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
447 then
448 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
449 else
450 jobs=2
451 fi
452
453 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
454 then
455 # ppc has "processor", but only when compiled with SMP
456 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
457 then
458 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
459 else
460 jobs=2
461 fi
462 elif [ "${ARCH}" = "s390" ]
463 then
464 # s390 has "# processors : "
465 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
466 else
467 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
468 die "Unknown ARCH -- ${ARCH}!"
469 fi
470
471 # Make sure the number is valid ...
472 if [ "${jobs}" -lt 1 ]
473 then
474 jobs=1
475 fi
476
477 if [ -n "${ADMINPARAM}" ]
478 then
479 if [ "${jobs}" -gt "${ADMINPARAM}" ]
480 then
481 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
482 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
483 else
484 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
485 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
486 fi
487 fi
488}
489
490# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
491# does not exist on the users system 378# does not exist on the users system
492# vapier@gentoo.org 379# vapier@gentoo.org
493# 380#
494# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
495emktemp() { 382emktemp() {
496 local exe="touch" 383 local exe="touch"
497 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
498 local topdir="$1" 385 local topdir=$1
499 386
500 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
501 then
502 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
503 && topdir="/tmp" \ 389 && topdir="/tmp" \
504 || topdir="${T}" 390 || topdir=${T}
505 fi 391 fi
506 392
507 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
508 then
509 local tmp=/ 394 local tmp=/
510 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
511 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
512 done 397 done
513 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
514 echo "${tmp}" 399 echo "${tmp}"
515 else 400 else
516 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
517 && exe="-p" \ 402 && exe="-p" \
518 || exe="-d" 403 || exe="-d"
519 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
520 fi 405 fi
521} 406}
525# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
526# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
527# 412#
528# egetent(database, key) 413# egetent(database, key)
529egetent() { 414egetent() {
530 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
531 case "$2" in 417 case "$2" in
532 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
533 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
534 ;; 420 ;;
535 *) # Numeric 421 *) # Numeric
536 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
537 ;; 423 ;;
538 esac 424 esac
539 elif useq x86-fbsd ; then 425 ;;
540 local action 426 *-freebsd*)
541 if [ "$1" == "passwd" ] 427 local opts action="user"
542 then 428 [[ $1 == "passwd" ]] || action="group"
543 action="user" 429
544 else 430 # lookup by uid/gid
545 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
546 fi 433 fi
434
547 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
548 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
549 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
550 getent "$1" "$2" 442 getent "$1" "$2"
551 fi 443 ;;
444 esac
552} 445}
553 446
554# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
555# vapier@gentoo.org 448# vapier@gentoo.org
556# 449#
564# homedir: /dev/null 457# homedir: /dev/null
565# groups: none 458# groups: none
566# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
567enewuser() { 460enewuser() {
568 # get the username 461 # get the username
569 local euser="$1"; shift 462 local euser=$1; shift
570 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
571 then
572 eerror "No username specified !" 464 eerror "No username specified !"
573 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
574 fi 466 fi
575 467
576 # lets see if the username already exists 468 # lets see if the username already exists
577 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
578 then
579 return 0 470 return 0
580 fi 471 fi
581 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
582 473
583 # options to pass to useradd 474 # options to pass to useradd
584 local opts= 475 local opts=
585 476
586 # handle uid 477 # handle uid
587 local euid="$1"; shift 478 local euid=$1; shift
588 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
589 then
590 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
591 then
592 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
593 then
594 euid="next" 482 euid="next"
595 fi 483 fi
596 else 484 else
597 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
598 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
599 fi 487 fi
600 else 488 else
601 euid="next" 489 euid="next"
602 fi 490 fi
603 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
604 then 492 for euid in $(seq 101 999) ; do
605 local pwrange
606 if [ "${USERLAND}" == "BSD" ] ; then
607 pwrange="`jot 898 101`"
608 else
609 pwrange="`seq 101 999`"
610 fi
611 for euid in ${pwrange} ; do
612 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
613 done 494 done
614 fi 495 fi
615 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
616 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
617 498
618 # handle shell 499 # handle shell
619 local eshell="$1"; shift 500 local eshell=$1; shift
620 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
621 then
622 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
623 then
624 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
625 die "${eshell} does not exist" 504 die "${eshell} does not exist"
626 fi 505 fi
627 else 506 else
628 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
629 then 508 [[ -x ${ROOT}${shell} ]] && break
630 eshell="/usr/bin/false" 509 done
631 else 510
632 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
633 fi 514 fi
515
516 eshell=${shell}
634 fi 517 fi
635 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
636 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
637 520
638 # handle homedir 521 # handle homedir
639 local ehome="$1"; shift 522 local ehome=$1; shift
640 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
641 then
642 ehome="/dev/null" 524 ehome="/dev/null"
643 fi 525 fi
644 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
645 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
646 528
647 # handle groups 529 # handle groups
648 local egroups="$1"; shift 530 local egroups=$1; shift
649 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
650 then
651 local oldifs="${IFS}" 532 local oldifs=${IFS}
652 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
653 534
654 export IFS="," 535 export IFS=","
655 for g in ${egroups} 536 for g in ${egroups} ; do
656 do
657 export IFS="${oldifs}" 537 export IFS=${oldifs}
658 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
659 then
660 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
661 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
662 fi 541 fi
663 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
664 then
665 defgroup="${g}" 543 defgroup=${g}
666 else 544 else
667 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
668 fi 546 fi
669 export IFS="," 547 export IFS=","
670 done 548 done
671 export IFS="${oldifs}" 549 export IFS=${oldifs}
672 550
673 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
674 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
675 then
676 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
677 fi 554 fi
678 else 555 else
679 egroups="(none)" 556 egroups="(none)"
680 fi 557 fi
681 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
682 559
683 # handle extra and add the user 560 # handle extra and add the user
684 local eextra="$@"
685 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
686 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
687 if useq ppc-macos 563 case ${CHOST} in
688 then 564 *-darwin*)
689 ### Make the user 565 ### Make the user
690 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
691 then
692 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
693 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
694 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
695 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
696 ### Add the user to the groups specified 571 ### Add the user to the groups specified
697 local oldifs="${IFS}" 572 local oldifs=${IFS}
698 export IFS="," 573 export IFS=","
699 for g in ${egroups} 574 for g in ${egroups} ; do
700 do
701 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
702 done 576 done
703 export IFS="${oldifs}" 577 export IFS=${oldifs}
704 else 578 else
705 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
706 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
707 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
708 die "Required function missing" 582 die "Required function missing"
709 fi 583 fi
710 elif use x86-fbsd ; then 584 ;;
711 if [ -z "${eextra}" ] 585 *-freebsd*)
712 then 586 if [[ -z $@ ]] ; then
713 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
714 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
715 die "enewuser failed" 589 die "enewuser failed"
716 else 590 else
717 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
718 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
719 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
720 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
721 else 600 else
722 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
723 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
724 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
725 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
726 || die "enewuser failed" 609 || die "enewuser failed"
727 else 610 else
728 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
729 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
730 || die "enewuser failed" 613 || die "enewuser failed"
731 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}"
732 fi 623 fi
624
733 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
734
735 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
736 then
737 einfo " - Creating ${ehome} in ${D}"
738 dodir ${ehome}
739 fowners ${euser} ${ehome}
740 fperms 755 ${ehome}
741 fi
742} 626}
743 627
744# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
745# vapier@gentoo.org 629# vapier@gentoo.org
746# 630#
775 then 659 then
776 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
777 then 661 then
778 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
779 then 663 then
780 if useq ppc-macos ; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
781 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
782 else 666 else
783 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
784 fi 668 fi
785 else 669 else
799 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
800 684
801 # add the group 685 # add the group
802 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
803 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
804 if useq ppc-macos ; then 688 case ${CHOST} in
689 *-darwin*)
805 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
806 then 691 then
807 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
808 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
809 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
810 die "Required function missing" 695 die "Required function missing"
811 fi 696 fi
812 697
813 # If we need the next available 698 # If we need the next available
814 case ${egid} in 699 case ${egid} in
815 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
816 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
817 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
818 done 703 done
819 esac 704 esac
820 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
821 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
822 elif use x86-fbsd ; then 707 ;;
708
709 *-freebsd*)
823 case ${egid} in 710 case ${egid} in
824 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
825 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
826 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
827 done 714 done
828 esac 715 esac
829 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
830 else 717 ;;
718
719 *-netbsd*)
720 case ${egid} in
721 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do
723 [ -z "`egetent group ${egid}`" ] && break
724 done
725 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;;
728
729 *)
831 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
832 fi 731 ;;
732 esac
833 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
834} 734}
835 735
836# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
837# vapier@gentoo.org 737# vapier@gentoo.org
862# name: the name that will show up in the menu 762# name: the name that will show up in the menu
863# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
864# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
865# a full path to an icon 765# a full path to an icon
866# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
867# http://www.freedesktop.org/standards/menu-spec/ 767# http://www.freedesktop.org/Standards/desktop-entry-spec
868# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
869make_desktop_entry() { 769make_desktop_entry() {
870 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 770 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
871 771
872 local exec="${1}" 772 local exec=${1}
873 local name="${2:-${PN}}" 773 local name=${2:-${PN}}
874 local icon="${3:-${PN}.png}" 774 local icon=${3:-${PN}.png}
875 local type="${4}" 775 local type=${4}
876 local subdir="${6}" 776 local path=${5}
877 local path="${5:-${GAMES_BINDIR}}" 777
878 if [ -z "${type}" ] 778 if [[ -z ${type} ]] ; then
879 then 779 local catmaj=${CATEGORY%%-*}
880 case ${CATEGORY} in 780 local catmin=${CATEGORY##*-}
881 "app-emulation") 781 case ${catmaj} in
882 type=Emulator 782 app)
883 subdir="Emulation" 783 case ${catmin} in
784 admin) type=System;;
785 cdr) type=DiscBurning;;
786 dicts) type=Dictionary;;
787 editors) type=TextEditor;;
788 emacs) type=TextEditor;;
789 emulation) type=Emulator;;
790 laptop) type=HardwareSettings;;
791 office) type=Office;;
792 vim) type=TextEditor;;
793 xemacs) type=TextEditor;;
794 *) type=;;
795 esac
884 ;; 796 ;;
885 "games-"*) 797
886 type=Game 798 dev)
887 subdir="Games" 799 type="Development"
888 ;; 800 ;;
889 "net-"*) 801
890 type=Network 802 games)
891 subdir="${type}" 803 case ${catmin} in
804 action) type=ActionGame;;
805 arcade) type=ArcadeGame;;
806 board) type=BoardGame;;
807 kid) type=KidsGame;;
808 emulation) type=Emulator;;
809 puzzle) type=LogicGame;;
810 rpg) type=RolePlaying;;
811 roguelike) type=RolePlaying;;
812 simulation) type=Simulation;;
813 sports) type=SportsGame;;
814 strategy) type=StrategyGame;;
815 *) type=;;
816 esac
817 type="Game;${type}"
892 ;; 818 ;;
819
820 mail)
821 type="Network;Email"
822 ;;
823
824 media)
825 case ${catmin} in
826 gfx) type=Graphics;;
827 radio) type=Tuner;;
828 sound) type=Audio;;
829 tv) type=TV;;
830 video) type=Video;;
831 *) type=;;
832 esac
833 type="AudioVideo;${type}"
834 ;;
835
836 net)
837 case ${catmin} in
838 dialup) type=Dialup;;
839 ftp) type=FileTransfer;;
840 im) type=InstantMessaging;;
841 irc) type=IRCClient;;
842 mail) type=Email;;
843 news) type=News;;
844 nntp) type=News;;
845 p2p) type=FileTransfer;;
846 *) type=;;
847 esac
848 type="Network;${type}"
849 ;;
850
851 sci)
852 case ${catmin} in
853 astro*) type=Astronomoy;;
854 bio*) type=Biology;;
855 calc*) type=Calculator;;
856 chem*) type=Chemistry;;
857 geo*) type=Geology;;
858 math*) type=Math;;
859 *) type=;;
860 esac
861 type="Science;${type}"
862 ;;
863
864 www)
865 case ${catmin} in
866 client) type=WebBrowser;;
867 *) type=;;
868 esac
869 type="Network"
870 ;;
871
893 *) 872 *)
894 type= 873 type=
895 subdir=
896 ;; 874 ;;
897 esac 875 esac
898 fi 876 fi
877 if [ "${SLOT}" == "0" ] ; then
878 local desktop_name="${PN}"
879 else
880 local desktop_name="${PN}-${SLOT}"
881 fi
899 local desktop="${T}/${exec}.desktop" 882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
900 883
901echo "[Desktop Entry] 884echo "[Desktop Entry]
902Encoding=UTF-8 885Encoding=UTF-8
903Version=0.9.2 886Version=0.9.2
904Name=${name} 887Name=${name}
907Exec=${exec} 890Exec=${exec}
908Path=${path} 891Path=${path}
909Icon=${icon} 892Icon=${icon}
910Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
911 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
912 insinto /usr/share/applications 898 insinto /usr/share/applications
913 doins "${desktop}" 899 doins "${desktop}"
914 900 )
915 return 0
916} 901}
917 902
918# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
919# 904#
920# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
921# title: File to execute to start the Window Manager 906# title: File to execute to start the Window Manager
922# command: Name of the Window Manager 907# command: Name of the Window Manager
923 908
924make_session_desktop() { 909make_session_desktop() {
925
926 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 910 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
927 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 911 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
928 912
929 local title="${1}" 913 local title=$1
930 local command="${2}" 914 local command=$2
931 local desktop="${T}/${wm}.desktop" 915 local desktop=${T}/${wm}.desktop
932 916
933echo "[Desktop Entry] 917echo "[Desktop Entry]
934Encoding=UTF-8 918Encoding=UTF-8
935Name=${title} 919Name=${title}
936Comment=This session logs you into ${title} 920Comment=This session logs you into ${title}
938TryExec=${command} 922TryExec=${command}
939Type=Application" > "${desktop}" 923Type=Application" > "${desktop}"
940 924
941 insinto /usr/share/xsessions 925 insinto /usr/share/xsessions
942 doins "${desktop}" 926 doins "${desktop}"
943
944 return 0
945} 927}
946 928
947domenu() { 929domenu() {
948 local i 930 local i j
949 local j
950 insinto /usr/share/applications 931 insinto /usr/share/applications
951 for i in ${@} 932 for i in "$@" ; do
952 do
953 if [ -f "${i}" ]; 933 if [[ -f ${i} ]] ; then
954 then
955 doins ${i} 934 doins "${i}"
956 elif [ -d "${i}" ]; 935 elif [[ -d ${i} ]] ; then
957 then
958 for j in ${i}/*.desktop 936 for j in "${i}"/*.desktop ; do
959 do
960 doins ${j} 937 doins "${j}"
961 done 938 done
962 fi 939 fi
963 done 940 done
964} 941}
942newmenu() {
943 insinto /usr/share/applications
944 newins "$1" "$2"
945}
965 946
966doicon() { 947doicon() {
967 local i 948 local i j
968 local j
969 insinto /usr/share/pixmaps 949 insinto /usr/share/pixmaps
970 for i in ${@} 950 for i in "$@" ; do
971 do
972 if [ -f "${i}" ]; 951 if [[ -f ${i} ]] ; then
973 then
974 doins ${i} 952 doins "${i}"
975 elif [ -d "${i}" ]; 953 elif [[ -d ${i} ]] ; then
976 then
977 for j in ${i}/*.png 954 for j in "${i}"/*.png ; do
978 do
979 doins ${j} 955 doins "${j}"
980 done 956 done
981 fi 957 fi
982 done 958 done
959}
960newicon() {
961 insinto /usr/share/pixmaps
962 newins "$1" "$2"
983} 963}
984 964
985############################################################## 965##############################################################
986# END: Handle .desktop files and menu entries # 966# END: Handle .desktop files and menu entries #
987############################################################## 967##############################################################
988 968
989 969
990# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
991find_unpackable_file() { 971find_unpackable_file() {
992 local src="$1" 972 local src=$1
993 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
994 then
995 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
996 else 975 else
997 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
998 then
999 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
1000 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
1001 then
1002 src="${PWD}/${src}" 979 src=${PWD}/${src}
1003 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
1004 then
1005 src="${src}" 981 src=${src}
1006 fi
1007 fi 982 fi
1008 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
1009 echo "${src}" 985 echo "${src}"
1010} 986}
1011 987
1012# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
1013# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
1028# lseek 1004# lseek
1029# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1030# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
1031# thus we would pass in the value of '4' as the second parameter. 1007# thus we would pass in the value of '4' as the second parameter.
1032unpack_pdv() { 1008unpack_pdv() {
1033 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
1034 local sizeoff_t="$2" 1010 local sizeoff_t=$2
1035 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1036 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1037 1014
1038 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
1039 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1040 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1041 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1042 1019
1043 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1107# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1108# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1109# - If the offset is not specified then we will attempt to extract 1086# - If the offset is not specified then we will attempt to extract
1110# the proper offset from the script itself. 1087# the proper offset from the script itself.
1111unpack_makeself() { 1088unpack_makeself() {
1112 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1113 local skip="$2" 1090 local skip=$2
1114 local exe="$3" 1091 local exe=$3
1115 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1116 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1117 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1118 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1119 then
1120 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1121 local skip=0 1099 local skip=0
1122 exe=tail 1100 exe=tail
1123 case ${ver} in 1101 case ${ver} in
1124 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1125 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1137 ;; 1115 ;;
1138 2.1.3) 1116 2.1.3)
1139 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1140 let skip="skip + 1" 1118 let skip="skip + 1"
1141 ;; 1119 ;;
1142 2.1.4) 1120 2.1.4|2.1.5)
1143 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1121 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1144 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1145 exe="dd" 1123 exe="dd"
1146 ;; 1124 ;;
1147 *) 1125 *)
1192check_license() { 1170check_license() {
1193 local lic=$1 1171 local lic=$1
1194 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1195 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1196 else 1174 else
1197 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1198 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1199 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1200 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1201 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1202 lic="${src}" 1180 lic="${lic}"
1203 fi
1204 fi 1181 fi
1182 fi
1205 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1206 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1207 1185
1208 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1209 # accepted ... if we don't find a match, we make the user accept 1187 # accepted ... if we don't find a match, we make the user accept
1210 local shopts=$- 1188 local shopts=$-
1381# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1382# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1383# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1384cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1385 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1386 local dir="$(dirname ${@})" 1364 local dir=$(dirname "$*")
1387 local file="$(basename ${@})" 1365 local file=$(basename "$*")
1388 local mline="" 1366 local mline=""
1389 local showedmsg=0 1367 local showedmsg=0
1390 1368
1391 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1369 for mline in $(mount | egrep -e '(iso|cdrom|fs=cdfss)' | awk '{print $3}') ; do
1392 [[ -d ${mline}/${dir} ]] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1393 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1394 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1395 done 1373 done
1396 1374
1397 if [[ -z ${CDROM_ROOT} ]] ; then 1375 if [[ -z ${CDROM_ROOT} ]] ; then
1398 echo 1376 echo
1413 fi 1391 fi
1414 showedmsg=1 1392 showedmsg=1
1415 fi 1393 fi
1416 einfo "Press return to scan for the cd again" 1394 einfo "Press return to scan for the cd again"
1417 einfo "or hit CTRL+C to abort the emerge." 1395 einfo "or hit CTRL+C to abort the emerge."
1396 echo
1397 einfo "If you are having trouble with the detection"
1398 einfo "of your CD, it is possible that you do not have"
1399 einfo "Joliet support enabled in your kernel. Please"
1400 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1418 read 1401 read
1419 fi 1402 fi
1420 done 1403 done
1421} 1404}
1422 1405
1432# directories and uses the intersection of the lists. 1415# directories and uses the intersection of the lists.
1433# The -u builds a list of po files found in all the 1416# The -u builds a list of po files found in all the
1434# directories and uses the union of the lists. 1417# directories and uses the union of the lists.
1435strip-linguas() { 1418strip-linguas() {
1436 local ls newls 1419 local ls newls
1437 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1420 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1438 local op="$1"; shift 1421 local op=$1; shift
1439 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1422 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1440 local d f 1423 local d f
1441 for d in "$@" ; do 1424 for d in "$@" ; do
1442 if [ "${op}" == "-u" ] ; then 1425 if [[ ${op} == "-u" ]] ; then
1443 newls="${ls}" 1426 newls=${ls}
1444 else 1427 else
1445 newls="" 1428 newls=""
1446 fi 1429 fi
1447 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1430 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1448 if [ "${op}" == "-i" ] ; then 1431 if [[ ${op} == "-i" ]] ; then
1449 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1432 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1450 else 1433 else
1451 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1434 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1452 fi 1435 fi
1453 done 1436 done
1454 ls="${newls}" 1437 ls=${newls}
1455 done 1438 done
1456 ls="${ls//.po}" 1439 ls=${ls//.po}
1457 else 1440 else
1458 ls="$@" 1441 ls=$@
1459 fi 1442 fi
1460 1443
1461 ls=" ${ls} " 1444 ls=" ${ls} "
1462 newls="" 1445 newls=""
1463 for f in ${LINGUAS} ; do 1446 for f in ${LINGUAS} ; do
1464 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1447 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1465 newls="${newls} ${f}" 1448 newls="${newls} ${f}"
1466 else 1449 else
1467 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1450 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1468 fi 1451 fi
1469 done 1452 done
1470 if [ -z "${newls}" ] ; then 1453 if [[ -z ${newls} ]] ; then
1471 unset LINGUAS 1454 export LINGUAS=""
1472 else 1455 else
1473 export LINGUAS="${newls}" 1456 export LINGUAS=${newls:1}
1474 fi 1457 fi
1475} 1458}
1476 1459
1477# moved from kernel.eclass since they are generally useful outside of 1460# moved from kernel.eclass since they are generally useful outside of
1478# kernel.eclass -iggy (20041002) 1461# kernel.eclass -iggy (20041002)
1480# the following functions are useful in kernel module ebuilds, etc. 1463# the following functions are useful in kernel module ebuilds, etc.
1481# for an example see ivtv or drbd ebuilds 1464# for an example see ivtv or drbd ebuilds
1482 1465
1483# set's ARCH to match what the kernel expects 1466# set's ARCH to match what the kernel expects
1484set_arch_to_kernel() { 1467set_arch_to_kernel() {
1468 i=10
1469 while ((i--)) ; do
1470 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1471 done
1485 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1472 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1486 case ${ARCH} in 1473 case ${ARCH} in
1487 x86) export ARCH="i386";; 1474 x86) export ARCH="i386";;
1488 amd64) export ARCH="x86_64";; 1475 amd64) export ARCH="x86_64";;
1489 hppa) export ARCH="parisc";; 1476 hppa) export ARCH="parisc";;
1490 mips) export ARCH="mips";; 1477 mips) export ARCH="mips";;
1478 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!
1491 *) export ARCH="${ARCH}";; 1479 *) export ARCH="${ARCH}";;
1492 esac 1480 esac
1493} 1481}
1494 1482
1495# set's ARCH back to what portage expects 1483# set's ARCH back to what portage expects
1496set_arch_to_portage() { 1484set_arch_to_portage() {
1485 i=10
1486 while ((i--)) ; do
1487 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1488 done
1497 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1489 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1498} 1490}
1499 1491
1500# Jeremy Huddleston <eradicator@gentoo.org>: 1492# Jeremy Huddleston <eradicator@gentoo.org>:
1501# preserve_old_lib /path/to/libblah.so.0 1493# preserve_old_lib /path/to/libblah.so.0
1536 LIB=$1 1528 LIB=$1
1537 1529
1538 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1530 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1539 SONAME=`basename ${LIB}` 1531 SONAME=`basename ${LIB}`
1540 1532
1541 einfo "An old version of an installed library was detected on your system." 1533 ewarn "An old version of an installed library was detected on your system."
1542 einfo "In order to avoid breaking packages that link against is, this older version" 1534 ewarn "In order to avoid breaking packages that link against it, this older version"
1543 einfo "is not being removed. In order to make full use of this newer version," 1535 ewarn "is not being removed. In order to make full use of this newer version,"
1544 einfo "you will need to execute the following command:" 1536 ewarn "you will need to execute the following command:"
1545 einfo " revdep-rebuild --soname ${SONAME}" 1537 ewarn " revdep-rebuild --soname ${SONAME}"
1546 einfo 1538 ewarn
1547 einfo "After doing that, you can safely remove ${LIB}" 1539 ewarn "After doing that, you can safely remove ${LIB}"
1548 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1549 fi 1541 fi
1550} 1542}
1551 1543
1552# Hack for people to figure out if a package was built with 1544# Hack for people to figure out if a package was built with
1553# certain USE flags 1545# certain USE flags
1554# 1546#
1555# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1547# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1556# ex: built_with_use xchat gtk2 1548# ex: built_with_use xchat gtk2
1557# 1549#
1578 shift 1570 shift
1579 done 1571 done
1580 [[ ${opt} = "-a" ]] 1572 [[ ${opt} = "-a" ]]
1581} 1573}
1582 1574
1583# Many configure scripts wrongly bail when a C++ compiler 1575# Many configure scripts wrongly bail when a C++ compiler
1584# could not be detected. #73450 1576# could not be detected. #73450
1585epunt_cxx() { 1577epunt_cxx() {
1586 local dir=$1 1578 local dir=$1
1587 [[ -z ${dir} ]] && dir=${S} 1579 [[ -z ${dir} ]] && dir=${S}
1588 ebegin "Removing useless C++ checks" 1580 ebegin "Removing useless C++ checks"
1591 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1583 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1592 done 1584 done
1593 eend 0 1585 eend 0
1594} 1586}
1595 1587
1596# This function simply returns the desired lib directory. With portage 1588# dopamd <file> [more files]
1597# 2.0.51, we now have support for installing libraries to lib32/lib64
1598# to accomidate the needs of multilib systems. It's no longer a good idea
1599# to assume all libraries will end up in lib. Replace any (sane) instances
1600# where lib is named directly with $(get_libdir) if possible.
1601# 1589#
1602# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 1590# Install pam auth config file in /etc/pam.d
1591dopamd() {
1592 [[ -z $1 ]] && die "dopamd requires at least one argument"
1593
1594 use pam || return 0
1595
1596 INSDESTTREE=/etc/pam.d \
1597 doins "$@" || die "failed to install $@"
1598}
1599# newpamd <old name> <new name>
1603# 1600#
1604# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 1601# Install pam file <old name> as <new name> in /etc/pam.d
1605# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 1602newpamd() {
1606# fall back on old behavior. Any profile that has these set should also 1603 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1607# depend on a newer version of portage (not yet released) which uses these 1604
1608# over CONF_LIBDIR in econf, dolib, etc... 1605 use pam || return 0
1609get_libdir() { 1606
1610 LIBDIR_TEST=$(type econf) 1607 INSDESTTREE=/etc/pam.d \
1611 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 1608 newins "$1" "$2" || die "failed to install $1 as $2"
1612 # if there is an override, we want to use that... always. 1609}
1613 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 1610
1614 # We don't need to know the verison of portage. We only need to know 1611# make a wrapper script ...
1615 # if there is support for CONF_LIBDIR in econf and co. 1612# NOTE: this was originally games_make_wrapper, but I noticed other places where
1616 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 1613# this could be used, so I have moved it here and made it not games-specific
1617 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then 1614# -- wolf31o2
1618 # # and if there isnt an override, and we're using a version of 1615# $1 == wrapper name
1619 # # portage without CONF_LIBDIR support, force the use of lib. dolib 1616# $2 == binary to run
1620 # # and friends from portage 2.0.50 wont be too happy otherwise. 1617# $3 == directory to chdir before running binary
1621 # CONF_LIBDIR="lib" 1618# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1619# $5 == path for wrapper
1620make_wrapper() {
1621 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1622 local tmpwrapper=$(emktemp)
1623 # We don't want to quote ${bin} so that people can pass complex
1624 # things as $bin ... "./someprog --args"
1625 cat << EOF > "${tmpwrapper}"
1626#!/bin/sh
1627cd "${chdir:-.}"
1628if [ -n "${libdir}" ] ; then
1629 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1631 else
1632 export LD_LIBRARY_PATH="${libdir}"
1622 #fi 1633 fi
1623 elif [ -n "$(get_abi_LIBDIR)" ]; then # Using eradicator's LIBDIR_<abi> approach...
1624 CONF_LIBDIR="$(get_abi_LIBDIR)"
1625 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
1626 # will be <portage-2.0.51_pre20
1627 CONF_LIBDIR="lib"
1628 fi 1634fi
1629 # and of course, default to lib if CONF_LIBDIR isnt set 1635exec ${bin} "\$@"
1630 echo ${CONF_LIBDIR:=lib} 1636EOF
1631 unset LIBDIR_TEST 1637 chmod go+rx "${tmpwrapper}"
1632} 1638 if [[ -n ${path} ]] ; then
1633 1639 exeinto "${path}"
1634get_multilibdir() { 1640 newexe "${tmpwrapper}" "${wrapper}"
1635 if [ -n "$(get_abi_LIBDIR)" ]; then
1636 eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
1637 exit 1
1638 fi
1639 echo ${CONF_MULTILIBDIR:=lib32}
1640}
1641
1642# Sometimes you need to override the value returned by get_libdir. A good
1643# example of this is xorg-x11, where lib32 isnt a supported configuration,
1644# and where lib64 -must- be used on amd64 (for applications that need lib
1645# to be 32bit, such as adobe acrobat). Note that this override also bypasses
1646# portage version sanity checking.
1647# get_libdir_override expects one argument, the result get_libdir should
1648# return:
1649#
1650# get_libdir_override lib64
1651#
1652# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
1653get_libdir_override() {
1654 if [ -n "$(get_abi_LIBDIR)" ]; then
1655 eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
1656 exit 1
1657 fi
1658 CONF_LIBDIR="$1"
1659 CONF_LIBDIR_OVERRIDE="$1"
1660}
1661
1662# get_abi_var <VAR> [<ABI>]
1663# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1664#
1665# ex:
1666# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1667#
1668# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1669# This will hopefully be added to portage soon...
1670#
1671# If <ABI> is not specified, ${ABI} is used.
1672# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1673# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1674#
1675# Jeremy Huddleston <eradicator@gentoo.org>
1676get_abi_var() {
1677 local flag=${1}
1678 local abi
1679 if [ $# -gt 1 ]; then
1680 abi=${2}
1681 elif [ -n "${ABI}" ]; then
1682 abi=${ABI}
1683 elif [ -n "${DEFAULT_ABI}" ]; then
1684 abi=${DEFAULT_ABI}
1685 else 1641 else
1686 return 1 1642 newbin "${tmpwrapper}" "${wrapper}"
1687 fi 1643 fi
1688
1689 local var="${flag}_${abi}"
1690 echo ${!var}
1691} 1644}
1692
1693get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
1694get_abi_CXXFLAGS() { get_abi_var CXXFLAGS ${@}; }
1695get_abi_ASFLAGS() { get_abi_var ASFLAGS ${@}; }
1696get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
1697
1698# get_all_libdir()
1699# Returns a list of all the libdirs used by this profile
1700get_all_libdirs() {
1701 local libdirs
1702 if [ -n "${MULTILIB_ABIS}" ]; then
1703 for abi in ${MULTILIB_ABIS}; do
1704 libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
1705 done
1706 libdirs="${libdirs:1}"
1707 elif [ -n "${CONF_LIBDIR}" ]; then
1708 libdirs="${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}"
1709 else
1710 libdirs="lib"
1711 fi
1712
1713 echo "${libdirs}"
1714}

Legend:
Removed from v.1.138  
changed lines
  Added in v.1.212

  ViewVC Help
Powered by ViewVC 1.1.20