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

Diff of /eclass/eutils.eclass

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

Revision 1.86 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.86 2004/03/25 01:28:11 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
… …
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 # lets see if the username already exists 525 # lets see if the username already exists
502 if [ "${euser}" == "`getent passwd \"${euser}\" | cut -d: -f1`" ] 526 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ]
503 then 527 then
504 return 0 528 return 0
505 fi 529 fi
506 einfo "Adding user '${euser}' to your system ..." 530 einfo "Adding user '${euser}' to your system ..."
507 531
… …
512 local euid="$1"; shift 536 local euid="$1"; shift
513 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 537 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ]
514 then 538 then
515 if [ "${euid}" -gt 0 ] 539 if [ "${euid}" -gt 0 ]
516 then 540 then
517 if [ ! -z "`getent passwd ${euid}`" ] 541 if [ ! -z "`egetent passwd ${euid}`" ]
518 then 542 then
519 euid="next" 543 euid="next"
520 fi 544 fi
521 else 545 else
522 eerror "Userid given but is not greater than 0 !" 546 eerror "Userid given but is not greater than 0 !"
… …
525 else 549 else
526 euid="next" 550 euid="next"
527 fi 551 fi
528 if [ "${euid}" == "next" ] 552 if [ "${euid}" == "next" ]
529 then 553 then
530 for euid in `seq 101 999` ; do 554 local pwrange
555 if [ "${ARCH}" == "macos" ] ; then
556 pwrange="`jot 898 101`"
557 else
558 pwrange="`seq 101 999`"
559 fi
560 for euid in ${pwrange} ; do
531 [ -z "`getent passwd ${euid}`" ] && break 561 [ -z "`egetent passwd ${euid}`" ] && break
532 done 562 done
533 fi 563 fi
534 opts="${opts} -u ${euid}" 564 opts="${opts} -u ${euid}"
535 einfo " - Userid: ${euid}" 565 einfo " - Userid: ${euid}"
536 566
… …
564 then 594 then
565 local oldifs="${IFS}" 595 local oldifs="${IFS}"
566 export IFS="," 596 export IFS=","
567 for g in ${egroups} 597 for g in ${egroups}
568 do 598 do
569 if [ -z "`getent group \"${g}\"`" ] 599 if [ -z "`egetent group \"${g}\"`" ]
570 then 600 then
571 eerror "You must add group ${g} to the system first" 601 eerror "You must add group ${g} to the system first"
572 die "${g} is not a valid GID" 602 die "${g} is not a valid GID"
573 fi 603 fi
574 done 604 done
… …
581 611
582 # handle extra and add the user 612 # handle extra and add the user
583 local eextra="$@" 613 local eextra="$@"
584 local oldsandbox="${SANDBOX_ON}" 614 local oldsandbox="${SANDBOX_ON}"
585 export SANDBOX_ON="0" 615 export SANDBOX_ON="0"
616 if [ "${ARCH}" == "macos" ];
617 then
618 ### Make the user
586 if [ -z "${eextra}" ] 619 if [ -z "${eextra}" ]
587 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
588 useradd ${opts} ${euser} \ 639 useradd ${opts} ${euser} \
589 -c "added by portage for ${PN}" \ 640 -c "added by portage for ${PN}" \
590 || die "enewuser failed" 641 || die "enewuser failed"
591 else 642 else
592 einfo " - Extra: ${eextra}" 643 einfo " - Extra: ${eextra}"
593 useradd ${opts} ${euser} ${eextra} \ 644 useradd ${opts} ${euser} ${eextra} \
594 || die "enewuser failed" 645 || die "enewuser failed"
646 fi
595 fi 647 fi
596 export SANDBOX_ON="${oldsandbox}" 648 export SANDBOX_ON="${oldsandbox}"
597 649
598 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 650 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
599 then 651 then
… …
621 eerror "No group specified !" 673 eerror "No group specified !"
622 die "Cannot call enewgroup without a group" 674 die "Cannot call enewgroup without a group"
623 fi 675 fi
624 676
625 # see if group already exists 677 # see if group already exists
626 if [ "${egroup}" == "`getent group \"${egroup}\" | cut -d: -f1`" ] 678 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ]
627 then 679 then
628 return 0 680 return 0
629 fi 681 fi
630 einfo "Adding group '${egroup}' to your system ..." 682 einfo "Adding group '${egroup}' to your system ..."
631 683
… …
636 local egid="$1"; shift 688 local egid="$1"; shift
637 if [ ! -z "${egid}" ] 689 if [ ! -z "${egid}" ]
638 then 690 then
639 if [ "${egid}" -gt 0 ] 691 if [ "${egid}" -gt 0 ]
640 then 692 then
641 if [ -z "`getent group ${egid}`" ] 693 if [ -z "`egetent group ${egid}`" ]
642 then 694 then
695 if [ "${ARCH}" == "macos" ] ; then
696 opts="${opts} ${egid}"
697 else
643 opts="${opts} -g ${egid}" 698 opts="${opts} -g ${egid}"
699 fi
644 else 700 else
645 egid="next available; requested gid taken" 701 egid="next available; requested gid taken"
646 fi 702 fi
647 else 703 else
648 eerror "Groupid given but is not greater than 0 !" 704 eerror "Groupid given but is not greater than 0 !"
… …
658 opts="${opts} ${eextra}" 714 opts="${opts} ${eextra}"
659 715
660 # add the group 716 # add the group
661 local oldsandbox="${SANDBOX_ON}" 717 local oldsandbox="${SANDBOX_ON}"
662 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
663 groupadd ${opts} ${egroup} || die "enewgroup failed" 739 groupadd ${opts} ${egroup} || die "enewgroup failed"
740 fi
664 export SANDBOX_ON="${oldsandbox}" 741 export SANDBOX_ON="${oldsandbox}"
665} 742}
666 743
667# Simple script to replace 'dos2unix' binaries 744# Simple script to replace 'dos2unix' binaries
668# vapier@gentoo.org 745# vapier@gentoo.org
… …
689# name: the name that will show up in the menu 766# name: the name that will show up in the menu
690# icon: give your little like a pretty little icon ... 767# icon: give your little like a pretty little icon ...
691# this can be relative (to /usr/share/pixmaps) or 768# this can be relative (to /usr/share/pixmaps) or
692# a full path to an icon 769# a full path to an icon
693# type: what kind of application is this ? for categories: 770# type: what kind of application is this ? for categories:
694# http://www.freedesktop.org/standards/menu/draft/menu-spec/menu-spec.html 771# http://www.freedesktop.org/standards/menu-spec/
695# path: if your app needs to startup in a specific dir 772# path: if your app needs to startup in a specific dir
696make_desktop_entry() { 773make_desktop_entry() {
697 [ -z "$1" ] && eerror "You must specify the executable" && return 1 774 [ -z "$1" ] && eerror "You must specify the executable" && return 1
698 775
699 local exec="${1}" 776 local exec="${1}"
… …
1169 einfo "or hit CTRL+C to abort the emerge." 1246 einfo "or hit CTRL+C to abort the emerge."
1170 read 1247 read
1171 fi 1248 fi
1172 done 1249 done
1173} 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.86  
changed lines
  Added in v.1.92
  ViewVC Help
Powered by ViewVC 1.1.20