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

  ViewVC Help
Powered by ViewVC 1.1.20