/[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.204
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.204 2005/10/07 04:15:20 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
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 opts action="user"
543 if [ "$1" == "passwd" ] 424 [[ $1 == "passwd" ]] || action="group"
544 then 425
545 action="user" 426 # lookup by uid/gid
546 else 427 if [[ $2 == [[:digit:]]* ]] ; then
547 action="group" 428 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
548 fi 429 fi
430
549 pw show "${action}" "$2" -q 431 pw show ${action} ${opts} "$2" -q
550 else 432 else
551 which nscd >& /dev/null && nscd -i "$1" 433 which nscd >& /dev/null && nscd -i "$1"
552 getent "$1" "$2" 434 getent "$1" "$2"
553 fi 435 fi
554} 436}
566# homedir: /dev/null 448# homedir: /dev/null
567# groups: none 449# groups: none
568# extra: comment of 'added by portage for ${PN}' 450# extra: comment of 'added by portage for ${PN}'
569enewuser() { 451enewuser() {
570 # get the username 452 # get the username
571 local euser="$1"; shift 453 local euser=$1; shift
572 if [ -z "${euser}" ] 454 if [[ -z ${euser} ]] ; then
573 then
574 eerror "No username specified !" 455 eerror "No username specified !"
575 die "Cannot call enewuser without a username" 456 die "Cannot call enewuser without a username"
576 fi 457 fi
577 458
578 # lets see if the username already exists 459 # lets see if the username already exists
579 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 460 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
580 then
581 return 0 461 return 0
582 fi 462 fi
583 einfo "Adding user '${euser}' to your system ..." 463 einfo "Adding user '${euser}' to your system ..."
584 464
585 # options to pass to useradd 465 # options to pass to useradd
586 local opts= 466 local opts=
587 467
588 # handle uid 468 # handle uid
589 local euid="$1"; shift 469 local euid=$1; shift
590 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 470 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
591 then
592 if [ "${euid}" -gt 0 ] 471 if [[ ${euid} -gt 0 ]] ; then
593 then
594 if [ ! -z "`egetent passwd ${euid}`" ] 472 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
595 then
596 euid="next" 473 euid="next"
597 fi 474 fi
598 else 475 else
599 eerror "Userid given but is not greater than 0 !" 476 eerror "Userid given but is not greater than 0 !"
600 die "${euid} is not a valid UID" 477 die "${euid} is not a valid UID"
601 fi 478 fi
602 else 479 else
603 euid="next" 480 euid="next"
604 fi 481 fi
605 if [ "${euid}" == "next" ] 482 if [[ ${euid} == "next" ]] ; then
606 then 483 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 484 [[ -z $(egetent passwd ${euid}) ]] && break
615 done 485 done
616 fi 486 fi
617 opts="${opts} -u ${euid}" 487 opts="${opts} -u ${euid}"
618 einfo " - Userid: ${euid}" 488 einfo " - Userid: ${euid}"
619 489
620 # handle shell 490 # handle shell
621 local eshell="$1"; shift 491 local eshell=$1; shift
622 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 492 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
623 then
624 if [ ! -e "${eshell}" ] 493 if [[ ! -e ${eshell} ]] ; then
625 then
626 eerror "A shell was specified but it does not exist !" 494 eerror "A shell was specified but it does not exist !"
627 die "${eshell} does not exist" 495 die "${eshell} does not exist"
628 fi 496 fi
629 else 497 else
630 if [ "${USERLAND}" == "BSD" ] 498 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
631 then 499 [[ -x ${ROOT}${shell} ]] && break
632 eshell="/usr/bin/false" 500 done
633 else 501
634 eshell="/bin/false" 502 if [[ ${shell} == "/dev/null" ]] ; then
503 eerror "Unable to identify the shell to use"
504 die "Unable to identify the shell to use"
635 fi 505 fi
506
507 eshell=${shell}
636 fi 508 fi
637 einfo " - Shell: ${eshell}" 509 einfo " - Shell: ${eshell}"
638 opts="${opts} -s ${eshell}" 510 opts="${opts} -s ${eshell}"
639 511
640 # handle homedir 512 # handle homedir
641 local ehome="$1"; shift 513 local ehome=$1; shift
642 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 514 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
643 then
644 ehome="/dev/null" 515 ehome="/dev/null"
645 fi 516 fi
646 einfo " - Home: ${ehome}" 517 einfo " - Home: ${ehome}"
647 opts="${opts} -d ${ehome}" 518 opts="${opts} -d ${ehome}"
648 519
649 # handle groups 520 # handle groups
650 local egroups="$1"; shift 521 local egroups=$1; shift
651 if [ ! -z "${egroups}" ] 522 if [[ ! -z ${egroups} ]] ; then
652 then
653 local oldifs="${IFS}" 523 local oldifs=${IFS}
654 local defgroup="" exgroups="" 524 local defgroup="" exgroups=""
655 525
656 export IFS="," 526 export IFS=","
657 for g in ${egroups} 527 for g in ${egroups} ; do
658 do
659 export IFS="${oldifs}" 528 export IFS=${oldifs}
660 if [ -z "`egetent group \"${g}\"`" ] 529 if [[ -z $(egetent group "${g}") ]] ; then
661 then
662 eerror "You must add group ${g} to the system first" 530 eerror "You must add group ${g} to the system first"
663 die "${g} is not a valid GID" 531 die "${g} is not a valid GID"
664 fi 532 fi
665 if [ -z "${defgroup}" ] 533 if [[ -z ${defgroup} ]] ; then
666 then
667 defgroup="${g}" 534 defgroup=${g}
668 else 535 else
669 exgroups="${exgroups},${g}" 536 exgroups="${exgroups},${g}"
670 fi 537 fi
671 export IFS="," 538 export IFS=","
672 done 539 done
673 export IFS="${oldifs}" 540 export IFS=${oldifs}
674 541
675 opts="${opts} -g ${defgroup}" 542 opts="${opts} -g ${defgroup}"
676 if [ ! -z "${exgroups}" ] 543 if [[ ! -z ${exgroups} ]] ; then
677 then
678 opts="${opts} -G ${exgroups:1}" 544 opts="${opts} -G ${exgroups:1}"
679 fi 545 fi
680 else 546 else
681 egroups="(none)" 547 egroups="(none)"
682 fi 548 fi
683 einfo " - Groups: ${egroups}" 549 einfo " - Groups: ${egroups}"
684 550
685 # handle extra and add the user 551 # handle extra and add the user
686 local eextra="$@"
687 local oldsandbox="${SANDBOX_ON}" 552 local oldsandbox=${SANDBOX_ON}
688 export SANDBOX_ON="0" 553 export SANDBOX_ON="0"
689 if useq ppc-macos 554 case ${USERLAND} in
690 then 555 Darwin)
691 ### Make the user 556 ### Make the user
692 if [ -z "${eextra}" ] 557 if [[ -z $@ ]] ; then
693 then
694 dscl . create /users/${euser} uid ${euid} 558 dscl . create /users/${euser} uid ${euid}
695 dscl . create /users/${euser} shell ${eshell} 559 dscl . create /users/${euser} shell ${eshell}
696 dscl . create /users/${euser} home ${ehome} 560 dscl . create /users/${euser} home ${ehome}
697 dscl . create /users/${euser} realname "added by portage for ${PN}" 561 dscl . create /users/${euser} realname "added by portage for ${PN}"
698 ### Add the user to the groups specified 562 ### Add the user to the groups specified
699 local oldifs="${IFS}" 563 local oldifs=${IFS}
700 export IFS="," 564 export IFS=","
701 for g in ${egroups} 565 for g in ${egroups} ; do
702 do
703 dscl . merge /groups/${g} users ${euser} 566 dscl . merge /groups/${g} users ${euser}
704 done 567 done
705 export IFS="${oldifs}" 568 export IFS=${oldifs}
706 else 569 else
707 einfo "Extra options are not supported on macos yet" 570 einfo "Extra options are not supported on Darwin yet"
708 einfo "Please report the ebuild along with the info below" 571 einfo "Please report the ebuild along with the info below"
709 einfo "eextra: ${eextra}" 572 einfo "eextra: $@"
710 die "Required function missing" 573 die "Required function missing"
711 fi 574 fi
712 elif use x86-fbsd ; then 575 ;;
713 if [ -z "${eextra}" ] 576 BSD)
714 then 577 if [[ -z $@ ]] ; then
715 pw useradd ${euser} ${opts} \ 578 pw useradd ${euser} ${opts} \
716 -c "added by portage for ${PN}" \ 579 -c "added by portage for ${PN}" \
717 die "enewuser failed" 580 die "enewuser failed"
718 else 581 else
719 einfo " - Extra: ${eextra}" 582 einfo " - Extra: $@"
720 pw useradd ${euser} ${opts} \ 583 pw useradd ${euser} ${opts} \
721 -c ${eextra} || die "enewuser failed" 584 "$@" || die "enewuser failed"
722 fi 585 fi
723 else 586 ;;
724 if [ -z "${eextra}" ] 587 *)
725 then 588 if [[ -z $@ ]] ; then
726 useradd ${opts} ${euser} \ 589 useradd ${opts} ${euser} \
727 -c "added by portage for ${PN}" \ 590 -c "added by portage for ${PN}" \
728 || die "enewuser failed" 591 || die "enewuser failed"
729 else 592 else
730 einfo " - Extra: ${eextra}" 593 einfo " - Extra: $@"
731 useradd ${opts} ${euser} ${eextra} \ 594 useradd ${opts} ${euser} "$@" \
732 || die "enewuser failed" 595 || die "enewuser failed"
733 fi 596 fi
597 ;;
598 esac
599
600 if [[ ! -e ${ROOT}/${ehome} ]] ; then
601 einfo " - Creating ${ehome} in ${ROOT}"
602 mkdir -p "${ROOT}/${ehome}"
603 chown ${euser} "${ROOT}/${ehome}"
604 chmod 755 "${ROOT}/${ehome}"
734 fi 605 fi
606
735 export SANDBOX_ON="${oldsandbox}" 607 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} 608}
745 609
746# Simplify/standardize adding groups to the system 610# Simplify/standardize adding groups to the system
747# vapier@gentoo.org 611# vapier@gentoo.org
748# 612#
777 then 641 then
778 if [ "${egid}" -gt 0 ] 642 if [ "${egid}" -gt 0 ]
779 then 643 then
780 if [ -z "`egetent group ${egid}`" ] 644 if [ -z "`egetent group ${egid}`" ]
781 then 645 then
782 if useq ppc-macos ; then 646 if [[ "${USERLAND}" == "Darwin" ]]; then
783 opts="${opts} ${egid}" 647 opts="${opts} ${egid}"
784 else 648 else
785 opts="${opts} -g ${egid}" 649 opts="${opts} -g ${egid}"
786 fi 650 fi
787 else 651 else
801 opts="${opts} ${eextra}" 665 opts="${opts} ${eextra}"
802 666
803 # add the group 667 # add the group
804 local oldsandbox="${SANDBOX_ON}" 668 local oldsandbox="${SANDBOX_ON}"
805 export SANDBOX_ON="0" 669 export SANDBOX_ON="0"
806 if useq ppc-macos ; then 670 if [[ "${USERLAND}" == "Darwin" ]]; then
807 if [ ! -z "${eextra}" ]; 671 if [ ! -z "${eextra}" ];
808 then 672 then
809 einfo "Extra options are not supported on macos yet" 673 einfo "Extra options are not supported on Darwin/OS X yet"
810 einfo "Please report the ebuild along with the info below" 674 einfo "Please report the ebuild along with the info below"
811 einfo "eextra: ${eextra}" 675 einfo "eextra: ${eextra}"
812 die "Required function missing" 676 die "Required function missing"
813 fi 677 fi
814 678
815 # If we need the next available 679 # If we need the next available
816 case ${egid} in 680 case ${egid} in
817 *[!0-9]*) # Non numeric 681 *[!0-9]*) # Non numeric
818 for egid in `jot 898 101`; do 682 for egid in $(seq 101 999); do
819 [ -z "`egetent group ${egid}`" ] && break 683 [ -z "`egetent group ${egid}`" ] && break
820 done 684 done
821 esac 685 esac
822 dscl . create /groups/${egroup} gid ${egid} 686 dscl . create /groups/${egroup} gid ${egid}
823 dscl . create /groups/${egroup} passwd '*' 687 dscl . create /groups/${egroup} passwd '*'
824 elif use x86-fbsd ; then 688 elif [[ "${USERLAND}" == "BSD" ]] ; then
825 case ${egid} in 689 case ${egid} in
826 *[!0-9]*) # Non numeric 690 *[!0-9]*) # Non numeric
827 for egid in `jot 898 101`; do 691 for egid in $(seq 101 999); do
828 [ -z "`egetent group ${egid}`" ] && break 692 [ -z "`egetent group ${egid}`" ] && break
829 done 693 done
830 esac 694 esac
831 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 695 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
832 else 696 else
864# name: the name that will show up in the menu 728# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 729# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 730# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 731# a full path to an icon
868# type: what kind of application is this ? for categories: 732# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 733# http://www.freedesktop.org/Standards/desktop-entry-spec
870# path: if your app needs to startup in a specific dir 734# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 735make_desktop_entry() {
872 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 736 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
873 737
874 local exec="${1}" 738 local exec=${1}
875 local name="${2:-${PN}}" 739 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 740 local icon=${3:-${PN}.png}
877 local type="${4}" 741 local type=${4}
878 local subdir="${6}" 742 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 743
880 if [ -z "${type}" ] 744 if [[ -z ${type} ]] ; then
881 then 745 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 746 local catmin=${CATEGORY##*-}
883 "app-emulation") 747 case ${catmaj} in
884 type=Emulator 748 app)
885 subdir="Emulation" 749 case ${catmin} in
750 admin) type=System;;
751 cdr) type=DiscBurning;;
752 dicts) type=Dictionary;;
753 editors) type=TextEditor;;
754 emacs) type=TextEditor;;
755 emulation) type=Emulator;;
756 laptop) type=HardwareSettings;;
757 office) type=Office;;
758 vim) type=TextEditor;;
759 xemacs) type=TextEditor;;
760 *) type=;;
761 esac
886 ;; 762 ;;
887 "games-"*) 763
888 type=Game 764 dev)
889 subdir="Games" 765 type="Development"
890 ;; 766 ;;
891 "net-"*) 767
892 type=Network 768 games)
893 subdir="${type}" 769 case ${catmin} in
770 action) type=ActionGame;;
771 arcade) type=ArcadeGame;;
772 board) type=BoardGame;;
773 kid) type=KidsGame;;
774 emulation) type=Emulator;;
775 puzzle) type=LogicGame;;
776 rpg) type=RolePlaying;;
777 roguelike) type=RolePlaying;;
778 simulation) type=Simulation;;
779 sports) type=SportsGame;;
780 strategy) type=StrategyGame;;
781 *) type=;;
782 esac
783 type="Game;${type}"
894 ;; 784 ;;
785
786 mail)
787 type="Network;Email"
788 ;;
789
790 media)
791 case ${catmin} in
792 gfx) type=Graphics;;
793 radio) type=Tuner;;
794 sound) type=Audio;;
795 tv) type=TV;;
796 video) type=Video;;
797 *) type=;;
798 esac
799 type="AudioVideo;${type}"
800 ;;
801
802 net)
803 case ${catmin} in
804 dialup) type=Dialup;;
805 ftp) type=FileTransfer;;
806 im) type=InstantMessaging;;
807 irc) type=IRCClient;;
808 mail) type=Email;;
809 news) type=News;;
810 nntp) type=News;;
811 p2p) type=FileTransfer;;
812 *) type=;;
813 esac
814 type="Network;${type}"
815 ;;
816
817 sci)
818 case ${catmin} in
819 astro*) type=Astronomoy;;
820 bio*) type=Biology;;
821 calc*) type=Calculator;;
822 chem*) type=Chemistry;;
823 geo*) type=Geology;;
824 math*) type=Math;;
825 *) type=;;
826 esac
827 type="Science;${type}"
828 ;;
829
830 www)
831 case ${catmin} in
832 client) type=WebBrowser;;
833 *) type=;;
834 esac
835 type="Network"
836 ;;
837
895 *) 838 *)
896 type= 839 type=
897 subdir=
898 ;; 840 ;;
899 esac 841 esac
900 fi 842 fi
843 if [ "${SLOT}" == "0" ] ; then
844 local desktop_name="${PN}"
845 else
846 local desktop_name="${PN}-${SLOT}"
847 fi
901 local desktop="${T}/${exec}.desktop" 848 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902 849
903echo "[Desktop Entry] 850echo "[Desktop Entry]
904Encoding=UTF-8 851Encoding=UTF-8
905Version=0.9.2 852Version=0.9.2
906Name=${name} 853Name=${name}
909Exec=${exec} 856Exec=${exec}
910Path=${path} 857Path=${path}
911Icon=${icon} 858Icon=${icon}
912Categories=Application;${type};" > "${desktop}" 859Categories=Application;${type};" > "${desktop}"
913 860
861 (
862 # wrap the env here so that the 'insinto' call
863 # doesn't corrupt the env of the caller
914 insinto /usr/share/applications 864 insinto /usr/share/applications
915 doins "${desktop}" 865 doins "${desktop}"
916 866 )
917 return 0
918} 867}
919 868
920# Make a GDM/KDM Session file 869# Make a GDM/KDM Session file
921# 870#
922# make_desktop_entry(<title>, <command>) 871# make_desktop_entry(<title>, <command>)
923# title: File to execute to start the Window Manager 872# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 873# command: Name of the Window Manager
925 874
926make_session_desktop() { 875make_session_desktop() {
927
928 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 876 [[ -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 877 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
930 878
931 local title="${1}" 879 local title=$1
932 local command="${2}" 880 local command=$2
933 local desktop="${T}/${wm}.desktop" 881 local desktop=${T}/${wm}.desktop
934 882
935echo "[Desktop Entry] 883echo "[Desktop Entry]
936Encoding=UTF-8 884Encoding=UTF-8
937Name=${title} 885Name=${title}
938Comment=This session logs you into ${title} 886Comment=This session logs you into ${title}
940TryExec=${command} 888TryExec=${command}
941Type=Application" > "${desktop}" 889Type=Application" > "${desktop}"
942 890
943 insinto /usr/share/xsessions 891 insinto /usr/share/xsessions
944 doins "${desktop}" 892 doins "${desktop}"
945
946 return 0
947} 893}
948 894
949domenu() { 895domenu() {
950 local i 896 local i j
951 local j
952 insinto /usr/share/applications 897 insinto /usr/share/applications
953 for i in ${@} 898 for i in "$@" ; do
954 do
955 if [ -f "${i}" ]; 899 if [[ -f ${i} ]] ; then
956 then
957 doins ${i} 900 doins "${i}"
958 elif [ -d "${i}" ]; 901 elif [[ -d ${i} ]] ; then
959 then
960 for j in ${i}/*.desktop 902 for j in "${i}"/*.desktop ; do
961 do
962 doins ${j} 903 doins "${j}"
963 done 904 done
964 fi 905 fi
965 done 906 done
966} 907}
908newmenu() {
909 insinto /usr/share/applications
910 newins "$1" "$2"
911}
967 912
968doicon() { 913doicon() {
969 local i 914 local i j
970 local j
971 insinto /usr/share/pixmaps 915 insinto /usr/share/pixmaps
972 for i in ${@} 916 for i in "$@" ; do
973 do
974 if [ -f "${i}" ]; 917 if [[ -f ${i} ]] ; then
975 then
976 doins ${i} 918 doins "${i}"
977 elif [ -d "${i}" ]; 919 elif [[ -d ${i} ]] ; then
978 then
979 for j in ${i}/*.png 920 for j in "${i}"/*.png ; do
980 do
981 doins ${j} 921 doins "${j}"
982 done 922 done
983 fi 923 fi
984 done 924 done
925}
926newicon() {
927 insinto /usr/share/pixmaps
928 newins "$1" "$2"
985} 929}
986 930
987############################################################## 931##############################################################
988# END: Handle .desktop files and menu entries # 932# END: Handle .desktop files and menu entries #
989############################################################## 933##############################################################
990 934
991 935
992# for internal use only (unpack_pdv and unpack_makeself) 936# for internal use only (unpack_pdv and unpack_makeself)
993find_unpackable_file() { 937find_unpackable_file() {
994 local src="$1" 938 local src=$1
995 if [ -z "${src}" ] 939 if [[ -z ${src} ]] ; then
996 then
997 src="${DISTDIR}/${A}" 940 src=${DISTDIR}/${A}
998 else 941 else
999 if [ -e "${DISTDIR}/${src}" ] 942 if [[ -e ${DISTDIR}/${src} ]] ; then
1000 then
1001 src="${DISTDIR}/${src}" 943 src=${DISTDIR}/${src}
1002 elif [ -e "${PWD}/${src}" ] 944 elif [[ -e ${PWD}/${src} ]] ; then
1003 then
1004 src="${PWD}/${src}" 945 src=${PWD}/${src}
1005 elif [ -e "${src}" ] 946 elif [[ -e ${src} ]] ; then
1006 then
1007 src="${src}" 947 src=${src}
1008 fi
1009 fi 948 fi
1010 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 949 fi
950 [[ ! -e ${src} ]] && return 1
1011 echo "${src}" 951 echo "${src}"
1012} 952}
1013 953
1014# Unpack those pesky pdv generated files ... 954# Unpack those pesky pdv generated files ...
1015# They're self-unpacking programs with the binary package stuffed in 955# They're self-unpacking programs with the binary package stuffed in
1030# lseek 970# lseek
1031# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 971# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1032# lseek(3, -4, SEEK_END) = 2981250 972# lseek(3, -4, SEEK_END) = 2981250
1033# thus we would pass in the value of '4' as the second parameter. 973# thus we would pass in the value of '4' as the second parameter.
1034unpack_pdv() { 974unpack_pdv() {
1035 local src="`find_unpackable_file $1`" 975 local src=$(find_unpackable_file $1)
1036 local sizeoff_t="$2" 976 local sizeoff_t=$2
1037 977
978 [[ -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 :(" 979 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1039 980
1040 local shrtsrc="`basename ${src}`" 981 local shrtsrc="`basename ${src}`"
1041 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 982 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1042 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 983 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\"` 984 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] 1050# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1110# - If the file is not specified then unpack will utilize ${A}. 1051# - If the file is not specified then unpack will utilize ${A}.
1111# - If the offset is not specified then we will attempt to extract 1052# - If the offset is not specified then we will attempt to extract
1112# the proper offset from the script itself. 1053# the proper offset from the script itself.
1113unpack_makeself() { 1054unpack_makeself() {
1114 local src="$(find_unpackable_file "$1")" 1055 local src=$(find_unpackable_file "$1")
1115 local skip="$2" 1056 local skip=$2
1116 local exe="$3" 1057 local exe=$3
1117 1058
1059 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1060
1118 local shrtsrc="$(basename "${src}")" 1061 local shrtsrc=$(basename "${src}")
1119 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1062 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1120 if [ -z "${skip}" ] 1063 if [ -z "${skip}" ]
1121 then 1064 then
1122 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1065 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1123 local skip=0 1066 local skip=0
1194check_license() { 1137check_license() {
1195 local lic=$1 1138 local lic=$1
1196 if [ -z "${lic}" ] ; then 1139 if [ -z "${lic}" ] ; then
1197 lic="${PORTDIR}/licenses/${LICENSE}" 1140 lic="${PORTDIR}/licenses/${LICENSE}"
1198 else 1141 else
1199 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1142 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1200 lic="${PORTDIR}/licenses/${src}" 1143 lic="${PORTDIR}/licenses/${lic}"
1201 elif [ -e "${PWD}/${src}" ] ; then 1144 elif [ -e "${PWD}/${lic}" ] ; then
1202 lic="${PWD}/${src}" 1145 lic="${PWD}/${lic}"
1203 elif [ -e "${src}" ] ; then 1146 elif [ -e "${lic}" ] ; then
1204 lic="${src}" 1147 lic="${lic}"
1205 fi
1206 fi 1148 fi
1149 fi
1207 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1150 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1208 local l="`basename ${lic}`" 1151 local l="`basename ${lic}`"
1209 1152
1210 # here is where we check for the licenses the user already 1153 # here is where we check for the licenses the user already
1211 # accepted ... if we don't find a match, we make the user accept 1154 # accepted ... if we don't find a match, we make the user accept
1212 local shopts=$- 1155 local shopts=$-
1383# displayed and we'll hang out here until: 1326# displayed and we'll hang out here until:
1384# (1) the file is found on a mounted cdrom 1327# (1) the file is found on a mounted cdrom
1385# (2) the user hits CTRL+C 1328# (2) the user hits CTRL+C
1386cdrom_locate_file_on_cd() { 1329cdrom_locate_file_on_cd() {
1387 while [[ -z ${CDROM_ROOT} ]] ; do 1330 while [[ -z ${CDROM_ROOT} ]] ; do
1388 local dir="$(dirname ${@})" 1331 local dir=$(dirname "$*")
1389 local file="$(basename ${@})" 1332 local file=$(basename "$*")
1390 local mline="" 1333 local mline=""
1391 local showedmsg=0 1334 local showedmsg=0
1392 1335
1393 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1336 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1394 [[ -d ${mline}/${dir} ]] || continue 1337 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1338 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1396 && export CDROM_ROOT=${mline} 1339 && export CDROM_ROOT=${mline}
1397 done 1340 done
1398 1341
1399 if [[ -z ${CDROM_ROOT} ]] ; then 1342 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1343 echo
1415 fi 1358 fi
1416 showedmsg=1 1359 showedmsg=1
1417 fi 1360 fi
1418 einfo "Press return to scan for the cd again" 1361 einfo "Press return to scan for the cd again"
1419 einfo "or hit CTRL+C to abort the emerge." 1362 einfo "or hit CTRL+C to abort the emerge."
1363 echo
1364 einfo "If you are having trouble with the detection"
1365 einfo "of your CD, it is possible that you do not have"
1366 einfo "Joliet support enabled in your kernel. Please"
1367 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1420 read 1368 read
1421 fi 1369 fi
1422 done 1370 done
1423} 1371}
1424 1372
1434# directories and uses the intersection of the lists. 1382# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1383# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1384# directories and uses the union of the lists.
1437strip-linguas() { 1385strip-linguas() {
1438 local ls newls 1386 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1387 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1388 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1389 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1442 local d f 1390 local d f
1443 for d in "$@" ; do 1391 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1392 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1393 newls=${ls}
1446 else 1394 else
1447 newls="" 1395 newls=""
1448 fi 1396 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1397 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1450 if [ "${op}" == "-i" ] ; then 1398 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1399 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1452 else 1400 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1401 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1454 fi 1402 fi
1455 done 1403 done
1456 ls="${newls}" 1404 ls=${newls}
1457 done 1405 done
1458 ls="${ls//.po}" 1406 ls=${ls//.po}
1459 else 1407 else
1460 ls="$@" 1408 ls=$@
1461 fi 1409 fi
1462 1410
1463 ls=" ${ls} " 1411 ls=" ${ls} "
1464 newls="" 1412 newls=""
1465 for f in ${LINGUAS} ; do 1413 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1414 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1467 newls="${newls} ${f}" 1415 newls="${newls} ${f}"
1468 else 1416 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1417 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1418 fi
1471 done 1419 done
1472 if [ -z "${newls}" ] ; then 1420 if [[ -z ${newls} ]] ; then
1473 unset LINGUAS 1421 export LINGUAS=""
1474 else 1422 else
1475 export LINGUAS="${newls}" 1423 export LINGUAS=${newls:1}
1476 fi 1424 fi
1477} 1425}
1478 1426
1479# moved from kernel.eclass since they are generally useful outside of 1427# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1428# kernel.eclass -iggy (20041002)
1488 while ((i--)) ; do 1436 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1437 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1438 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1439 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1440 case ${ARCH} in
1493 x86) export ARCH="i386";; 1441 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1442 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1443 hppa) export ARCH="parisc";;
1496 mips) export ARCH="mips";; 1444 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! 1445 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}";; 1446 *) export ARCH="${ARCH}";;
1499 esac 1447 esac
1500} 1448}
1501 1449
1502# set's ARCH back to what portage expects 1450# set's ARCH back to what portage expects
1503set_arch_to_portage() { 1451set_arch_to_portage() {
1547 LIB=$1 1495 LIB=$1
1548 1496
1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1497 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1550 SONAME=`basename ${LIB}` 1498 SONAME=`basename ${LIB}`
1551 1499
1552 einfo "An old version of an installed library was detected on your system." 1500 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" 1501 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," 1502 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:" 1503 ewarn "you will need to execute the following command:"
1556 einfo " revdep-rebuild --soname ${SONAME}" 1504 ewarn " revdep-rebuild --soname ${SONAME}"
1557 einfo 1505 ewarn
1558 einfo "After doing that, you can safely remove ${LIB}" 1506 ewarn "After doing that, you can safely remove ${LIB}"
1559 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1507 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1560 fi 1508 fi
1561} 1509}
1562 1510
1563# Hack for people to figure out if a package was built with 1511# Hack for people to figure out if a package was built with
1564# certain USE flags 1512# certain USE flags
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1550 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1551 done
1604 eend 0 1552 eend 0
1605} 1553}
1606 1554
1607# dopamd [ file ] [ new file ] 1555# dopamd <file> [more files]
1608# 1556#
1609# Install pam auth config file in /etc/pam.d 1557# 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() { 1558dopamd() {
1615 local pamd="$1" newpamd="${2:-$1}"
1616 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1559 [[ -z $1 ]] && die "dopamd requires at least one argument"
1617 1560
1618 use pam || return 0 1561 use pam || return 0
1619 1562
1620 insinto /etc/pam.d 1563 INSDESTTREE=/etc/pam.d \
1621 # these are the default doins options, but be explicit just in case 1564 doins "$@" || die "failed to install $@"
1622 insopts -m 0644 -o root -g root
1623 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1624} 1565}
1566# newpamd <old name> <new name>
1567#
1568# Install pam file <old name> as <new name> in /etc/pam.d
1569newpamd() {
1570 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1571
1572 use pam || return 0
1573
1574 INSDESTTREE=/etc/pam.d \
1575 newins "$1" "$2" || die "failed to install $1 as $2"
1576}
1577
1578# make a wrapper script ...
1579# NOTE: this was originally games_make_wrapper, but I noticed other places where
1580# this could be used, so I have moved it here and made it not games-specific
1581# -- wolf31o2
1582# $1 == wrapper name
1583# $2 == binary to run
1584# $3 == directory to chdir before running binary
1585# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1586# $5 == path for wrapper
1587make_wrapper() {
1588 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1589 local tmpwrapper=$(emktemp)
1590 # We don't want to quote ${bin} so that people can pass complex
1591 # things as $bin ... "./someprog --args"
1592 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh
1594cd "${chdir:-.}"
1595if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1596 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1597fi
1598exec ${bin} "\$@"
1599EOF
1600 chmod go+rx "${tmpwrapper}"
1601 if [[ -n ${path} ]] ; then
1602 exeinto "${path}"
1603 newexe "${tmpwrapper}" "${wrapper}"
1604 else
1605 newbin "${tmpwrapper}" "${wrapper}"
1606 fi
1607}

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

  ViewVC Help
Powered by ViewVC 1.1.20