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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.139  
changed lines
  Added in v.1.200

  ViewVC Help
Powered by ViewVC 1.1.20