/[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.282
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.282 2007/06/16 07:11:43 vapier 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
45# This function generate linker scripts in /usr/lib for dynamic
46# 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
48# 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
50# library search path. This cause many builds to fail.
51# See bug #4411 for more info.
52#
53# To use, simply call:
54#
55# gen_usr_ldscript libfoo.so
56#
57# Note that you should in general use the unversioned name of
58# the library, as ldconfig should usually update it correctly
59# to point to the latest version of the library present.
60#
61# <azarah@gentoo.org> (26 Oct 2002)
62#
63gen_usr_ldscript() {
64 local lib libdir=$(get_libdir)
65 # Just make sure it exists
66 dodir /usr/${libdir}
67
68 for lib in "${@}" ; do
69 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
70 /* GNU ld script
71 Since Gentoo has critical dynamic libraries
72 in /lib, and the static versions in /usr/lib,
73 we need to have a "fake" dynamic lib in /usr/lib,
74 otherwise we run into linking problems.
75
76 See bug http://bugs.gentoo.org/4411 for more info.
77 */
78 GROUP ( /${libdir}/${lib} )
79 END_LDSCRIPT
80 fperms a+x "/usr/${libdir}/${lib}" || die "could not change perms on ${lib}"
81 done
82}
83
84 40
85# Default directory where patches are located 41# Default directory where patches are located
86EPATCH_SOURCE="${WORKDIR}/patch" 42EPATCH_SOURCE="${WORKDIR}/patch"
87# Default extension for patches 43# Default extension for patches
88EPATCH_SUFFIX="patch.bz2" 44EPATCH_SUFFIX="patch.bz2"
89# Default options for patch 45# Default options for patch
90# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 46# 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. 47# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
92# Set -E to automatically remove empty files. 48# Set -E to automatically remove empty files.
93EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 49EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
94# List of patches not to apply. Not this is only file names, 50# List of patches not to apply. Not this is only file names,
95# and not the full path .. 51# and not the full path ..
96EPATCH_EXCLUDE="" 52EPATCH_EXCLUDE=""
97# Change the printed message for a single patch. 53# Change the printed message for a single patch.
98EPATCH_SINGLE_MSG="" 54EPATCH_SINGLE_MSG=""
99# Change the printed message for multiple patches. 55# Change the printed message for multiple patches.
100EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 56EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
101# Force applying bulk patches even if not following the style: 57# Force applying bulk patches even if not following the style:
102# 58#
103# ??_${ARCH}_foo.${EPATCH_SUFFIX} 59# ??_${ARCH}_foo.${EPATCH_SUFFIX}
104# 60#
105EPATCH_FORCE="no" 61EPATCH_FORCE="no"
106 62
107# This function is for bulk patching, or in theory for just one 63# This function is for bulk patching, or in theory for just one
108# or two patches. 64# or two patches.
119# 75#
120# Patches are applied in current directory. 76# Patches are applied in current directory.
121# 77#
122# Bulk Patches should preferibly have the form of: 78# Bulk Patches should preferibly have the form of:
123# 79#
124# ??_${ARCH}_foo.${EPATCH_SUFFIX} 80# ??_${ARCH}_foo.${EPATCH_SUFFIX}
125# 81#
126# For example: 82# For example:
127# 83#
128# 01_all_misc-fix.patch.bz2 84# 01_all_misc-fix.patch.bz2
129# 02_sparc_another-fix.patch.bz2 85# 02_sparc_another-fix.patch.bz2
130# 86#
131# This ensures that there are a set order, and you can have ARCH 87# This ensures that there are a set order, and you can have ARCH
132# specific patches. 88# specific patches.
133# 89#
134# If you however give an argument to epatch(), it will treat it as a 90# If you however give an argument to epatch(), it will treat it as a
222 fi 178 fi
223 for x in ${EPATCH_SOURCE} 179 for x in ${EPATCH_SOURCE}
224 do 180 do
225 # New ARCH dependant patch naming scheme ... 181 # New ARCH dependant patch naming scheme ...
226 # 182 #
227 # ???_arch_foo.patch 183 # ???_arch_foo.patch
228 # 184 #
229 if [ -f ${x} ] && \ 185 if [ -f ${x} ] && \
230 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 186 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
231 [ "${EPATCH_FORCE}" = "yes" ]) 187 [ "${EPATCH_FORCE}" = "yes" ])
232 then 188 then
233 local count=0 189 local count=0
234 local popts="${EPATCH_OPTS}" 190 local popts="${EPATCH_OPTS}"
235 local patchname=${x##*/} 191 local patchname=${x##*/}
236 192
264 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 220 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
265 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 221 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
266 222
267 if [ "${PATCH_SUFFIX}" != "patch" ] 223 if [ "${PATCH_SUFFIX}" != "patch" ]
268 then 224 then
269 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 225 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
270 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 226 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
271 else 227 else
272 PATCH_TARGET="${x}" 228 PATCH_TARGET="${x}"
273 fi 229 fi
274 230
275 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 231 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 232 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
277 233
278 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 234 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
279 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 235 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 236
362 [[ -z ${T} ]] \ 318 [[ -z ${T} ]] \
363 && topdir="/tmp" \ 319 && topdir="/tmp" \
364 || topdir=${T} 320 || topdir=${T}
365 fi 321 fi
366 322
367 if [[ -z $(type -p mktemp) ]] ; then 323 if ! type -P mktemp > /dev/null ; then
324 # system lacks `mktemp` so we have to fake it
368 local tmp=/ 325 local tmp=/
369 while [[ -e ${tmp} ]] ; do 326 while [[ -e ${tmp} ]] ; do
370 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 327 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
371 done 328 done
372 ${exe} "${tmp}" || ${exe} -p "${tmp}" 329 ${exe} "${tmp}" || ${exe} -p "${tmp}"
373 echo "${tmp}" 330 echo "${tmp}"
374 else 331 else
332 # the args here will give slightly wierd names on BSD,
333 # but should produce a usable file on all userlands
375 if [[ ${exe} == "touch" ]] ; then 334 if [[ ${exe} == "touch" ]] ; then
376 [[ ${USERLAND} == "GNU" ]] \
377 && mktemp -p "${topdir}" \
378 || TMPDIR="${topdir}" mktemp -t tmp 335 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
379 else 336 else
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -d "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -dt tmp 337 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
383 fi 338 fi
384 fi 339 fi
385} 340}
386 341
387# Small wrapper for getent (Linux), nidump (Mac OS X), 342# Small wrapper for getent (Linux), nidump (Mac OS X),
450 eerror "No username specified !" 405 eerror "No username specified !"
451 die "Cannot call enewuser without a username" 406 die "Cannot call enewuser without a username"
452 fi 407 fi
453 408
454 # lets see if the username already exists 409 # lets see if the username already exists
455 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 410 if [[ -n $(egetent passwd "${euser}") ]] ; then
456 return 0 411 return 0
457 fi 412 fi
458 einfo "Adding user '${euser}' to your system ..." 413 einfo "Adding user '${euser}' to your system ..."
459 414
460 # options to pass to useradd 415 # options to pass to useradd
461 local opts= 416 local opts=
462 417
463 # handle uid 418 # handle uid
464 local euid=$1; shift 419 local euid=$1; shift
465 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 420 if [[ -n ${euid} && ${euid} != -1 ]] ; then
466 if [[ ${euid} -gt 0 ]] ; then 421 if [[ ${euid} -gt 0 ]] ; then
467 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 422 if [[ -n $(egetent passwd ${euid}) ]] ; then
468 euid="next" 423 euid="next"
469 fi 424 fi
470 else 425 else
471 eerror "Userid given but is not greater than 0 !" 426 eerror "Userid given but is not greater than 0 !"
472 die "${euid} is not a valid UID" 427 die "${euid} is not a valid UID"
473 fi 428 fi
474 else 429 else
475 euid="next" 430 euid="next"
476 fi 431 fi
477 if [[ ${euid} == "next" ]] ; then 432 if [[ ${euid} == "next" ]] ; then
478 for euid in $(seq 101 999) ; do 433 for ((euid = 101; euid <= 999; euid++)); do
479 [[ -z $(egetent passwd ${euid}) ]] && break 434 [[ -z $(egetent passwd ${euid}) ]] && break
480 done 435 done
481 fi 436 fi
482 opts="${opts} -u ${euid}" 437 opts="${opts} -u ${euid}"
483 einfo " - Userid: ${euid}" 438 einfo " - Userid: ${euid}"
497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do 452 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
498 [[ -x ${ROOT}${shell} ]] && break 453 [[ -x ${ROOT}${shell} ]] && break
499 done 454 done
500 455
501 if [[ ${shell} == "/dev/null" ]] ; then 456 if [[ ${shell} == "/dev/null" ]] ; then
502 eerror "Unable to identify the shell to use" 457 eerror "Unable to identify the shell to use, proceeding with userland default."
503 die "Unable to identify the shell to use" 458 case ${USERLAND} in
459 GNU) shell="/bin/false" ;;
460 BSD) shell="/sbin/nologin" ;;
461 Darwin) shell="/usr/sbin/nologin" ;;
462 *) die "Unable to identify the default shell for userland ${USERLAND}"
463 esac
504 fi 464 fi
505 465
506 eshell=${shell} 466 eshell=${shell}
507 fi 467 fi
508 einfo " - Shell: ${eshell}" 468 einfo " - Shell: ${eshell}"
653 eerror "No group specified !" 613 eerror "No group specified !"
654 die "Cannot call enewgroup without a group" 614 die "Cannot call enewgroup without a group"
655 fi 615 fi
656 616
657 # see if group already exists 617 # see if group already exists
658 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 618 if [[ -n $(egetent group "${egroup}") ]]; then
659 then
660 return 0 619 return 0
661 fi 620 fi
662 einfo "Adding group '${egroup}' to your system ..." 621 einfo "Adding group '${egroup}' to your system ..."
663 622
664 # options to pass to useradd 623 # options to pass to useradd
707 fi 666 fi
708 667
709 # If we need the next available 668 # If we need the next available
710 case ${egid} in 669 case ${egid} in
711 *[!0-9]*) # Non numeric 670 *[!0-9]*) # Non numeric
712 for egid in $(seq 101 999); do 671 for ((egid = 101; egid <= 999; egid++)); do
713 [ -z "`egetent group ${egid}`" ] && break 672 [[ -z $(egetent group ${egid}) ]] && break
714 done 673 done
715 esac 674 esac
716 dscl . create /groups/${egroup} gid ${egid} 675 dscl . create /groups/${egroup} gid ${egid}
717 dscl . create /groups/${egroup} passwd '*' 676 dscl . create /groups/${egroup} passwd '*'
718 ;; 677 ;;
719 678
720 *-freebsd*|*-dragonfly*) 679 *-freebsd*|*-dragonfly*)
721 case ${egid} in 680 case ${egid} in
722 *[!0-9]*) # Non numeric 681 *[!0-9]*) # Non numeric
723 for egid in $(seq 101 999); do 682 for ((egid = 101; egid <= 999; egid++)); do
724 [ -z "`egetent group ${egid}`" ] && break 683 [[ -z $(egetent group ${egid}) ]] && break
725 done 684 done
726 esac 685 esac
727 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 686 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
728 ;; 687 ;;
729 688
730 *-netbsd*) 689 *-netbsd*)
731 case ${egid} in 690 case ${egid} in
732 *[!0-9]*) # Non numeric 691 *[!0-9]*) # Non numeric
733 for egid in $(seq 101 999); do 692 for ((egid = 101; egid <= 999; egid++)); do
734 [ -z "`egetent group ${egid}`" ] && break 693 [[ -z $(egetent group ${egid}) ]] && break
735 done 694 done
736 esac 695 esac
737 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 696 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
738 ;; 697 ;;
739 698
747# Simple script to replace 'dos2unix' binaries 706# Simple script to replace 'dos2unix' binaries
748# vapier@gentoo.org 707# vapier@gentoo.org
749# 708#
750# edos2unix(file, <more files> ...) 709# edos2unix(file, <more files> ...)
751edos2unix() { 710edos2unix() {
752 for f in "$@" 711 echo "$@" | xargs sed -i 's/\r$//'
753 do
754 cp "${f}" ${T}/edos2unix
755 sed 's/\r$//' ${T}/edos2unix > "${f}"
756 done
757} 712}
758 713
759 714
760############################################################## 715##############################################################
761# START: Handle .desktop files and menu entries # 716# START: Handle .desktop files and menu entries #
762# maybe this should be separated into a new eclass some time # 717# maybe this should be separated into a new eclass some time #
763# lanius@gentoo.org # 718# lanius@gentoo.org #
764############################################################## 719##############################################################
765 720
766# Make a desktop file ! 721# Make a desktop file !
767# Great for making those icons in kde/gnome startmenu ! 722# Great for making those icons in kde/gnome startmenu !
768# Amaze your friends ! Get the women ! Join today ! 723# Amaze your friends ! Get the women ! Join today !
769# 724#
770# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 725# make_desktop_entry(<command>, [name], [icon], [type], [path])
771# 726#
772# binary: what binary does the app run with ? 727# binary: what command does the app run with ?
773# name: the name that will show up in the menu 728# name: the name that will show up in the menu
774# icon: give your little like a pretty little icon ... 729# icon: give your little like a pretty little icon ...
775# this can be relative (to /usr/share/pixmaps) or 730# this can be relative (to /usr/share/pixmaps) or
776# a full path to an icon 731# a full path to an icon
777# type: what kind of application is this ? for categories: 732# type: what kind of application is this ? for categories:
778# http://www.freedesktop.org/Standards/desktop-entry-spec 733# http://www.freedesktop.org/Standards/desktop-entry-spec
779# path: if your app needs to startup in a specific dir 734# path: if your app needs to startup in a specific dir
780make_desktop_entry() { 735make_desktop_entry() {
781 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 736 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
782 737
790 local catmaj=${CATEGORY%%-*} 745 local catmaj=${CATEGORY%%-*}
791 local catmin=${CATEGORY##*-} 746 local catmin=${CATEGORY##*-}
792 case ${catmaj} in 747 case ${catmaj} in
793 app) 748 app)
794 case ${catmin} in 749 case ${catmin} in
795 admin) type=System;; 750 admin) type=System;;
796 cdr) type=DiscBurning;; 751 cdr) type=DiscBurning;;
797 dicts) type=Dictionary;; 752 dicts) type=Dictionary;;
798 editors) type=TextEditor;; 753 editors) type=TextEditor;;
799 emacs) type=TextEditor;; 754 emacs) type=TextEditor;;
800 emulation) type=Emulator;; 755 emulation) type=Emulator;;
801 laptop) type=HardwareSettings;; 756 laptop) type=HardwareSettings;;
802 office) type=Office;; 757 office) type=Office;;
803 vim) type=TextEditor;; 758 vim) type=TextEditor;;
804 xemacs) type=TextEditor;; 759 xemacs) type=TextEditor;;
805 *) type=;; 760 *) type=;;
806 esac 761 esac
807 ;; 762 ;;
808 763
809 dev) 764 dev)
810 type="Development" 765 type="Development"
811 ;; 766 ;;
812 767
813 games) 768 games)
814 case ${catmin} in 769 case ${catmin} in
815 action) type=ActionGame;; 770 action|fps) type=ActionGame;;
816 arcade) type=ArcadeGame;; 771 arcade) type=ArcadeGame;;
817 board) type=BoardGame;; 772 board) type=BoardGame;;
818 kid) type=KidsGame;; 773 kids) type=KidsGame;;
819 emulation) type=Emulator;; 774 emulation) type=Emulator;;
820 puzzle) type=LogicGame;; 775 puzzle) type=LogicGame;;
821 rpg) type=RolePlaying;; 776 rpg) type=RolePlaying;;
822 roguelike) type=RolePlaying;; 777 roguelike) type=RolePlaying;;
823 simulation) type=Simulation;; 778 simulation) type=Simulation;;
824 sports) type=SportsGame;; 779 sports) type=SportsGame;;
825 strategy) type=StrategyGame;; 780 strategy) type=StrategyGame;;
826 *) type=;; 781 *) type=;;
827 esac 782 esac
828 type="Game;${type}" 783 type="Game;${type}"
829 ;; 784 ;;
830 785
831 mail) 786 mail)
835 media) 790 media)
836 case ${catmin} in 791 case ${catmin} in
837 gfx) type=Graphics;; 792 gfx) type=Graphics;;
838 radio) type=Tuner;; 793 radio) type=Tuner;;
839 sound) type=Audio;; 794 sound) type=Audio;;
840 tv) type=TV;; 795 tv) type=TV;;
841 video) type=Video;; 796 video) type=Video;;
842 *) type=;; 797 *) type=;;
843 esac 798 esac
844 type="AudioVideo;${type}" 799 type="AudioVideo;${type}"
845 ;; 800 ;;
846 801
847 net) 802 net)
848 case ${catmin} in 803 case ${catmin} in
849 dialup) type=Dialup;; 804 dialup) type=Dialup;;
850 ftp) type=FileTransfer;; 805 ftp) type=FileTransfer;;
851 im) type=InstantMessaging;; 806 im) type=InstantMessaging;;
852 irc) type=IRCClient;; 807 irc) type=IRCClient;;
853 mail) type=Email;; 808 mail) type=Email;;
854 news) type=News;; 809 news) type=News;;
855 nntp) type=News;; 810 nntp) type=News;;
856 p2p) type=FileTransfer;; 811 p2p) type=FileTransfer;;
857 *) type=;; 812 *) type=;;
858 esac 813 esac
859 type="Network;${type}" 814 type="Network;${type}"
860 ;; 815 ;;
861 816
862 sci) 817 sci)
863 case ${catmin} in 818 case ${catmin} in
864 astro*) type=Astronomy;; 819 astro*) type=Astronomy;;
865 bio*) type=Biology;; 820 bio*) type=Biology;;
866 calc*) type=Calculator;; 821 calc*) type=Calculator;;
867 chem*) type=Chemistry;; 822 chem*) type=Chemistry;;
868 geo*) type=Geology;; 823 geo*) type=Geology;;
869 math*) type=Math;; 824 math*) type=Math;;
870 *) type=;; 825 *) type=;;
871 esac 826 esac
872 type="Science;${type}" 827 type="Science;${type}"
873 ;; 828 ;;
874 829
875 www) 830 www)
876 case ${catmin} in 831 case ${catmin} in
877 client) type=WebBrowser;; 832 client) type=WebBrowser;;
878 *) type=;; 833 *) type=;;
879 esac 834 esac
880 type="Network" 835 type="Network"
881 ;; 836 ;;
882 837
883 *) 838 *)
888 if [ "${SLOT}" == "0" ] ; then 843 if [ "${SLOT}" == "0" ] ; then
889 local desktop_name="${PN}" 844 local desktop_name="${PN}"
890 else 845 else
891 local desktop_name="${PN}-${SLOT}" 846 local desktop_name="${PN}-${SLOT}"
892 fi 847 fi
893 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 848 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
894# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 849 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
895 850
851 cat <<-EOF > "${desktop}"
896echo "[Desktop Entry] 852 [Desktop Entry]
897Encoding=UTF-8 853 Encoding=UTF-8
898Version=0.9.2 854 Version=0.9.2
899Name=${name} 855 Name=${name}
900Type=Application 856 Type=Application
901Comment=${DESCRIPTION} 857 Comment=${DESCRIPTION}
902Exec=${exec} 858 Exec=${exec}
903TryExec=${exec} 859 TryExec=${exec%% *}
904Path=${path} 860 Path=${path}
905Icon=${icon} 861 Icon=${icon}
906Categories=Application;${type};" > "${desktop}" 862 Categories=Application;${type};
863 EOF
907 864
908 ( 865 (
909 # wrap the env here so that the 'insinto' call 866 # wrap the env here so that the 'insinto' call
910 # doesn't corrupt the env of the caller 867 # doesn't corrupt the env of the caller
911 insinto /usr/share/applications 868 insinto /usr/share/applications
912 doins "${desktop}" 869 doins "${desktop}"
913 ) 870 )
914} 871}
915 872
873
874# Validate desktop entries using desktop-file-utils
875# Carsten Lohrke <carlo@gentoo.org>
876#
877# Usage: validate_desktop_entries [directory ...]
878
879validate_desktop_entries() {
880 if [[ -x /usr/bin/desktop-file-validate ]] ; then
881 einfo "Checking desktop entry validity"
882 local directories=""
883 for d in /usr/share/applications $@ ; do
884 [[ -d ${D}${d} ]] && directories="${directories} ${D}${d}"
885 done
886 if [[ -n ${directories} ]] ; then
887 for FILE in $(find ${directories} -name "*\.desktop" \
888 -not -path '*.hidden*' | sort -u 2>/dev/null)
889 do
890 local temp=$(desktop-file-validate ${FILE} | grep -v "warning:" | \
891 sed -e "s|error: ||" -e "s|${FILE}:|--|g" )
892 [[ -n $temp ]] && elog ${temp/--/${FILE/${D}/}:}
893 done
894 fi
895 echo ""
896 else
897 einfo "Passing desktop entry validity check. Install dev-util/desktop-file-utils, if you want to help to improve Gentoo."
898 fi
899}
900
901
916# Make a GDM/KDM Session file 902# Make a GDM/KDM Session file
917# 903#
918# make_desktop_entry(<title>, <command>) 904# make_session_desktop(<title>, <command>)
919# title: File to execute to start the Window Manager 905# title: File to execute to start the Window Manager
920# command: Name of the Window Manager 906# command: Name of the Window Manager
921 907
922make_session_desktop() { 908make_session_desktop() {
923 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1 909 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
925 911
926 local title=$1 912 local title=$1
927 local command=$2 913 local command=$2
928 local desktop=${T}/${wm}.desktop 914 local desktop=${T}/${wm}.desktop
929 915
916 cat <<-EOF > "${desktop}"
930echo "[Desktop Entry] 917 [Desktop Entry]
931Encoding=UTF-8 918 Encoding=UTF-8
932Name=${title} 919 Name=${title}
933Comment=This session logs you into ${title} 920 Comment=This session logs you into ${title}
934Exec=${command} 921 Exec=${command}
935TryExec=${command} 922 TryExec=${command}
936Type=Application" > "${desktop}" 923 Type=Application
924 EOF
937 925
926 (
927 # wrap the env here so that the 'insinto' call
928 # doesn't corrupt the env of the caller
938 insinto /usr/share/xsessions 929 insinto /usr/share/xsessions
939 doins "${desktop}" 930 doins "${desktop}"
931 )
940} 932}
941 933
942domenu() { 934domenu() {
935 (
936 # wrap the env here so that the 'insinto' call
937 # doesn't corrupt the env of the caller
943 local i j 938 local i j ret=0
944 insinto /usr/share/applications 939 insinto /usr/share/applications
945 for i in "$@" ; do 940 for i in "$@" ; do
946 if [[ -f ${i} ]] ; then 941 if [[ -f ${i} ]] ; then
947 doins "${i}" 942 doins "${i}"
943 ((ret+=$?))
948 elif [[ -d ${i} ]] ; then 944 elif [[ -d ${i} ]] ; then
949 for j in "${i}"/*.desktop ; do 945 for j in "${i}"/*.desktop ; do
950 doins "${j}" 946 doins "${j}"
947 ((ret+=$?))
951 done 948 done
952 fi 949 fi
953 done 950 done
951 exit ${ret}
952 )
954} 953}
955newmenu() { 954newmenu() {
955 (
956 # wrap the env here so that the 'insinto' call
957 # doesn't corrupt the env of the caller
956 insinto /usr/share/applications 958 insinto /usr/share/applications
957 newins "$1" "$2" 959 newins "$@"
960 )
958} 961}
959 962
960doicon() { 963doicon() {
964 (
965 # wrap the env here so that the 'insinto' call
966 # doesn't corrupt the env of the caller
961 local i j 967 local i j ret
962 insinto /usr/share/pixmaps 968 insinto /usr/share/pixmaps
963 for i in "$@" ; do 969 for i in "$@" ; do
964 if [[ -f ${i} ]] ; then 970 if [[ -f ${i} ]] ; then
965 doins "${i}" 971 doins "${i}"
972 ((ret+=$?))
966 elif [[ -d ${i} ]] ; then 973 elif [[ -d ${i} ]] ; then
967 for j in "${i}"/*.png ; do 974 for j in "${i}"/*.png ; do
968 doins "${j}" 975 doins "${j}"
976 ((ret+=$?))
969 done 977 done
970 fi 978 fi
971 done 979 done
980 exit ${ret}
981 )
972} 982}
973newicon() { 983newicon() {
984 (
985 # wrap the env here so that the 'insinto' call
986 # doesn't corrupt the env of the caller
974 insinto /usr/share/pixmaps 987 insinto /usr/share/pixmaps
975 newins "$1" "$2" 988 newins "$@"
989 )
976} 990}
977 991
978############################################################## 992##############################################################
979# END: Handle .desktop files and menu entries # 993# END: Handle .desktop files and menu entries #
980############################################################## 994##############################################################
981 995
982 996
983# for internal use only (unpack_pdv and unpack_makeself) 997# for internal use only (unpack_pdv and unpack_makeself)
984find_unpackable_file() { 998find_unpackable_file() {
1003# the middle of the archive. Valve seems to use it a lot ... too bad 1017# 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. 1018# it seems to like to segfault a lot :(. So lets take it apart ourselves.
1005# 1019#
1006# Usage: unpack_pdv [file to unpack] [size of off_t] 1020# 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 1021# - 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 1022# 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 1023# 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: 1024# archive. one way to determine this is by running the following commands:
1011# strings <pdv archive> | grep lseek 1025# strings <pdv archive> | grep lseek
1012# strace -elseek <pdv archive> 1026# strace -elseek <pdv archive>
1013# basically look for the first lseek command (we do the strings/grep because 1027# 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 1028# sometimes the function call is _llseek or something) and steal the 2nd
1015# parameter. here is an example: 1029# parameter. here is an example:
1016# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1030# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1017# lseek 1031# lseek
1018# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1032# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1019# lseek(3, -4, SEEK_END) = 2981250 1033# lseek(3, -4, SEEK_END) = 2981250
1020# thus we would pass in the value of '4' as the second parameter. 1034# thus we would pass in the value of '4' as the second parameter.
1021unpack_pdv() { 1035unpack_pdv() {
1022 local src=$(find_unpackable_file $1) 1036 local src=$(find_unpackable_file "$1")
1023 local sizeoff_t=$2 1037 local sizeoff_t=$2
1024 1038
1025 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1039 [[ -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 :(" 1040 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1027 1041
1028 local shrtsrc=$(basename "${src}") 1042 local shrtsrc=$(basename "${src}")
1029 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1043 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1030 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1044 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\"` 1045 local tailskip=$(tail -c $((${sizeoff_t}*2)) "${src}" | head -c ${sizeoff_t} | hexdump -e \"%i\")
1032 1046
1033 # grab metadata for debug reasons 1047 # grab metadata for debug reasons
1034 local metafile="$(emktemp)" 1048 local metafile=$(emktemp)
1035 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1049 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1036 1050
1037 # rip out the final file name from the metadata 1051 # rip out the final file name from the metadata
1038 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1052 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1039 datafile="`basename ${datafile}`" 1053 datafile=$(basename "${datafile}")
1040 1054
1041 # now lets uncompress/untar the file if need be 1055 # now lets uncompress/untar the file if need be
1042 local tmpfile="$(emktemp)" 1056 local tmpfile=$(emktemp)
1043 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1057 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1044 1058
1045 local iscompressed="`file -b ${tmpfile}`" 1059 local iscompressed=$(file -b "${tmpfile}")
1046 if [ "${iscompressed:0:8}" == "compress" ] ; then 1060 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1047 iscompressed=1 1061 iscompressed=1
1048 mv ${tmpfile}{,.Z} 1062 mv ${tmpfile}{,.Z}
1049 gunzip ${tmpfile} 1063 gunzip ${tmpfile}
1050 else 1064 else
1051 iscompressed=0 1065 iscompressed=0
1052 fi 1066 fi
1053 local istar="`file -b ${tmpfile}`" 1067 local istar=$(file -b "${tmpfile}")
1054 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1068 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1055 istar=1 1069 istar=1
1056 else 1070 else
1057 istar=0 1071 istar=0
1058 fi 1072 fi
1059 1073
1095# many other game companies. 1109# many other game companies.
1096# 1110#
1097# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1111# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1098# - If the file is not specified then unpack will utilize ${A}. 1112# - If the file is not specified then unpack will utilize ${A}.
1099# - If the offset is not specified then we will attempt to extract 1113# - If the offset is not specified then we will attempt to extract
1100# the proper offset from the script itself. 1114# the proper offset from the script itself.
1101unpack_makeself() { 1115unpack_makeself() {
1102 local src_input=${1:-${A}} 1116 local src_input=${1:-${A}}
1103 local src=$(find_unpackable_file "${src_input}") 1117 local src=$(find_unpackable_file "${src_input}")
1104 local skip=$2 1118 local skip=$2
1105 local exe=$3 1119 local exe=$3
1111 if [[ -z ${skip} ]] ; then 1125 if [[ -z ${skip} ]] ; then
1112 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1126 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1113 local skip=0 1127 local skip=0
1114 exe=tail 1128 exe=tail
1115 case ${ver} in 1129 case ${ver} in
1116 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1130 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) 1131 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1118 ;; 1132 ;;
1119 2.0|2.0.1) 1133 2.0|2.0.1)
1120 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1134 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1121 ;; 1135 ;;
1151 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1165 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1152 *) die "makeself cant handle exe '${exe}'" 1166 *) die "makeself cant handle exe '${exe}'"
1153 esac 1167 esac
1154 1168
1155 # lets grab the first few bytes of the file to figure out what kind of archive it is 1169 # lets grab the first few bytes of the file to figure out what kind of archive it is
1156 local tmpfile="$(emktemp)" 1170 local tmpfile=$(emktemp)
1157 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1171 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1158 local filetype="$(file -b "${tmpfile}")" 1172 local filetype=$(file -b "${tmpfile}")
1159 case ${filetype} in 1173 case ${filetype} in
1160 *tar\ archive) 1174 *tar\ archive*)
1161 eval ${exe} | tar --no-same-owner -xf - 1175 eval ${exe} | tar --no-same-owner -xf -
1162 ;; 1176 ;;
1163 bzip2*) 1177 bzip2*)
1164 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1178 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1165 ;; 1179 ;;
1201 # accepted ... if we don't find a match, we make the user accept 1215 # accepted ... if we don't find a match, we make the user accept
1202 local shopts=$- 1216 local shopts=$-
1203 local alic 1217 local alic
1204 set -o noglob #so that bash doesn't expand "*" 1218 set -o noglob #so that bash doesn't expand "*"
1205 for alic in ${ACCEPT_LICENSE} ; do 1219 for alic in ${ACCEPT_LICENSE} ; do
1206 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1220 if [[ ${alic} == ${l} ]]; then
1207 set +o noglob; set -${shopts} #reset old shell opts 1221 set +o noglob; set -${shopts} #reset old shell opts
1208 return 0 1222 return 0
1209 fi 1223 fi
1210 done 1224 done
1211 set +o noglob; set -$shopts #reset old shell opts 1225 set +o noglob; set -$shopts #reset old shell opts
1212 1226
1213 local licmsg="$(emktemp)" 1227 local licmsg=$(emktemp)
1214 cat << EOF > ${licmsg} 1228 cat <<-EOF > ${licmsg}
1215********************************************************** 1229 **********************************************************
1216The following license outlines the terms of use of this 1230 The following license outlines the terms of use of this
1217package. You MUST accept this license for installation to 1231 package. You MUST accept this license for installation to
1218continue. When you are done viewing, hit 'q'. If you 1232 continue. When you are done viewing, hit 'q'. If you
1219CTRL+C out of this, the install will not run! 1233 CTRL+C out of this, the install will not run!
1220********************************************************** 1234 **********************************************************
1221 1235
1222EOF 1236 EOF
1223 cat ${lic} >> ${licmsg} 1237 cat ${lic} >> ${licmsg}
1224 ${PAGER:-less} ${licmsg} || die "Could not execute pager (${PAGER}) to accept ${lic}" 1238 ${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] " 1239 einfon "Do you accept the terms of this license (${l})? [yes/no] "
1226 read alic 1240 read alic
1227 case ${alic} in 1241 case ${alic} in
1244# and when the function returns, you can assume that the cd has been 1258# and when the function returns, you can assume that the cd has been
1245# found at CDROM_ROOT. 1259# found at CDROM_ROOT.
1246# 1260#
1247# normally the cdrom functions will refer to the cds as 'cd #1', 'cd #2', 1261# 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 1262# etc... if you want to give the cds better names, then just export
1249# the CDROM_NAME_X variables before calling cdrom_get_cds(). 1263# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1264# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1265# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1266# CDROM_NAME_2="data cd"
1267# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1250# 1268#
1251# for those multi cd ebuilds, see the cdrom_load_next_cd() below. 1269# for those multi cd ebuilds, see the cdrom_load_next_cd() below.
1252# 1270#
1253# Usage: cdrom_get_cds <file on cd1> [file on cd2] [file on cd3] [...] 1271# 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 1272# - 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 1273# the cd ... the more files you give this function, the more cds
1256# the cdrom functions will handle 1274# the cdrom functions will handle
1257cdrom_get_cds() { 1275cdrom_get_cds() {
1258 # first we figure out how many cds we're dealing with by 1276 # first we figure out how many cds we're dealing with by
1259 # the # of files they gave us 1277 # the # of files they gave us
1260 local cdcnt=0 1278 local cdcnt=0
1261 local f= 1279 local f=
1305 echo 1323 echo
1306 einfo "For example:" 1324 einfo "For example:"
1307 einfo "export CD_ROOT=/mnt/cdrom" 1325 einfo "export CD_ROOT=/mnt/cdrom"
1308 echo 1326 echo
1309 else 1327 else
1328 if [[ -n ${CDROM_NAME_SET} ]] ; then
1329 # Translate the CDROM_NAME_SET array into CDROM_NAME_#
1330 cdcnt=0
1331 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1332 ((++cdcnt))
1333 export CDROM_NAME_${cdcnt}="${CDROM_NAME_SET[$((${cdcnt}-1))]}"
1334 done
1335 fi
1336
1310 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1337 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1311 cdcnt=0 1338 cdcnt=0
1312 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do 1339 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1313 ((++cdcnt)) 1340 ((++cdcnt))
1314 var="CDROM_NAME_${cdcnt}" 1341 var="CDROM_NAME_${cdcnt}"
1381 1408
1382 while [[ -n ${cdset[${i}]} ]] ; do 1409 while [[ -n ${cdset[${i}]} ]] ; do
1383 local dir=$(dirname ${cdset[${i}]}) 1410 local dir=$(dirname ${cdset[${i}]})
1384 local file=$(basename ${cdset[${i}]}) 1411 local file=$(basename ${cdset[${i}]})
1385 1412
1386 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1413 local point= node= fs= foo=
1387 [[ -d ${mline}/${dir} ]] || continue 1414 while read point node fs foo ; do
1415 [[ " cd9660 iso9660 udf " != *" ${fs} "* ]] && \
1416 ! [[ ${fs} == "subfs" && ",${opts}," == *",fs=cdfss,"* ]] \
1417 && continue
1418 point=${point//\040/ }
1388 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1419 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1389 export CDROM_ROOT=${mline} 1420 export CDROM_ROOT=${point}
1390 export CDROM_SET=${i} 1421 export CDROM_SET=${i}
1391 export CDROM_MATCH=${cdset[${i}]} 1422 export CDROM_MATCH=${cdset[${i}]}
1392 return 1423 return
1393 fi 1424 done <<< "$(get_mounts)"
1394 done
1395 1425
1396 ((++i)) 1426 ((++i))
1397 done 1427 done
1398 1428
1399 echo 1429 echo
1427 1457
1428# Make sure that LINGUAS only contains languages that 1458# Make sure that LINGUAS only contains languages that
1429# a package can support 1459# a package can support
1430# 1460#
1431# usage: strip-linguas <allow LINGUAS> 1461# usage: strip-linguas <allow LINGUAS>
1432# strip-linguas -i <directories of .po files> 1462# strip-linguas -i <directories of .po files>
1433# strip-linguas -u <directories of .po files> 1463# strip-linguas -u <directories of .po files>
1434# 1464#
1435# The first form allows you to specify a list of LINGUAS. 1465# The first form allows you to specify a list of LINGUAS.
1436# The -i builds a list of po files found in all the 1466# The -i builds a list of po files found in all the
1437# directories and uses the intersection of the lists. 1467# directories and uses the intersection of the lists.
1438# The -u builds a list of po files found in all the 1468# The -u builds a list of po files found in all the
1439# directories and uses the union of the lists. 1469# directories and uses the union of the lists.
1440strip-linguas() { 1470strip-linguas() {
1441 local ls newls 1471 local ls newls nols
1442 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1472 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1443 local op=$1; shift 1473 local op=$1; shift
1444 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1474 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1445 local d f 1475 local d f
1446 for d in "$@" ; do 1476 for d in "$@" ; do
1460 done 1490 done
1461 else 1491 else
1462 ls="$@" 1492 ls="$@"
1463 fi 1493 fi
1464 1494
1495 nols=""
1465 newls="" 1496 newls=""
1466 for f in ${LINGUAS} ; do 1497 for f in ${LINGUAS} ; do
1467 if hasq ${f} ${ls} ; then 1498 if hasq ${f} ${ls} ; then
1468 newls="${newls} ${f}" 1499 newls="${newls} ${f}"
1469 else 1500 else
1470 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1501 nols="${nols} ${f}"
1471 fi 1502 fi
1472 done 1503 done
1504 [[ -n ${nols} ]] \
1505 && ewarn "Sorry, but ${PN} does not support the LINGUAs:" ${nols}
1473 export LINGUAS=${newls:1} 1506 export LINGUAS=${newls:1}
1474} 1507}
1475 1508
1476# moved from kernel.eclass since they are generally useful outside of 1509# moved from kernel.eclass since they are generally useful outside of
1477# kernel.eclass -iggy (20041002) 1510# kernel.eclass -iggy (20041002)
1485 while ((i--)) ; do 1518 while ((i--)) ; do
1486 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1519 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1487 done 1520 done
1488 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1521 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1489 case ${ARCH} in 1522 case ${ARCH} in
1490 x86) export ARCH="i386";; 1523 x86) export ARCH="i386";;
1491 amd64) export ARCH="x86_64";; 1524 amd64) export ARCH="x86_64";;
1492 hppa) export ARCH="parisc";; 1525 hppa) export ARCH="parisc";;
1493 mips) export ARCH="mips";; 1526 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! 1527 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}";; 1528 *) export ARCH="${ARCH}";;
1496 esac 1529 esac
1497} 1530}
1498 1531
1499# set's ARCH back to what portage expects 1532# set's ARCH back to what portage expects
1500set_arch_to_portage() { 1533set_arch_to_portage() {
1507 1540
1508# Jeremy Huddleston <eradicator@gentoo.org>: 1541# Jeremy Huddleston <eradicator@gentoo.org>:
1509# preserve_old_lib /path/to/libblah.so.0 1542# preserve_old_lib /path/to/libblah.so.0
1510# preserve_old_lib_notify /path/to/libblah.so.0 1543# preserve_old_lib_notify /path/to/libblah.so.0
1511# 1544#
1512# These functions are useful when a lib in your package changes --library. Such 1545# 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 1546# 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 1547# 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 1548# 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: 1549# solution, so instead you can add the following to your ebuilds:
1517# 1550#
1518# src_install() { 1551# pkg_preinst() {
1519# ... 1552# ...
1520# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1553# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1521# ... 1554# ...
1522# } 1555# }
1523# 1556#
1526# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1559# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1527# ... 1560# ...
1528# } 1561# }
1529 1562
1530preserve_old_lib() { 1563preserve_old_lib() {
1531 LIB=$1 1564 if [[ ${EBUILD_PHASE} != "preinst" ]] ; then
1565 eerror "preserve_old_lib() must be called from pkg_preinst() only"
1566 die "Invalid preserve_old_lib() usage"
1567 fi
1568 [[ -z $1 ]] && die "Usage: preserve_old_lib <library to preserve> [more libraries to preserve]"
1532 1569
1533 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1570 local lib dir
1534 SONAME=`basename ${LIB}` 1571 for lib in "$@" ; do
1535 DIRNAME=`dirname ${LIB}` 1572 [[ -e ${ROOT}/${lib} ]] || continue
1536 1573 dir=${lib%/*}
1537 dodir ${DIRNAME} 1574 dodir ${dir} || die "dodir ${dir} failed"
1538 cp ${ROOT}${LIB} ${D}${DIRNAME} 1575 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1539 touch ${D}${LIB} 1576 touch "${D}"/${lib}
1540 fi 1577 done
1541} 1578}
1542 1579
1543preserve_old_lib_notify() { 1580preserve_old_lib_notify() {
1544 LIB=$1 1581 if [[ ${EBUILD_PHASE} != "postinst" ]] ; then
1582 eerror "preserve_old_lib_notify() must be called from pkg_postinst() only"
1583 die "Invalid preserve_old_lib_notify() usage"
1584 fi
1545 1585
1546 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1586 local lib notice=0
1547 SONAME=`basename ${LIB}` 1587 for lib in "$@" ; do
1548 1588 [[ -e ${ROOT}/${lib} ]] || continue
1589 if [[ ${notice} -eq 0 ]] ; then
1590 notice=1
1549 ewarn "An old version of an installed library was detected on your system." 1591 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" 1592 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," 1593 ewarn "the libraries are not being removed. You need to run revdep-rebuild"
1552 ewarn "you will need to execute the following command:" 1594 ewarn "in order to remove these old dependencies. If you do not have this"
1553 ewarn " revdep-rebuild --library ${SONAME}" 1595 ewarn "helper program, simply emerge the 'gentoolkit' package."
1554 ewarn 1596 ewarn
1555 ewarn "After doing that, you can safely remove ${LIB}"
1556 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1557 fi 1597 fi
1598 ewarn " # revdep-rebuild --library ${lib##*/}"
1599 done
1558} 1600}
1559 1601
1560# Hack for people to figure out if a package was built with 1602# Hack for people to figure out if a package was built with
1561# certain USE flags 1603# certain USE flags
1562# 1604#
1563# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1605# Usage: built_with_use [--missing <action>] [-a|-o] <DEPEND ATOM> <List of USE flags>
1564# ex: built_with_use xchat gtk2 1606# ex: built_with_use xchat gtk2
1565# 1607#
1566# Flags: -a all USE flags should be utilized 1608# Flags: -a all USE flags should be utilized
1567# -o at least one USE flag should be utilized 1609# -o at least one USE flag should be utilized
1610# --missing peform the specified action if the flag is not in IUSE (true/false/die)
1611# --hidden USE flag we're checking is hidden expanded so it isnt in IUSE
1568# Note: the default flag is '-a' 1612# Note: the default flag is '-a'
1569built_with_use() { 1613built_with_use() {
1614 local hidden="no"
1615 if [[ $1 == "--hidden" ]] ; then
1616 hidden="yes"
1617 shift
1618 fi
1619
1620 local missing_action="die"
1621 if [[ $1 == "--missing" ]] ; then
1622 missing_action=$2
1623 shift ; shift
1624 case ${missing_action} in
1625 true|false|die) ;;
1626 *) die "unknown action '${missing_action}'";;
1627 esac
1628 fi
1629
1570 local opt=$1 1630 local opt=$1
1571 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1631 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1572 1632
1573 local PKG=$(best_version $1) 1633 local PKG=$(best_version $1)
1634 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1574 shift 1635 shift
1575 1636
1576 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE 1637 local USEFILE=${ROOT}/var/db/pkg/${PKG}/USE
1638 local IUSEFILE=${ROOT}/var/db/pkg/${PKG}/IUSE
1577 1639
1578 # if the USE file doesnt exist, assume the $PKG is either 1640 # if the IUSE file doesn't exist, the read will error out, we need to handle
1579 # injected or package.provided 1641 # this gracefully
1580 [[ ! -e ${USEFILE} ]] && return 0 1642 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1643 case ${missing_action} in
1644 true) return 0;;
1645 false) return 1;;
1646 die) die "Unable to determine what USE flags $PKG was built with";;
1647 esac
1648 fi
1649
1650 if [[ ${hidden} == "no" ]] ; then
1651 local IUSE_BUILT=$(<${IUSEFILE})
1652 # Don't check USE_EXPAND #147237
1653 local expand
1654 for expand in $(echo ${USE_EXPAND} | tr '[:upper:]' '[:lower:]') ; do
1655 if [[ $1 == ${expand}_* ]] ; then
1656 expand=""
1657 break
1658 fi
1659 done
1660 if [[ -n ${expand} ]] ; then
1661 if ! has $1 ${IUSE_BUILT} ; then
1662 case ${missing_action} in
1663 true) return 0;;
1664 false) return 1;;
1665 die) die "$PKG does not actually support the $1 USE flag!";;
1666 esac
1667 fi
1668 fi
1669 fi
1581 1670
1582 local USE_BUILT=$(<${USEFILE}) 1671 local USE_BUILT=$(<${USEFILE})
1583 while [[ $# -gt 0 ]] ; do 1672 while [[ $# -gt 0 ]] ; do
1584 if [[ ${opt} = "-o" ]] ; then 1673 if [[ ${opt} = "-o" ]] ; then
1585 has $1 ${USE_BUILT} && return 0 1674 has $1 ${USE_BUILT} && return 0
1600 local f 1689 local f
1601 for f in $(find ${dir} -name configure) ; do 1690 for f in $(find ${dir} -name configure) ; do
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1691 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1692 done
1604 eend 0 1693 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} 1694}
1629 1695
1630# make a wrapper script ... 1696# make a wrapper script ...
1631# NOTE: this was originally games_make_wrapper, but I noticed other places where 1697# 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 1698# 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.282

  ViewVC Help
Powered by ViewVC 1.1.20