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

Diff of /eclass/eutils.eclass

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

Revision 1.237 Revision 1.281
1# Copyright 1999-2006 Gentoo Foundation 1# Copyright 1999-2007 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.237 2006/06/04 15:18:12 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.281 2007/06/05 15:59:26 nyhm Exp $
4# 4#
5# This eclass is for general purpose functions that most ebuilds 5# This eclass is for general purpose functions that most ebuilds
6# have to implement themselves. 6# have to implement themselves.
7# 7#
8# NB: If you add anything, please comment it! 8# NB: If you add anything, please comment it!
9#
10# Maintainer: see each individual function, base-system@gentoo.org as default
9 11
10inherit multilib portability 12inherit multilib portability
11
12DEPEND="!bootstrap? ( sys-devel/patch )"
13RDEPEND=""
14# sys-apps/shadow is needed for useradd, etc, bug #94745.
15 13
16DESCRIPTION="Based on the ${ECLASS} eclass" 14DESCRIPTION="Based on the ${ECLASS} eclass"
17 15
18# Wait for the supplied number of seconds. If no argument is supplied, defaults 16# Wait for the supplied number of seconds. If no argument is supplied, defaults
19# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 17# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
20# outputting to a terminal, don't wait. For compatability purposes, the argument 18# outputting to a terminal, don't wait. For compatability purposes, the argument
21# must be an integer greater than zero. 19# must be an integer greater than zero.
22# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 20# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
23epause() { 21epause() {
24 if [ -z "$EPAUSE_IGNORE" ] && [ -t 1 ] ; then 22 [[ -z ${EPAUSE_IGNORE} ]] && sleep ${1:-5}
25 sleep ${1:-5}
26 fi
27} 23}
28 24
29# Beep the specified number of times (defaults to five). If our output 25# Beep the specified number of times (defaults to five). If our output
30# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set, 26# is not a terminal, don't beep. If the EBEEP_IGNORE env var is set,
31# don't beep. 27# don't beep.
32# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004) 28# Bug 62950, Ciaran McCreesh <ciaranm@gentoo.org> (05 Sep 2004)
33ebeep() { 29ebeep() {
34 local n 30 local n
35 if [ -z "$EBEEP_IGNORE" ] && [ -t 1 ] ; then 31 if [[ -z ${EBEEP_IGNORE} ]] ; then
36 for ((n=1 ; n <= ${1:-5} ; n++)) ; do 32 for ((n=1 ; n <= ${1:-5} ; n++)) ; do
37 echo -ne "\a" 33 echo -ne "\a"
38 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null 34 sleep 0.1 &>/dev/null ; sleep 0,1 &>/dev/null
39 echo -ne "\a" 35 echo -ne "\a"
40 sleep 1 36 sleep 1
41 done 37 done
42 fi 38 fi
43} 39}
44 40
45# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
46# libs in /lib. This is to fix linking problems when you have 42# libs in /lib. This is to fix linking problems when you have
47# the .so in /lib, and the .a in /usr/lib. What happens is that 43# the .so in /lib, and the .a in /usr/lib. What happens is that
48# in some cases when linking dynamic, the .a in /usr/lib is used 44# in some cases when linking dynamic, the .a in /usr/lib is used
49# instead of the .so in /lib due to gcc/libtool tweaking ld's 45# instead of the .so in /lib due to gcc/libtool tweaking ld's
50# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
51# See bug #4411 for more info. 47# See bug #4411 for more info.
52# 48#
53# To use, simply call: 49# To use, simply call:
54# 50#
55# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
56# 52#
57# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
58# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
59# to point to the latest version of the library present. 55# to point to the latest version of the library present.
60# 56#
61# <azarah@gentoo.org> (26 Oct 2002) 57# <azarah@gentoo.org> (26 Oct 2002)
62# 58#
63gen_usr_ldscript() { 59gen_usr_ldscript() {
60 if [[ $(type -t _tc_gen_usr_ldscript) == "function" ]] ; then
61 _tc_gen_usr_ldscript "$@"
62 return $?
63 fi
64
65 ewarn "QA Notice: Please upgrade your ebuild to use toolchain-funcs"
66 ewarn "QA Notice: rather than gen_usr_ldscript() from eutils"
67
64 local lib libdir=$(get_libdir) 68 local lib libdir=$(get_libdir)
65 # Just make sure it exists 69 # Just make sure it exists
66 dodir /usr/${libdir} 70 dodir /usr/${libdir}
67 71
68 for lib in "${@}" ; do 72 for lib in "${@}" ; do
89# Default options for patch 93# Default options for patch
90# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 94# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
91# Set --no-backup-if-mismatch so we don't leave '.orig' files behind. 95# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
92# Set -E to automatically remove empty files. 96# Set -E to automatically remove empty files.
93EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
94# List of patches not to apply. Not this is only file names, 98# List of patches not to apply. Not this is only file names,
95# and not the full path .. 99# and not the full path ..
96EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
97# Change the printed message for a single patch. 101# Change the printed message for a single patch.
98EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches. 103# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
101# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
102# 106#
103# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
104# 108#
105EPATCH_FORCE="no" 109EPATCH_FORCE="no"
106 110
107# This function is for bulk patching, or in theory for just one 111# This function is for bulk patching, or in theory for just one
108# or two patches. 112# or two patches.
119# 123#
120# Patches are applied in current directory. 124# Patches are applied in current directory.
121# 125#
122# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
123# 127#
124# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
125# 129#
126# For example: 130# For example:
127# 131#
128# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
129# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
130# 134#
131# This ensures that there are a set order, and you can have ARCH 135# This ensures that there are a set order, and you can have ARCH
132# specific patches. 136# specific patches.
133# 137#
134# If you however give an argument to epatch(), it will treat it as a 138# If you however give an argument to epatch(), it will treat it as a
222 fi 226 fi
223 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
224 do 228 do
225 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
226 # 230 #
227 # ???_arch_foo.patch 231 # ???_arch_foo.patch
228 # 232 #
229 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
230 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
231 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
232 then 236 then
233 local count=0 237 local count=0
234 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
235 local patchname=${x##*/} 239 local patchname=${x##*/}
236 240
264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
266 270
267 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
268 then 272 then
269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
270 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
271 else 275 else
272 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
273 fi 277 fi
274 278
275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 280 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
277 281
278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 284
362 [[ -z ${T} ]] \ 366 [[ -z ${T} ]] \
363 && topdir="/tmp" \ 367 && topdir="/tmp" \
364 || topdir=${T} 368 || topdir=${T}
365 fi 369 fi
366 370
367 if [[ -z $(type -p mktemp) ]] ; then 371 if ! type -P mktemp > /dev/null ; then
372 # system lacks `mktemp` so we have to fake it
368 local tmp=/ 373 local tmp=/
369 while [[ -e ${tmp} ]] ; do 374 while [[ -e ${tmp} ]] ; do
370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 375 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
371 done 376 done
372 ${exe} "${tmp}" || ${exe} -p "${tmp}" 377 ${exe} "${tmp}" || ${exe} -p "${tmp}"
373 echo "${tmp}" 378 echo "${tmp}"
374 else 379 else
380 # the args here will give slightly wierd names on BSD,
381 # but should produce a usable file on all userlands
375 if [[ ${exe} == "touch" ]] ; then 382 if [[ ${exe} == "touch" ]] ; then
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -p "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -t tmp 383 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
379 else 384 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp 385 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
383 fi 386 fi
384 fi 387 fi
385} 388}
386 389
387# Small wrapper for getent (Linux), nidump (Mac OS X), 390# Small wrapper for getent (Linux), nidump (Mac OS X),
450 eerror "No username specified !" 453 eerror "No username specified !"
451 die "Cannot call enewuser without a username" 454 die "Cannot call enewuser without a username"
452 fi 455 fi
453 456
454 # lets see if the username already exists 457 # lets see if the username already exists
455 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 458 if [[ -n $(egetent passwd "${euser}") ]] ; then
456 return 0 459 return 0
457 fi 460 fi
458 einfo "Adding user '${euser}' to your system ..." 461 einfo "Adding user '${euser}' to your system ..."
459 462
460 # options to pass to useradd 463 # options to pass to useradd
461 local opts= 464 local opts=
462 465
463 # handle uid 466 # handle uid
464 local euid=$1; shift 467 local euid=$1; shift
465 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 468 if [[ -n ${euid} && ${euid} != -1 ]] ; then
466 if [[ ${euid} -gt 0 ]] ; then 469 if [[ ${euid} -gt 0 ]] ; then
467 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 470 if [[ -n $(egetent passwd ${euid}) ]] ; then
468 euid="next" 471 euid="next"
469 fi 472 fi
470 else 473 else
471 eerror "Userid given but is not greater than 0 !" 474 eerror "Userid given but is not greater than 0 !"
472 die "${euid} is not a valid UID" 475 die "${euid} is not a valid UID"
473 fi 476 fi
474 else 477 else
475 euid="next" 478 euid="next"
476 fi 479 fi
477 if [[ ${euid} == "next" ]] ; then 480 if [[ ${euid} == "next" ]] ; then
478 for euid in $(seq 101 999) ; do 481 for ((euid = 101; euid <= 999; euid++)); do
479 [[ -z $(egetent passwd ${euid}) ]] && break 482 [[ -z $(egetent passwd ${euid}) ]] && break
480 done 483 done
481 fi 484 fi
482 opts="${opts} -u ${euid}" 485 opts="${opts} -u ${euid}"
483 einfo " - Userid: ${euid}" 486 einfo " - Userid: ${euid}"
497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 500 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 [[ -x ${ROOT}${shell} ]] && break 501 [[ -x ${ROOT}${shell} ]] && break
499 done 502 done
500 503
501 if [[ ${shell} == "/dev/null" ]] ; then 504 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 505 eerror "Unable to identify the shell to use, proceeding with userland default."
503 die "Unable to identify the shell to use" 506 case ${USERLAND} in
507 GNU) shell="/bin/false" ;;
508 BSD) shell="/sbin/nologin" ;;
509 Darwin) shell="/usr/sbin/nologin" ;;
510 *) die "Unable to identify the default shell for userland ${USERLAND}"
511 esac
504 fi 512 fi
505 513
506 eshell=${shell} 514 eshell=${shell}
507 fi 515 fi
508 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
653 eerror "No group specified !" 661 eerror "No group specified !"
654 die "Cannot call enewgroup without a group" 662 die "Cannot call enewgroup without a group"
655 fi 663 fi
656 664
657 # see if group already exists 665 # see if group already exists
658 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 666 if [[ -n $(egetent group "${egroup}") ]]; then
659 then
660 return 0 667 return 0
661 fi 668 fi
662 einfo "Adding group '${egroup}' to your system ..." 669 einfo "Adding group '${egroup}' to your system ..."
663 670
664 # options to pass to useradd 671 # options to pass to useradd
707 fi 714 fi
708 715
709 # If we need the next available 716 # If we need the next available
710 case ${egid} in 717 case ${egid} in
711 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
712 for egid in $(seq 101 999); do 719 for ((egid = 101; egid <= 999; egid++)); do
713 [ -z "`egetent group ${egid}`" ] && break 720 [[ -z $(egetent group ${egid}) ]] && break
714 done 721 done
715 esac 722 esac
716 dscl . create /groups/${egroup} gid ${egid} 723 dscl . create /groups/${egroup} gid ${egid}
717 dscl . create /groups/${egroup} passwd '*' 724 dscl . create /groups/${egroup} passwd '*'
718 ;; 725 ;;
719 726
720 *-freebsd*|*-dragonfly*) 727 *-freebsd*|*-dragonfly*)
721 case ${egid} in 728 case ${egid} in
722 *[!0-9]*) # Non numeric 729 *[!0-9]*) # Non numeric
723 for egid in $(seq 101 999); do 730 for ((egid = 101; egid <= 999; egid++)); do
724 [ -z "`egetent group ${egid}`" ] && break 731 [[ -z $(egetent group ${egid}) ]] && break
725 done 732 done
726 esac 733 esac
727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 734 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
728 ;; 735 ;;
729 736
730 *-netbsd*) 737 *-netbsd*)
731 case ${egid} in 738 case ${egid} in
732 *[!0-9]*) # Non numeric 739 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do 740 for ((egid = 101; egid <= 999; egid++)); do
734 [ -z "`egetent group ${egid}`" ] && break 741 [[ -z $(egetent group ${egid}) ]] && break
735 done 742 done
736 esac 743 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 744 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;; 745 ;;
739 746
747# Simple script to replace 'dos2unix' binaries 754# Simple script to replace 'dos2unix' binaries
748# vapier@gentoo.org 755# vapier@gentoo.org
749# 756#
750# edos2unix(file, <more files> ...) 757# edos2unix(file, <more files> ...)
751edos2unix() { 758edos2unix() {
752 for f in "$@" 759 echo "$@" | xargs sed -i 's/\r$//'
753 do
754 cp "${f}" ${T}/edos2unix
755 sed 's/\r$//' ${T}/edos2unix > "${f}"
756 done
757} 760}
758 761
759 762
760############################################################## 763##############################################################
761# START: Handle .desktop files and menu entries # 764# START: Handle .desktop files and menu entries #
762# maybe this should be separated into a new eclass some time # 765# maybe this should be separated into a new eclass some time #
763# lanius@gentoo.org # 766# lanius@gentoo.org #
764############################################################## 767##############################################################
765 768
766# Make a desktop file ! 769# Make a desktop file !
767# Great for making those icons in kde/gnome startmenu ! 770# Great for making those icons in kde/gnome startmenu !
768# Amaze your friends ! Get the women ! Join today ! 771# Amaze your friends ! Get the women ! Join today !
769# 772#
770# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 773# make_desktop_entry(<command>, [name], [icon], [type], [path])
771# 774#
772# binary: what binary does the app run with ? 775# binary: what command does the app run with ?
773# name: the name that will show up in the menu 776# name: the name that will show up in the menu
774# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
775# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
776# a full path to an icon 779# a full path to an icon
777# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
778# http://www.freedesktop.org/Standards/desktop-entry-spec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
779# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
780make_desktop_entry() { 783make_desktop_entry() {
781 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 784 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
782 785
790 local catmaj=${CATEGORY%%-*} 793 local catmaj=${CATEGORY%%-*}
791 local catmin=${CATEGORY##*-} 794 local catmin=${CATEGORY##*-}
792 case ${catmaj} in 795 case ${catmaj} in
793 app) 796 app)
794 case ${catmin} in 797 case ${catmin} in
795 admin) type=System;; 798 admin) type=System;;
796 cdr) type=DiscBurning;; 799 cdr) type=DiscBurning;;
797 dicts) type=Dictionary;; 800 dicts) type=Dictionary;;
798 editors) type=TextEditor;; 801 editors) type=TextEditor;;
799 emacs) type=TextEditor;; 802 emacs) type=TextEditor;;
800 emulation) type=Emulator;; 803 emulation) type=Emulator;;
801 laptop) type=HardwareSettings;; 804 laptop) type=HardwareSettings;;
802 office) type=Office;; 805 office) type=Office;;
803 vim) type=TextEditor;; 806 vim) type=TextEditor;;
804 xemacs) type=TextEditor;; 807 xemacs) type=TextEditor;;
805 *) type=;; 808 *) type=;;
806 esac 809 esac
807 ;; 810 ;;
808 811
809 dev) 812 dev)
810 type="Development" 813 type="Development"
811 ;; 814 ;;
812 815
813 games) 816 games)
814 case ${catmin} in 817 case ${catmin} in
815 action) type=ActionGame;; 818 action|fps) type=ActionGame;;
816 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
817 board) type=BoardGame;; 820 board) type=BoardGame;;
818 kid) type=KidsGame;; 821 kids) type=KidsGame;;
819 emulation) type=Emulator;; 822 emulation) type=Emulator;;
820 puzzle) type=LogicGame;; 823 puzzle) type=LogicGame;;
821 rpg) type=RolePlaying;; 824 rpg) type=RolePlaying;;
822 roguelike) type=RolePlaying;; 825 roguelike) type=RolePlaying;;
823 simulation) type=Simulation;; 826 simulation) type=Simulation;;
824 sports) type=SportsGame;; 827 sports) type=SportsGame;;
825 strategy) type=StrategyGame;; 828 strategy) type=StrategyGame;;
826 *) type=;; 829 *) type=;;
827 esac 830 esac
828 type="Game;${type}" 831 type="Game;${type}"
829 ;; 832 ;;
830 833
831 mail) 834 mail)
835 media) 838 media)
836 case ${catmin} in 839 case ${catmin} in
837 gfx) type=Graphics;; 840 gfx) type=Graphics;;
838 radio) type=Tuner;; 841 radio) type=Tuner;;
839 sound) type=Audio;; 842 sound) type=Audio;;
840 tv) type=TV;; 843 tv) type=TV;;
841 video) type=Video;; 844 video) type=Video;;
842 *) type=;; 845 *) type=;;
843 esac 846 esac
844 type="AudioVideo;${type}" 847 type="AudioVideo;${type}"
845 ;; 848 ;;
846 849
847 net) 850 net)
848 case ${catmin} in 851 case ${catmin} in
849 dialup) type=Dialup;; 852 dialup) type=Dialup;;
850 ftp) type=FileTransfer;; 853 ftp) type=FileTransfer;;
851 im) type=InstantMessaging;; 854 im) type=InstantMessaging;;
852 irc) type=IRCClient;; 855 irc) type=IRCClient;;
853 mail) type=Email;; 856 mail) type=Email;;
854 news) type=News;; 857 news) type=News;;
855 nntp) type=News;; 858 nntp) type=News;;
856 p2p) type=FileTransfer;; 859 p2p) type=FileTransfer;;
857 *) type=;; 860 *) type=;;
858 esac 861 esac
859 type="Network;${type}" 862 type="Network;${type}"
860 ;; 863 ;;
861 864
862 sci) 865 sci)
863 case ${catmin} in 866 case ${catmin} in
864 astro*) type=Astronomy;; 867 astro*) type=Astronomy;;
865 bio*) type=Biology;; 868 bio*) type=Biology;;
866 calc*) type=Calculator;; 869 calc*) type=Calculator;;
867 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
868 geo*) type=Geology;; 871 geo*) type=Geology;;
869 math*) type=Math;; 872 math*) type=Math;;
870 *) type=;; 873 *) type=;;
871 esac 874 esac
872 type="Science;${type}" 875 type="Science;${type}"
873 ;; 876 ;;
874 877
875 www) 878 www)
876 case ${catmin} in 879 case ${catmin} in
877 client) type=WebBrowser;; 880 client) type=WebBrowser;;
878 *) type=;; 881 *) type=;;
879 esac 882 esac
880 type="Network" 883 type="Network"
881 ;; 884 ;;
882 885
883 *) 886 *)
888 if [ "${SLOT}" == "0" ] ; then 891 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}" 892 local desktop_name="${PN}"
890 else 893 else
891 local desktop_name="${PN}-${SLOT}" 894 local desktop_name="${PN}-${SLOT}"
892 fi 895 fi
893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 896 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 897 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
895 898
899 cat <<-EOF > "${desktop}"
896echo "[Desktop Entry] 900 [Desktop Entry]
897Encoding=UTF-8 901 Encoding=UTF-8
898Version=0.9.2 902 Version=0.9.2
899Name=${name} 903 Name=${name}
900Type=Application 904 Type=Application
901Comment=${DESCRIPTION} 905 Comment=${DESCRIPTION}
902Exec=${exec} 906 Exec=${exec}
903TryExec=${exec} 907 TryExec=${exec%% *}
904Path=${path} 908 Path=${path}
905Icon=${icon} 909 Icon=${icon}
906Categories=Application;${type};" > "${desktop}" 910 Categories=Application;${type};
911 EOF
907 912
908 ( 913 (
909 # wrap the env here so that the 'insinto' call 914 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller 915 # doesn't corrupt the env of the caller
911 insinto /usr/share/applications 916 insinto /usr/share/applications
912 doins "${desktop}" 917 doins "${desktop}"
913 ) 918 )
914} 919}
915 920
921
922# Validate desktop entries using desktop-file-utils
923# Carsten Lohrke <carlo@gentoo.org>
924#
925# Usage: validate_desktop_entries [directory ...]
926
927validate_desktop_entries() {
928 if [[ -x /usr/bin/desktop-file-validate ]] ; then
929 einfo "Checking desktop entry validity"
930 local directories=""
931 for d in /usr/share/applications $@ ; do
932 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
933 done
934 if [[ -n ${directories} ]] ; then
935 for FILE in $(find ${directories} -name "*\.desktop" \
936 -not -path '*.hidden*' | sort -u 2>/dev/null)
937 do
938 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
939 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
940 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
941 done
942 fi
943 echo ""
944 else
945 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
946 fi
947}
948
949
916# Make a GDM/KDM Session file 950# Make a GDM/KDM Session file
917# 951#
918# make_desktop_entry(<title>, <command>) 952# make_session_desktop(<title>, <command>)
919# title: File to execute to start the Window Manager 953# title: File to execute to start the Window Manager
920# command: Name of the Window Manager 954# command: Name of the Window Manager
921 955
922make_session_desktop() { 956make_session_desktop() {
923 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 957 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
925 959
926 local title=$1 960 local title=$1
927 local command=$2 961 local command=$2
928 local desktop=${T}/${wm}.desktop 962 local desktop=${T}/${wm}.desktop
929 963
964 cat <<-EOF > "${desktop}"
930echo "[Desktop Entry] 965 [Desktop Entry]
931Encoding=UTF-8 966 Encoding=UTF-8
932Name=${title} 967 Name=${title}
933Comment=This session logs you into ${title} 968 Comment=This session logs you into ${title}
934Exec=${command} 969 Exec=${command}
935TryExec=${command} 970 TryExec=${command}
936Type=Application" > "${desktop}" 971 Type=Application
972 EOF
937 973
974 (
975 # wrap the env here so that the 'insinto' call
976 # doesn't corrupt the env of the caller
938 insinto /usr/share/xsessions 977 insinto /usr/share/xsessions
939 doins "${desktop}" 978 doins "${desktop}"
979 )
940} 980}
941 981
942domenu() { 982domenu() {
983 (
984 # wrap the env here so that the 'insinto' call
985 # doesn't corrupt the env of the caller
943 local i j 986 local i j ret=0
944 insinto /usr/share/applications 987 insinto /usr/share/applications
945 for i in "$@" ; do 988 for i in "$@" ; do
946 if [[ -f ${i} ]] ; then 989 if [[ -f ${i} ]] ; then
947 doins "${i}" 990 doins "${i}"
991 ((ret+=$?))
948 elif [[ -d ${i} ]] ; then 992 elif [[ -d ${i} ]] ; then
949 for j in "${i}"/*.desktop ; do 993 for j in "${i}"/*.desktop ; do
950 doins "${j}" 994 doins "${j}"
995 ((ret+=$?))
951 done 996 done
952 fi 997 fi
953 done 998 done
999 exit ${ret}
1000 )
954} 1001}
955newmenu() { 1002newmenu() {
1003 (
1004 # wrap the env here so that the 'insinto' call
1005 # doesn't corrupt the env of the caller
956 insinto /usr/share/applications 1006 insinto /usr/share/applications
957 newins "$1" "$2" 1007 newins "$@"
1008 )
958} 1009}
959 1010
960doicon() { 1011doicon() {
1012 (
1013 # wrap the env here so that the 'insinto' call
1014 # doesn't corrupt the env of the caller
961 local i j 1015 local i j ret
962 insinto /usr/share/pixmaps 1016 insinto /usr/share/pixmaps
963 for i in "$@" ; do 1017 for i in "$@" ; do
964 if [[ -f ${i} ]] ; then 1018 if [[ -f ${i} ]] ; then
965 doins "${i}" 1019 doins "${i}"
1020 ((ret+=$?))
966 elif [[ -d ${i} ]] ; then 1021 elif [[ -d ${i} ]] ; then
967 for j in "${i}"/*.png ; do 1022 for j in "${i}"/*.png ; do
968 doins "${j}" 1023 doins "${j}"
1024 ((ret+=$?))
969 done 1025 done
970 fi 1026 fi
971 done 1027 done
1028 exit ${ret}
1029 )
972} 1030}
973newicon() { 1031newicon() {
1032 (
1033 # wrap the env here so that the 'insinto' call
1034 # doesn't corrupt the env of the caller
974 insinto /usr/share/pixmaps 1035 insinto /usr/share/pixmaps
975 newins "$1" "$2" 1036 newins "$@"
1037 )
976} 1038}
977 1039
978############################################################## 1040##############################################################
979# END: Handle .desktop files and menu entries # 1041# END: Handle .desktop files and menu entries #
980############################################################## 1042##############################################################
981 1043
982 1044
983# for internal use only (unpack_pdv and unpack_makeself) 1045# for internal use only (unpack_pdv and unpack_makeself)
984find_unpackable_file() { 1046find_unpackable_file() {
1003# the middle of the archive. Valve seems to use it a lot ... too bad 1065# the middle of the archive. Valve seems to use it a lot ... too bad
1004# it seems to like to segfault a lot :(. So lets take it apart ourselves. 1066# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1005# 1067#
1006# Usage: unpack_pdv [file to unpack] [size of off_t] 1068# Usage: unpack_pdv [file to unpack] [size of off_t]
1007# - you have to specify the off_t size ... i have no idea how to extract that 1069# - you have to specify the off_t size ... i have no idea how to extract that
1008# information out of the binary executable myself. basically you pass in 1070# information out of the binary executable myself. basically you pass in
1009# the size of the off_t type (in bytes) on the machine that built the pdv 1071# the size of the off_t type (in bytes) on the machine that built the pdv
1010# archive. one way to determine this is by running the following commands: 1072# archive. one way to determine this is by running the following commands:
1011# strings <pdv archive> | grep lseek 1073# strings <pdv archive> | grep lseek
1012# strace -elseek <pdv archive> 1074# strace -elseek <pdv archive>
1013# basically look for the first lseek command (we do the strings/grep because 1075# basically look for the first lseek command (we do the strings/grep because
1014# sometimes the function call is _llseek or something) and steal the 2nd 1076# sometimes the function call is _llseek or something) and steal the 2nd
1015# parameter. here is an example: 1077# parameter. here is an example:
1016# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1078# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1017# lseek 1079# lseek
1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1080# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1019# lseek(3, -4, SEEK_END) = 2981250 1081# lseek(3, -4, SEEK_END) = 2981250
1020# thus we would pass in the value of '4' as the second parameter. 1082# thus we would pass in the value of '4' as the second parameter.
1021unpack_pdv() { 1083unpack_pdv() {
1022 local src=$(find_unpackable_file $1) 1084 local src=$(find_unpackable_file "$1")
1023 local sizeoff_t=$2 1085 local sizeoff_t=$2
1024 1086
1025 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1087 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1026 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :(" 1088 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1027 1089
1028 local shrtsrc=$(basename "${src}") 1090 local shrtsrc=$(basename "${src}")
1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1091 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1092 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1031 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1093 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1032 1094
1033 # grab metadata for debug reasons 1095 # grab metadata for debug reasons
1034 local metafile="$(emktemp)" 1096 local metafile=$(emktemp)
1035 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1097 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1036 1098
1037 # rip out the final file name from the metadata 1099 # rip out the final file name from the metadata
1038 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1100 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1039 datafile="`basename ${datafile}`" 1101 datafile=$(basename "${datafile}")
1040 1102
1041 # now lets uncompress/untar the file if need be 1103 # now lets uncompress/untar the file if need be
1042 local tmpfile="$(emktemp)" 1104 local tmpfile=$(emktemp)
1043 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1105 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1044 1106
1045 local iscompressed="`file -b ${tmpfile}`" 1107 local iscompressed=$(file -b "${tmpfile}")
1046 if [ "${iscompressed:0:8}" == "compress" ] ; then 1108 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1047 iscompressed=1 1109 iscompressed=1
1048 mv ${tmpfile}{,.Z} 1110 mv ${tmpfile}{,.Z}
1049 gunzip ${tmpfile} 1111 gunzip ${tmpfile}
1050 else 1112 else
1051 iscompressed=0 1113 iscompressed=0
1052 fi 1114 fi
1053 local istar="`file -b ${tmpfile}`" 1115 local istar=$(file -b "${tmpfile}")
1054 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1116 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1055 istar=1 1117 istar=1
1056 else 1118 else
1057 istar=0 1119 istar=0
1058 fi 1120 fi
1059 1121
1095# many other game companies. 1157# many other game companies.
1096# 1158#
1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1159# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1098# - If the file is not specified then unpack will utilize ${A}. 1160# - If the file is not specified then unpack will utilize ${A}.
1099# - If the offset is not specified then we will attempt to extract 1161# - If the offset is not specified then we will attempt to extract
1100# the proper offset from the script itself. 1162# the proper offset from the script itself.
1101unpack_makeself() { 1163unpack_makeself() {
1102 local src_input=${1:-${A}} 1164 local src_input=${1:-${A}}
1103 local src=$(find_unpackable_file "${src_input}") 1165 local src=$(find_unpackable_file "${src_input}")
1104 local skip=$2 1166 local skip=$2
1105 local exe=$3 1167 local exe=$3
1111 if [[ -z ${skip} ]] ; then 1173 if [[ -z ${skip} ]] ; then
1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1174 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1113 local skip=0 1175 local skip=0
1114 exe=tail 1176 exe=tail
1115 case ${ver} in 1177 case ${ver} in
1116 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1178 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1117 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1179 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1118 ;; 1180 ;;
1119 2.0|2.0.1) 1181 2.0|2.0.1)
1120 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1182 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1121 ;; 1183 ;;
1151 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1213 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1152 *) die "makeself cant handle exe '${exe}'" 1214 *) die "makeself cant handle exe '${exe}'"
1153 esac 1215 esac
1154 1216
1155 # lets grab the first few bytes of the file to figure out what kind of archive it is 1217 # lets grab the first few bytes of the file to figure out what kind of archive it is
1156 local tmpfile="$(emktemp)" 1218 local tmpfile=$(emktemp)
1157 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1219 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1158 local filetype="$(file -b "${tmpfile}")" 1220 local filetype=$(file -b "${tmpfile}")
1159 case ${filetype} in 1221 case ${filetype} in
1160 *tar\ archive) 1222 *tar\ archive*)
1161 eval ${exe} | tar --no-same-owner -xf - 1223 eval ${exe} | tar --no-same-owner -xf -
1162 ;; 1224 ;;
1163 bzip2*) 1225 bzip2*)
1164 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1226 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1165 ;; 1227 ;;
1201 # accepted ... if we don't find a match, we make the user accept 1263 # accepted ... if we don't find a match, we make the user accept
1202 local shopts=$- 1264 local shopts=$-
1203 local alic 1265 local alic
1204 set -o noglob #so that bash doesn't expand "*" 1266 set -o noglob #so that bash doesn't expand "*"
1205 for alic in ${ACCEPT_LICENSE} ; do 1267 for alic in ${ACCEPT_LICENSE} ; do
1206 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1268 if [[ ${alic} == ${l} ]]; then
1207 set +o noglob; set -${shopts} #reset old shell opts 1269 set +o noglob; set -${shopts} #reset old shell opts
1208 return 0 1270 return 0
1209 fi 1271 fi
1210 done 1272 done
1211 set +o noglob; set -$shopts #reset old shell opts 1273 set +o noglob; set -$shopts #reset old shell opts
1212 1274
1213 local licmsg="$(emktemp)" 1275 local licmsg=$(emktemp)
1214 cat << EOF > ${licmsg} 1276 cat <<-EOF > ${licmsg}
1215********************************************************** 1277 **********************************************************
1216The following license outlines the terms of use of this 1278 The following license outlines the terms of use of this
1217package. You MUST accept this license for installation to 1279 package. You MUST accept this license for installation to
1218continue. When you are done viewing, hit 'q'. If you 1280 continue. When you are done viewing, hit 'q'. If you
1219CTRL+C out of this, the install will not run! 1281 CTRL+C out of this, the install will not run!
1220********************************************************** 1282 **********************************************************
1221 1283
1222EOF 1284 EOF
1223 cat ${lic} >> ${licmsg} 1285 cat ${lic} >> ${licmsg}
1224 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1286 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}"
1225 einfon "Do you accept the terms of this license (${l})? [yes/no] " 1287 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1226 read alic 1288 read alic
1227 case ${alic} in 1289 case ${alic} in
1244# and when the function returns, you can assume that the cd has been 1306# and when the function returns, you can assume that the cd has been
1245# found at CDROM_ROOT. 1307# found at CDROM_ROOT.
1246# 1308#
1247# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1309# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2',
1248# etc... if you want to give the cds better names, then just export 1310# etc... if you want to give the cds better names, then just export
1249# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1311# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1312# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1313# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1314# CDROM_NAME_2="data cd"
1315# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1250# 1316#
1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1317# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1252# 1318#
1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1319# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...]
1254# - this will attempt to locate a cd based upon a file that is on 1320# - this will attempt to locate a cd based upon a file that is on
1255# the cd ... the more files you give this function, the more cds 1321# the cd ... the more files you give this function, the more cds
1256# the cdrom functions will handle 1322# the cdrom functions will handle
1257cdrom_get_cds() { 1323cdrom_get_cds() {
1258 # first we figure out how many cds we're dealing with by 1324 # first we figure out how many cds we're dealing with by
1259 # the # of files they gave us 1325 # the # of files they gave us
1260 local cdcnt=0 1326 local cdcnt=0
1261 local f= 1327 local f=
1305 echo 1371 echo
1306 einfo "For example:" 1372 einfo "For example:"
1307 einfo "export CD_ROOT=/mnt/cdrom" 1373 einfo "export CD_ROOT=/mnt/cdrom"
1308 echo 1374 echo
1309 else 1375 else
1376 if [[ -n ${CDROM_NAME_SET} ]] ; then
1377 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1378 cdcnt=0
1379 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1380 ((++cdcnt))
1381 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1382 done
1383 fi
1384
1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1385 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1311 cdcnt=0 1386 cdcnt=0
1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1387 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1313 ((++cdcnt)) 1388 ((++cdcnt))
1314 var="CDROM_NAME_${cdcnt}" 1389 var="CDROM_NAME_${cdcnt}"
1381 1456
1382 while [[ -n ${cdset[${i}]} ]] ; do 1457 while [[ -n ${cdset[${i}]} ]] ; do
1383 local dir=$(dirname ${cdset[${i}]}) 1458 local dir=$(dirname ${cdset[${i}]})
1384 local file=$(basename ${cdset[${i}]}) 1459 local file=$(basename ${cdset[${i}]})
1385 1460
1386 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1461 local point= node= fs= foo=
1387 [[ -d ${mline}/${dir} ]] || continue 1462 while read point node fs foo ; do
1463 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1464 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1465 && continue
1466 point=${point//\040/ }
1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1467 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1389 export CDROM_ROOT=${mline} 1468 export CDROM_ROOT=${point}
1390 export CDROM_SET=${i} 1469 export CDROM_SET=${i}
1391 export CDROM_MATCH=${cdset[${i}]} 1470 export CDROM_MATCH=${cdset[${i}]}
1392 return 1471 return
1393 fi 1472 done <<< "$(get_mounts)"
1394 done
1395 1473
1396 ((++i)) 1474 ((++i))
1397 done 1475 done
1398 1476
1399 echo 1477 echo
1427 1505
1428# Make sure that LINGUAS only contains languages that 1506# Make sure that LINGUAS only contains languages that
1429# a package can support 1507# a package can support
1430# 1508#
1431# usage: strip-linguas <allow LINGUAS> 1509# usage: strip-linguas <allow LINGUAS>
1432# strip-linguas -i <directories of .po files> 1510# strip-linguas -i <directories of .po files>
1433# strip-linguas -u <directories of .po files> 1511# strip-linguas -u <directories of .po files>
1434# 1512#
1435# The first form allows you to specify a list of LINGUAS. 1513# The first form allows you to specify a list of LINGUAS.
1436# The -i builds a list of po files found in all the 1514# The -i builds a list of po files found in all the
1437# directories and uses the intersection of the lists. 1515# directories and uses the intersection of the lists.
1438# The -u builds a list of po files found in all the 1516# The -u builds a list of po files found in all the
1439# directories and uses the union of the lists. 1517# directories and uses the union of the lists.
1440strip-linguas() { 1518strip-linguas() {
1441 local ls newls 1519 local ls newls nols
1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1520 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1443 local op=$1; shift 1521 local op=$1; shift
1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1522 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1445 local d f 1523 local d f
1446 for d in "$@" ; do 1524 for d in "$@" ; do
1460 done 1538 done
1461 else 1539 else
1462 ls="$@" 1540 ls="$@"
1463 fi 1541 fi
1464 1542
1543 nols=""
1465 newls="" 1544 newls=""
1466 for f in ${LINGUAS} ; do 1545 for f in ${LINGUAS} ; do
1467 if hasq ${f} ${ls} ; then 1546 if hasq ${f} ${ls} ; then
1468 newls="${newls} ${f}" 1547 newls="${newls} ${f}"
1469 else 1548 else
1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1549 nols="${nols} ${f}"
1471 fi 1550 fi
1472 done 1551 done
1552 [[ -n ${nols} ]] \
1553 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1473 export LINGUAS=${newls:1} 1554 export LINGUAS=${newls:1}
1474} 1555}
1475 1556
1476# moved from kernel.eclass since they are generally useful outside of 1557# moved from kernel.eclass since they are generally useful outside of
1477# kernel.eclass -iggy (20041002) 1558# kernel.eclass -iggy (20041002)
1485 while ((i--)) ; do 1566 while ((i--)) ; do
1486 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1567 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1487 done 1568 done
1488 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1569 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1489 case ${ARCH} in 1570 case ${ARCH} in
1490 x86) export ARCH="i386";; 1571 x86) export ARCH="i386";;
1491 amd64) export ARCH="x86_64";; 1572 amd64) export ARCH="x86_64";;
1492 hppa) export ARCH="parisc";; 1573 hppa) export ARCH="parisc";;
1493 mips) export ARCH="mips";; 1574 mips) export ARCH="mips";;
1494 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! 1575 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!
1495 *) export ARCH="${ARCH}";; 1576 *) export ARCH="${ARCH}";;
1496 esac 1577 esac
1497} 1578}
1498 1579
1499# set's ARCH back to what portage expects 1580# set's ARCH back to what portage expects
1500set_arch_to_portage() { 1581set_arch_to_portage() {
1507 1588
1508# Jeremy Huddleston <eradicator@gentoo.org>: 1589# Jeremy Huddleston <eradicator@gentoo.org>:
1509# preserve_old_lib /path/to/libblah.so.0 1590# preserve_old_lib /path/to/libblah.so.0
1510# preserve_old_lib_notify /path/to/libblah.so.0 1591# preserve_old_lib_notify /path/to/libblah.so.0
1511# 1592#
1512# These functions are useful when a lib in your package changes --library. Such 1593# These functions are useful when a lib in your package changes --library. Such
1513# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0 1594# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1514# would break packages that link against it. Most people get around this 1595# would break packages that link against it. Most people get around this
1515# by using the portage SLOT mechanism, but that is not always a relevant 1596# by using the portage SLOT mechanism, but that is not always a relevant
1516# solution, so instead you can add the following to your ebuilds: 1597# solution, so instead you can add the following to your ebuilds:
1517# 1598#
1518# src_install() { 1599# pkg_preinst() {
1519# ... 1600# ...
1520# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1601# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1521# ... 1602# ...
1522# } 1603# }
1523# 1604#
1526# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1607# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1527# ... 1608# ...
1528# } 1609# }
1529 1610
1530preserve_old_lib() { 1611preserve_old_lib() {
1531 LIB=$1 1612 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1613 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1614 die "Invalid preserve_old_lib() usage"
1615 fi
1616 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1532 1617
1533 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1618 local lib dir
1534 SONAME=`basename ${LIB}` 1619 for lib in "$@" ; do
1535 DIRNAME=`dirname ${LIB}` 1620 [[ -e ${ROOT}/${lib} ]] || continue
1536 1621 dir=${lib%/*}
1537 dodir ${DIRNAME} 1622 dodir ${dir} || die "dodir ${dir} failed"
1538 cp ${ROOT}${LIB} ${D}${DIRNAME} 1623 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1539 touch ${D}${LIB} 1624 touch "${D}"/${lib}
1540 fi 1625 done
1541} 1626}
1542 1627
1543preserve_old_lib_notify() { 1628preserve_old_lib_notify() {
1544 LIB=$1 1629 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1630 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1631 die "Invalid preserve_old_lib_notify() usage"
1632 fi
1545 1633
1546 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1634 local lib notice=0
1547 SONAME=`basename ${LIB}` 1635 for lib in "$@" ; do
1548 1636 [[ -e ${ROOT}/${lib} ]] || continue
1637 if [[ ${notice} -eq 0 ]] ; then
1638 notice=1
1549 ewarn "An old version of an installed library was detected on your system." 1639 ewarn "Old versions of installed libraries were detected on your system."
1550 ewarn "In order to avoid breaking packages that link against it, this older version" 1640 ewarn "In order to avoid breaking packages that depend on these old libs,"
1551 ewarn "is not being removed. In order to make full use of this newer version," 1641 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1552 ewarn "you will need to execute the following command:" 1642 ewarn "in order to remove these old dependencies. If you do not have this"
1553 ewarn " revdep-rebuild --library ${SONAME}" 1643 ewarn "helper program, simply emerge the 'gentoolkit' package."
1554 ewarn 1644 ewarn
1555 ewarn "After doing that, you can safely remove ${LIB}"
1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1557 fi 1645 fi
1646 ewarn " # revdep-rebuild --library ${lib##*/}"
1647 done
1558} 1648}
1559 1649
1560# Hack for people to figure out if a package was built with 1650# Hack for people to figure out if a package was built with
1561# certain USE flags 1651# certain USE flags
1562# 1652#
1563# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1653# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1564# ex: built_with_use xchat gtk2 1654# ex: built_with_use xchat gtk2
1565# 1655#
1566# Flags: -a all USE flags should be utilized 1656# Flags: -a all USE flags should be utilized
1567# -o at least one USE flag should be utilized 1657# -o at least one USE flag should be utilized
1658# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1659# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1568# Note: the default flag is '-a' 1660# Note: the default flag is '-a'
1569built_with_use() { 1661built_with_use() {
1662 local hidden="no"
1663 if [[ $1 == "--hidden" ]] ; then
1664 hidden="yes"
1665 shift
1666 fi
1667
1668 local missing_action="die"
1669 if [[ $1 == "--missing" ]] ; then
1670 missing_action=$2
1671 shift ; shift
1672 case ${missing_action} in
1673 true|false|die) ;;
1674 *) die "unknown action '${missing_action}'";;
1675 esac
1676 fi
1677
1570 local opt=$1 1678 local opt=$1
1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1679 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1572 1680
1573 local PKG=$(best_version $1) 1681 local PKG=$(best_version $1)
1682 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1574 shift 1683 shift
1575 1684
1576 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1685 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1686 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1577 1687
1578 # if the USE file doesnt exist, assume the $PKG is either 1688 # if the IUSE file doesn't exist, the read will error out, we need to handle
1579 # injected or package.provided 1689 # this gracefully
1580 [[ ! -e ${USEFILE} ]] && return 0 1690 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1691 case ${missing_action} in
1692 true) return 0;;
1693 false) return 1;;
1694 die) die "Unable to determine what USE flags $PKG was built with";;
1695 esac
1696 fi
1697
1698 if [[ ${hidden} == "no" ]] ; then
1699 local IUSE_BUILT=$(<${IUSEFILE})
1700 # Don't check USE_EXPAND #147237
1701 local expand
1702 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1703 if [[ $1 == ${expand}_* ]] ; then
1704 expand=""
1705 break
1706 fi
1707 done
1708 if [[ -n ${expand} ]] ; then
1709 if ! has $1 ${IUSE_BUILT} ; then
1710 case ${missing_action} in
1711 true) return 0;;
1712 false) return 1;;
1713 die) die "$PKG does not actually support the $1 USE flag!";;
1714 esac
1715 fi
1716 fi
1717 fi
1581 1718
1582 local USE_BUILT=$(<${USEFILE}) 1719 local USE_BUILT=$(<${USEFILE})
1583 while [[ $# -gt 0 ]] ; do 1720 while [[ $# -gt 0 ]] ; do
1584 if [[ ${opt} = "-o" ]] ; then 1721 if [[ ${opt} = "-o" ]] ; then
1585 has $1 ${USE_BUILT} && return 0 1722 has $1 ${USE_BUILT} && return 0
1600 local f 1737 local f
1601 for f in $(find ${dir} -name configure) ; do 1738 for f in $(find ${dir} -name configure) ; do
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1739 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1740 done
1604 eend 0 1741 eend 0
1605}
1606
1607# dopamd <file> [more files]
1608#
1609# Install pam auth config file in /etc/pam.d
1610dopamd() {
1611 [[ -z $1 ]] && die "dopamd requires at least one argument"
1612
1613 use pam || return 0
1614
1615 INSDESTTREE=/etc/pam.d \
1616 doins "$@" || die "failed to install $@"
1617}
1618# newpamd <old name> <new name>
1619#
1620# Install pam file <old name> as <new name> in /etc/pam.d
1621newpamd() {
1622 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1623
1624 use pam || return 0
1625
1626 INSDESTTREE=/etc/pam.d \
1627 newins "$1" "$2" || die "failed to install $1 as $2"
1628} 1742}
1629 1743
1630# make a wrapper script ... 1744# make a wrapper script ...
1631# NOTE: this was originally games_make_wrapper, but I noticed other places where 1745# NOTE: this was originally games_make_wrapper, but I noticed other places where
1632# this could be used, so I have moved it here and made it not games-specific 1746# this could be used, so I have moved it here and made it not games-specific

Legend:
Removed from v.1.237  
changed lines
  Added in v.1.281

  ViewVC Help
Powered by ViewVC 1.1.20