/[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.186
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.186 2005/07/06 20:20:03 agriffis 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
13ECLASS=eutils
14INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
15 14
16DEPEND="!bootstrap? ( sys-devel/patch )" 15DEPEND="!bootstrap? ( sys-devel/patch )"
16# sys-apps/shadow is needed for useradd, etc, bug #94745.
17 17
18DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
19 19
20# Wait for the supplied number of seconds. If no argument is supplied, defaults 20# 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 21# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
65gen_usr_ldscript() { 65gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 66 local libdir="$(get_libdir)"
67 # Just make sure it exists 67 # Just make sure it exists
68 dodir /usr/${libdir} 68 dodir /usr/${libdir}
69 69
70 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
71/* GNU ld script 72 /* GNU ld script
72 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
73 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
74 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems. 76 otherwise we run into linking problems.
76 See bug #4411 on http://bugs.gentoo.org/ for 77
77 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
78GROUP ( /${libdir}/${1} ) 80 GROUP ( /${libdir}/${lib} )
79END_LDSCRIPT 81 END_LDSCRIPT
80 fperms a+x "/usr/${libdir}/${1}" 82 fperms a+x "/usr/${libdir}/${lib}"
83 done
81} 84}
82 85
83# Simple function to draw a line consisting of '=' the same length as $* 86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
84# 88#
85# <azarah@gentoo.org> (11 Nov 2002) 89# <azarah@gentoo.org> (11 Nov 2002)
86# 90#
87draw_line() { 91draw_line() {
88 local i=0 92 local i=0
114EPATCH_SOURCE="${WORKDIR}/patch" 118EPATCH_SOURCE="${WORKDIR}/patch"
115# Default extension for patches 119# Default extension for patches
116EPATCH_SUFFIX="patch.bz2" 120EPATCH_SUFFIX="patch.bz2"
117# Default options for patch 121# Default options for patch
118# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 122# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
119EPATCH_OPTS="-g0" 123# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
124EPATCH_OPTS="-g0 --no-backup-if-mismatch"
120# List of patches not to apply. Not this is only file names, 125# List of patches not to apply. Not this is only file names,
121# and not the full path .. 126# and not the full path ..
122EPATCH_EXCLUDE="" 127EPATCH_EXCLUDE=""
123# Change the printed message for a single patch. 128# Change the printed message for a single patch.
124EPATCH_SINGLE_MSG="" 129EPATCH_SINGLE_MSG=""
130# Change the printed message for multiple patches.
131EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
125# Force applying bulk patches even if not following the style: 132# Force applying bulk patches even if not following the style:
126# 133#
127# ??_${ARCH}_foo.${EPATCH_SUFFIX} 134# ??_${ARCH}_foo.${EPATCH_SUFFIX}
128# 135#
129EPATCH_FORCE="no" 136EPATCH_FORCE="no"
170 local x="" 177 local x=""
171 178
172 if [ "$#" -gt 1 ] 179 if [ "$#" -gt 1 ]
173 then 180 then
174 local m="" 181 local m=""
175 einfo "${#} patches to apply ..."
176 for m in "$@" ; do 182 for m in "$@" ; do
177 epatch "${m}" 183 epatch "${m}"
178 done 184 done
179 return 0 185 return 0
180 fi 186 fi
234 ;; 240 ;;
235 esac 241 esac
236 242
237 if [ "${SINGLE_PATCH}" = "no" ] 243 if [ "${SINGLE_PATCH}" = "no" ]
238 then 244 then
239 einfo "Applying various patches (bugfixes/updates) ..." 245 einfo "${EPATCH_MULTI_MSG}"
240 fi 246 fi
241 for x in ${EPATCH_SOURCE} 247 for x in ${EPATCH_SOURCE}
242 do 248 do
243 # New ARCH dependant patch naming scheme ... 249 # New ARCH dependant patch naming scheme ...
244 # 250 #
245 # ???_arch_foo.patch 251 # ???_arch_foo.patch
246 # 252 #
247 if [ -f ${x} ] && \ 253 if [ -f ${x} ] && \
248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 254 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
249 [ "${EPATCH_FORCE}" = "yes" ]) 255 [ "${EPATCH_FORCE}" = "yes" ])
250 then 256 then
251 local count=0 257 local count=0
252 local popts="${EPATCH_OPTS}" 258 local popts="${EPATCH_OPTS}"
259 local patchname=${x##*/}
253 260
254 if [ -n "${EPATCH_EXCLUDE}" ] 261 if [ -n "${EPATCH_EXCLUDE}" ]
255 then 262 then
256 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 263 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
257 then 264 then
258 continue 265 continue
259 fi 266 fi
260 fi 267 fi
261 268
263 then 270 then
264 if [ -n "${EPATCH_SINGLE_MSG}" ] 271 if [ -n "${EPATCH_SINGLE_MSG}" ]
265 then 272 then
266 einfo "${EPATCH_SINGLE_MSG}" 273 einfo "${EPATCH_SINGLE_MSG}"
267 else 274 else
268 einfo "Applying ${x##*/} ..." 275 einfo "Applying ${patchname} ..."
269 fi 276 fi
270 else 277 else
271 einfo " ${x##*/} ..." 278 einfo " ${patchname} ..."
272 fi 279 fi
273 280
274 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 281 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 283
277 # Allow for prefix to differ ... im lazy, so shoot me :/ 284 # Allow for prefix to differ ... im lazy, so shoot me :/
278 while [ "${count}" -lt 5 ] 285 while [ "${count}" -lt 5 ]
279 do 286 do
280 # Generate some useful debug info ... 287 # Generate some useful debug info ...
281 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 290
284 if [ "${PATCH_SUFFIX}" != "patch" ] 291 if [ "${PATCH_SUFFIX}" != "patch" ]
285 then 292 then
286 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 293 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 else 295 else
289 PATCH_TARGET="${x}" 296 PATCH_TARGET="${x}"
290 fi 297 fi
291 298
292 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 301
295 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 304
298 if [ "${PATCH_SUFFIX}" != "patch" ] 305 if [ "${PATCH_SUFFIX}" != "patch" ]
299 then 306 then
300 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 307 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
301 then 308 then
302 echo 309 echo
303 eerror "Could not extract patch!" 310 eerror "Could not extract patch!"
304 #die "Could not extract patch!" 311 #die "Could not extract patch!"
305 count=5 312 count=5
306 break 313 break
307 fi 314 fi
308 fi 315 fi
309 316
310 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 317 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
311 then 318 then
312 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 324
318 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 325 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
319 326
320 if [ "$?" -ne 0 ] 327 if [ "$?" -ne 0 ]
321 then 328 then
322 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 329 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo 330 echo
324 eerror "A dry-run of patch command succeeded, but actually" 331 eerror "A dry-run of patch command succeeded, but actually"
325 eerror "applying the patch failed!" 332 eerror "applying the patch failed!"
326 #die "Real world sux compared to the dreamworld!" 333 #die "Real world sux compared to the dreamworld!"
327 count=5 334 count=5
328 fi 335 fi
329 336
330 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 337 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
331 338
332 break 339 break
333 fi 340 fi
334 341
335 count=$((count + 1)) 342 count=$((count + 1))
341 fi 348 fi
342 349
343 if [ "${count}" -eq 5 ] 350 if [ "${count}" -eq 5 ]
344 then 351 then
345 echo 352 echo
346 eerror "Failed Patch: ${x##*/}!" 353 eerror "Failed Patch: ${patchname} !"
354 eerror " ( ${PATCH_TARGET} )"
347 eerror 355 eerror
348 eerror "Include in your bugreport the contents of:" 356 eerror "Include in your bugreport the contents of:"
349 eerror 357 eerror
350 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 358 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
351 echo 359 echo
352 die "Failed Patch: ${x##*/}!" 360 die "Failed Patch: ${patchname}!"
353 fi 361 fi
354 362
355 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 363 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
356 364
357 eend 0 365 eend 0
358 fi 366 fi
359 done 367 done
360 if [ "${SINGLE_PATCH}" = "no" ] 368 if [ "${SINGLE_PATCH}" = "no" ]
361 then 369 then
362 einfo "Done with patching" 370 einfo "Done with patching"
363 fi
364}
365
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 371 fi
490} 372}
491 373
492# Cheap replacement for when debianutils (and thus mktemp) 374# Cheap replacement for when debianutils (and thus mktemp)
493# does not exist on the users system 375# does not exist on the users system
527# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 409# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
528# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 410# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
529# 411#
530# egetent(database, key) 412# egetent(database, key)
531egetent() { 413egetent() {
532 if useq ppc-macos ; then 414 if [[ "${USERLAND}" == "Darwin" ]] ; then
533 case "$2" in 415 case "$2" in
534 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
535 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
536 ;; 418 ;;
537 *) # Numeric 419 *) # Numeric
538 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
539 ;; 421 ;;
540 esac 422 esac
541 elif useq x86-fbsd ; then 423 elif [[ "${USERLAND}" == "BSD" ]] ; then
542 local action 424 local action
543 if [ "$1" == "passwd" ] 425 if [ "$1" == "passwd" ]
544 then 426 then
545 action="user" 427 action="user"
546 else 428 else
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
607 local pwrange 483 local pwrange
608 if [ "${USERLAND}" == "BSD" ] ; then 484 if [[ ${USERLAND} == "BSD" ]] ; then
609 pwrange="`jot 898 101`" 485 pwrange=$(jot 898 101)
610 else 486 else
611 pwrange="`seq 101 999`" 487 pwrange=$(seq 101 999)
612 fi 488 fi
613 for euid in ${pwrange} ; do 489 for euid in ${pwrange} ; do
614 [ -z "`egetent passwd ${euid}`" ] && break 490 [[ -z $(egetent passwd ${euid}) ]] && break
615 done 491 done
616 fi 492 fi
617 opts="${opts} -u ${euid}" 493 opts="${opts} -u ${euid}"
618 einfo " - Userid: ${euid}" 494 einfo " - Userid: ${euid}"
619 495
620 # handle shell 496 # handle shell
621 local eshell="$1"; shift 497 local eshell=$1; shift
622 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 498 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
623 then
624 if [ ! -e "${eshell}" ] 499 if [[ ! -e ${eshell} ]] ; then
625 then
626 eerror "A shell was specified but it does not exist !" 500 eerror "A shell was specified but it does not exist !"
627 die "${eshell} does not exist" 501 die "${eshell} does not exist"
628 fi 502 fi
629 else 503 else
630 if [ "${USERLAND}" == "BSD" ] 504 case ${USERLAND} in
631 then
632 eshell="/usr/bin/false" 505 Darwin) eshell="/usr/bin/false";;
633 else 506 BSD) eshell="/usr/sbin/nologin";;
634 eshell="/bin/false" 507 *) eshell="/bin/false";;
635 fi 508 esac
636 fi 509 fi
637 einfo " - Shell: ${eshell}" 510 einfo " - Shell: ${eshell}"
638 opts="${opts} -s ${eshell}" 511 opts="${opts} -s ${eshell}"
639 512
640 # handle homedir 513 # handle homedir
641 local ehome="$1"; shift 514 local ehome=$1; shift
642 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 515 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
643 then
644 ehome="/dev/null" 516 ehome="/dev/null"
645 fi 517 fi
646 einfo " - Home: ${ehome}" 518 einfo " - Home: ${ehome}"
647 opts="${opts} -d ${ehome}" 519 opts="${opts} -d ${ehome}"
648 520
649 # handle groups 521 # handle groups
650 local egroups="$1"; shift 522 local egroups=$1; shift
651 if [ ! -z "${egroups}" ] 523 if [[ ! -z ${egroups} ]] ; then
652 then
653 local oldifs="${IFS}" 524 local oldifs=${IFS}
654 local defgroup="" exgroups="" 525 local defgroup="" exgroups=""
655 526
656 export IFS="," 527 export IFS=","
657 for g in ${egroups} 528 for g in ${egroups} ; do
658 do
659 export IFS="${oldifs}" 529 export IFS=${oldifs}
660 if [ -z "`egetent group \"${g}\"`" ] 530 if [[ -z $(egetent group "${g}") ]] ; then
661 then
662 eerror "You must add group ${g} to the system first" 531 eerror "You must add group ${g} to the system first"
663 die "${g} is not a valid GID" 532 die "${g} is not a valid GID"
664 fi 533 fi
665 if [ -z "${defgroup}" ] 534 if [[ -z ${defgroup} ]] ; then
666 then
667 defgroup="${g}" 535 defgroup=${g}
668 else 536 else
669 exgroups="${exgroups},${g}" 537 exgroups="${exgroups},${g}"
670 fi 538 fi
671 export IFS="," 539 export IFS=","
672 done 540 done
673 export IFS="${oldifs}" 541 export IFS=${oldifs}
674 542
675 opts="${opts} -g ${defgroup}" 543 opts="${opts} -g ${defgroup}"
676 if [ ! -z "${exgroups}" ] 544 if [[ ! -z ${exgroups} ]] ; then
677 then
678 opts="${opts} -G ${exgroups:1}" 545 opts="${opts} -G ${exgroups:1}"
679 fi 546 fi
680 else 547 else
681 egroups="(none)" 548 egroups="(none)"
682 fi 549 fi
683 einfo " - Groups: ${egroups}" 550 einfo " - Groups: ${egroups}"
684 551
685 # handle extra and add the user 552 # handle extra and add the user
686 local eextra="$@"
687 local oldsandbox="${SANDBOX_ON}" 553 local oldsandbox=${SANDBOX_ON}
688 export SANDBOX_ON="0" 554 export SANDBOX_ON="0"
689 if useq ppc-macos 555 case ${USERLAND} in
690 then 556 Darwin)
691 ### Make the user 557 ### Make the user
692 if [ -z "${eextra}" ] 558 if [[ -z $@ ]] ; then
693 then
694 dscl . create /users/${euser} uid ${euid} 559 dscl . create /users/${euser} uid ${euid}
695 dscl . create /users/${euser} shell ${eshell} 560 dscl . create /users/${euser} shell ${eshell}
696 dscl . create /users/${euser} home ${ehome} 561 dscl . create /users/${euser} home ${ehome}
697 dscl . create /users/${euser} realname "added by portage for ${PN}" 562 dscl . create /users/${euser} realname "added by portage for ${PN}"
698 ### Add the user to the groups specified 563 ### Add the user to the groups specified
699 local oldifs="${IFS}" 564 local oldifs=${IFS}
700 export IFS="," 565 export IFS=","
701 for g in ${egroups} 566 for g in ${egroups} ; do
702 do
703 dscl . merge /groups/${g} users ${euser} 567 dscl . merge /groups/${g} users ${euser}
704 done 568 done
705 export IFS="${oldifs}" 569 export IFS=${oldifs}
706 else 570 else
707 einfo "Extra options are not supported on macos yet" 571 einfo "Extra options are not supported on Darwin yet"
708 einfo "Please report the ebuild along with the info below" 572 einfo "Please report the ebuild along with the info below"
709 einfo "eextra: ${eextra}" 573 einfo "eextra: $@"
710 die "Required function missing" 574 die "Required function missing"
711 fi 575 fi
712 elif use x86-fbsd ; then 576 ;;
713 if [ -z "${eextra}" ] 577 BSD)
714 then 578 if [[ -z $@ ]] ; then
715 pw useradd ${euser} ${opts} \ 579 pw useradd ${euser} ${opts} \
716 -c "added by portage for ${PN}" \ 580 -c "added by portage for ${PN}" \
717 die "enewuser failed" 581 die "enewuser failed"
718 else 582 else
719 einfo " - Extra: ${eextra}" 583 einfo " - Extra: $@"
720 pw useradd ${euser} ${opts} \ 584 pw useradd ${euser} ${opts} \
721 -c ${eextra} || die "enewuser failed" 585 "$@" || die "enewuser failed"
722 fi 586 fi
723 else 587 ;;
724 if [ -z "${eextra}" ] 588 *)
725 then 589 if [[ -z $@ ]] ; then
726 useradd ${opts} ${euser} \ 590 useradd ${opts} ${euser} \
727 -c "added by portage for ${PN}" \ 591 -c "added by portage for ${PN}" \
728 || die "enewuser failed" 592 || die "enewuser failed"
729 else 593 else
730 einfo " - Extra: ${eextra}" 594 einfo " - Extra: $@"
731 useradd ${opts} ${euser} ${eextra} \ 595 useradd ${opts} ${euser} "$@" \
732 || die "enewuser failed" 596 || die "enewuser failed"
733 fi 597 fi
734 fi 598 ;;
599 esac
735 export SANDBOX_ON="${oldsandbox}" 600 export SANDBOX_ON=${oldsandbox}
736 601
737 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 602 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
738 then 603 then
739 einfo " - Creating ${ehome} in ${D}" 604 einfo " - Creating ${ehome} in ${D}"
740 dodir ${ehome} 605 dodir ${ehome}
777 then 642 then
778 if [ "${egid}" -gt 0 ] 643 if [ "${egid}" -gt 0 ]
779 then 644 then
780 if [ -z "`egetent group ${egid}`" ] 645 if [ -z "`egetent group ${egid}`" ]
781 then 646 then
782 if useq ppc-macos ; then 647 if [[ "${USERLAND}" == "Darwin" ]]; then
783 opts="${opts} ${egid}" 648 opts="${opts} ${egid}"
784 else 649 else
785 opts="${opts} -g ${egid}" 650 opts="${opts} -g ${egid}"
786 fi 651 fi
787 else 652 else
801 opts="${opts} ${eextra}" 666 opts="${opts} ${eextra}"
802 667
803 # add the group 668 # add the group
804 local oldsandbox="${SANDBOX_ON}" 669 local oldsandbox="${SANDBOX_ON}"
805 export SANDBOX_ON="0" 670 export SANDBOX_ON="0"
806 if useq ppc-macos ; then 671 if [[ "${USERLAND}" == "Darwin" ]]; then
807 if [ ! -z "${eextra}" ]; 672 if [ ! -z "${eextra}" ];
808 then 673 then
809 einfo "Extra options are not supported on macos yet" 674 einfo "Extra options are not supported on Darwin/OS X yet"
810 einfo "Please report the ebuild along with the info below" 675 einfo "Please report the ebuild along with the info below"
811 einfo "eextra: ${eextra}" 676 einfo "eextra: ${eextra}"
812 die "Required function missing" 677 die "Required function missing"
813 fi 678 fi
814 679
819 [ -z "`egetent group ${egid}`" ] && break 684 [ -z "`egetent group ${egid}`" ] && break
820 done 685 done
821 esac 686 esac
822 dscl . create /groups/${egroup} gid ${egid} 687 dscl . create /groups/${egroup} gid ${egid}
823 dscl . create /groups/${egroup} passwd '*' 688 dscl . create /groups/${egroup} passwd '*'
824 elif use x86-fbsd ; then 689 elif [[ "${USERLAND}" == "BSD" ]] ; then
825 case ${egid} in 690 case ${egid} in
826 *[!0-9]*) # Non numeric 691 *[!0-9]*) # Non numeric
827 for egid in `jot 898 101`; do 692 for egid in `jot 898 101`; do
828 [ -z "`egetent group ${egid}`" ] && break 693 [ -z "`egetent group ${egid}`" ] && break
829 done 694 done
864# name: the name that will show up in the menu 729# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 730# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 731# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 732# a full path to an icon
868# type: what kind of application is this ? for categories: 733# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 734# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
870# path: if your app needs to startup in a specific dir 735# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 736make_desktop_entry() {
872 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 737 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
873 738
874 local exec="${1}" 739 local exec=${1}
875 local name="${2:-${PN}}" 740 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 741 local icon=${3:-${PN}.png}
877 local type="${4}" 742 local type=${4}
878 local subdir="${6}" 743 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 744
880 if [ -z "${type}" ] 745 if [[ -z ${type} ]] ; then
881 then 746 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 747 local catmin=${CATEGORY##*-}
883 "app-emulation") 748 case ${catmaj} in
884 type=Emulator 749 app)
885 subdir="Emulation" 750 case ${catmin} in
751 admin) type=System;;
752 cdr) type=DiscBurning;;
753 dicts) type=Dictionary;;
754 editors) type=TextEditor;;
755 emacs) type=TextEditor;;
756 emulation) type=Emulator;;
757 laptop) type=HardwareSettings;;
758 office) type=Office;;
759 vim) type=TextEditor;;
760 xemacs) type=TextEditor;;
761 *) type=;;
762 esac
886 ;; 763 ;;
887 "games-"*) 764
888 type=Game 765 dev)
889 subdir="Games" 766 type="Development"
890 ;; 767 ;;
891 "net-"*) 768
892 type=Network 769 games)
893 subdir="${type}" 770 [[ -z ${path} ]] && path=${GAMES_BINDIR}
771
772 case ${catmin} in
773 action) type=ActionGame;;
774 arcade) type=ArcadeGame;;
775 board) type=BoardGame;;
776 kid) type=KidsGame;;
777 emulation) type=Emulator;;
778 puzzle) type=LogicGame;;
779 rpg) type=RolePlaying;;
780 roguelike) type=RolePlaying;;
781 simulation) type=Simulation;;
782 sports) type=SportsGame;;
783 strategy) type=StrategyGame;;
784 *) type=;;
785 esac
786 type="Game;${type}"
894 ;; 787 ;;
788
789 mail)
790 type="Network;Email"
791 ;;
792
793 media)
794 case ${catmin} in
795 gfx) type=Graphics;;
796 radio) type=Tuner;;
797 sound) type=Audio;;
798 tv) type=TV;;
799 video) type=Video;;
800 *) type=;;
801 esac
802 type="AudioVideo;${type}"
803 ;;
804
805 net)
806 case ${catmin} in
807 dialup) type=Dialup;;
808 ftp) type=FileTransfer;;
809 im) type=InstantMessaging;;
810 irc) type=IRCClient;;
811 mail) type=Email;;
812 news) type=News;;
813 nntp) type=News;;
814 p2p) type=FileTransfer;;
815 *) type=;;
816 esac
817 type="Network;${type}"
818 ;;
819
820 sci)
821 case ${catmin} in
822 astro*) type=Astronomoy;;
823 bio*) type=Biology;;
824 calc*) type=Calculator;;
825 chem*) type=Chemistry;;
826 geo*) type=Geology;;
827 math*) type=Math;;
828 *) type=;;
829 esac
830 type="Science;${type}"
831 ;;
832
833 www)
834 case ${catmin} in
835 client) type=WebBrowser;;
836 *) type=;;
837 esac
838 type="Network"
839 ;;
840
895 *) 841 *)
896 type= 842 type=
897 subdir=
898 ;; 843 ;;
899 esac 844 esac
900 fi 845 fi
846 if [ "${SLOT}" == "0" ] ; then
847 local desktop_name="${PN}"
848 else
849 local desktop_name="${PN}-${SLOT}"
850 fi
901 local desktop="${T}/${exec}.desktop" 851 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902 852
903echo "[Desktop Entry] 853echo "[Desktop Entry]
904Encoding=UTF-8 854Encoding=UTF-8
905Version=0.9.2 855Version=0.9.2
906Name=${name} 856Name=${name}
922# make_desktop_entry(<title>, <command>) 872# make_desktop_entry(<title>, <command>)
923# title: File to execute to start the Window Manager 873# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 874# command: Name of the Window Manager
925 875
926make_session_desktop() { 876make_session_desktop() {
927
928 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 877 [[ -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 878 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
930 879
931 local title="${1}" 880 local title=$1
932 local command="${2}" 881 local command=$2
933 local desktop="${T}/${wm}.desktop" 882 local desktop=${T}/${wm}.desktop
934 883
935echo "[Desktop Entry] 884echo "[Desktop Entry]
936Encoding=UTF-8 885Encoding=UTF-8
937Name=${title} 886Name=${title}
938Comment=This session logs you into ${title} 887Comment=This session logs you into ${title}
940TryExec=${command} 889TryExec=${command}
941Type=Application" > "${desktop}" 890Type=Application" > "${desktop}"
942 891
943 insinto /usr/share/xsessions 892 insinto /usr/share/xsessions
944 doins "${desktop}" 893 doins "${desktop}"
945
946 return 0
947} 894}
948 895
949domenu() { 896domenu() {
950 local i 897 local i j
951 local j
952 insinto /usr/share/applications 898 insinto /usr/share/applications
953 for i in ${@} 899 for i in "$@" ; do
954 do
955 if [ -f "${i}" ]; 900 if [[ -f ${i} ]] ; then
956 then
957 doins ${i} 901 doins "${i}"
958 elif [ -d "${i}" ]; 902 elif [[ -d ${i} ]] ; then
959 then
960 for j in ${i}/*.desktop 903 for j in "${i}"/*.desktop ; do
961 do
962 doins ${j} 904 doins "${j}"
963 done 905 done
964 fi 906 fi
965 done 907 done
966} 908}
909newmenu() {
910 insinto /usr/share/applications
911 newins "$1" "$2"
912}
967 913
968doicon() { 914doicon() {
969 local i 915 local i j
970 local j
971 insinto /usr/share/pixmaps 916 insinto /usr/share/pixmaps
972 for i in ${@} 917 for i in "$@" ; do
973 do
974 if [ -f "${i}" ]; 918 if [[ -f ${i} ]] ; then
975 then
976 doins ${i} 919 doins "${i}"
977 elif [ -d "${i}" ]; 920 elif [[ -d ${i} ]] ; then
978 then
979 for j in ${i}/*.png 921 for j in "${i}"/*.png ; do
980 do
981 doins ${j} 922 doins "${j}"
982 done 923 done
983 fi 924 fi
984 done 925 done
926}
927newicon() {
928 insinto /usr/share/pixmaps
929 newins "$1" "$2"
985} 930}
986 931
987############################################################## 932##############################################################
988# END: Handle .desktop files and menu entries # 933# END: Handle .desktop files and menu entries #
989############################################################## 934##############################################################
1390 local mline="" 1335 local mline=""
1391 local showedmsg=0 1336 local showedmsg=0
1392 1337
1393 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1338 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1394 [[ -d ${mline}/${dir} ]] || continue 1339 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1340 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1396 && export CDROM_ROOT=${mline} 1341 && export CDROM_ROOT=${mline}
1397 done 1342 done
1398 1343
1399 if [[ -z ${CDROM_ROOT} ]] ; then 1344 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1345 echo
1415 fi 1360 fi
1416 showedmsg=1 1361 showedmsg=1
1417 fi 1362 fi
1418 einfo "Press return to scan for the cd again" 1363 einfo "Press return to scan for the cd again"
1419 einfo "or hit CTRL+C to abort the emerge." 1364 einfo "or hit CTRL+C to abort the emerge."
1365 echo
1366 einfo "If you are having trouble with the detection"
1367 einfo "of your CD, it is possible that you do not have"
1368 einfo "Joliet support enabled in your kernel. Please"
1369 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1420 read 1370 read
1421 fi 1371 fi
1422 done 1372 done
1423} 1373}
1424 1374
1434# directories and uses the intersection of the lists. 1384# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1385# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1386# directories and uses the union of the lists.
1437strip-linguas() { 1387strip-linguas() {
1438 local ls newls 1388 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1389 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1390 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1391 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1442 local d f 1392 local d f
1443 for d in "$@" ; do 1393 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1394 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1395 newls=${ls}
1446 else 1396 else
1447 newls="" 1397 newls=""
1448 fi 1398 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1399 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1450 if [ "${op}" == "-i" ] ; then 1400 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1401 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1452 else 1402 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1403 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1454 fi 1404 fi
1455 done 1405 done
1456 ls="${newls}" 1406 ls=${newls}
1457 done 1407 done
1458 ls="${ls//.po}" 1408 ls=${ls//.po}
1459 else 1409 else
1460 ls="$@" 1410 ls=$@
1461 fi 1411 fi
1462 1412
1463 ls=" ${ls} " 1413 ls=" ${ls} "
1464 newls="" 1414 newls=""
1465 for f in ${LINGUAS} ; do 1415 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1416 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1467 newls="${newls} ${f}" 1417 newls="${newls} ${f}"
1468 else 1418 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1419 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1420 fi
1471 done 1421 done
1472 if [ -z "${newls}" ] ; then 1422 if [[ -z ${newls} ]] ; then
1473 unset LINGUAS 1423 export LINGUAS=""
1474 else 1424 else
1475 export LINGUAS="${newls}" 1425 export LINGUAS=${newls:1}
1476 fi 1426 fi
1477} 1427}
1478 1428
1479# moved from kernel.eclass since they are generally useful outside of 1429# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1430# kernel.eclass -iggy (20041002)
1488 while ((i--)) ; do 1438 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1439 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1440 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1441 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1442 case ${ARCH} in
1493 x86) export ARCH="i386";; 1443 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1444 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1445 hppa) export ARCH="parisc";;
1496 mips) export ARCH="mips";; 1446 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! 1447 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}";; 1448 *) export ARCH="${ARCH}";;
1499 esac 1449 esac
1500} 1450}
1501 1451
1502# set's ARCH back to what portage expects 1452# set's ARCH back to what portage expects
1503set_arch_to_portage() { 1453set_arch_to_portage() {
1548 1498
1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1499 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1550 SONAME=`basename ${LIB}` 1500 SONAME=`basename ${LIB}`
1551 1501
1552 einfo "An old version of an installed library was detected on your system." 1502 einfo "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" 1503 einfo "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," 1504 einfo "is not being removed. In order to make full use of this newer version,"
1555 einfo "you will need to execute the following command:" 1505 einfo "you will need to execute the following command:"
1556 einfo " revdep-rebuild --soname ${SONAME}" 1506 einfo " revdep-rebuild --soname ${SONAME}"
1557 einfo 1507 einfo
1558 einfo "After doing that, you can safely remove ${LIB}" 1508 einfo "After doing that, you can safely remove ${LIB}"
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1552 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1553 done
1604 eend 0 1554 eend 0
1605} 1555}
1606 1556
1607# dopamd [ file ] [ new file ] 1557# dopamd <file> [more files]
1608# 1558#
1609# Install pam auth config file in /etc/pam.d 1559# 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() { 1560dopamd() {
1615 local pamd="$1" newpamd="${2:-$1}"
1616 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1561 [[ -z $1 ]] && die "dopamd requires at least one argument"
1617 1562
1618 use pam || return 0 1563 use pam || return 0
1619 1564
1620 insinto /etc/pam.d 1565 INSDESTTREE=/etc/pam.d \
1621 # these are the default doins options, but be explicit just in case 1566 doins "$@" || die "failed to install $@"
1622 insopts -m 0644 -o root -g root
1623 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1624} 1567}
1568# newpamd <old name> <new name>
1569#
1570# Install pam file <old name> as <new name> in /etc/pam.d
1571newpamd() {
1572 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1573
1574 use pam || return 0
1575
1576 INSDESTTREE=/etc/pam.d \
1577 newins "$1" "$2" || die "failed to install $1 as $2"
1578}
1579
1580# make a wrapper script ...
1581# NOTE: this was originally games_make_wrapper, but I noticed other places where
1582# this could be used, so I have moved it here and made it not games-specific
1583# -- wolf31o2
1584# $1 == wrapper name
1585# $2 == binary to run
1586# $3 == directory to chdir before running binary
1587# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1588# $5 == path for wrapper
1589make_wrapper() {
1590 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1591 local tmpwrapper=$(emktemp)
1592 cat << EOF > "${tmpwrapper}"
1593#!/bin/sh
1594cd "${chdir}"
1595export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1596exec ${bin} "\$@"
1597EOF
1598 chmod go+rx "${tmpwrapper}"
1599 if [ -n "${5}" ]
1600 then
1601 exeinto ${5}
1602 newexe "${tmpwrapper}" "${wrapper}"
1603 else
1604 newbin "${tmpwrapper}" "${wrapper}"
1605 fi
1606}

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

  ViewVC Help
Powered by ViewVC 1.1.20