/[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.181
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.181 2005/06/09 15:25:56 azarah 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
625 then 508 then
626 eerror "A shell was specified but it does not exist !" 509 eerror "A shell was specified but it does not exist !"
627 die "${eshell} does not exist" 510 die "${eshell} does not exist"
628 fi 511 fi
629 else 512 else
630 if [ "${USERLAND}" == "BSD" ] 513 if [[ "${USERLAND}" == "Darwin" ]]; then
631 then
632 eshell="/usr/bin/false" 514 eshell="/usr/bin/false"
515 elif [[ "${USERLAND}" == "BSD" ]]; then
516 eshell="/usr/sbin/nologin"
633 else 517 else
634 eshell="/bin/false" 518 eshell="/bin/false"
635 fi 519 fi
636 fi 520 fi
637 einfo " - Shell: ${eshell}" 521 einfo " - Shell: ${eshell}"
638 opts="${opts} -s ${eshell}" 522 opts="${opts} -s ${eshell}"
639 523
640 # handle homedir 524 # handle homedir
641 local ehome="$1"; shift 525 local ehome="$1"; shift
642 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 526 if [ -z "${ehome}" ] || [ "${ehome}" == "-1" ]
643 then 527 then
644 ehome="/dev/null" 528 ehome="/dev/null"
645 fi 529 fi
646 einfo " - Home: ${ehome}" 530 einfo " - Home: ${ehome}"
647 opts="${opts} -d ${ehome}" 531 opts="${opts} -d ${ehome}"
684 568
685 # handle extra and add the user 569 # handle extra and add the user
686 local eextra="$@" 570 local eextra="$@"
687 local oldsandbox="${SANDBOX_ON}" 571 local oldsandbox="${SANDBOX_ON}"
688 export SANDBOX_ON="0" 572 export SANDBOX_ON="0"
689 if useq ppc-macos 573 if [[ "${USERLAND}" == "Darwin" ]]
690 then 574 then
691 ### Make the user 575 ### Make the user
692 if [ -z "${eextra}" ] 576 if [ -z "${eextra}" ]
693 then 577 then
694 dscl . create /users/${euser} uid ${euid} 578 dscl . create /users/${euser} uid ${euid}
707 einfo "Extra options are not supported on macos yet" 591 einfo "Extra options are not supported on macos yet"
708 einfo "Please report the ebuild along with the info below" 592 einfo "Please report the ebuild along with the info below"
709 einfo "eextra: ${eextra}" 593 einfo "eextra: ${eextra}"
710 die "Required function missing" 594 die "Required function missing"
711 fi 595 fi
712 elif use x86-fbsd ; then 596 elif [[ "${USERLAND}" == "BSD" ]] ; then
713 if [ -z "${eextra}" ] 597 if [ -z "${eextra}" ]
714 then 598 then
715 pw useradd ${euser} ${opts} \ 599 pw useradd ${euser} ${opts} \
716 -c "added by portage for ${PN}" \ 600 -c "added by portage for ${PN}" \
717 die "enewuser failed" 601 die "enewuser failed"
777 then 661 then
778 if [ "${egid}" -gt 0 ] 662 if [ "${egid}" -gt 0 ]
779 then 663 then
780 if [ -z "`egetent group ${egid}`" ] 664 if [ -z "`egetent group ${egid}`" ]
781 then 665 then
782 if useq ppc-macos ; then 666 if [[ "${USERLAND}" == "Darwin" ]]; then
783 opts="${opts} ${egid}" 667 opts="${opts} ${egid}"
784 else 668 else
785 opts="${opts} -g ${egid}" 669 opts="${opts} -g ${egid}"
786 fi 670 fi
787 else 671 else
801 opts="${opts} ${eextra}" 685 opts="${opts} ${eextra}"
802 686
803 # add the group 687 # add the group
804 local oldsandbox="${SANDBOX_ON}" 688 local oldsandbox="${SANDBOX_ON}"
805 export SANDBOX_ON="0" 689 export SANDBOX_ON="0"
806 if useq ppc-macos ; then 690 if [[ "${USERLAND}" == "Darwin" ]]; then
807 if [ ! -z "${eextra}" ]; 691 if [ ! -z "${eextra}" ];
808 then 692 then
809 einfo "Extra options are not supported on macos yet" 693 einfo "Extra options are not supported on Darwin/OS X yet"
810 einfo "Please report the ebuild along with the info below" 694 einfo "Please report the ebuild along with the info below"
811 einfo "eextra: ${eextra}" 695 einfo "eextra: ${eextra}"
812 die "Required function missing" 696 die "Required function missing"
813 fi 697 fi
814 698
819 [ -z "`egetent group ${egid}`" ] && break 703 [ -z "`egetent group ${egid}`" ] && break
820 done 704 done
821 esac 705 esac
822 dscl . create /groups/${egroup} gid ${egid} 706 dscl . create /groups/${egroup} gid ${egid}
823 dscl . create /groups/${egroup} passwd '*' 707 dscl . create /groups/${egroup} passwd '*'
824 elif use x86-fbsd ; then 708 elif [[ "${USERLAND}" == "BSD" ]] ; then
825 case ${egid} in 709 case ${egid} in
826 *[!0-9]*) # Non numeric 710 *[!0-9]*) # Non numeric
827 for egid in `jot 898 101`; do 711 for egid in `jot 898 101`; do
828 [ -z "`egetent group ${egid}`" ] && break 712 [ -z "`egetent group ${egid}`" ] && break
829 done 713 done
864# name: the name that will show up in the menu 748# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 749# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 750# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 751# a full path to an icon
868# type: what kind of application is this ? for categories: 752# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 753# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
870# path: if your app needs to startup in a specific dir 754# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 755make_desktop_entry() {
872 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 756 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
873 757
874 local exec="${1}" 758 local exec=${1}
875 local name="${2:-${PN}}" 759 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 760 local icon=${3:-${PN}.png}
877 local type="${4}" 761 local type=${4}
878 local subdir="${6}" 762 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 763
880 if [ -z "${type}" ] 764 if [[ -z ${type} ]] ; then
881 then 765 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 766 local catmin=${CATEGORY##*-}
883 "app-emulation") 767 case ${catmaj} in
884 type=Emulator 768 app)
885 subdir="Emulation" 769 case ${catmin} in
770 admin) type=System;;
771 cdr) type=DiscBurning;;
772 dicts) type=Dictionary;;
773 editors) type=TextEditor;;
774 emacs) type=TextEditor;;
775 emulation) type=Emulator;;
776 laptop) type=HardwareSettings;;
777 office) type=Office;;
778 vim) type=TextEditor;;
779 xemacs) type=TextEditor;;
780 *) type=;;
781 esac
886 ;; 782 ;;
887 "games-"*) 783
888 type=Game 784 dev)
889 subdir="Games" 785 type="Development"
890 ;; 786 ;;
891 "net-"*) 787
892 type=Network 788 games)
893 subdir="${type}" 789 [[ -z ${path} ]] && path=${GAMES_BINDIR}
790
791 case ${catmin} in
792 action) type=ActionGame;;
793 arcade) type=ArcadeGame;;
794 board) type=BoardGame;;
795 kid) type=KidsGame;;
796 emulation) type=Emulator;;
797 puzzle) type=LogicGame;;
798 rpg) type=RolePlaying;;
799 roguelike) type=RolePlaying;;
800 simulation) type=Simulation;;
801 sports) type=SportsGame;;
802 strategy) type=StrategyGame;;
803 *) type=;;
804 esac
805 type="Game;${type}"
894 ;; 806 ;;
807
808 mail)
809 type="Network;Email"
810 ;;
811
812 media)
813 case ${catmin} in
814 gfx) type=Graphics;;
815 radio) type=Tuner;;
816 sound) type=Audio;;
817 tv) type=TV;;
818 video) type=Video;;
819 *) type=;;
820 esac
821 type="AudioVideo;${type}"
822 ;;
823
824 net)
825 case ${catmin} in
826 dialup) type=Dialup;;
827 ftp) type=FileTransfer;;
828 im) type=InstantMessaging;;
829 irc) type=IRCClient;;
830 mail) type=Email;;
831 news) type=News;;
832 nntp) type=News;;
833 p2p) type=FileTransfer;;
834 *) type=;;
835 esac
836 type="Network;${type}"
837 ;;
838
839 sci)
840 case ${catmin} in
841 astro*) type=Astronomoy;;
842 bio*) type=Biology;;
843 calc*) type=Calculator;;
844 chem*) type=Chemistry;;
845 geo*) type=Geology;;
846 math*) type=Math;;
847 *) type=;;
848 esac
849 type="Science;${type}"
850 ;;
851
852 www)
853 case ${catmin} in
854 client) type=WebBrowser;;
855 *) type=;;
856 esac
857 type="Network"
858 ;;
859
895 *) 860 *)
896 type= 861 type=
897 subdir=
898 ;; 862 ;;
899 esac 863 esac
900 fi 864 fi
865 if [ "${SLOT}" == "0" ] ; then
866 local desktop_name="${PN}"
867 else
868 local desktop_name="${PN}-${SLOT}"
869 fi
901 local desktop="${T}/${exec}.desktop" 870 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902 871
903echo "[Desktop Entry] 872echo "[Desktop Entry]
904Encoding=UTF-8 873Encoding=UTF-8
905Version=0.9.2 874Version=0.9.2
906Name=${name} 875Name=${name}
922# make_desktop_entry(<title>, <command>) 891# make_desktop_entry(<title>, <command>)
923# title: File to execute to start the Window Manager 892# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 893# command: Name of the Window Manager
925 894
926make_session_desktop() { 895make_session_desktop() {
927
928 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 896 [[ -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 897 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
930 898
931 local title="${1}" 899 local title=$1
932 local command="${2}" 900 local command=$2
933 local desktop="${T}/${wm}.desktop" 901 local desktop=${T}/${wm}.desktop
934 902
935echo "[Desktop Entry] 903echo "[Desktop Entry]
936Encoding=UTF-8 904Encoding=UTF-8
937Name=${title} 905Name=${title}
938Comment=This session logs you into ${title} 906Comment=This session logs you into ${title}
940TryExec=${command} 908TryExec=${command}
941Type=Application" > "${desktop}" 909Type=Application" > "${desktop}"
942 910
943 insinto /usr/share/xsessions 911 insinto /usr/share/xsessions
944 doins "${desktop}" 912 doins "${desktop}"
945
946 return 0
947} 913}
948 914
949domenu() { 915domenu() {
950 local i 916 local i j
951 local j
952 insinto /usr/share/applications 917 insinto /usr/share/applications
953 for i in ${@} 918 for i in "$@" ; do
954 do
955 if [ -f "${i}" ]; 919 if [[ -f ${i} ]] ; then
956 then
957 doins ${i} 920 doins "${i}"
958 elif [ -d "${i}" ]; 921 elif [[ -d ${i} ]] ; then
959 then
960 for j in ${i}/*.desktop 922 for j in "${i}"/*.desktop ; do
961 do
962 doins ${j} 923 doins "${j}"
963 done 924 done
964 fi 925 fi
965 done 926 done
966} 927}
928newmenu() {
929 insinto /usr/share/applications
930 newins "$1" "$2"
931}
967 932
968doicon() { 933doicon() {
969 local i 934 local i j
970 local j
971 insinto /usr/share/pixmaps 935 insinto /usr/share/pixmaps
972 for i in ${@} 936 for i in "$@" ; do
973 do
974 if [ -f "${i}" ]; 937 if [[ -f ${i} ]] ; then
975 then
976 doins ${i} 938 doins "${i}"
977 elif [ -d "${i}" ]; 939 elif [[ -d ${i} ]] ; then
978 then
979 for j in ${i}/*.png 940 for j in "${i}"/*.png ; do
980 do
981 doins ${j} 941 doins "${j}"
982 done 942 done
983 fi 943 fi
984 done 944 done
945}
946newicon() {
947 insinto /usr/share/pixmaps
948 newins "$1" "$2"
985} 949}
986 950
987############################################################## 951##############################################################
988# END: Handle .desktop files and menu entries # 952# END: Handle .desktop files and menu entries #
989############################################################## 953##############################################################
1390 local mline="" 1354 local mline=""
1391 local showedmsg=0 1355 local showedmsg=0
1392 1356
1393 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1357 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1394 [[ -d ${mline}/${dir} ]] || continue 1358 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1359 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1396 && export CDROM_ROOT=${mline} 1360 && export CDROM_ROOT=${mline}
1397 done 1361 done
1398 1362
1399 if [[ -z ${CDROM_ROOT} ]] ; then 1363 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1364 echo
1434# directories and uses the intersection of the lists. 1398# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1399# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1400# directories and uses the union of the lists.
1437strip-linguas() { 1401strip-linguas() {
1438 local ls newls 1402 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1403 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1404 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1405 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1442 local d f 1406 local d f
1443 for d in "$@" ; do 1407 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1408 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1409 newls=${ls}
1446 else 1410 else
1447 newls="" 1411 newls=""
1448 fi 1412 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1413 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1450 if [ "${op}" == "-i" ] ; then 1414 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1415 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1452 else 1416 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1417 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1454 fi 1418 fi
1455 done 1419 done
1456 ls="${newls}" 1420 ls=${newls}
1457 done 1421 done
1458 ls="${ls//.po}" 1422 ls=${ls//.po}
1459 else 1423 else
1460 ls="$@" 1424 ls=$@
1461 fi 1425 fi
1462 1426
1463 ls=" ${ls} " 1427 ls=" ${ls} "
1464 newls="" 1428 newls=""
1465 for f in ${LINGUAS} ; do 1429 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1430 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1467 newls="${newls} ${f}" 1431 newls="${newls} ${f}"
1468 else 1432 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1433 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1434 fi
1471 done 1435 done
1472 if [ -z "${newls}" ] ; then 1436 if [[ -z ${newls} ]] ; then
1473 unset LINGUAS 1437 export LINGUAS=""
1474 else 1438 else
1475 export LINGUAS="${newls}" 1439 export LINGUAS=${newls:1}
1476 fi 1440 fi
1477} 1441}
1478 1442
1479# moved from kernel.eclass since they are generally useful outside of 1443# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1444# kernel.eclass -iggy (20041002)
1488 while ((i--)) ; do 1452 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1453 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1454 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1455 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1456 case ${ARCH} in
1493 x86) export ARCH="i386";; 1457 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1458 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1459 hppa) export ARCH="parisc";;
1496 mips) export ARCH="mips";; 1460 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! 1461 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}";; 1462 *) export ARCH="${ARCH}";;
1499 esac 1463 esac
1500} 1464}
1501 1465
1502# set's ARCH back to what portage expects 1466# set's ARCH back to what portage expects
1503set_arch_to_portage() { 1467set_arch_to_portage() {
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1566 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1567 done
1604 eend 0 1568 eend 0
1605} 1569}
1606 1570
1607# dopamd [ file ] [ new file ] 1571# dopamd <file> [more files]
1608# 1572#
1609# Install pam auth config file in /etc/pam.d 1573# 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() { 1574dopamd() {
1615 local pamd="$1" newpamd="${2:-$1}"
1616 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1575 [[ -z $1 ]] && die "dopamd requires at least one argument"
1617 1576
1618 use pam || return 0 1577 use pam || return 0
1619 1578
1620 insinto /etc/pam.d 1579 INSDESTTREE=/etc/pam.d \
1621 # these are the default doins options, but be explicit just in case 1580 doins "$@" || die "failed to install $@"
1622 insopts -m 0644 -o root -g root
1623 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1624} 1581}
1582# newpamd <old name> <new name>
1583#
1584# Install pam file <old name> as <new name> in /etc/pam.d
1585newpamd() {
1586 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1587
1588 use pam || return 0
1589
1590 INSDESTTREE=/etc/pam.d \
1591 newins "$1" "$2" || die "failed to install $1 as $2"
1592}
1593
1594# make a wrapper script ...
1595# NOTE: this was originally games_make_wrapper, but I noticed other places where
1596# this could be used, so I have moved it here and made it not games-specific
1597# -- wolf31o2
1598# $1 == wrapper name
1599# $2 == binary to run
1600# $3 == directory to chdir before running binary
1601# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1602# $5 == path for wrapper
1603make_wrapper() {
1604 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1605 local tmpwrapper=$(emktemp)
1606 cat << EOF > "${tmpwrapper}"
1607#!/bin/sh
1608cd "${chdir}"
1609export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1610exec ${bin} "\$@"
1611EOF
1612 chmod go+rx "${tmpwrapper}"
1613 if [ -n "${5}" ]
1614 then
1615 exeinto ${5}
1616 newexe "${tmpwrapper}" "${wrapper}"
1617 else
1618 newbin "${tmpwrapper}" "${wrapper}"
1619 fi
1620}

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

  ViewVC Help
Powered by ViewVC 1.1.20