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

Diff of /eclass/eutils.eclass

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

Revision 1.248 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.248 2006/08/19 13:52:02 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!
37 done 37 done
38 fi 38 fi
39} 39}
40 40
41# This function generate linker scripts in /usr/lib for dynamic 41# This function generate linker scripts in /usr/lib for dynamic
42# 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
43# 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
44# 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
45# 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
46# library search path. This cause many builds to fail. 46# library search path. This cause many builds to fail.
47# See bug #4411 for more info. 47# See bug #4411 for more info.
48# 48#
49# To use, simply call: 49# To use, simply call:
50# 50#
51# gen_usr_ldscript libfoo.so 51# gen_usr_ldscript libfoo.so
52# 52#
53# Note that you should in general use the unversioned name of 53# Note that you should in general use the unversioned name of
54# the library, as ldconfig should usually update it correctly 54# the library, as ldconfig should usually update it correctly
55# to point to the latest version of the library present. 55# to point to the latest version of the library present.
56# 56#
93# Default options for patch 93# Default options for patch
94# 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
95# 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.
96# Set -E to automatically remove empty files. 96# Set -E to automatically remove empty files.
97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch" 97EPATCH_OPTS="-g0 -E --no-backup-if-mismatch"
98# 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,
99# and not the full path .. 99# and not the full path ..
100EPATCH_EXCLUDE="" 100EPATCH_EXCLUDE=""
101# Change the printed message for a single patch. 101# Change the printed message for a single patch.
102EPATCH_SINGLE_MSG="" 102EPATCH_SINGLE_MSG=""
103# Change the printed message for multiple patches. 103# Change the printed message for multiple patches.
104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..." 104EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
105# Force applying bulk patches even if not following the style: 105# Force applying bulk patches even if not following the style:
106# 106#
107# ??_${ARCH}_foo.${EPATCH_SUFFIX} 107# ??_${ARCH}_foo.${EPATCH_SUFFIX}
108# 108#
109EPATCH_FORCE="no" 109EPATCH_FORCE="no"
110 110
111# 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
112# or two patches. 112# or two patches.
123# 123#
124# Patches are applied in current directory. 124# Patches are applied in current directory.
125# 125#
126# Bulk Patches should preferibly have the form of: 126# Bulk Patches should preferibly have the form of:
127# 127#
128# ??_${ARCH}_foo.${EPATCH_SUFFIX} 128# ??_${ARCH}_foo.${EPATCH_SUFFIX}
129# 129#
130# For example: 130# For example:
131# 131#
132# 01_all_misc-fix.patch.bz2 132# 01_all_misc-fix.patch.bz2
133# 02_sparc_another-fix.patch.bz2 133# 02_sparc_another-fix.patch.bz2
134# 134#
135# 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
136# specific patches. 136# specific patches.
137# 137#
138# 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
226 fi 226 fi
227 for x in ${EPATCH_SOURCE} 227 for x in ${EPATCH_SOURCE}
228 do 228 do
229 # New ARCH dependant patch naming scheme ... 229 # New ARCH dependant patch naming scheme ...
230 # 230 #
231 # ???_arch_foo.patch 231 # ???_arch_foo.patch
232 # 232 #
233 if [ -f ${x} ] && \ 233 if [ -f ${x} ] && \
234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \ 234 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
235 [ "${EPATCH_FORCE}" = "yes" ]) 235 [ "${EPATCH_FORCE}" = "yes" ])
236 then 236 then
237 local count=0 237 local count=0
238 local popts="${EPATCH_OPTS}" 238 local popts="${EPATCH_OPTS}"
239 local patchname=${x##*/} 239 local patchname=${x##*/}
240 240
268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 268 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 269 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
270 270
271 if [ "${PATCH_SUFFIX}" != "patch" ] 271 if [ "${PATCH_SUFFIX}" != "patch" ]
272 then 272 then
273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 273 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 274 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 else 275 else
276 PATCH_TARGET="${x}" 276 PATCH_TARGET="${x}"
277 fi 277 fi
278 278
279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 279 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
280 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##*/}
281 281
282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 282 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 283 _epatch_draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
284 284
366 [[ -z ${T} ]] \ 366 [[ -z ${T} ]] \
367 && topdir="/tmp" \ 367 && topdir="/tmp" \
368 || topdir=${T} 368 || topdir=${T}
369 fi 369 fi
370 370
371 if [[ -z $(type -p mktemp) ]] ; then 371 if ! type -P mktemp > /dev/null ; then
372 # system lacks `mktemp` so we have to fake it
372 local tmp=/ 373 local tmp=/
373 while [[ -e ${tmp} ]] ; do 374 while [[ -e ${tmp} ]] ; do
374 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM} 375 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
375 done 376 done
376 ${exe} "${tmp}" || ${exe} -p "${tmp}" 377 ${exe} "${tmp}" || ${exe} -p "${tmp}"
377 echo "${tmp}" 378 echo "${tmp}"
378 else 379 else
380 # the args here will give slightly wierd names on BSD,
381 # but should produce a usable file on all userlands
379 if [[ ${exe} == "touch" ]] ; then 382 if [[ ${exe} == "touch" ]] ; then
380 [[ ${USERLAND} == "GNU" ]] \
381 && mktemp -p "${topdir}" \
382 || TMPDIR="${topdir}" mktemp -t tmp 383 TMPDIR="${topdir}" mktemp -t tmp.XXXXXXXXXX
383 else 384 else
384 [[ ${USERLAND} == "GNU" ]] \
385 && mktemp -d "${topdir}" \
386 || TMPDIR="${topdir}" mktemp -dt tmp 385 TMPDIR="${topdir}" mktemp -dt tmp.XXXXXXXXXX
387 fi 386 fi
388 fi 387 fi
389} 388}
390 389
391# Small wrapper for getent (Linux), nidump (Mac OS X), 390# Small wrapper for getent (Linux), nidump (Mac OS X),
454 eerror "No username specified !" 453 eerror "No username specified !"
455 die "Cannot call enewuser without a username" 454 die "Cannot call enewuser without a username"
456 fi 455 fi
457 456
458 # lets see if the username already exists 457 # lets see if the username already exists
459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then 458 if [[ -n $(egetent passwd "${euser}") ]] ; then
460 return 0 459 return 0
461 fi 460 fi
462 einfo "Adding user '${euser}' to your system ..." 461 einfo "Adding user '${euser}' to your system ..."
463 462
464 # options to pass to useradd 463 # options to pass to useradd
465 local opts= 464 local opts=
466 465
467 # handle uid 466 # handle uid
468 local euid=$1; shift 467 local euid=$1; shift
469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then 468 if [[ -n ${euid} && ${euid} != -1 ]] ; then
470 if [[ ${euid} -gt 0 ]] ; then 469 if [[ ${euid} -gt 0 ]] ; then
471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then 470 if [[ -n $(egetent passwd ${euid}) ]] ; then
472 euid="next" 471 euid="next"
473 fi 472 fi
474 else 473 else
475 eerror "Userid given but is not greater than 0 !" 474 eerror "Userid given but is not greater than 0 !"
476 die "${euid} is not a valid UID" 475 die "${euid} is not a valid UID"
477 fi 476 fi
478 else 477 else
479 euid="next" 478 euid="next"
480 fi 479 fi
481 if [[ ${euid} == "next" ]] ; then 480 if [[ ${euid} == "next" ]] ; then
482 for euid in $(seq 101 999) ; do 481 for ((euid = 101; euid <= 999; euid++)); do
483 [[ -z $(egetent passwd ${euid}) ]] && break 482 [[ -z $(egetent passwd ${euid}) ]] && break
484 done 483 done
485 fi 484 fi
486 opts="${opts} -u ${euid}" 485 opts="${opts} -u ${euid}"
487 einfo " - Userid: ${euid}" 486 einfo " - Userid: ${euid}"
501 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
502 [[ -x ${ROOT}${shell} ]] && break 501 [[ -x ${ROOT}${shell} ]] && break
503 done 502 done
504 503
505 if [[ ${shell} == "/dev/null" ]] ; then 504 if [[ ${shell} == "/dev/null" ]] ; then
506 eerror "Unable to identify the shell to use" 505 eerror "Unable to identify the shell to use, proceeding with userland default."
507 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
508 fi 512 fi
509 513
510 eshell=${shell} 514 eshell=${shell}
511 fi 515 fi
512 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
657 eerror "No group specified !" 661 eerror "No group specified !"
658 die "Cannot call enewgroup without a group" 662 die "Cannot call enewgroup without a group"
659 fi 663 fi
660 664
661 # see if group already exists 665 # see if group already exists
662 if [ "${egroup}" == "`egetent group \"${egroup}\" | cut -d: -f1`" ] 666 if [[ -n $(egetent group "${egroup}") ]]; then
663 then
664 return 0 667 return 0
665 fi 668 fi
666 einfo "Adding group '${egroup}' to your system ..." 669 einfo "Adding group '${egroup}' to your system ..."
667 670
668 # options to pass to useradd 671 # options to pass to useradd
711 fi 714 fi
712 715
713 # If we need the next available 716 # If we need the next available
714 case ${egid} in 717 case ${egid} in
715 *[!0-9]*) # Non numeric 718 *[!0-9]*) # Non numeric
716 for egid in $(seq 101 999); do 719 for ((egid = 101; egid <= 999; egid++)); do
717 [ -z "`egetent group ${egid}`" ] && break 720 [[ -z $(egetent group ${egid}) ]] && break
718 done 721 done
719 esac 722 esac
720 dscl . create /groups/${egroup} gid ${egid} 723 dscl . create /groups/${egroup} gid ${egid}
721 dscl . create /groups/${egroup} passwd '*' 724 dscl . create /groups/${egroup} passwd '*'
722 ;; 725 ;;
723 726
724 *-freebsd*|*-dragonfly*) 727 *-freebsd*|*-dragonfly*)
725 case ${egid} in 728 case ${egid} in
726 *[!0-9]*) # Non numeric 729 *[!0-9]*) # Non numeric
727 for egid in $(seq 101 999); do 730 for ((egid = 101; egid <= 999; egid++)); do
728 [ -z "`egetent group ${egid}`" ] && break 731 [[ -z $(egetent group ${egid}) ]] && break
729 done 732 done
730 esac 733 esac
731 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 734 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
732 ;; 735 ;;
733 736
734 *-netbsd*) 737 *-netbsd*)
735 case ${egid} in 738 case ${egid} in
736 *[!0-9]*) # Non numeric 739 *[!0-9]*) # Non numeric
737 for egid in $(seq 101 999); do 740 for ((egid = 101; egid <= 999; egid++)); do
738 [ -z "`egetent group ${egid}`" ] && break 741 [[ -z $(egetent group ${egid}) ]] && break
739 done 742 done
740 esac 743 esac
741 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 744 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
742 ;; 745 ;;
743 746
751# Simple script to replace 'dos2unix' binaries 754# Simple script to replace 'dos2unix' binaries
752# vapier@gentoo.org 755# vapier@gentoo.org
753# 756#
754# edos2unix(file, <more files> ...) 757# edos2unix(file, <more files> ...)
755edos2unix() { 758edos2unix() {
756 for f in "$@" 759 echo "$@" | xargs sed -i 's/\r$//'
757 do
758 cp "${f}" ${T}/edos2unix
759 sed 's/\r$//' ${T}/edos2unix > "${f}"
760 done
761} 760}
762 761
763 762
764############################################################## 763##############################################################
765# START: Handle .desktop files and menu entries # 764# START: Handle .desktop files and menu entries #
766# maybe this should be separated into a new eclass some time # 765# maybe this should be separated into a new eclass some time #
767# lanius@gentoo.org # 766# lanius@gentoo.org #
768############################################################## 767##############################################################
769 768
770# Make a desktop file ! 769# Make a desktop file !
771# Great for making those icons in kde/gnome startmenu ! 770# Great for making those icons in kde/gnome startmenu !
772# Amaze your friends ! Get the women ! Join today ! 771# Amaze your friends ! Get the women ! Join today !
773# 772#
774# make_desktop_entry(<command>, [name], [icon], [type], [path]) 773# make_desktop_entry(<command>, [name], [icon], [type], [path])
775# 774#
776# binary: what command does the app run with ? 775# binary: what command does the app run with ?
777# name: the name that will show up in the menu 776# name: the name that will show up in the menu
778# icon: give your little like a pretty little icon ... 777# icon: give your little like a pretty little icon ...
779# this can be relative (to /usr/share/pixmaps) or 778# this can be relative (to /usr/share/pixmaps) or
780# a full path to an icon 779# a full path to an icon
781# type: what kind of application is this ? for categories: 780# type: what kind of application is this ? for categories:
782# http://www.freedesktop.org/Standards/desktop-entry-spec 781# http://www.freedesktop.org/Standards/desktop-entry-spec
783# path: if your app needs to startup in a specific dir 782# path: if your app needs to startup in a specific dir
784make_desktop_entry() { 783make_desktop_entry() {
785 [[ -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
786 785
794 local catmaj=${CATEGORY%%-*} 793 local catmaj=${CATEGORY%%-*}
795 local catmin=${CATEGORY##*-} 794 local catmin=${CATEGORY##*-}
796 case ${catmaj} in 795 case ${catmaj} in
797 app) 796 app)
798 case ${catmin} in 797 case ${catmin} in
799 admin) type=System;; 798 admin) type=System;;
800 cdr) type=DiscBurning;; 799 cdr) type=DiscBurning;;
801 dicts) type=Dictionary;; 800 dicts) type=Dictionary;;
802 editors) type=TextEditor;; 801 editors) type=TextEditor;;
803 emacs) type=TextEditor;; 802 emacs) type=TextEditor;;
804 emulation) type=Emulator;; 803 emulation) type=Emulator;;
805 laptop) type=HardwareSettings;; 804 laptop) type=HardwareSettings;;
806 office) type=Office;; 805 office) type=Office;;
807 vim) type=TextEditor;; 806 vim) type=TextEditor;;
808 xemacs) type=TextEditor;; 807 xemacs) type=TextEditor;;
809 *) type=;; 808 *) type=;;
810 esac 809 esac
811 ;; 810 ;;
812 811
813 dev) 812 dev)
814 type="Development" 813 type="Development"
815 ;; 814 ;;
816 815
817 games) 816 games)
818 case ${catmin} in 817 case ${catmin} in
819 action) type=ActionGame;; 818 action|fps) type=ActionGame;;
820 arcade) type=ArcadeGame;; 819 arcade) type=ArcadeGame;;
821 board) type=BoardGame;; 820 board) type=BoardGame;;
822 kid) type=KidsGame;; 821 kids) type=KidsGame;;
823 emulation) type=Emulator;; 822 emulation) type=Emulator;;
824 puzzle) type=LogicGame;; 823 puzzle) type=LogicGame;;
825 rpg) type=RolePlaying;; 824 rpg) type=RolePlaying;;
826 roguelike) type=RolePlaying;; 825 roguelike) type=RolePlaying;;
827 simulation) type=Simulation;; 826 simulation) type=Simulation;;
828 sports) type=SportsGame;; 827 sports) type=SportsGame;;
829 strategy) type=StrategyGame;; 828 strategy) type=StrategyGame;;
830 *) type=;; 829 *) type=;;
831 esac 830 esac
832 type="Game;${type}" 831 type="Game;${type}"
833 ;; 832 ;;
834 833
835 mail) 834 mail)
839 media) 838 media)
840 case ${catmin} in 839 case ${catmin} in
841 gfx) type=Graphics;; 840 gfx) type=Graphics;;
842 radio) type=Tuner;; 841 radio) type=Tuner;;
843 sound) type=Audio;; 842 sound) type=Audio;;
844 tv) type=TV;; 843 tv) type=TV;;
845 video) type=Video;; 844 video) type=Video;;
846 *) type=;; 845 *) type=;;
847 esac 846 esac
848 type="AudioVideo;${type}" 847 type="AudioVideo;${type}"
849 ;; 848 ;;
850 849
851 net) 850 net)
852 case ${catmin} in 851 case ${catmin} in
853 dialup) type=Dialup;; 852 dialup) type=Dialup;;
854 ftp) type=FileTransfer;; 853 ftp) type=FileTransfer;;
855 im) type=InstantMessaging;; 854 im) type=InstantMessaging;;
856 irc) type=IRCClient;; 855 irc) type=IRCClient;;
857 mail) type=Email;; 856 mail) type=Email;;
858 news) type=News;; 857 news) type=News;;
859 nntp) type=News;; 858 nntp) type=News;;
860 p2p) type=FileTransfer;; 859 p2p) type=FileTransfer;;
861 *) type=;; 860 *) type=;;
862 esac 861 esac
863 type="Network;${type}" 862 type="Network;${type}"
864 ;; 863 ;;
865 864
866 sci) 865 sci)
867 case ${catmin} in 866 case ${catmin} in
868 astro*) type=Astronomy;; 867 astro*) type=Astronomy;;
869 bio*) type=Biology;; 868 bio*) type=Biology;;
870 calc*) type=Calculator;; 869 calc*) type=Calculator;;
871 chem*) type=Chemistry;; 870 chem*) type=Chemistry;;
872 geo*) type=Geology;; 871 geo*) type=Geology;;
873 math*) type=Math;; 872 math*) type=Math;;
874 *) type=;; 873 *) type=;;
875 esac 874 esac
876 type="Science;${type}" 875 type="Science;${type}"
877 ;; 876 ;;
878 877
879 www) 878 www)
880 case ${catmin} in 879 case ${catmin} in
881 client) type=WebBrowser;; 880 client) type=WebBrowser;;
882 *) type=;; 881 *) type=;;
883 esac 882 esac
884 type="Network" 883 type="Network"
885 ;; 884 ;;
886 885
887 *) 886 *)
892 if [ "${SLOT}" == "0" ] ; then 891 if [ "${SLOT}" == "0" ] ; then
893 local desktop_name="${PN}" 892 local desktop_name="${PN}"
894 else 893 else
895 local desktop_name="${PN}-${SLOT}" 894 local desktop_name="${PN}-${SLOT}"
896 fi 895 fi
897 local desktop=${T}/${exec%% *}-${desktop_name}.desktop 896 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
898# local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 897 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
899 898
899 cat <<-EOF > "${desktop}"
900echo "[Desktop Entry] 900 [Desktop Entry]
901Encoding=UTF-8 901 Encoding=UTF-8
902Version=0.9.2 902 Version=0.9.2
903Name=${name} 903 Name=${name}
904Type=Application 904 Type=Application
905Comment=${DESCRIPTION} 905 Comment=${DESCRIPTION}
906Exec=${exec} 906 Exec=${exec}
907TryExec=${exec%% *} 907 TryExec=${exec%% *}
908Path=${path} 908 Path=${path}
909Icon=${icon} 909 Icon=${icon}
910Categories=Application;${type};" > "${desktop}" 910 Categories=Application;${type};
911 EOF
911 912
912 ( 913 (
913 # wrap the env here so that the 'insinto' call 914 # wrap the env here so that the 'insinto' call
914 # doesn't corrupt the env of the caller 915 # doesn't corrupt the env of the caller
915 insinto /usr/share/applications 916 insinto /usr/share/applications
916 doins "${desktop}" 917 doins "${desktop}"
917 ) 918 )
918} 919}
919 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
920# Make a GDM/KDM Session file 950# Make a GDM/KDM Session file
921# 951#
922# make_desktop_entry(<title>, <command>) 952# make_session_desktop(<title>, <command>)
923# title: File to execute to start the Window Manager 953# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 954# command: Name of the Window Manager
925 955
926make_session_desktop() { 956make_session_desktop() {
927 [[ -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
929 959
930 local title=$1 960 local title=$1
931 local command=$2 961 local command=$2
932 local desktop=${T}/${wm}.desktop 962 local desktop=${T}/${wm}.desktop
933 963
964 cat <<-EOF > "${desktop}"
934echo "[Desktop Entry] 965 [Desktop Entry]
935Encoding=UTF-8 966 Encoding=UTF-8
936Name=${title} 967 Name=${title}
937Comment=This session logs you into ${title} 968 Comment=This session logs you into ${title}
938Exec=${command} 969 Exec=${command}
939TryExec=${command} 970 TryExec=${command}
940Type=Application" > "${desktop}" 971 Type=Application
972 EOF
941 973
974 (
975 # wrap the env here so that the 'insinto' call
976 # doesn't corrupt the env of the caller
942 insinto /usr/share/xsessions 977 insinto /usr/share/xsessions
943 doins "${desktop}" 978 doins "${desktop}"
979 )
944} 980}
945 981
946domenu() { 982domenu() {
983 (
984 # wrap the env here so that the 'insinto' call
985 # doesn't corrupt the env of the caller
947 local i j 986 local i j ret=0
948 insinto /usr/share/applications 987 insinto /usr/share/applications
949 for i in "$@" ; do 988 for i in "$@" ; do
950 if [[ -f ${i} ]] ; then 989 if [[ -f ${i} ]] ; then
951 doins "${i}" 990 doins "${i}"
991 ((ret+=$?))
952 elif [[ -d ${i} ]] ; then 992 elif [[ -d ${i} ]] ; then
953 for j in "${i}"/*.desktop ; do 993 for j in "${i}"/*.desktop ; do
954 doins "${j}" 994 doins "${j}"
995 ((ret+=$?))
955 done 996 done
956 fi 997 fi
957 done 998 done
999 exit ${ret}
1000 )
958} 1001}
959newmenu() { 1002newmenu() {
1003 (
1004 # wrap the env here so that the 'insinto' call
1005 # doesn't corrupt the env of the caller
960 insinto /usr/share/applications 1006 insinto /usr/share/applications
961 newins "$1" "$2" 1007 newins "$@"
1008 )
962} 1009}
963 1010
964doicon() { 1011doicon() {
1012 (
1013 # wrap the env here so that the 'insinto' call
1014 # doesn't corrupt the env of the caller
965 local i j 1015 local i j ret
966 insinto /usr/share/pixmaps 1016 insinto /usr/share/pixmaps
967 for i in "$@" ; do 1017 for i in "$@" ; do
968 if [[ -f ${i} ]] ; then 1018 if [[ -f ${i} ]] ; then
969 doins "${i}" 1019 doins "${i}"
1020 ((ret+=$?))
970 elif [[ -d ${i} ]] ; then 1021 elif [[ -d ${i} ]] ; then
971 for j in "${i}"/*.png ; do 1022 for j in "${i}"/*.png ; do
972 doins "${j}" 1023 doins "${j}"
1024 ((ret+=$?))
973 done 1025 done
974 fi 1026 fi
975 done 1027 done
1028 exit ${ret}
1029 )
976} 1030}
977newicon() { 1031newicon() {
1032 (
1033 # wrap the env here so that the 'insinto' call
1034 # doesn't corrupt the env of the caller
978 insinto /usr/share/pixmaps 1035 insinto /usr/share/pixmaps
979 newins "$1" "$2" 1036 newins "$@"
1037 )
980} 1038}
981 1039
982############################################################## 1040##############################################################
983# END: Handle .desktop files and menu entries # 1041# END: Handle .desktop files and menu entries #
984############################################################## 1042##############################################################
985 1043
986 1044
987# for internal use only (unpack_pdv and unpack_makeself) 1045# for internal use only (unpack_pdv and unpack_makeself)
988find_unpackable_file() { 1046find_unpackable_file() {
1007# 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
1008# 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.
1009# 1067#
1010# Usage: unpack_pdv [file to unpack] [size of off_t] 1068# Usage: unpack_pdv [file to unpack] [size of off_t]
1011# - 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
1012# information out of the binary executable myself. basically you pass in 1070# information out of the binary executable myself. basically you pass in
1013# 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
1014# 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:
1015# strings <pdv archive> | grep lseek 1073# strings <pdv archive> | grep lseek
1016# strace -elseek <pdv archive> 1074# strace -elseek <pdv archive>
1017# 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
1018# 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
1019# parameter. here is an example: 1077# parameter. here is an example:
1020# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek 1078# root@vapier 0 pdv_unpack # strings hldsupdatetool.bin | grep lseek
1021# lseek 1079# lseek
1022# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1080# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1023# lseek(3, -4, SEEK_END) = 2981250 1081# lseek(3, -4, SEEK_END) = 2981250
1024# 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.
1025unpack_pdv() { 1083unpack_pdv() {
1026 local src=$(find_unpackable_file $1) 1084 local src=$(find_unpackable_file "$1")
1027 local sizeoff_t=$2 1085 local sizeoff_t=$2
1028 1086
1029 [[ -z ${src} ]] && die "Could not locate source for '$1'" 1087 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1030 [[ -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 :("
1031 1089
1032 local shrtsrc=$(basename "${src}") 1090 local shrtsrc=$(basename "${src}")
1033 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1091 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1034 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1092 local metaskip=$(tail -c ${sizeoff_t} "${src}" | hexdump -e \"%i\")
1035 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\")
1036 1094
1037 # grab metadata for debug reasons 1095 # grab metadata for debug reasons
1038 local metafile="$(emktemp)" 1096 local metafile=$(emktemp)
1039 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1097 tail -c +$((${metaskip}+1)) "${src}" > "${metafile}"
1040 1098
1041 # rip out the final file name from the metadata 1099 # rip out the final file name from the metadata
1042 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1100 local datafile=$(tail -c +$((${metaskip}+1)) "${src}" | strings | head -n 1)
1043 datafile="`basename ${datafile}`" 1101 datafile=$(basename "${datafile}")
1044 1102
1045 # now lets uncompress/untar the file if need be 1103 # now lets uncompress/untar the file if need be
1046 local tmpfile="$(emktemp)" 1104 local tmpfile=$(emktemp)
1047 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}
1048 1106
1049 local iscompressed="`file -b ${tmpfile}`" 1107 local iscompressed=$(file -b "${tmpfile}")
1050 if [ "${iscompressed:0:8}" == "compress" ] ; then 1108 if [[ ${iscompressed:0:8} == "compress" ]] ; then
1051 iscompressed=1 1109 iscompressed=1
1052 mv ${tmpfile}{,.Z} 1110 mv ${tmpfile}{,.Z}
1053 gunzip ${tmpfile} 1111 gunzip ${tmpfile}
1054 else 1112 else
1055 iscompressed=0 1113 iscompressed=0
1056 fi 1114 fi
1057 local istar="`file -b ${tmpfile}`" 1115 local istar=$(file -b "${tmpfile}")
1058 if [ "${istar:0:9}" == "POSIX tar" ] ; then 1116 if [[ ${istar:0:9} == "POSIX tar" ]] ; then
1059 istar=1 1117 istar=1
1060 else 1118 else
1061 istar=0 1119 istar=0
1062 fi 1120 fi
1063 1121
1099# many other game companies. 1157# many other game companies.
1100# 1158#
1101# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1159# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1102# - If the file is not specified then unpack will utilize ${A}. 1160# - If the file is not specified then unpack will utilize ${A}.
1103# - 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
1104# the proper offset from the script itself. 1162# the proper offset from the script itself.
1105unpack_makeself() { 1163unpack_makeself() {
1106 local src_input=${1:-${A}} 1164 local src_input=${1:-${A}}
1107 local src=$(find_unpackable_file "${src_input}") 1165 local src=$(find_unpackable_file "${src_input}")
1108 local skip=$2 1166 local skip=$2
1109 local exe=$3 1167 local exe=$3
1155 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}'";;
1156 *) die "makeself cant handle exe '${exe}'" 1214 *) die "makeself cant handle exe '${exe}'"
1157 esac 1215 esac
1158 1216
1159 # 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
1160 local tmpfile="$(emktemp)" 1218 local tmpfile=$(emktemp)
1161 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1219 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1162 local filetype="$(file -b "${tmpfile}")" 1220 local filetype=$(file -b "${tmpfile}")
1163 case ${filetype} in 1221 case ${filetype} in
1164 *tar\ archive) 1222 *tar\ archive*)
1165 eval ${exe} | tar --no-same-owner -xf - 1223 eval ${exe} | tar --no-same-owner -xf -
1166 ;; 1224 ;;
1167 bzip2*) 1225 bzip2*)
1168 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf - 1226 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1169 ;; 1227 ;;
1205 # 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
1206 local shopts=$- 1264 local shopts=$-
1207 local alic 1265 local alic
1208 set -o noglob #so that bash doesn't expand "*" 1266 set -o noglob #so that bash doesn't expand "*"
1209 for alic in ${ACCEPT_LICENSE} ; do 1267 for alic in ${ACCEPT_LICENSE} ; do
1210 if [[ ${alic} == * || ${alic} == ${l} ]]; then 1268 if [[ ${alic} == ${l} ]]; then
1211 set +o noglob; set -${shopts} #reset old shell opts 1269 set +o noglob; set -${shopts} #reset old shell opts
1212 return 0 1270 return 0
1213 fi 1271 fi
1214 done 1272 done
1215 set +o noglob; set -$shopts #reset old shell opts 1273 set +o noglob; set -$shopts #reset old shell opts
1216 1274
1217 local licmsg="$(emktemp)" 1275 local licmsg=$(emktemp)
1218 cat << EOF > ${licmsg} 1276 cat <<-EOF > ${licmsg}
1219********************************************************** 1277 **********************************************************
1220The following license outlines the terms of use of this 1278 The following license outlines the terms of use of this
1221package. You MUST accept this license for installation to 1279 package. You MUST accept this license for installation to
1222continue. When you are done viewing, hit 'q'. If you 1280 continue. When you are done viewing, hit 'q'. If you
1223CTRL+C out of this, the install will not run! 1281 CTRL+C out of this, the install will not run!
1224********************************************************** 1282 **********************************************************
1225 1283
1226EOF 1284 EOF
1227 cat ${lic} >> ${licmsg} 1285 cat ${lic} >> ${licmsg}
1228 ${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}"
1229 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] "
1230 read alic 1288 read alic
1231 case ${alic} in 1289 case ${alic} in
1249# found at CDROM_ROOT. 1307# found at CDROM_ROOT.
1250# 1308#
1251# 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',
1252# 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
1253# the appropriate CDROM_NAME variable before calling cdrom_get_cds(). 1311# the appropriate CDROM_NAME variable before calling cdrom_get_cds().
1254# - CDROM_NAME="fooie cd" - for when you only want 1 cd 1312# - CDROM_NAME="fooie cd" - for when you only want 1 cd
1255# - CDROM_NAME_1="install cd" - for when you want more than 1 cd 1313# - CDROM_NAME_1="install cd" - for when you want more than 1 cd
1256# CDROM_NAME_2="data cd" 1314# CDROM_NAME_2="data cd"
1257# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_# 1315# - CDROM_NAME_SET=( "install cd" "data cd" ) - short hand for CDROM_NAME_#
1258# 1316#
1259# 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.
1260# 1318#
1261# 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] [...]
1262# - 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
1263# 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
1264# the cdrom functions will handle 1322# the cdrom functions will handle
1265cdrom_get_cds() { 1323cdrom_get_cds() {
1266 # 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
1267 # the # of files they gave us 1325 # the # of files they gave us
1268 local cdcnt=0 1326 local cdcnt=0
1269 local f= 1327 local f=
1398 1456
1399 while [[ -n ${cdset[${i}]} ]] ; do 1457 while [[ -n ${cdset[${i}]} ]] ; do
1400 local dir=$(dirname ${cdset[${i}]}) 1458 local dir=$(dirname ${cdset[${i}]})
1401 local file=$(basename ${cdset[${i}]}) 1459 local file=$(basename ${cdset[${i}]})
1402 1460
1403 for mline in $(mount | gawk '/(iso|cdrom|fs=cdfss)/ {print $3}') ; do 1461 local point= node= fs= foo=
1404 [[ -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/ }
1405 if [[ -n $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] ; then 1467 [[ -z $(find "${point}/${dir}" -maxdepth 1 -iname "${file}") ]] && continue
1406 export CDROM_ROOT=${mline} 1468 export CDROM_ROOT=${point}
1407 export CDROM_SET=${i} 1469 export CDROM_SET=${i}
1408 export CDROM_MATCH=${cdset[${i}]} 1470 export CDROM_MATCH=${cdset[${i}]}
1409 return 1471 return
1410 fi 1472 done <<< "$(get_mounts)"
1411 done
1412 1473
1413 ((++i)) 1474 ((++i))
1414 done 1475 done
1415 1476
1416 echo 1477 echo
1444 1505
1445# Make sure that LINGUAS only contains languages that 1506# Make sure that LINGUAS only contains languages that
1446# a package can support 1507# a package can support
1447# 1508#
1448# usage: strip-linguas <allow LINGUAS> 1509# usage: strip-linguas <allow LINGUAS>
1449# strip-linguas -i <directories of .po files> 1510# strip-linguas -i <directories of .po files>
1450# strip-linguas -u <directories of .po files> 1511# strip-linguas -u <directories of .po files>
1451# 1512#
1452# The first form allows you to specify a list of LINGUAS. 1513# The first form allows you to specify a list of LINGUAS.
1453# 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
1454# directories and uses the intersection of the lists. 1515# directories and uses the intersection of the lists.
1455# 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
1456# directories and uses the union of the lists. 1517# directories and uses the union of the lists.
1457strip-linguas() { 1518strip-linguas() {
1458 local ls newls nols 1519 local ls newls nols
1459 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then 1520 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1460 local op=$1; shift 1521 local op=$1; shift
1461 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift 1522 ls=$(find "$1" -name '*.po' -exec basename {} .po \;); shift
1505 while ((i--)) ; do 1566 while ((i--)) ; do
1506 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1567 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1507 done 1568 done
1508 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1569 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1509 case ${ARCH} in 1570 case ${ARCH} in
1510 x86) export ARCH="i386";; 1571 x86) export ARCH="i386";;
1511 amd64) export ARCH="x86_64";; 1572 amd64) export ARCH="x86_64";;
1512 hppa) export ARCH="parisc";; 1573 hppa) export ARCH="parisc";;
1513 mips) export ARCH="mips";; 1574 mips) export ARCH="mips";;
1514 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!
1515 *) export ARCH="${ARCH}";; 1576 *) export ARCH="${ARCH}";;
1516 esac 1577 esac
1517} 1578}
1518 1579
1519# set's ARCH back to what portage expects 1580# set's ARCH back to what portage expects
1520set_arch_to_portage() { 1581set_arch_to_portage() {
1527 1588
1528# Jeremy Huddleston <eradicator@gentoo.org>: 1589# Jeremy Huddleston <eradicator@gentoo.org>:
1529# preserve_old_lib /path/to/libblah.so.0 1590# preserve_old_lib /path/to/libblah.so.0
1530# preserve_old_lib_notify /path/to/libblah.so.0 1591# preserve_old_lib_notify /path/to/libblah.so.0
1531# 1592#
1532# 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
1533# 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
1534# 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
1535# 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
1536# solution, so instead you can add the following to your ebuilds: 1597# solution, so instead you can add the following to your ebuilds:
1537# 1598#
1538# src_install() { 1599# pkg_preinst() {
1539# ... 1600# ...
1540# preserve_old_lib /usr/$(get_libdir)/libogg.so.0 1601# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1541# ... 1602# ...
1542# } 1603# }
1543# 1604#
1546# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0 1607# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1547# ... 1608# ...
1548# } 1609# }
1549 1610
1550preserve_old_lib() { 1611preserve_old_lib() {
1551 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]"
1552 1617
1553 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1618 local lib dir
1554 SONAME=`basename ${LIB}` 1619 for lib in "$@" ; do
1555 DIRNAME=`dirname ${LIB}` 1620 [[ -e ${ROOT}/${lib} ]] || continue
1556 1621 dir=${lib%/*}
1557 dodir ${DIRNAME} 1622 dodir ${dir} || die "dodir ${dir} failed"
1558 cp ${ROOT}${LIB} ${D}${DIRNAME} 1623 cp "${ROOT}"/${lib} "${D}"/${lib} || die "cp ${lib} failed"
1559 touch ${D}${LIB} 1624 touch "${D}"/${lib}
1560 fi 1625 done
1561} 1626}
1562 1627
1563preserve_old_lib_notify() { 1628preserve_old_lib_notify() {
1564 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
1565 1633
1566 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1634 local lib notice=0
1567 SONAME=`basename ${LIB}` 1635 for lib in "$@" ; do
1568 1636 [[ -e ${ROOT}/${lib} ]] || continue
1637 if [[ ${notice} -eq 0 ]] ; then
1638 notice=1
1569 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."
1570 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,"
1571 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"
1572 ewarn "you will need to execute the following command:" 1642 ewarn "in order to remove these old dependencies. If you do not have this"
1573 ewarn " revdep-rebuild --library ${SONAME}" 1643 ewarn "helper program, simply emerge the 'gentoolkit' package."
1574 ewarn 1644 ewarn
1575 ewarn "After doing that, you can safely remove ${LIB}"
1576 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1577 fi 1645 fi
1646 ewarn " # revdep-rebuild --library ${lib##*/}"
1647 done
1578} 1648}
1579 1649
1580# 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
1581# certain USE flags 1651# certain USE flags
1582# 1652#
1583# 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>
1584# ex: built_with_use xchat gtk2 1654# ex: built_with_use xchat gtk2
1585# 1655#
1586# Flags: -a all USE flags should be utilized 1656# Flags: -a all USE flags should be utilized
1587# -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
1588# Note: the default flag is '-a' 1660# Note: the default flag is '-a'
1589built_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
1590 local opt=$1 1678 local opt=$1
1591 [[ ${opt:0:1} = "-" ]] && shift || opt="-a" 1679 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1592 1680
1593 local PKG=$(best_version $1) 1681 local PKG=$(best_version $1)
1594 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package" 1682 [[ -z ${PKG} ]] && die "Unable to resolve $1 to an installed package"
1595 shift 1683 shift
1596 1684
1597 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
1598 1687
1599 # 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
1600 # injected or package.provided 1689 # this gracefully
1690 if [[ ! -e ${USEFILE} ]] || [[ ! -e ${IUSEFILE} && ${hidden} == "no" ]] ; then
1691 case ${missing_action} in
1692 true) return 0;;
1693 false) return 1;;
1601 [[ ! -e ${USEFILE} ]] && die "Unable to determine what USE flags $PKG was built with" 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
1602 1718
1603 local USE_BUILT=$(<${USEFILE}) 1719 local USE_BUILT=$(<${USEFILE})
1604 while [[ $# -gt 0 ]] ; do 1720 while [[ $# -gt 0 ]] ; do
1605 if [[ ${opt} = "-o" ]] ; then 1721 if [[ ${opt} = "-o" ]] ; then
1606 has $1 ${USE_BUILT} && return 0 1722 has $1 ${USE_BUILT} && return 0
1621 local f 1737 local f
1622 for f in $(find ${dir} -name configure) ; do 1738 for f in $(find ${dir} -name configure) ; do
1623 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
1624 done 1740 done
1625 eend 0 1741 eend 0
1626}
1627
1628# dopamd <file> [more files]
1629#
1630# Install pam auth config file in /etc/pam.d
1631dopamd() {
1632 [[ -z $1 ]] && die "dopamd requires at least one argument"
1633
1634 use pam || return 0
1635
1636 INSDESTTREE=/etc/pam.d \
1637 doins "$@" || die "failed to install $@"
1638}
1639# newpamd <old name> <new name>
1640#
1641# Install pam file <old name> as <new name> in /etc/pam.d
1642newpamd() {
1643 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1644
1645 use pam || return 0
1646
1647 INSDESTTREE=/etc/pam.d \
1648 newins "$1" "$2" || die "failed to install $1 as $2"
1649} 1742}
1650 1743
1651# make a wrapper script ... 1744# make a wrapper script ...
1652# 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
1653# 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.248  
changed lines
  Added in v.1.281

  ViewVC Help
Powered by ViewVC 1.1.20