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

Diff of /eclass/eutils.eclass

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

Revision 1.83 Revision 1.92
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.83 2004/02/27 20:39:19 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.92 2004/08/03 17:24:52 vapier 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.
258 else 258 else
259 PATCH_TARGET="${x}" 259 PATCH_TARGET="${x}"
260 fi 260 fi
261 261
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
263 echo "patch ${popts} -p${count} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 263 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
264 264
265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
267 267
268 if [ "${PATCH_SUFFIX}" != "patch" ] 268 if [ "${PATCH_SUFFIX}" != "patch" ]
275 count=5 275 count=5
276 break 276 break
277 fi 277 fi
278 fi 278 fi
279 279
280 if (cat ${PATCH_TARGET} | patch ${popts} --dry-run -f -p${count}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 280 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1
281 then 281 then
282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real
287 287
288 cat ${PATCH_TARGET} | patch ${popts} -p${count} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 288 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1
289 289
290 if [ "$?" -ne 0 ] 290 if [ "$?" -ne 0 ]
291 then 291 then
292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}
293 echo 293 echo
431 then 431 then
432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))" 432 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
433 else 433 else
434 jobs=2 434 jobs=2
435 fi 435 fi
436 elif [ "${ARCH}" = "s390" ]
437 then
438 # s390 has "# processors : "
439 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
436 else 440 else
437 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))" 441 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
438 die "Unknown ARCH -- ${ARCH}!" 442 die "Unknown ARCH -- ${ARCH}!"
439 fi 443 fi
440 444
471 mktemp -p ${topdir} 475 mktemp -p ${topdir}
472 else 476 else
473 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 477 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
474 touch ${tmp} 478 touch ${tmp}
475 echo ${tmp} 479 echo ${tmp}
480 fi
481}
482
483# Small wrapper for getent (Linux) and nidump (Mac OS X)
484# used in enewuser()/enewgroup()
485# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
486#
487# egetent(database, key)
488egetent() {
489 if [ "${ARCH}" == "macos" ] ; then
490 case "$2" in
491 *[!0-9]*) # Non numeric
492 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
493 ;;
494 *) # Numeric
495 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
496 ;;
497 esac
498 else
499 getent $1 $2
476 fi 500 fi
477} 501}
478 502
479# Simplify/standardize adding users to the system 503# Simplify/standardize adding users to the system
480# vapier@gentoo.org 504# vapier@gentoo.org
496 then 520 then
497 eerror "No username specified !" 521 eerror "No username specified !"
498 die "Cannot call enewuser without a username" 522 die "Cannot call enewuser without a username"
499 fi 523 fi
500 524
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 525 # lets see if the username already exists
507 if [ "${euser}" == "${realuser}" ] 526 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
508 then 527 then
509 return 0 528 return 0
510 fi 529 fi
511 einfo "Adding user '${euser}' to your system ..." 530 einfo "Adding user '${euser}' to your system ..."
512 531
517 local euid="$1"; shift 536 local euid="$1"; shift
518 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 537 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
519 then 538 then
520 if [ "${euid}" -gt 0 ] 539 if [ "${euid}" -gt 0 ]
521 then 540 then
522 chown ${euid} ${tmpfile} >& /dev/null 541 if [ ! -z "`egetent passwd ${euid}`" ]
523 realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
524 if [ "${realuser//[0-9]}" != "" ]
525 then 542 then
526 euid="uid is taken; using next available" 543 euid="next"
527 else
528 opts="${opts} -u ${euid}"
529 fi 544 fi
530 else 545 else
531 eerror "Userid given but is not greater than 0 !" 546 eerror "Userid given but is not greater than 0 !"
532 die "${euid} is not a valid UID" 547 die "${euid} is not a valid UID"
533 fi 548 fi
534 else 549 else
535 euid="next available" 550 euid="next"
551 fi
552 if [ "${euid}" == "next" ]
553 then
554 local pwrange
555 if [ "${ARCH}" == "macos" ] ; then
556 pwrange="`jot 898 101`"
557 else
558 pwrange="`seq 101 999`"
536 fi 559 fi
560 for euid in ${pwrange} ; do
561 [ -z "`egetent passwd ${euid}`" ] && break
562 done
563 fi
564 opts="${opts} -u ${euid}"
537 einfo " - Userid: ${euid}" 565 einfo " - Userid: ${euid}"
538 566
539 # handle shell 567 # handle shell
540 local eshell="$1"; shift 568 local eshell="$1"; shift
541 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 569 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ]
562 590
563 # handle groups 591 # handle groups
564 local egroups="$1"; shift 592 local egroups="$1"; shift
565 if [ ! -z "${egroups}" ] 593 if [ ! -z "${egroups}" ]
566 then 594 then
567 local realgroup=
568 local oldifs="${IFS}" 595 local oldifs="${IFS}"
569 export IFS="," 596 export IFS=","
570 for g in ${egroups} 597 for g in ${egroups}
571 do 598 do
572 chgrp ${g} ${tmpfile} >& /dev/null 599 if [ -z "`egetent group \"${g}\"`" ]
573 realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
574 if [ "${g}" != "${realgroup}" ]
575 then 600 then
576 eerror "You must add ${g} to the system first" 601 eerror "You must add group ${g} to the system first"
577 die "${g} is not a valid GID" 602 die "${g} is not a valid GID"
578 fi 603 fi
579 done 604 done
580 export IFS="${oldifs}" 605 export IFS="${oldifs}"
581 opts="${opts} -g ${egroups}" 606 opts="${opts} -g ${egroups}"
586 611
587 # handle extra and add the user 612 # handle extra and add the user
588 local eextra="$@" 613 local eextra="$@"
589 local oldsandbox="${SANDBOX_ON}" 614 local oldsandbox="${SANDBOX_ON}"
590 export SANDBOX_ON="0" 615 export SANDBOX_ON="0"
616 if [ "${ARCH}" == "macos" ];
617 then
618 ### Make the user
591 if [ -z "${eextra}" ] 619 if [ -z "${eextra}" ]
592 then 620 then
621 dscl . create /users/${euser} uid ${euid}
622 dscl . create /users/${euser} shell ${eshell}
623 dscl . create /users/${euser} home ${ehome}
624 dscl . create /users/${euser} realname "added by portage for ${PN}"
625 ### Add the user to the groups specified
626 for g in ${egroups}
627 do
628 dscl . merge /groups/${g} users ${euser}
629 done
630 else
631 einfo "Extra options are not supported on macos yet"
632 einfo "Please report the ebuild along with the info below"
633 einfo "eextra: ${eextra}"
634 die "Required function missing"
635 fi
636 else
637 if [ -z "${eextra}" ]
638 then
593 useradd ${opts} ${euser} \ 639 useradd ${opts} ${euser} \
594 -c "added by portage for ${PN}" \ 640 -c "added by portage for ${PN}" \
595 || die "enewuser failed" 641 || die "enewuser failed"
596 else 642 else
597 einfo " - Extra: ${eextra}" 643 einfo " - Extra: ${eextra}"
598 useradd ${opts} ${euser} ${eextra} \ 644 useradd ${opts} ${euser} ${eextra} \
599 || die "enewuser failed" 645 || die "enewuser failed"
646 fi
600 fi 647 fi
601 export SANDBOX_ON="${oldsandbox}" 648 export SANDBOX_ON="${oldsandbox}"
602 649
603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 650 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
604 then 651 then
625 then 672 then
626 eerror "No group specified !" 673 eerror "No group specified !"
627 die "Cannot call enewgroup without a group" 674 die "Cannot call enewgroup without a group"
628 fi 675 fi
629 676
630 # setup a file for testing groupname
631 local tmpfile="`mymktemp ${T}`"
632 chgrp ${egroup} ${tmpfile} >& /dev/null
633 local realgroup="`ls -l ${tmpfile} | awk '{print $4}'`"
634
635 # see if group already exists 677 # see if group already exists
636 if [ "${egroup}" == "${realgroup}" ] 678 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
637 then 679 then
638 return 0 680 return 0
639 fi 681 fi
640 einfo "Adding group '${egroup}' to your system ..." 682 einfo "Adding group '${egroup}' to your system ..."
641 683
646 local egid="$1"; shift 688 local egid="$1"; shift
647 if [ ! -z "${egid}" ] 689 if [ ! -z "${egid}" ]
648 then 690 then
649 if [ "${egid}" -gt 0 ] 691 if [ "${egid}" -gt 0 ]
650 then 692 then
651 chgrp ${egid} ${tmpfile} >& /dev/null 693 if [ -z "`egetent group ${egid}`" ]
652 realuser="`ls -l ${tmpfile} | awk '{print $3}'`"
653 if [ "${realuser//[0-9]}" != "" ]
654 then 694 then
655 euid="gid is taken; using next available" 695 if [ "${ARCH}" == "macos" ] ; then
696 opts="${opts} ${egid}"
697 else
698 opts="${opts} -g ${egid}"
699 fi
656 else 700 else
657 opts="${opts} -g ${egid}" 701 egid="next available; requested gid taken"
658 fi 702 fi
659 else 703 else
660 eerror "Groupid given but is not greater than 0 !" 704 eerror "Groupid given but is not greater than 0 !"
661 die "${egid} is not a valid GID" 705 die "${egid} is not a valid GID"
662 fi 706 fi
670 opts="${opts} ${eextra}" 714 opts="${opts} ${eextra}"
671 715
672 # add the group 716 # add the group
673 local oldsandbox="${SANDBOX_ON}" 717 local oldsandbox="${SANDBOX_ON}"
674 export SANDBOX_ON="0" 718 export SANDBOX_ON="0"
719 if [ "${ARCH}" == "macos" ];
720 then
721 if [ ! -z "${eextra}" ];
722 then
723 einfo "Extra options are not supported on macos yet"
724 einfo "Please report the ebuild along with the info below"
725 einfo "eextra: ${eextra}"
726 die "Required function missing"
727 fi
728
729 # If we need the next available
730 case ${egid} in
731 *[!0-9]*) # Non numeric
732 for egid in `jot 898 101`; do
733 [ -z "`egetent group ${egid}`" ] && break
734 done
735 esac
736 dscl . create /groups/${egroup} gid ${egid}
737 dscl . create /groups/${egroup} passwd '*'
738 else
675 groupadd ${opts} ${egroup} || die "enewgroup failed" 739 groupadd ${opts} ${egroup} || die "enewgroup failed"
740 fi
676 export SANDBOX_ON="${oldsandbox}" 741 export SANDBOX_ON="${oldsandbox}"
677} 742}
678 743
679# Simple script to replace 'dos2unix' binaries 744# Simple script to replace 'dos2unix' binaries
680# vapier@gentoo.org 745# vapier@gentoo.org
701# name: the name that will show up in the menu 766# name: the name that will show up in the menu
702# icon: give your little like a pretty little icon ... 767# icon: give your little like a pretty little icon ...
703# this can be relative (to /usr/share/pixmaps) or 768# this can be relative (to /usr/share/pixmaps) or
704# a full path to an icon 769# a full path to an icon
705# type: what kind of application is this ? for categories: 770# type: what kind of application is this ? for categories:
706# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 771# http://www.freedesktop.org/standards/menu-spec/
707# path: if your app needs to startup in a specific dir 772# path: if your app needs to startup in a specific dir
708make_desktop_entry() { 773make_desktop_entry() {
709 [ -z "$1" ] && eerror "You must specify the executable" && return 1 774 [ -z "$1" ] && eerror "You must specify the executable" && return 1
710 775
711 local exec="${1}" 776 local exec="${1}"
717 if [ -z "${type}" ] 782 if [ -z "${type}" ]
718 then 783 then
719 case ${CATEGORY} in 784 case ${CATEGORY} in
720 "app-emulation") 785 "app-emulation")
721 type=Emulator 786 type=Emulator
722 subdir="Games" 787 subdir="Emulation"
723 ;; 788 ;;
724 "games-"*) 789 "games-"*)
725 type=Game 790 type=Game
726 subdir="Games" 791 subdir="Games"
727 ;; 792 ;;
1181 einfo "or hit CTRL+C to abort the emerge." 1246 einfo "or hit CTRL+C to abort the emerge."
1182 read 1247 read
1183 fi 1248 fi
1184 done 1249 done
1185} 1250}
1251
1252# Make sure that LINGUAS only contains languages that
1253# a package can support
1254#
1255# usage: strip-linguas <allow LINGUAS>
1256# strip-linguas -i <directories of .po files>
1257# strip-linguas -u <directories of .po files>
1258#
1259# The first form allows you to specify a list of LINGUAS.
1260# The -i builds a list of po files found in all the
1261# directories and uses the intersection of the lists.
1262# The -u builds a list of po files found in all the
1263# directories and uses the union of the lists.
1264strip-linguas() {
1265 local ls newls
1266 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then
1267 local op="$1"; shift
1268 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1269 local d f
1270 for d in "$@" ; do
1271 if [ "${op}" == "-u" ] ; then
1272 newls="${ls}"
1273 else
1274 newls=""
1275 fi
1276 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1277 if [ "${op}" == "-i" ] ; then
1278 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}"
1279 else
1280 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}"
1281 fi
1282 done
1283 ls="${newls}"
1284 done
1285 ls="${ls//.po}"
1286 else
1287 ls="$@"
1288 fi
1289
1290 ls=" ${ls} "
1291 newls=""
1292 for f in ${LINGUAS} ; do
1293 if [ "${ls/ ${f} /}" != "${ls}" ] ; then
1294 nl="${newls} ${f}"
1295 else
1296 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1297 fi
1298 done
1299 if [ -z "${newls}" ] ; then
1300 unset LINGUAS
1301 else
1302 export LINGUAS="${newls}"
1303 fi
1304}

Legend:
Removed from v.1.83  
changed lines
  Added in v.1.92

  ViewVC Help
Powered by ViewVC 1.1.20