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

Diff of /eclass/eutils.eclass

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

Revision 1.143 Revision 1.197
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.143 2005/01/26 16:19:12 ka0ttic Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.197 2005/09/18 17:33:44 flameeyes 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
12inherit multilib 12inherit multilib portability
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS"
15 13
16DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 16
18DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
19 18
20# 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
21# 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
65gen_usr_ldscript() { 64gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
67 # Just make sure it exists 66 # Just make sure it exists
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
71/* GNU ld script 71 /* GNU ld script
72 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
73 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
74 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems. 75 otherwise we run into linking problems.
76 See bug #4411 on http://bugs.gentoo.org/ for 76
77 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
78GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
79END_LDSCRIPT 80 END_LDSCRIPT
80 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
81} 83}
82 84
83# 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()
84# 87#
85# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
86# 89#
87draw_line() { 90draw_line() {
88 local i=0 91 local i=0
114EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
115# Default extension for patches 118# Default extension for patches
116EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
117# Default options for patch 120# Default options for patch
118# 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
119EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
120# 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,
121# and not the full path .. 125# and not the full path ..
122EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
123# Change the printed message for a single patch. 127# Change the printed message for a single patch.
124EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
125# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
126# 132#
127# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
128# 134#
129EPATCH_FORCE="no" 135EPATCH_FORCE="no"
167 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
168 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
169 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
170 local x="" 176 local x=""
171 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
172 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
173 then 181 then
174 local m="" 182 local m=""
175 einfo "${#} patches to apply ..."
176 for m in "$@" ; do 183 for m in "$@" ; do
177 epatch "${m}" 184 epatch "${m}"
178 done 185 done
179 return 0 186 return 0
180 fi 187 fi
234 ;; 241 ;;
235 esac 242 esac
236 243
237 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
238 then 245 then
239 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
240 fi 247 fi
241 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
242 do 249 do
243 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
244 # 251 #
245 # ???_arch_foo.patch 252 # ???_arch_foo.patch
246 # 253 #
247 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
248 ([ "${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}" ] || \
249 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
250 then 257 then
251 local count=0 258 local count=0
252 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
253 261
254 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
255 then 263 then
256 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
257 then 265 then
258 continue 266 continue
259 fi 267 fi
260 fi 268 fi
261 269
263 then 271 then
264 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
265 then 273 then
266 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
267 else 275 else
268 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
269 fi 277 fi
270 else 278 else
271 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
272 fi 280 fi
273 281
274 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 284
277 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
278 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
279 do 287 do
280 # Generate some useful debug info ... 288 # Generate some useful debug info ...
281 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 291
284 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
285 then 293 then
286 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 else 296 else
289 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
290 fi 298 fi
291 299
292 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 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##*/}
294 302
295 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 305
298 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
299 then 307 then
300 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
301 then 309 then
302 echo 310 echo
303 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
304 #die "Could not extract patch!" 312 #die "Could not extract patch!"
305 count=5 313 count=5
306 break 314 break
307 fi 315 fi
308 fi 316 fi
309 317
310 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
311 then 319 then
312 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 325
318 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
319 327
320 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
321 then 329 then
322 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##*/}
323 echo 331 echo
324 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
325 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
326 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
327 count=5 335 count=5
328 fi 336 fi
329 337
330 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
331 339
332 break 340 break
333 fi 341 fi
334 342
335 count=$((count + 1)) 343 count=$((count + 1))
341 fi 349 fi
342 350
343 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
344 then 352 then
345 echo 353 echo
346 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
347 eerror 356 eerror
348 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
349 eerror 358 eerror
350 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
351 echo 360 echo
352 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
353 fi 362 fi
354 363
355 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
356 365
357 eend 0 366 eend 0
358 fi 367 fi
359 done 368 done
360 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
361 then 370 then
362 einfo "Done with patching" 371 einfo "Done with patching"
363 fi 372 fi
364} 373}
365 374
366# This function return true if we are using the NPTL pthreads
367# implementation.
368#
369# <azarah@gentoo.org> (06 March 2003)
370#
371have_NPTL() {
372 cat > ${T}/test-nptl.c <<-"END"
373 #define _XOPEN_SOURCE
374 #include <unistd.h>
375 #include <stdio.h>
376
377 int main()
378 {
379 char buf[255];
380 char *str = buf;
381
382 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
383 if (NULL != str) {
384 printf("%s\n", str);
385 if (NULL != strstr(str, "NPTL"))
386 return 0;
387 }
388
389 return 1;
390 }
391 END
392
393 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
394 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
395 then
396 echo "yes"
397 einfon "Checking what PTHREADS implementation we have ..."
398 if ${T}/nptl
399 then
400 return 0
401 else
402 return 1
403 fi
404 else
405 echo "no"
406 fi
407
408 return 1
409}
410
411# This function check how many cpu's are present, and then set
412# -j in MAKEOPTS accordingly.
413#
414# Thanks to nall <nall@gentoo.org> for this.
415#
416get_number_of_jobs() {
417 local jobs=0
418
419 if [ ! -r /proc/cpuinfo ]
420 then
421 return 1
422 fi
423
424 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
425 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
426 then
427 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
428 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
429 ADMINPARAM="${ADMINPARAM/-j}"
430 fi
431
432 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
433
434 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
435 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
436 then
437 # these archs will always have "[Pp]rocessor"
438 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
439
440 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
441 then
442 # sparc always has "ncpus active"
443 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
444
445 elif [ "${ARCH}" = "alpha" ]
446 then
447 # alpha has "cpus active", but only when compiled with SMP
448 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
449 then
450 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
451 else
452 jobs=2
453 fi
454
455 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
456 then
457 # ppc has "processor", but only when compiled with SMP
458 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
459 then
460 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
461 else
462 jobs=2
463 fi
464 elif [ "${ARCH}" = "s390" ]
465 then
466 # s390 has "# processors : "
467 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
468 else
469 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
470 die "Unknown ARCH -- ${ARCH}!"
471 fi
472
473 # Make sure the number is valid ...
474 if [ "${jobs}" -lt 1 ]
475 then
476 jobs=1
477 fi
478
479 if [ -n "${ADMINPARAM}" ]
480 then
481 if [ "${jobs}" -gt "${ADMINPARAM}" ]
482 then
483 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
484 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
485 else
486 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
487 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
488 fi
489 fi
490}
491
492# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
493# does not exist on the users system 376# does not exist on the users system
494# vapier@gentoo.org 377# vapier@gentoo.org
495# 378#
496# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
497emktemp() { 380emktemp() {
498 local exe="touch" 381 local exe="touch"
499 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
500 local topdir="$1" 383 local topdir=$1
501 384
502 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
503 then
504 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
505 && topdir="/tmp" \ 387 && topdir="/tmp" \
506 || topdir="${T}" 388 || topdir=${T}
507 fi 389 fi
508 390
509 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
510 then
511 local tmp=/ 392 local tmp=/
512 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
513 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
514 done 395 done
515 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
516 echo "${tmp}" 397 echo "${tmp}"
517 else 398 else
518 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
519 && exe="-p" \ 400 && exe="-p" \
520 || exe="-d" 401 || exe="-d"
521 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
522 fi 403 fi
523} 404}
527# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
528# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
529# 410#
530# egetent(database, key) 411# egetent(database, key)
531egetent() { 412egetent() {
532 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
533 case "$2" in 414 case "$2" in
534 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
535 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
536 ;; 417 ;;
537 *) # Numeric 418 *) # Numeric
538 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
539 ;; 420 ;;
540 esac 421 esac
541 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
542 local action 423 local action
543 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
544 then 425 then
545 action="user" 426 action="user"
546 else 427 else
566# homedir: /dev/null 447# homedir: /dev/null
567# groups: none 448# groups: none
568# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
569enewuser() { 450enewuser() {
570 # get the username 451 # get the username
571 local euser="$1"; shift 452 local euser=$1; shift
572 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
573 then
574 eerror "No username specified !" 454 eerror "No username specified !"
575 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
576 fi 456 fi
577 457
578 # lets see if the username already exists 458 # lets see if the username already exists
579 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
580 then
581 return 0 460 return 0
582 fi 461 fi
583 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
584 463
585 # options to pass to useradd 464 # options to pass to useradd
586 local opts= 465 local opts=
587 466
588 # handle uid 467 # handle uid
589 local euid="$1"; shift 468 local euid=$1; shift
590 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
591 then
592 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
593 then
594 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
595 then
596 euid="next" 472 euid="next"
597 fi 473 fi
598 else 474 else
599 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
600 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
601 fi 477 fi
602 else 478 else
603 euid="next" 479 euid="next"
604 fi 480 fi
605 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
606 then 482 for euid in $(seq 101 999) ; do
607 local pwrange
608 if [ "${USERLAND}" == "BSD" ] ; then
609 pwrange="`jot 898 101`"
610 else
611 pwrange="`seq 101 999`"
612 fi
613 for euid in ${pwrange} ; do
614 [ -z "`egetent passwd ${euid}`" ] && break 483 [[ -z $(egetent passwd ${euid}) ]] && break
615 done 484 done
616 fi 485 fi
617 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
618 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
619 488
620 # handle shell 489 # handle shell
621 local eshell="$1"; shift 490 local eshell=$1; shift
622 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
623 then
624 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
625 then
626 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
627 die "${eshell} does not exist" 494 die "${eshell} does not exist"
628 fi 495 fi
629 else 496 else
630 if [ "${USERLAND}" == "BSD" ] 497 case ${USERLAND} in
631 then
632 eshell="/usr/bin/false" 498 Darwin) eshell="/usr/bin/false";;
633 else 499 BSD) eshell="/usr/sbin/nologin";;
634 eshell="/bin/false" 500 *) eshell="/bin/false";;
635 fi 501 esac
636 fi 502 fi
637 einfo " - Shell: ${eshell}" 503 einfo " - Shell: ${eshell}"
638 opts="${opts} -s ${eshell}" 504 opts="${opts} -s ${eshell}"
639 505
640 # handle homedir 506 # handle homedir
641 local ehome="$1"; shift 507 local ehome=$1; shift
642 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 508 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
643 then
644 ehome="/dev/null" 509 ehome="/dev/null"
645 fi 510 fi
646 einfo " - Home: ${ehome}" 511 einfo " - Home: ${ehome}"
647 opts="${opts} -d ${ehome}" 512 opts="${opts} -d ${ehome}"
648 513
649 # handle groups 514 # handle groups
650 local egroups="$1"; shift 515 local egroups=$1; shift
651 if [ ! -z "${egroups}" ] 516 if [[ ! -z ${egroups} ]] ; then
652 then
653 local oldifs="${IFS}" 517 local oldifs=${IFS}
654 local defgroup="" exgroups="" 518 local defgroup="" exgroups=""
655 519
656 export IFS="," 520 export IFS=","
657 for g in ${egroups} 521 for g in ${egroups} ; do
658 do
659 export IFS="${oldifs}" 522 export IFS=${oldifs}
660 if [ -z "`egetent group \"${g}\"`" ] 523 if [[ -z $(egetent group "${g}") ]] ; then
661 then
662 eerror "You must add group ${g} to the system first" 524 eerror "You must add group ${g} to the system first"
663 die "${g} is not a valid GID" 525 die "${g} is not a valid GID"
664 fi 526 fi
665 if [ -z "${defgroup}" ] 527 if [[ -z ${defgroup} ]] ; then
666 then
667 defgroup="${g}" 528 defgroup=${g}
668 else 529 else
669 exgroups="${exgroups},${g}" 530 exgroups="${exgroups},${g}"
670 fi 531 fi
671 export IFS="," 532 export IFS=","
672 done 533 done
673 export IFS="${oldifs}" 534 export IFS=${oldifs}
674 535
675 opts="${opts} -g ${defgroup}" 536 opts="${opts} -g ${defgroup}"
676 if [ ! -z "${exgroups}" ] 537 if [[ ! -z ${exgroups} ]] ; then
677 then
678 opts="${opts} -G ${exgroups:1}" 538 opts="${opts} -G ${exgroups:1}"
679 fi 539 fi
680 else 540 else
681 egroups="(none)" 541 egroups="(none)"
682 fi 542 fi
683 einfo " - Groups: ${egroups}" 543 einfo " - Groups: ${egroups}"
684 544
685 # handle extra and add the user 545 # handle extra and add the user
686 local eextra="$@"
687 local oldsandbox="${SANDBOX_ON}" 546 local oldsandbox=${SANDBOX_ON}
688 export SANDBOX_ON="0" 547 export SANDBOX_ON="0"
689 if useq ppc-macos 548 case ${USERLAND} in
690 then 549 Darwin)
691 ### Make the user 550 ### Make the user
692 if [ -z "${eextra}" ] 551 if [[ -z $@ ]] ; then
693 then
694 dscl . create /users/${euser} uid ${euid} 552 dscl . create /users/${euser} uid ${euid}
695 dscl . create /users/${euser} shell ${eshell} 553 dscl . create /users/${euser} shell ${eshell}
696 dscl . create /users/${euser} home ${ehome} 554 dscl . create /users/${euser} home ${ehome}
697 dscl . create /users/${euser} realname "added by portage for ${PN}" 555 dscl . create /users/${euser} realname "added by portage for ${PN}"
698 ### Add the user to the groups specified 556 ### Add the user to the groups specified
699 local oldifs="${IFS}" 557 local oldifs=${IFS}
700 export IFS="," 558 export IFS=","
701 for g in ${egroups} 559 for g in ${egroups} ; do
702 do
703 dscl . merge /groups/${g} users ${euser} 560 dscl . merge /groups/${g} users ${euser}
704 done 561 done
705 export IFS="${oldifs}" 562 export IFS=${oldifs}
706 else 563 else
707 einfo "Extra options are not supported on macos yet" 564 einfo "Extra options are not supported on Darwin yet"
708 einfo "Please report the ebuild along with the info below" 565 einfo "Please report the ebuild along with the info below"
709 einfo "eextra: ${eextra}" 566 einfo "eextra: $@"
710 die "Required function missing" 567 die "Required function missing"
711 fi 568 fi
712 elif use x86-fbsd ; then 569 ;;
713 if [ -z "${eextra}" ] 570 BSD)
714 then 571 if [[ -z $@ ]] ; then
715 pw useradd ${euser} ${opts} \ 572 pw useradd ${euser} ${opts} \
716 -c "added by portage for ${PN}" \ 573 -c "added by portage for ${PN}" \
717 die "enewuser failed" 574 die "enewuser failed"
718 else 575 else
719 einfo " - Extra: ${eextra}" 576 einfo " - Extra: $@"
720 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
721 -c ${eextra} || die "enewuser failed" 578 "$@" || die "enewuser failed"
722 fi 579 fi
723 else 580 ;;
724 if [ -z "${eextra}" ] 581 *)
725 then 582 if [[ -z $@ ]] ; then
726 useradd ${opts} ${euser} \ 583 useradd ${opts} ${euser} \
727 -c "added by portage for ${PN}" \ 584 -c "added by portage for ${PN}" \
728 || die "enewuser failed" 585 || die "enewuser failed"
729 else 586 else
730 einfo " - Extra: ${eextra}" 587 einfo " - Extra: $@"
731 useradd ${opts} ${euser} ${eextra} \ 588 useradd ${opts} ${euser} "$@" \
732 || die "enewuser failed" 589 || die "enewuser failed"
733 fi 590 fi
591 ;;
592 esac
593
594 if [[ ! -e ${ROOT}/${ehome} ]] ; then
595 einfo " - Creating ${ehome} in ${ROOT}"
596 mkdir -p "${ROOT}/${ehome}"
597 chown ${euser} "${ROOT}/${ehome}"
598 chmod 755 "${ROOT}/${ehome}"
734 fi 599 fi
600
735 export SANDBOX_ON="${oldsandbox}" 601 export SANDBOX_ON=${oldsandbox}
736
737 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
738 then
739 einfo " - Creating ${ehome} in ${D}"
740 dodir ${ehome}
741 fowners ${euser} ${ehome}
742 fperms 755 ${ehome}
743 fi
744} 602}
745 603
746# Simplify/standardize adding groups to the system 604# Simplify/standardize adding groups to the system
747# vapier@gentoo.org 605# vapier@gentoo.org
748# 606#
777 then 635 then
778 if [ "${egid}" -gt 0 ] 636 if [ "${egid}" -gt 0 ]
779 then 637 then
780 if [ -z "`egetent group ${egid}`" ] 638 if [ -z "`egetent group ${egid}`" ]
781 then 639 then
782 if useq ppc-macos ; then 640 if [[ "${USERLAND}" == "Darwin" ]]; then
783 opts="${opts} ${egid}" 641 opts="${opts} ${egid}"
784 else 642 else
785 opts="${opts} -g ${egid}" 643 opts="${opts} -g ${egid}"
786 fi 644 fi
787 else 645 else
801 opts="${opts} ${eextra}" 659 opts="${opts} ${eextra}"
802 660
803 # add the group 661 # add the group
804 local oldsandbox="${SANDBOX_ON}" 662 local oldsandbox="${SANDBOX_ON}"
805 export SANDBOX_ON="0" 663 export SANDBOX_ON="0"
806 if useq ppc-macos ; then 664 if [[ "${USERLAND}" == "Darwin" ]]; then
807 if [ ! -z "${eextra}" ]; 665 if [ ! -z "${eextra}" ];
808 then 666 then
809 einfo "Extra options are not supported on macos yet" 667 einfo "Extra options are not supported on Darwin/OS X yet"
810 einfo "Please report the ebuild along with the info below" 668 einfo "Please report the ebuild along with the info below"
811 einfo "eextra: ${eextra}" 669 einfo "eextra: ${eextra}"
812 die "Required function missing" 670 die "Required function missing"
813 fi 671 fi
814 672
815 # If we need the next available 673 # If we need the next available
816 case ${egid} in 674 case ${egid} in
817 *[!0-9]*) # Non numeric 675 *[!0-9]*) # Non numeric
818 for egid in `jot 898 101`; do 676 for egid in $(seq 101 999); do
819 [ -z "`egetent group ${egid}`" ] && break 677 [ -z "`egetent group ${egid}`" ] && break
820 done 678 done
821 esac 679 esac
822 dscl . create /groups/${egroup} gid ${egid} 680 dscl . create /groups/${egroup} gid ${egid}
823 dscl . create /groups/${egroup} passwd '*' 681 dscl . create /groups/${egroup} passwd '*'
824 elif use x86-fbsd ; then 682 elif [[ "${USERLAND}" == "BSD" ]] ; then
825 case ${egid} in 683 case ${egid} in
826 *[!0-9]*) # Non numeric 684 *[!0-9]*) # Non numeric
827 for egid in `jot 898 101`; do 685 for egid in $(seq 101 999); do
828 [ -z "`egetent group ${egid}`" ] && break 686 [ -z "`egetent group ${egid}`" ] && break
829 done 687 done
830 esac 688 esac
831 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 689 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
832 else 690 else
864# name: the name that will show up in the menu 722# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 723# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 724# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 725# a full path to an icon
868# type: what kind of application is this ? for categories: 726# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 727# http://www.freedesktop.org/Standards/desktop-entry-spec
870# path: if your app needs to startup in a specific dir 728# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 729make_desktop_entry() {
872 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 730 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
873 731
874 local exec="${1}" 732 local exec=${1}
875 local name="${2:-${PN}}" 733 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 734 local icon=${3:-${PN}.png}
877 local type="${4}" 735 local type=${4}
878 local subdir="${6}" 736 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 737
880 if [ -z "${type}" ] 738 if [[ -z ${type} ]] ; then
881 then 739 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 740 local catmin=${CATEGORY##*-}
883 "app-emulation") 741 case ${catmaj} in
884 type=Emulator 742 app)
885 subdir="Emulation" 743 case ${catmin} in
744 admin) type=System;;
745 cdr) type=DiscBurning;;
746 dicts) type=Dictionary;;
747 editors) type=TextEditor;;
748 emacs) type=TextEditor;;
749 emulation) type=Emulator;;
750 laptop) type=HardwareSettings;;
751 office) type=Office;;
752 vim) type=TextEditor;;
753 xemacs) type=TextEditor;;
754 *) type=;;
755 esac
886 ;; 756 ;;
887 "games-"*) 757
888 type=Game 758 dev)
889 subdir="Games" 759 type="Development"
890 ;; 760 ;;
891 "net-"*) 761
892 type=Network 762 games)
893 subdir="${type}" 763 case ${catmin} in
764 action) type=ActionGame;;
765 arcade) type=ArcadeGame;;
766 board) type=BoardGame;;
767 kid) type=KidsGame;;
768 emulation) type=Emulator;;
769 puzzle) type=LogicGame;;
770 rpg) type=RolePlaying;;
771 roguelike) type=RolePlaying;;
772 simulation) type=Simulation;;
773 sports) type=SportsGame;;
774 strategy) type=StrategyGame;;
775 *) type=;;
776 esac
777 type="Game;${type}"
894 ;; 778 ;;
779
780 mail)
781 type="Network;Email"
782 ;;
783
784 media)
785 case ${catmin} in
786 gfx) type=Graphics;;
787 radio) type=Tuner;;
788 sound) type=Audio;;
789 tv) type=TV;;
790 video) type=Video;;
791 *) type=;;
792 esac
793 type="AudioVideo;${type}"
794 ;;
795
796 net)
797 case ${catmin} in
798 dialup) type=Dialup;;
799 ftp) type=FileTransfer;;
800 im) type=InstantMessaging;;
801 irc) type=IRCClient;;
802 mail) type=Email;;
803 news) type=News;;
804 nntp) type=News;;
805 p2p) type=FileTransfer;;
806 *) type=;;
807 esac
808 type="Network;${type}"
809 ;;
810
811 sci)
812 case ${catmin} in
813 astro*) type=Astronomoy;;
814 bio*) type=Biology;;
815 calc*) type=Calculator;;
816 chem*) type=Chemistry;;
817 geo*) type=Geology;;
818 math*) type=Math;;
819 *) type=;;
820 esac
821 type="Science;${type}"
822 ;;
823
824 www)
825 case ${catmin} in
826 client) type=WebBrowser;;
827 *) type=;;
828 esac
829 type="Network"
830 ;;
831
895 *) 832 *)
896 type= 833 type=
897 subdir=
898 ;; 834 ;;
899 esac 835 esac
900 fi 836 fi
837 if [ "${SLOT}" == "0" ] ; then
838 local desktop_name="${PN}"
839 else
840 local desktop_name="${PN}-${SLOT}"
841 fi
901 local desktop="${T}/${exec}.desktop" 842 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902 843
903echo "[Desktop Entry] 844echo "[Desktop Entry]
904Encoding=UTF-8 845Encoding=UTF-8
905Version=0.9.2 846Version=0.9.2
906Name=${name} 847Name=${name}
922# make_desktop_entry(<title>, <command>) 863# make_desktop_entry(<title>, <command>)
923# title: File to execute to start the Window Manager 864# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 865# command: Name of the Window Manager
925 866
926make_session_desktop() { 867make_session_desktop() {
927
928 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 868 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
929 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 869 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
930 870
931 local title="${1}" 871 local title=$1
932 local command="${2}" 872 local command=$2
933 local desktop="${T}/${wm}.desktop" 873 local desktop=${T}/${wm}.desktop
934 874
935echo "[Desktop Entry] 875echo "[Desktop Entry]
936Encoding=UTF-8 876Encoding=UTF-8
937Name=${title} 877Name=${title}
938Comment=This session logs you into ${title} 878Comment=This session logs you into ${title}
940TryExec=${command} 880TryExec=${command}
941Type=Application" > "${desktop}" 881Type=Application" > "${desktop}"
942 882
943 insinto /usr/share/xsessions 883 insinto /usr/share/xsessions
944 doins "${desktop}" 884 doins "${desktop}"
945
946 return 0
947} 885}
948 886
949domenu() { 887domenu() {
950 local i 888 local i j
951 local j
952 insinto /usr/share/applications 889 insinto /usr/share/applications
953 for i in ${@} 890 for i in "$@" ; do
954 do
955 if [ -f "${i}" ]; 891 if [[ -f ${i} ]] ; then
956 then
957 doins ${i} 892 doins "${i}"
958 elif [ -d "${i}" ]; 893 elif [[ -d ${i} ]] ; then
959 then
960 for j in ${i}/*.desktop 894 for j in "${i}"/*.desktop ; do
961 do
962 doins ${j} 895 doins "${j}"
963 done 896 done
964 fi 897 fi
965 done 898 done
966} 899}
900newmenu() {
901 insinto /usr/share/applications
902 newins "$1" "$2"
903}
967 904
968doicon() { 905doicon() {
969 local i 906 local i j
970 local j
971 insinto /usr/share/pixmaps 907 insinto /usr/share/pixmaps
972 for i in ${@} 908 for i in "$@" ; do
973 do
974 if [ -f "${i}" ]; 909 if [[ -f ${i} ]] ; then
975 then
976 doins ${i} 910 doins "${i}"
977 elif [ -d "${i}" ]; 911 elif [[ -d ${i} ]] ; then
978 then
979 for j in ${i}/*.png 912 for j in "${i}"/*.png ; do
980 do
981 doins ${j} 913 doins "${j}"
982 done 914 done
983 fi 915 fi
984 done 916 done
917}
918newicon() {
919 insinto /usr/share/pixmaps
920 newins "$1" "$2"
985} 921}
986 922
987############################################################## 923##############################################################
988# END: Handle .desktop files and menu entries # 924# END: Handle .desktop files and menu entries #
989############################################################## 925##############################################################
990 926
991 927
992# for internal use only (unpack_pdv and unpack_makeself) 928# for internal use only (unpack_pdv and unpack_makeself)
993find_unpackable_file() { 929find_unpackable_file() {
994 local src="$1" 930 local src=$1
995 if [ -z "${src}" ] 931 if [[ -z ${src} ]] ; then
996 then
997 src="${DISTDIR}/${A}" 932 src=${DISTDIR}/${A}
998 else 933 else
999 if [ -e "${DISTDIR}/${src}" ] 934 if [[ -e ${DISTDIR}/${src} ]] ; then
1000 then
1001 src="${DISTDIR}/${src}" 935 src=${DISTDIR}/${src}
1002 elif [ -e "${PWD}/${src}" ] 936 elif [[ -e ${PWD}/${src} ]] ; then
1003 then
1004 src="${PWD}/${src}" 937 src=${PWD}/${src}
1005 elif [ -e "${src}" ] 938 elif [[ -e ${src} ]] ; then
1006 then
1007 src="${src}" 939 src=${src}
1008 fi
1009 fi 940 fi
1010 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 941 fi
942 [[ ! -e ${src} ]] && return 1
1011 echo "${src}" 943 echo "${src}"
1012} 944}
1013 945
1014# Unpack those pesky pdv generated files ... 946# Unpack those pesky pdv generated files ...
1015# They're self-unpacking programs with the binary package stuffed in 947# They're self-unpacking programs with the binary package stuffed in
1030# lseek 962# lseek
1031# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 963# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1032# lseek(3, -4, SEEK_END) = 2981250 964# lseek(3, -4, SEEK_END) = 2981250
1033# thus we would pass in the value of '4' as the second parameter. 965# thus we would pass in the value of '4' as the second parameter.
1034unpack_pdv() { 966unpack_pdv() {
1035 local src="`find_unpackable_file $1`" 967 local src=$(find_unpackable_file $1)
1036 local sizeoff_t="$2" 968 local sizeoff_t=$2
1037 969
970 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1038 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 971 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1039 972
1040 local shrtsrc="`basename ${src}`" 973 local shrtsrc="`basename ${src}`"
1041 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 974 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1042 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 975 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1043 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 976 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1109# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1042# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1110# - If the file is not specified then unpack will utilize ${A}. 1043# - If the file is not specified then unpack will utilize ${A}.
1111# - If the offset is not specified then we will attempt to extract 1044# - If the offset is not specified then we will attempt to extract
1112# the proper offset from the script itself. 1045# the proper offset from the script itself.
1113unpack_makeself() { 1046unpack_makeself() {
1114 local src="$(find_unpackable_file "$1")" 1047 local src=$(find_unpackable_file "$1")
1115 local skip="$2" 1048 local skip=$2
1116 local exe="$3" 1049 local exe=$3
1117 1050
1051 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1052
1118 local shrtsrc="$(basename "${src}")" 1053 local shrtsrc=$(basename "${src}")
1119 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1054 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1120 if [ -z "${skip}" ] 1055 if [ -z "${skip}" ]
1121 then 1056 then
1122 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1057 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1123 local skip=0 1058 local skip=0
1383# displayed and we'll hang out here until: 1318# displayed and we'll hang out here until:
1384# (1) the file is found on a mounted cdrom 1319# (1) the file is found on a mounted cdrom
1385# (2) the user hits CTRL+C 1320# (2) the user hits CTRL+C
1386cdrom_locate_file_on_cd() { 1321cdrom_locate_file_on_cd() {
1387 while [[ -z ${CDROM_ROOT} ]] ; do 1322 while [[ -z ${CDROM_ROOT} ]] ; do
1388 local dir="$(dirname ${@})" 1323 local dir=$(dirname "$*")
1389 local file="$(basename ${@})" 1324 local file=$(basename "$*")
1390 local mline="" 1325 local mline=""
1391 local showedmsg=0 1326 local showedmsg=0
1392 1327
1393 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1328 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1394 [[ -d ${mline}/${dir} ]] || continue 1329 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1330 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1396 && export CDROM_ROOT=${mline} 1331 && export CDROM_ROOT=${mline}
1397 done 1332 done
1398 1333
1399 if [[ -z ${CDROM_ROOT} ]] ; then 1334 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1335 echo
1415 fi 1350 fi
1416 showedmsg=1 1351 showedmsg=1
1417 fi 1352 fi
1418 einfo "Press return to scan for the cd again" 1353 einfo "Press return to scan for the cd again"
1419 einfo "or hit CTRL+C to abort the emerge." 1354 einfo "or hit CTRL+C to abort the emerge."
1355 echo
1356 einfo "If you are having trouble with the detection"
1357 einfo "of your CD, it is possible that you do not have"
1358 einfo "Joliet support enabled in your kernel. Please"
1359 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1420 read 1360 read
1421 fi 1361 fi
1422 done 1362 done
1423} 1363}
1424 1364
1434# directories and uses the intersection of the lists. 1374# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1375# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1376# directories and uses the union of the lists.
1437strip-linguas() { 1377strip-linguas() {
1438 local ls newls 1378 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1379 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1380 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1381 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1442 local d f 1382 local d f
1443 for d in "$@" ; do 1383 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1384 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1385 newls=${ls}
1446 else 1386 else
1447 newls="" 1387 newls=""
1448 fi 1388 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1389 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1450 if [ "${op}" == "-i" ] ; then 1390 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1391 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1452 else 1392 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1393 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1454 fi 1394 fi
1455 done 1395 done
1456 ls="${newls}" 1396 ls=${newls}
1457 done 1397 done
1458 ls="${ls//.po}" 1398 ls=${ls//.po}
1459 else 1399 else
1460 ls="$@" 1400 ls=$@
1461 fi 1401 fi
1462 1402
1463 ls=" ${ls} " 1403 ls=" ${ls} "
1464 newls="" 1404 newls=""
1465 for f in ${LINGUAS} ; do 1405 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1406 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1467 newls="${newls} ${f}" 1407 newls="${newls} ${f}"
1468 else 1408 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1409 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1410 fi
1471 done 1411 done
1472 if [ -z "${newls}" ] ; then 1412 if [[ -z ${newls} ]] ; then
1473 unset LINGUAS 1413 export LINGUAS=""
1474 else 1414 else
1475 export LINGUAS="${newls}" 1415 export LINGUAS=${newls:1}
1476 fi 1416 fi
1477} 1417}
1478 1418
1479# moved from kernel.eclass since they are generally useful outside of 1419# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1420# kernel.eclass -iggy (20041002)
1488 while ((i--)) ; do 1428 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1429 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1430 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1431 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1432 case ${ARCH} in
1493 x86) export ARCH="i386";; 1433 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1434 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1435 hppa) export ARCH="parisc";;
1496 mips) export ARCH="mips";; 1436 mips) export ARCH="mips";;
1497 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! 1437 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!
1498 *) export ARCH="${ARCH}";; 1438 *) export ARCH="${ARCH}";;
1499 esac 1439 esac
1500} 1440}
1501 1441
1502# set's ARCH back to what portage expects 1442# set's ARCH back to what portage expects
1503set_arch_to_portage() { 1443set_arch_to_portage() {
1547 LIB=$1 1487 LIB=$1
1548 1488
1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1489 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1550 SONAME=`basename ${LIB}` 1490 SONAME=`basename ${LIB}`
1551 1491
1552 einfo "An old version of an installed library was detected on your system." 1492 ewarn "An old version of an installed library was detected on your system."
1553 einfo "In order to avoid breaking packages that link against is, this older version" 1493 ewarn "In order to avoid breaking packages that link against it, this older version"
1554 einfo "is not being removed. In order to make full use of this newer version," 1494 ewarn "is not being removed. In order to make full use of this newer version,"
1555 einfo "you will need to execute the following command:" 1495 ewarn "you will need to execute the following command:"
1556 einfo " revdep-rebuild --soname ${SONAME}" 1496 ewarn " revdep-rebuild --soname ${SONAME}"
1557 einfo 1497 ewarn
1558 einfo "After doing that, you can safely remove ${LIB}" 1498 ewarn "After doing that, you can safely remove ${LIB}"
1559 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1499 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1560 fi 1500 fi
1561} 1501}
1562 1502
1563# Hack for people to figure out if a package was built with 1503# Hack for people to figure out if a package was built with
1564# certain USE flags 1504# certain USE flags
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1542 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1543 done
1604 eend 0 1544 eend 0
1605} 1545}
1606 1546
1607# dopamd [ file ] [ new file ] 1547# dopamd <file> [more files]
1608# 1548#
1609# Install pam auth config file in /etc/pam.d 1549# Install pam auth config file in /etc/pam.d
1610#
1611# The first argument, 'file' is required. Install as 'new file', if
1612# specified.
1613
1614dopamd() { 1550dopamd() {
1615 local pamd="$1" newpamd="${2:-$1}"
1616 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1551 [[ -z $1 ]] && die "dopamd requires at least one argument"
1617 1552
1618 use pam || return 0 1553 use pam || return 0
1619 1554
1620 insinto /etc/pam.d 1555 INSDESTTREE=/etc/pam.d \
1621 # these are the default doins options, but be explicit just in case 1556 doins "$@" || die "failed to install $@"
1622 insopts -m 0644 -o root -g root
1623 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1624} 1557}
1558# newpamd <old name> <new name>
1559#
1560# Install pam file <old name> as <new name> in /etc/pam.d
1561newpamd() {
1562 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1563
1564 use pam || return 0
1565
1566 INSDESTTREE=/etc/pam.d \
1567 newins "$1" "$2" || die "failed to install $1 as $2"
1568}
1569
1570# make a wrapper script ...
1571# NOTE: this was originally games_make_wrapper, but I noticed other places where
1572# this could be used, so I have moved it here and made it not games-specific
1573# -- wolf31o2
1574# $1 == wrapper name
1575# $2 == binary to run
1576# $3 == directory to chdir before running binary
1577# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1578# $5 == path for wrapper
1579make_wrapper() {
1580 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1581 local tmpwrapper=$(emktemp)
1582 cat << EOF > "${tmpwrapper}"
1583#!/bin/sh
1584cd "${chdir}"
1585export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1586exec ${bin} "\$@"
1587EOF
1588 chmod go+rx "${tmpwrapper}"
1589 if [ -n "${5}" ]
1590 then
1591 exeinto ${5}
1592 newexe "${tmpwrapper}" "${wrapper}"
1593 else
1594 newbin "${tmpwrapper}" "${wrapper}"
1595 fi
1596}

Legend:
Removed from v.1.143  
changed lines
  Added in v.1.197

  ViewVC Help
Powered by ViewVC 1.1.20