/[gentoo-x86]/eclass/eutils.eclass
Gentoo

Diff of /eclass/eutils.eclass

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 1.76 Revision 1.108
1# Copyright 1999-2004 Gentoo Technologies, Inc. 1# Copyright 1999-2004 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.76 2004/01/26 23:40:07 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.108 2004/10/01 19:23:58 ka0ttic 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.
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12ECLASS=eutils 12ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 13INHERITED="$INHERITED $ECLASS"
14 14
15newdepend "!bootstrap? ( sys-devel/patch )" 15DEPEND="!bootstrap? ( sys-devel/patch )"
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero.
23# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
24epause() {
25 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then
26 sleep ${1:-5}
27 fi
28}
29
30# Beep the specified number of times (defaults to five). If our output
31# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
32# don't beep.
33# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
34ebeep() {
35 local n
36 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then
37 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
38 echo -ne "\a"
39 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
40 echo -ne "\a"
41 sleep 1
42 done
43 fi
44}
45
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96}
18 97
19# This function generate linker scripts in /usr/lib for dynamic 98# This function generate linker scripts in /usr/lib for dynamic
20# libs in /lib. This is to fix linking problems when you have 99# libs in /lib. This is to fix linking problems when you have
21# the .so in /lib, and the .a in /usr/lib. What happens is that 100# the .so in /lib, and the .a in /usr/lib. What happens is that
22# in some cases when linking dynamic, the .a in /usr/lib is used 101# in some cases when linking dynamic, the .a in /usr/lib is used
33# to point to the latest version of the library present. 112# to point to the latest version of the library present.
34# 113#
35# <azarah@gentoo.org> (26 Oct 2002) 114# <azarah@gentoo.org> (26 Oct 2002)
36# 115#
37gen_usr_ldscript() { 116gen_usr_ldscript() {
38
39 # Just make sure it exists 117 # Just make sure it exists
40 dodir /usr/lib 118 dodir /usr/$(get_libdir)
41 119
42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" 120 cat > "${D}/usr/$(get_libdir)/$1" << END_LDSCRIPT
43/* GNU ld script 121/* GNU ld script
44 Because Gentoo have critical dynamic libraries 122 Because Gentoo have critical dynamic libraries
45 in /lib, and the static versions in /usr/lib, we 123 in /lib, and the static versions in /usr/lib, we
46 need to have a "fake" dynamic lib in /usr/lib, 124 need to have a "fake" dynamic lib in /usr/lib,
47 otherwise we run into linking problems. 125 otherwise we run into linking problems.
48 See bug #4411 on http://bugs.gentoo.org/ for 126 See bug #4411 on http://bugs.gentoo.org/ for
49 more info. */ 127 more info. */
50GROUP ( /lib/libxxx ) 128GROUP ( /$(get_libdir)/$1 )
51END_LDSCRIPT 129END_LDSCRIPT
52
53 dosed "s:libxxx:$1:" /usr/lib/$1
54
55 return 0
56} 130}
57 131
58# Simple function to draw a line consisting of '=' the same length as $* 132# Simple function to draw a line consisting of '=' the same length as $*
59# 133#
60# <azarah@gentoo.org> (11 Nov 2002) 134# <azarah@gentoo.org> (11 Nov 2002)
144 local SINGLE_PATCH="no" 218 local SINGLE_PATCH="no"
145 local x="" 219 local x=""
146 220
147 if [ "$#" -gt 1 ] 221 if [ "$#" -gt 1 ]
148 then 222 then
149 eerror "Invalid arguments to epatch()" 223 local m=""
150 die "Invalid arguments to epatch()" 224 einfo "${#} patches to apply..."
225 for m in "$@" ; do
226 epatch "${m}"
227 done
228 return 0
151 fi 229 fi
152 230
153 if [ -n "$1" -a -f "$1" ] 231 if [ -n "$1" -a -f "$1" ]
154 then 232 then
155 SINGLE_PATCH="yes" 233 SINGLE_PATCH="yes"
258 else 336 else
259 PATCH_TARGET="${x}" 337 PATCH_TARGET="${x}"
260 fi 338 fi
261 339
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 341 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
264 342
265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 344 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
267 345
268 if [ "${PATCH_SUFFIX}" != "patch" ] 346 if [ "${PATCH_SUFFIX}" != "patch" ]
275 count=5 353 count=5
276 break 354 break
277 fi 355 fi
278 fi 356 fi
279 357
280 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 358 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
281 then 359 then
282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 360 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 361 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 362 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 364 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
287 365
288 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 366 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
289 367
290 if [ "$?" -ne 0 ] 368 if [ "$?" -ne 0 ]
291 then 369 then
292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 370 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
293 echo 371 echo
336# This function return true if we are using the NPTL pthreads 414# This function return true if we are using the NPTL pthreads
337# implementation. 415# implementation.
338# 416#
339# <azarah@gentoo.org> (06 March 2003) 417# <azarah@gentoo.org> (06 March 2003)
340# 418#
341
342have_NPTL() { 419have_NPTL() {
343
344 cat > ${T}/test-nptl.c <<-"END" 420 cat > ${T}/test-nptl.c <<-"END"
345 #define _XOPEN_SOURCE 421 #define _XOPEN_SOURCE
346 #include <unistd.h> 422 #include <unistd.h>
347 #include <stdio.h> 423 #include <stdio.h>
348 424
422 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))" 498 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
423 else 499 else
424 jobs=2 500 jobs=2
425 fi 501 fi
426 502
427 elif [ "${ARCH}" = "ppc" ] 503 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
428 then 504 then
429 # ppc has "processor", but only when compiled with SMP 505 # ppc has "processor", but only when compiled with SMP
430 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ] 506 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
431 then 507 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 508 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 509 else
434 jobs=2 510 jobs=2
435 fi 511 fi
512 elif [ "${ARCH}" = "s390" ]
513 then
514 # s390 has "# processors : "
515 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 516 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 517 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 518 die "Unknown ARCH -- ${ARCH}!"
439 fi 519 fi
440 520
456 fi 536 fi
457 fi 537 fi
458} 538}
459 539
460# Cheap replacement for when debianutils (and thus mktemp) 540# Cheap replacement for when debianutils (and thus mktemp)
461# do not exist on the users system 541# does not exist on the users system
462# vapier@gentoo.org 542# vapier@gentoo.org
463# 543#
464# Takes just 1 parameter (the directory to create tmpfile in) 544# Takes just 1 parameter (the directory to create tmpfile in)
465mymktemp() { 545mymktemp() {
466 local topdir="$1" 546 local topdir="$1"
467 547
468 [ -z "${topdir}" ] && topdir=/tmp 548 [ -z "${topdir}" ] && topdir=/tmp
469 if [ "`which mktemp 2>/dev/null`" ] 549 if [ "`which mktemp 2>/dev/null`" ]
470 then 550 then
471 mktemp -p ${topdir} 551 mktemp -p ${topdir}
472 else 552 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 553 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp} 554 touch ${tmp}
475 echo ${tmp} 555 echo ${tmp}
556 fi
557}
558
559# Small wrapper for getent (Linux), nidump (Mac OS X),
560# and pw (FreeBSD) used in enewuser()/enewgroup()
561# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
562# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
563#
564# egetent(database, key)
565egetent() {
566 if use macos || use ppc-macos ; then
567 case "$2" in
568 *[!0-9]*) # Non numeric
569 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
570 ;;
571 *) # Numeric
572 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
573 ;;
574 esac
575 elif useq x86-fbsd ; then
576 local action
577 if [ "$1" == "passwd" ]
578 then
579 action="user"
580 else
581 action="group"
582 fi
583 pw show "${action}" "$2" -q
584 else
585 getent "$1" "$2"
476 fi 586 fi
477} 587}
478 588
479# Simplify/standardize adding users to the system 589# Simplify/standardize adding users to the system
480# vapier@gentoo.org 590# vapier@gentoo.org
496 then 606 then
497 eerror "No username specified !" 607 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 608 die "Cannot call enewuser without a username"
499 fi 609 fi
500 610
501 # setup a file for testing usernames/groups
502 local tmpfile="`mymktemp ${T}`"
503 chown ${euser} ${tmpfile} >& /dev/null
504 local realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
505
506 # see if user already exists 611 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 612 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 613 then
509 return 0 614 return 0
510 fi 615 fi
511 einfo "Adding user '${euser}' to your system ..." 616 einfo "Adding user '${euser}' to your system ..."
512 617
517 local euid="$1"; shift 622 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 623 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 624 then
520 if [ "${euid}" -gt 0 ] 625 if [ "${euid}" -gt 0 ]
521 then 626 then
522 opts="${opts} -u ${euid}" 627 if [ ! -z "`egetent passwd ${euid}`" ]
628 then
629 euid="next"
630 fi
523 else 631 else
524 eerror "Userid given but is not greater than 0 !" 632 eerror "Userid given but is not greater than 0 !"
525 die "${euid} is not a valid UID" 633 die "${euid} is not a valid UID"
526 fi 634 fi
527 else 635 else
528 euid="next available" 636 euid="next"
637 fi
638 if [ "${euid}" == "next" ]
639 then
640 local pwrange
641 if use macos || use ppc-macos || [ "${USERLAND}" == "BSD" ] ; then
642 pwrange="`jot 898 101`"
643 else
644 pwrange="`seq 101 999`"
529 fi 645 fi
646 for euid in ${pwrange} ; do
647 [ -z "`egetent passwd ${euid}`" ] && break
648 done
649 fi
650 opts="${opts} -u ${euid}"
530 einfo " - Userid: ${euid}" 651 einfo " - Userid: ${euid}"
531 652
532 # handle shell 653 # handle shell
533 local eshell="$1"; shift 654 local eshell="$1"; shift
534 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 655 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
537 then 658 then
538 eerror "A shell was specified but it does not exist !" 659 eerror "A shell was specified but it does not exist !"
539 die "${eshell} does not exist" 660 die "${eshell} does not exist"
540 fi 661 fi
541 else 662 else
663 if [ "${USERLAND}" == "BSD" ]
664 then
665 eshell="/usr/bin/false"
666 else
542 eshell="/bin/false" 667 eshell="/bin/false"
668 fi
543 fi 669 fi
544 einfo " - Shell: ${eshell}" 670 einfo " - Shell: ${eshell}"
545 opts="${opts} -s ${eshell}" 671 opts="${opts} -s ${eshell}"
546 672
547 # handle homedir 673 # handle homedir
555 681
556 # handle groups 682 # handle groups
557 local egroups="$1"; shift 683 local egroups="$1"; shift
558 if [ ! -z "${egroups}" ] 684 if [ ! -z "${egroups}" ]
559 then 685 then
560 local realgroup=
561 local oldifs="${IFS}" 686 local oldifs="${IFS}"
687 local defgroup="" exgroups=""
688
562 export IFS="," 689 export IFS=","
563 for g in ${egroups} 690 for g in ${egroups}
564 do 691 do
565 chgrp ${g} ${tmpfile} >& /dev/null 692 if [ -z "`egetent group \"${g}\"`" ]
566 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
567 if [ "${g}" != "${realgroup}" ]
568 then 693 then
569 eerror "You must add ${g} to the system first" 694 eerror "You must add group ${g} to the system first"
570 die "${g} is not a valid GID" 695 die "${g} is not a valid GID"
696 fi
697 if [ -z "${defgroup}" ]
698 then
699 defgroup="${g}"
700 else
701 exgroups="${exgroups},${g}"
571 fi 702 fi
572 done 703 done
573 export IFS="${oldifs}" 704 export IFS="${oldifs}"
705
574 opts="${opts} -g ${egroups}" 706 opts="${opts} -g ${defgroup}"
707 if [ ! -z "${exgroups}" ]
708 then
709 opts="${opts} -G ${exgroups:1}"
710 fi
575 else 711 else
576 egroups="(none)" 712 egroups="(none)"
577 fi 713 fi
578 einfo " - Groups: ${egroups}" 714 einfo " - Groups: ${egroups}"
579 715
580 # handle extra and add the user 716 # handle extra and add the user
581 local eextra="$@" 717 local eextra="$@"
582 local oldsandbox="${SANDBOX_ON}" 718 local oldsandbox="${SANDBOX_ON}"
583 export SANDBOX_ON="0" 719 export SANDBOX_ON="0"
720 if use macos || use ppc-macos ;
721 then
722 ### Make the user
584 if [ -z "${eextra}" ] 723 if [ -z "${eextra}" ]
585 then 724 then
586 useradd ${opts} ${euser} \ 725 dscl . create /users/${euser} uid ${euid}
726 dscl . create /users/${euser} shell ${eshell}
727 dscl . create /users/${euser} home ${ehome}
728 dscl . create /users/${euser} realname "added by portage for ${PN}"
729 ### Add the user to the groups specified
730 for g in ${egroups}
731 do
732 # $egroups is , delimited, not space
733 ewarn "This is code is wrong; someone on the OS X team should fix it"
734 dscl . merge /groups/${g} users ${euser}
735 done
736 else
737 einfo "Extra options are not supported on macos yet"
738 einfo "Please report the ebuild along with the info below"
739 einfo "eextra: ${eextra}"
740 die "Required function missing"
741 fi
742 elif use x86-fbsd ; then
743 if [ -z "${eextra}" ]
744 then
745 pw useradd ${euser} ${opts} \
587 -c "added by portage for ${PN}" \ 746 -c "added by portage for ${PN}" \
588 || die "enewuser failed" 747 die "enewuser failed"
589 else 748 else
590 einfo " - Extra: ${eextra}" 749 einfo " - Extra: ${eextra}"
750 pw useradd ${euser} ${opts} \
751 -c ${eextra} || die "enewuser failed"
752 fi
753 else
754 if [ -z "${eextra}" ]
755 then
756 useradd ${opts} ${euser} \
757 -c "added by portage for ${PN}" \
758 || die "enewuser failed"
759 else
760 einfo " - Extra: ${eextra}"
591 useradd ${opts} ${euser} ${eextra} \ 761 useradd ${opts} ${euser} ${eextra} \
592 || die "enewuser failed" 762 || die "enewuser failed"
763 fi
593 fi 764 fi
594 export SANDBOX_ON="${oldsandbox}" 765 export SANDBOX_ON="${oldsandbox}"
595 766
596 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 767 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
597 then 768 then
618 then 789 then
619 eerror "No group specified !" 790 eerror "No group specified !"
620 die "Cannot call enewgroup without a group" 791 die "Cannot call enewgroup without a group"
621 fi 792 fi
622 793
623 # setup a file for testing groupname
624 local tmpfile="`mymktemp ${T}`"
625 chgrp ${egroup} ${tmpfile} >& /dev/null
626 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
627
628 # see if group already exists 794 # see if group already exists
629 if [ "${egroup}" == "${realgroup}" ] 795 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
630 then 796 then
631 return 0 797 return 0
632 fi 798 fi
633 einfo "Adding group '${egroup}' to your system ..." 799 einfo "Adding group '${egroup}' to your system ..."
634 800
639 local egid="$1"; shift 805 local egid="$1"; shift
640 if [ ! -z "${egid}" ] 806 if [ ! -z "${egid}" ]
641 then 807 then
642 if [ "${egid}" -gt 0 ] 808 if [ "${egid}" -gt 0 ]
643 then 809 then
810 if [ -z "`egetent group ${egid}`" ]
811 then
812 if use macos || use ppc-macos ; then
813 opts="${opts} ${egid}"
814 else
644 opts="${opts} -g ${egid}" 815 opts="${opts} -g ${egid}"
816 fi
817 else
818 egid="next available; requested gid taken"
819 fi
645 else 820 else
646 eerror "Groupid given but is not greater than 0 !" 821 eerror "Groupid given but is not greater than 0 !"
647 die "${egid} is not a valid GID" 822 die "${egid} is not a valid GID"
648 fi 823 fi
649 else 824 else
656 opts="${opts} ${eextra}" 831 opts="${opts} ${eextra}"
657 832
658 # add the group 833 # add the group
659 local oldsandbox="${SANDBOX_ON}" 834 local oldsandbox="${SANDBOX_ON}"
660 export SANDBOX_ON="0" 835 export SANDBOX_ON="0"
836 if use macos || use ppc-macos ;
837 then
838 if [ ! -z "${eextra}" ];
839 then
840 einfo "Extra options are not supported on macos yet"
841 einfo "Please report the ebuild along with the info below"
842 einfo "eextra: ${eextra}"
843 die "Required function missing"
844 fi
845
846 # If we need the next available
847 case ${egid} in
848 *[!0-9]*) # Non numeric
849 for egid in `jot 898 101`; do
850 [ -z "`egetent group ${egid}`" ] && break
851 done
852 esac
853 dscl . create /groups/${egroup} gid ${egid}
854 dscl . create /groups/${egroup} passwd '*'
855 elif use x86-fbsd ; then
856 case ${egid} in
857 *[!0-9]*) # Non numeric
858 for egid in `jot 898 101`; do
859 [ -z "`egetent group ${egid}`" ] && break
860 done
861 esac
862 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
863 else
661 groupadd ${opts} ${egroup} || die "enewgroup failed" 864 groupadd ${opts} ${egroup} || die "enewgroup failed"
865 fi
662 export SANDBOX_ON="${oldsandbox}" 866 export SANDBOX_ON="${oldsandbox}"
663} 867}
664 868
665# Simple script to replace 'dos2unix' binaries 869# Simple script to replace 'dos2unix' binaries
666# vapier@gentoo.org 870# vapier@gentoo.org
687# name: the name that will show up in the menu 891# name: the name that will show up in the menu
688# icon: give your little like a pretty little icon ... 892# icon: give your little like a pretty little icon ...
689# this can be relative (to /usr/share/pixmaps) or 893# this can be relative (to /usr/share/pixmaps) or
690# a full path to an icon 894# a full path to an icon
691# type: what kind of application is this ? for categories: 895# type: what kind of application is this ? for categories:
692# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 896# http://www.freedesktop.org/standards/menu-spec/
693# path: if your app needs to startup in a specific dir 897# path: if your app needs to startup in a specific dir
694make_desktop_entry() { 898make_desktop_entry() {
695 [ -z "$1" ] && eerror "You must specify the executable" && return 1 899 [ -z "$1" ] && eerror "You must specify the executable" && return 1
696 900
697 local exec="${1}" 901 local exec="${1}"
698 local name="${2:-${PN}}" 902 local name="${2:-${PN}}"
699 local icon="${3:-${PN}.png}" 903 local icon="${3:-${PN}.png}"
700 local type="${4}" 904 local type="${4}"
905 local subdir="${6}"
701 local path="${5:-${GAMES_PREFIX}}" 906 local path="${5:-${GAMES_BINDIR}}"
702 if [ -z "${type}" ] 907 if [ -z "${type}" ]
703 then 908 then
704 case ${CATEGORY} in 909 case ${CATEGORY} in
705 "app-emulation") 910 "app-emulation")
706 type=Emulator 911 type=Emulator
912 subdir="Emulation"
707 ;; 913 ;;
708 "games-"*) 914 "games-"*)
709 type=Game 915 type=Game
916 subdir="Games"
710 ;; 917 ;;
711 "net-"*) 918 "net-"*)
712 type=Network; 919 type=Network
920 subdir="${type}"
713 ;; 921 ;;
714 *) 922 *)
715 type= 923 type=
924 subdir=
716 ;; 925 ;;
717 esac 926 esac
718 fi 927 fi
719 local desktop="${T}/${exec}.desktop" 928 local desktop="${T}/${exec}.desktop"
720 929
725Type=Application 934Type=Application
726Comment=${DESCRIPTION} 935Comment=${DESCRIPTION}
727Exec=${exec} 936Exec=${exec}
728Path=${path} 937Path=${path}
729Icon=${icon} 938Icon=${icon}
730Categories=Application;${type};" > ${desktop} 939Categories=Application;${type};" > "${desktop}"
731 940
732 if [ -d "/usr/share/applications" ] 941 if [ -d "/usr/share/applications" ]
733 then 942 then
734 insinto /usr/share/applications 943 insinto /usr/share/applications
735 doins ${desktop} 944 doins "${desktop}"
736 fi 945 fi
737 946
738 #if [ -d "/usr/share/gnome/apps" ] 947 #if [ -d "/usr/share/gnome/apps" ]
739 #then 948 #then
740 # insinto /usr/share/gnome/apps/Games 949 # insinto /usr/share/gnome/apps/Games
750 # done 959 # done
751 #fi 960 #fi
752 961
753 if [ -d "/usr/share/applnk" ] 962 if [ -d "/usr/share/applnk" ]
754 then 963 then
755 insinto /usr/share/applnk/${type} 964 insinto /usr/share/applnk/${subdir}
756 doins ${desktop} 965 doins "${desktop}"
757 fi 966 fi
758 967
759 return 0 968 return 0
760}
761
762# new convenience patch wrapper function to eventually replace epatch(),
763# $PATCHES, $PATCHES1, src_unpack:patch, src_unpack:autopatch and
764# /usr/bin/patch
765# Features:
766# - bulk patch handling similar to epatch()'s
767# - automatic patch level detection like epatch()'s
768# - automatic patch uncompression like epatch()'s
769# - doesn't have the --dry-run overhead of epatch() - inspects patchfiles
770# manually instead
771# - once I decide it's production-ready, it'll be called from base_src_unpack
772# to handle $PATCHES to avoid defining src_unpack just to use xpatch
773
774# accepts zero or more parameters specifying patchfiles and/or patchdirs
775
776# known issues:
777# - only supports unified style patches (does anyone _really_ use anything
778# else?)
779# - because it doesn't use --dry-run there is a risk of it failing
780# to find the files to patch, ie detect the patchlevel, properly. It doesn't use
781# any of the backup heuristics that patch employs to discover a filename.
782# however, this isn't dangerous because if it works for the developer who's
783# writing the ebuild, it'll always work for the users, and if it doesn't,
784# then we'll fix it :-)
785# - no support as yet for patches applying outside $S (and not directly in $WORKDIR).
786xpatch() {
787
788 debug-print-function ${FUNCNAME} $*
789
790 local list=
791 local list2=
792 declare -i plevel
793
794 # parse patch sources
795 for x in $*
796 do
797 debug-print "${FUNCNAME}: parsing parameter ${x}"
798 if [ -f "${x}" ]
799 then
800 list="${list} ${x}"
801 elif [ -d "${x}" ]
802 then
803 # handles patchdirs like epatch() for now: no recursion.
804 # patches are sorted by filename, so with an xy_foo naming scheme you'll get the right order.
805 # only patches with _$ARCH_ or _all_ in their filenames are applied.
806 for file in `ls -A ${x}`
807 do
808 debug-print "${FUNCNAME}: parsing in subdir: file ${file}"
809 if [ -f "${x}/${file}" -a "${file}" != "${file/_all_}" -o \
810 "${file}" != "${file/_$ARCH_}" ]
811 then
812 list2="${list2} ${x}/${file}"
813 fi
814 done
815 list="`echo ${list2} | sort` ${list}"
816 else
817 die "Couldn't find ${x}"
818 fi
819 done
820
821 debug-print "${FUNCNAME}: final list of patches: ${list}"
822
823 for x in ${list};
824 do
825 debug-print "${FUNCNAME}: processing ${x}"
826 # deal with compressed files. /usr/bin/file is in the system profile, or should be.
827 case "`/usr/bin/file -b ${x}`" in
828 *gzip*)
829 patchfile="${T}/current.patch"
830 ungzip -c "${x}" > "${patchfile}"
831 ;;
832 *bzip2*)
833 patchfile="${T}/current.patch"
834 bunzip2 -c "${x}" > "${patchfile}"
835 ;;
836 *text*)
837 patchfile="${x}"
838 ;;
839 *)
840 die "Could not determine filetype of patch ${x}"
841 ;;
842 esac
843 debug-print "${FUNCNAME}: patchfile=${patchfile}"
844
845 # determine patchlevel. supports p0 and higher with either $S or $WORKDIR as base.
846 target="`/bin/grep -m 1 '^+++ ' ${patchfile}`"
847 debug-print "${FUNCNAME}: raw target=${target}"
848 # strip target down to the path/filename, remove leading +++
849 target="${target/+++ }"; target="${target%% *}"
850 # duplicate slashes are discarded by patch wrt the patchlevel. therefore we need
851 # to discard them as well to calculate the correct patchlevel.
852 target="${target//\/\//\/}"
853 debug-print "${FUNCNAME}: stripped target=${target}"
854
855 # look for target
856 for basedir in "${S}" "${WORKDIR}" "${PWD}"; do
857 debug-print "${FUNCNAME}: looking in basedir=${basedir}"
858 cd "${basedir}"
859
860 # try stripping leading directories
861 target2="${target}"
862 plevel=0
863 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
864 while [ ! -f "${target2}" ]
865 do
866 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
867 plevel=$((plevel+1))
868 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
869 [ "${target2}" == "${target2/\/}" ] && break
870 done
871 test -f "${target2}" && break
872
873 # try stripping filename - needed to support patches creating new files
874 target2="${target%/*}"
875 plevel=0
876 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
877 while [ ! -d "${target2}" ]
878 do
879 target2="${target2#*/}" # removes piece of target2 upto the first occurence of /
880 plevel=$((plevel+1))
881 debug-print "${FUNCNAME}: trying target2=${target2}, plevel=${plevel}"
882 [ "${target2}" == "${target2/\/}" ] && break
883 done
884 test -d "${target2}" && break
885
886 done
887
888 test -f "${basedir}/${target2}" || test -d "${basedir}/${target2}" \
889 || die "Could not determine patchlevel for ${x}"
890 debug-print "${FUNCNAME}: determined plevel=${plevel}"
891 # do the patching
892 ebegin "Applying patch ${x##*/}..."
893 /usr/bin/patch -p${plevel} < "${patchfile}" > /dev/null \
894 || die "Failed to apply patch ${x}"
895 eend $?
896
897 done
898
899} 969}
900 970
901# for internal use only (unpack_pdv and unpack_makeself) 971# for internal use only (unpack_pdv and unpack_makeself)
902find_unpackable_file() { 972find_unpackable_file() {
903 local src="$1" 973 local src="$1"
1071 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1141 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf -
1072 ;; 1142 ;;
1073 gzip*) 1143 gzip*)
1074 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1144 tail -n +${skip} ${src} | tar --no-same-owner -xzf -
1075 ;; 1145 ;;
1146 compress*)
1147 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf -
1148 ;;
1076 *) 1149 *)
1150 eerror "Unknown filetype \"${filetype}\" ?"
1077 false 1151 false
1078 ;; 1152 ;;
1079 esac 1153 esac
1080 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1154 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1081} 1155}
1100 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1174 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
1101 local l="`basename ${lic}`" 1175 local l="`basename ${lic}`"
1102 1176
1103 # here is where we check for the licenses the user already 1177 # here is where we check for the licenses the user already
1104 # accepted ... if we don't find a match, we make the user accept 1178 # accepted ... if we don't find a match, we make the user accept
1179 local shopts=$-
1105 local alic 1180 local alic
1181 set -o noglob #so that bash doesn't expand "*"
1106 for alic in "${ACCEPT_LICENSE}" ; do 1182 for alic in ${ACCEPT_LICENSE} ; do
1107 [ "${alic}" == "*" ] && return 0 1183 if [[ ${alic} == * || ${alic} == ${l} ]]; then
1108 [ "${alic}" == "${l}" ] && return 0 1184 set +o noglob; set -${shopts} #reset old shell opts
1185 return 0
1186 fi
1109 done 1187 done
1188 set +o noglob; set -$shopts #reset old shell opts
1110 1189
1111 local licmsg="`mymktemp ${T}`" 1190 local licmsg="`mymktemp ${T}`"
1112 cat << EOF > ${licmsg} 1191 cat << EOF > ${licmsg}
1113********************************************************** 1192**********************************************************
1114The following license outlines the terms of use of this 1193The following license outlines the terms of use of this
1239# remember, you can only go forward in the cd chain, you can't go back. 1318# remember, you can only go forward in the cd chain, you can't go back.
1240cdrom_load_next_cd() { 1319cdrom_load_next_cd() {
1241 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1320 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1242 local var= 1321 local var=
1243 1322
1323 if [ ! -z "${CD_ROOT}" ] ; then
1324 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1325 return
1326 fi
1327
1244 unset CDROM_ROOT 1328 unset CDROM_ROOT
1245 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1329 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1246 if [ -z "${!var}" ] ; then 1330 if [ -z "${!var}" ] ; then
1247 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1331 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1248 cdrom_locate_file_on_cd ${!var} 1332 cdrom_locate_file_on_cd ${!var}
1296 einfo "or hit CTRL+C to abort the emerge." 1380 einfo "or hit CTRL+C to abort the emerge."
1297 read 1381 read
1298 fi 1382 fi
1299 done 1383 done
1300} 1384}
1385
1386# Make sure that LINGUAS only contains languages that
1387# a package can support
1388#
1389# usage: strip-linguas <allow LINGUAS>
1390# strip-linguas -i <directories of .po files>
1391# strip-linguas -u <directories of .po files>
1392#
1393# The first form allows you to specify a list of LINGUAS.
1394# The -i builds a list of po files found in all the
1395# directories and uses the intersection of the lists.
1396# The -u builds a list of po files found in all the
1397# directories and uses the union of the lists.
1398strip-linguas() {
1399 local ls newls
1400 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1401 local op="$1"; shift
1402 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1403 local d f
1404 for d in "$@" ; do
1405 if [ "${op}" == "-u" ] ; then
1406 newls="${ls}"
1407 else
1408 newls=""
1409 fi
1410 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1411 if [ "${op}" == "-i" ] ; then
1412 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1413 else
1414 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
1415 fi
1416 done
1417 ls="${newls}"
1418 done
1419 ls="${ls//.po}"
1420 else
1421 ls="$@"
1422 fi
1423
1424 ls=" ${ls} "
1425 newls=""
1426 for f in ${LINGUAS} ; do
1427 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1428 nl="${newls} ${f}"
1429 else
1430 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1431 fi
1432 done
1433 if [ -z "${newls}" ] ; then
1434 unset LINGUAS
1435 else
1436 export LINGUAS="${newls}"
1437 fi
1438}

Legend:
Removed from v.1.76  
changed lines
  Added in v.1.108

  ViewVC Help
Powered by ViewVC 1.1.20