/[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.190
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.190 2005/07/11 15:08:06 swegener 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"
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"
170 local x="" 176 local x=""
171 177
172 if [ "$#" -gt 1 ] 178 if [ "$#" -gt 1 ]
173 then 179 then
174 local m="" 180 local m=""
175 einfo "${#} patches to apply ..."
176 for m in "$@" ; do 181 for m in "$@" ; do
177 epatch "${m}" 182 epatch "${m}"
178 done 183 done
179 return 0 184 return 0
180 fi 185 fi
234 ;; 239 ;;
235 esac 240 esac
236 241
237 if [ "${SINGLE_PATCH}" = "no" ] 242 if [ "${SINGLE_PATCH}" = "no" ]
238 then 243 then
239 einfo "Applying various patches (bugfixes/updates) ..." 244 einfo "${EPATCH_MULTI_MSG}"
240 fi 245 fi
241 for x in ${EPATCH_SOURCE} 246 for x in ${EPATCH_SOURCE}
242 do 247 do
243 # New ARCH dependant patch naming scheme ... 248 # New ARCH dependant patch naming scheme ...
244 # 249 #
245 # ???_arch_foo.patch 250 # ???_arch_foo.patch
246 # 251 #
247 if [ -f ${x} ] && \ 252 if [ -f ${x} ] && \
248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 253 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
249 [ "${EPATCH_FORCE}" = "yes" ]) 254 [ "${EPATCH_FORCE}" = "yes" ])
250 then 255 then
251 local count=0 256 local count=0
252 local popts="${EPATCH_OPTS}" 257 local popts="${EPATCH_OPTS}"
258 local patchname=${x##*/}
253 259
254 if [ -n "${EPATCH_EXCLUDE}" ] 260 if [ -n "${EPATCH_EXCLUDE}" ]
255 then 261 then
256 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 262 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
257 then 263 then
258 continue 264 continue
259 fi 265 fi
260 fi 266 fi
261 267
263 then 269 then
264 if [ -n "${EPATCH_SINGLE_MSG}" ] 270 if [ -n "${EPATCH_SINGLE_MSG}" ]
265 then 271 then
266 einfo "${EPATCH_SINGLE_MSG}" 272 einfo "${EPATCH_SINGLE_MSG}"
267 else 273 else
268 einfo "Applying ${x##*/} ..." 274 einfo "Applying ${patchname} ..."
269 fi 275 fi
270 else 276 else
271 einfo " ${x##*/} ..." 277 einfo " ${patchname} ..."
272 fi 278 fi
273 279
274 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 280 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 281 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 282
277 # Allow for prefix to differ ... im lazy, so shoot me :/ 283 # Allow for prefix to differ ... im lazy, so shoot me :/
278 while [ "${count}" -lt 5 ] 284 while [ "${count}" -lt 5 ]
279 do 285 do
280 # Generate some useful debug info ... 286 # Generate some useful debug info ...
281 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 289
284 if [ "${PATCH_SUFFIX}" != "patch" ] 290 if [ "${PATCH_SUFFIX}" != "patch" ]
285 then 291 then
286 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 293 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 else 294 else
289 PATCH_TARGET="${x}" 295 PATCH_TARGET="${x}"
290 fi 296 fi
291 297
292 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 300
295 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 303
298 if [ "${PATCH_SUFFIX}" != "patch" ] 304 if [ "${PATCH_SUFFIX}" != "patch" ]
299 then 305 then
300 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 306 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
301 then 307 then
302 echo 308 echo
303 eerror "Could not extract patch!" 309 eerror "Could not extract patch!"
304 #die "Could not extract patch!" 310 #die "Could not extract patch!"
305 count=5 311 count=5
306 break 312 break
307 fi 313 fi
308 fi 314 fi
309 315
310 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 316 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
311 then 317 then
312 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 323
318 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 324 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
319 325
320 if [ "$?" -ne 0 ] 326 if [ "$?" -ne 0 ]
321 then 327 then
322 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 328 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo 329 echo
324 eerror "A dry-run of patch command succeeded, but actually" 330 eerror "A dry-run of patch command succeeded, but actually"
325 eerror "applying the patch failed!" 331 eerror "applying the patch failed!"
326 #die "Real world sux compared to the dreamworld!" 332 #die "Real world sux compared to the dreamworld!"
327 count=5 333 count=5
328 fi 334 fi
329 335
330 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 336 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
331 337
332 break 338 break
333 fi 339 fi
334 340
335 count=$((count + 1)) 341 count=$((count + 1))
341 fi 347 fi
342 348
343 if [ "${count}" -eq 5 ] 349 if [ "${count}" -eq 5 ]
344 then 350 then
345 echo 351 echo
346 eerror "Failed Patch: ${x##*/}!" 352 eerror "Failed Patch: ${patchname} !"
353 eerror " ( ${PATCH_TARGET} )"
347 eerror 354 eerror
348 eerror "Include in your bugreport the contents of:" 355 eerror "Include in your bugreport the contents of:"
349 eerror 356 eerror
350 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 357 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
351 echo 358 echo
352 die "Failed Patch: ${x##*/}!" 359 die "Failed Patch: ${patchname}!"
353 fi 360 fi
354 361
355 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 362 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
356 363
357 eend 0 364 eend 0
358 fi 365 fi
359 done 366 done
360 if [ "${SINGLE_PATCH}" = "no" ] 367 if [ "${SINGLE_PATCH}" = "no" ]
361 then 368 then
362 einfo "Done with patching" 369 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 370 fi
490} 371}
491 372
492# Cheap replacement for when debianutils (and thus mktemp) 373# Cheap replacement for when debianutils (and thus mktemp)
493# does not exist on the users system 374# does not exist on the users system
527# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
528# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
529# 410#
530# egetent(database, key) 411# egetent(database, key)
531egetent() { 412egetent() {
532 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
533 case "$2" in 414 case "$2" in
534 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
535 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
536 ;; 417 ;;
537 *) # Numeric 418 *) # Numeric
538 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
539 ;; 420 ;;
540 esac 421 esac
541 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
542 local action 423 local action
543 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
544 then 425 then
545 action="user" 426 action="user"
546 else 427 else
566# homedir: /dev/null 447# homedir: /dev/null
567# groups: none 448# groups: none
568# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
569enewuser() { 450enewuser() {
570 # get the username 451 # get the username
571 local euser="$1"; shift 452 local euser=$1; shift
572 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
573 then
574 eerror "No username specified !" 454 eerror "No username specified !"
575 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
576 fi 456 fi
577 457
578 # lets see if the username already exists 458 # lets see if the username already exists
579 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
580 then
581 return 0 460 return 0
582 fi 461 fi
583 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
584 463
585 # options to pass to useradd 464 # options to pass to useradd
586 local opts= 465 local opts=
587 466
588 # handle uid 467 # handle uid
589 local euid="$1"; shift 468 local euid=$1; shift
590 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
591 then
592 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
593 then
594 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
595 then
596 euid="next" 472 euid="next"
597 fi 473 fi
598 else 474 else
599 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
600 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
601 fi 477 fi
602 else 478 else
603 euid="next" 479 euid="next"
604 fi 480 fi
605 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
606 then
607 local pwrange 482 local pwrange
608 if [ "${USERLAND}" == "BSD" ] ; then 483 if [[ ${USERLAND} == "BSD" ]] ; then
609 pwrange="`jot 898 101`" 484 pwrange=$(jot 898 101)
610 else 485 else
611 pwrange="`seq 101 999`" 486 pwrange=$(seq 101 999)
612 fi 487 fi
613 for euid in ${pwrange} ; do 488 for euid in ${pwrange} ; do
614 [ -z "`egetent passwd ${euid}`" ] && break 489 [[ -z $(egetent passwd ${euid}) ]] && break
615 done 490 done
616 fi 491 fi
617 opts="${opts} -u ${euid}" 492 opts="${opts} -u ${euid}"
618 einfo " - Userid: ${euid}" 493 einfo " - Userid: ${euid}"
619 494
620 # handle shell 495 # handle shell
621 local eshell="$1"; shift 496 local eshell=$1; shift
622 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 497 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
623 then
624 if [ ! -e "${eshell}" ] 498 if [[ ! -e ${eshell} ]] ; then
625 then
626 eerror "A shell was specified but it does not exist !" 499 eerror "A shell was specified but it does not exist !"
627 die "${eshell} does not exist" 500 die "${eshell} does not exist"
628 fi 501 fi
629 else 502 else
630 if [ "${USERLAND}" == "BSD" ] 503 case ${USERLAND} in
631 then
632 eshell="/usr/bin/false" 504 Darwin) eshell="/usr/bin/false";;
633 else 505 BSD) eshell="/usr/sbin/nologin";;
634 eshell="/bin/false" 506 *) eshell="/bin/false";;
635 fi 507 esac
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
734 fi 597 ;;
598 esac
735 export SANDBOX_ON="${oldsandbox}" 599 export SANDBOX_ON=${oldsandbox}
736 600
737 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 601 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
738 then 602 then
739 einfo " - Creating ${ehome} in ${D}" 603 einfo " - Creating ${ehome} in ${D}"
740 dodir ${ehome} 604 dodir ${ehome}
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
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 `jot 898 101`; do
828 [ -z "`egetent group ${egid}`" ] && break 692 [ -z "`egetent group ${egid}`" ] && break
829 done 693 done
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/wiki/Standards_2fmenu_2dspec
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 [[ -z ${path} ]] && path=${GAMES_BINDIR}
770
771 case ${catmin} in
772 action) type=ActionGame;;
773 arcade) type=ArcadeGame;;
774 board) type=BoardGame;;
775 kid) type=KidsGame;;
776 emulation) type=Emulator;;
777 puzzle) type=LogicGame;;
778 rpg) type=RolePlaying;;
779 roguelike) type=RolePlaying;;
780 simulation) type=Simulation;;
781 sports) type=SportsGame;;
782 strategy) type=StrategyGame;;
783 *) type=;;
784 esac
785 type="Game;${type}"
894 ;; 786 ;;
787
788 mail)
789 type="Network;Email"
790 ;;
791
792 media)
793 case ${catmin} in
794 gfx) type=Graphics;;
795 radio) type=Tuner;;
796 sound) type=Audio;;
797 tv) type=TV;;
798 video) type=Video;;
799 *) type=;;
800 esac
801 type="AudioVideo;${type}"
802 ;;
803
804 net)
805 case ${catmin} in
806 dialup) type=Dialup;;
807 ftp) type=FileTransfer;;
808 im) type=InstantMessaging;;
809 irc) type=IRCClient;;
810 mail) type=Email;;
811 news) type=News;;
812 nntp) type=News;;
813 p2p) type=FileTransfer;;
814 *) type=;;
815 esac
816 type="Network;${type}"
817 ;;
818
819 sci)
820 case ${catmin} in
821 astro*) type=Astronomoy;;
822 bio*) type=Biology;;
823 calc*) type=Calculator;;
824 chem*) type=Chemistry;;
825 geo*) type=Geology;;
826 math*) type=Math;;
827 *) type=;;
828 esac
829 type="Science;${type}"
830 ;;
831
832 www)
833 case ${catmin} in
834 client) type=WebBrowser;;
835 *) type=;;
836 esac
837 type="Network"
838 ;;
839
895 *) 840 *)
896 type= 841 type=
897 subdir=
898 ;; 842 ;;
899 esac 843 esac
900 fi 844 fi
845 if [ "${SLOT}" == "0" ] ; then
846 local desktop_name="${PN}"
847 else
848 local desktop_name="${PN}-${SLOT}"
849 fi
901 local desktop="${T}/${exec}.desktop" 850 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902 851
903echo "[Desktop Entry] 852echo "[Desktop Entry]
904Encoding=UTF-8 853Encoding=UTF-8
905Version=0.9.2 854Version=0.9.2
906Name=${name} 855Name=${name}
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##############################################################
1390 local mline="" 1334 local mline=""
1391 local showedmsg=0 1335 local showedmsg=0
1392 1336
1393 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1337 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1394 [[ -d ${mline}/${dir} ]] || continue 1338 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1339 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1396 && export CDROM_ROOT=${mline} 1340 && export CDROM_ROOT=${mline}
1397 done 1341 done
1398 1342
1399 if [[ -z ${CDROM_ROOT} ]] ; then 1343 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1344 echo
1415 fi 1359 fi
1416 showedmsg=1 1360 showedmsg=1
1417 fi 1361 fi
1418 einfo "Press return to scan for the cd again" 1362 einfo "Press return to scan for the cd again"
1419 einfo "or hit CTRL+C to abort the emerge." 1363 einfo "or hit CTRL+C to abort the emerge."
1364 echo
1365 einfo "If you are having trouble with the detection"
1366 einfo "of your CD, it is possible that you do not have"
1367 einfo "Joliet support enabled in your kernel. Please"
1368 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1420 read 1369 read
1421 fi 1370 fi
1422 done 1371 done
1423} 1372}
1424 1373
1434# directories and uses the intersection of the lists. 1383# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1384# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1385# directories and uses the union of the lists.
1437strip-linguas() { 1386strip-linguas() {
1438 local ls newls 1387 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1388 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1389 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1390 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1442 local d f 1391 local d f
1443 for d in "$@" ; do 1392 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1393 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1394 newls=${ls}
1446 else 1395 else
1447 newls="" 1396 newls=""
1448 fi 1397 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1398 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1450 if [ "${op}" == "-i" ] ; then 1399 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1400 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1452 else 1401 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1402 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1454 fi 1403 fi
1455 done 1404 done
1456 ls="${newls}" 1405 ls=${newls}
1457 done 1406 done
1458 ls="${ls//.po}" 1407 ls=${ls//.po}
1459 else 1408 else
1460 ls="$@" 1409 ls=$@
1461 fi 1410 fi
1462 1411
1463 ls=" ${ls} " 1412 ls=" ${ls} "
1464 newls="" 1413 newls=""
1465 for f in ${LINGUAS} ; do 1414 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1415 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1467 newls="${newls} ${f}" 1416 newls="${newls} ${f}"
1468 else 1417 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1418 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1419 fi
1471 done 1420 done
1472 if [ -z "${newls}" ] ; then 1421 if [[ -z ${newls} ]] ; then
1473 unset LINGUAS 1422 export LINGUAS=""
1474 else 1423 else
1475 export LINGUAS="${newls}" 1424 export LINGUAS=${newls:1}
1476 fi 1425 fi
1477} 1426}
1478 1427
1479# moved from kernel.eclass since they are generally useful outside of 1428# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1429# kernel.eclass -iggy (20041002)
1488 while ((i--)) ; do 1437 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1438 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1439 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1440 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1441 case ${ARCH} in
1493 x86) export ARCH="i386";; 1442 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1443 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1444 hppa) export ARCH="parisc";;
1496 mips) export ARCH="mips";; 1445 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! 1446 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}";; 1447 *) export ARCH="${ARCH}";;
1499 esac 1448 esac
1500} 1449}
1501 1450
1502# set's ARCH back to what portage expects 1451# set's ARCH back to what portage expects
1503set_arch_to_portage() { 1452set_arch_to_portage() {
1548 1497
1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1498 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1550 SONAME=`basename ${LIB}` 1499 SONAME=`basename ${LIB}`
1551 1500
1552 einfo "An old version of an installed library was detected on your system." 1501 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" 1502 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," 1503 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:" 1504 einfo "you will need to execute the following command:"
1556 einfo " revdep-rebuild --soname ${SONAME}" 1505 einfo " revdep-rebuild --soname ${SONAME}"
1557 einfo 1506 einfo
1558 einfo "After doing that, you can safely remove ${LIB}" 1507 einfo "After doing that, you can safely remove ${LIB}"
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1551 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1552 done
1604 eend 0 1553 eend 0
1605} 1554}
1606 1555
1607# dopamd [ file ] [ new file ] 1556# dopamd <file> [more files]
1608# 1557#
1609# Install pam auth config file in /etc/pam.d 1558# 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() { 1559dopamd() {
1615 local pamd="$1" newpamd="${2:-$1}"
1616 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1560 [[ -z $1 ]] && die "dopamd requires at least one argument"
1617 1561
1618 use pam || return 0 1562 use pam || return 0
1619 1563
1620 insinto /etc/pam.d 1564 INSDESTTREE=/etc/pam.d \
1621 # these are the default doins options, but be explicit just in case 1565 doins "$@" || die "failed to install $@"
1622 insopts -m 0644 -o root -g root
1623 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1624} 1566}
1567# newpamd <old name> <new name>
1568#
1569# Install pam file <old name> as <new name> in /etc/pam.d
1570newpamd() {
1571 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1572
1573 use pam || return 0
1574
1575 INSDESTTREE=/etc/pam.d \
1576 newins "$1" "$2" || die "failed to install $1 as $2"
1577}
1578
1579# make a wrapper script ...
1580# NOTE: this was originally games_make_wrapper, but I noticed other places where
1581# this could be used, so I have moved it here and made it not games-specific
1582# -- wolf31o2
1583# $1 == wrapper name
1584# $2 == binary to run
1585# $3 == directory to chdir before running binary
1586# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1587# $5 == path for wrapper
1588make_wrapper() {
1589 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1590 local tmpwrapper=$(emktemp)
1591 cat << EOF > "${tmpwrapper}"
1592#!/bin/sh
1593cd "${chdir}"
1594export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1595exec ${bin} "\$@"
1596EOF
1597 chmod go+rx "${tmpwrapper}"
1598 if [ -n "${5}" ]
1599 then
1600 exeinto ${5}
1601 newexe "${tmpwrapper}" "${wrapper}"
1602 else
1603 newbin "${tmpwrapper}" "${wrapper}"
1604 fi
1605}

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

  ViewVC Help
Powered by ViewVC 1.1.20