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

Diff of /eclass/eutils.eclass

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

Revision 1.332 Revision 1.349
1# Copyright 1999-2009 Gentoo Foundation 1# Copyright 1999-2009 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.332 2010/02/17 02:22:43 reavertm Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.349 2010/08/19 21:32:26 vapier Exp $
4 4
5# @ECLASS: eutils.eclass 5# @ECLASS: eutils.eclass
6# @MAINTAINER: 6# @MAINTAINER:
7# base-system@gentoo.org 7# base-system@gentoo.org
8# @BLURB: many extra (but common) functions that are used in ebuilds 8# @BLURB: many extra (but common) functions that are used in ebuilds
52} 52}
53 53
54else 54else
55 55
56ebeep() { 56ebeep() {
57 eqawarn "QA Notice: ebeep is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org" 57 ewarn "QA Notice: ebeep is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
58} 58}
59 59
60epause() { 60epause() {
61 eqawarn "QA Notice: epause is not defined in EAPI=3, please file a bug at http://bugs.gentoo.org" 61 ewarn "QA Notice: epause is not defined in EAPI=${EAPI}, please file a bug at http://bugs.gentoo.org"
62} 62}
63 63
64fi
65
66# @FUNCTION: eqawarn
67# @USAGE: [message]
68# @DESCRIPTION:
69# Proxy to einfo for package managers that don't provide eqawarn and use the PM
70# implementation if available.
71if ! declare -F eqawarn >/dev/null ; then
72 eqawarn() {
73 einfo "$@"
74 }
64fi 75fi
65 76
66# @FUNCTION: ecvs_clean 77# @FUNCTION: ecvs_clean
67# @USAGE: [list of dirs] 78# @USAGE: [list of dirs]
68# @DESCRIPTION: 79# @DESCRIPTION:
422 EPATCH_SOURCE=${EPATCH_SOURCE} \ 433 EPATCH_SOURCE=${EPATCH_SOURCE} \
423 EPATCH_SUFFIX="patch" \ 434 EPATCH_SUFFIX="patch" \
424 EPATCH_FORCE="yes" \ 435 EPATCH_FORCE="yes" \
425 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \ 436 EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
426 epatch 437 epatch
427 break 438 return 0
428 fi 439 fi
429 done 440 done
441 return 1
430} 442}
431 443
432# @FUNCTION: emktemp 444# @FUNCTION: emktemp
433# @USAGE: [temp dir] 445# @USAGE: [temp dir]
434# @DESCRIPTION: 446# @DESCRIPTION:
706 fi 718 fi
707 ;; 719 ;;
708 720
709 *) 721 *)
710 if [[ -z $@ ]] ; then 722 if [[ -z $@ ]] ; then
711 useradd ${opts} \ 723 useradd -r ${opts} \
712 -c "added by portage for ${PN}" \ 724 -c "added by portage for ${PN}" \
713 ${euser} \ 725 ${euser} \
714 || die "enewuser failed" 726 || die "enewuser failed"
715 else 727 else
716 einfo " - Extra: $@" 728 einfo " - Extra: $@"
717 useradd ${opts} "$@" \ 729 useradd -r ${opts} "$@" \
718 ${euser} \ 730 ${euser} \
719 || die "enewuser failed" 731 || die "enewuser failed"
720 fi 732 fi
721 ;; 733 ;;
722 esac 734 esac
835 esac 847 esac
836 groupadd -g ${egid} ${egroup} || die "enewgroup failed" 848 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
837 ;; 849 ;;
838 850
839 *) 851 *)
852 # We specify -r so that we get a GID in the system range from login.defs
840 groupadd ${opts} ${egroup} || die "enewgroup failed" 853 groupadd -r ${opts} ${egroup} || die "enewgroup failed"
841 ;; 854 ;;
842 esac 855 esac
843 export SANDBOX_ON="${oldsandbox}" 856 export SANDBOX_ON="${oldsandbox}"
844} 857}
845 858
856 869
857# Make a desktop file ! 870# Make a desktop file !
858# Great for making those icons in kde/gnome startmenu ! 871# Great for making those icons in kde/gnome startmenu !
859# Amaze your friends ! Get the women ! Join today ! 872# Amaze your friends ! Get the women ! Join today !
860# 873#
861# make_desktop_entry(<command>, [name], [icon], [type], [path]) 874# make_desktop_entry(<command>, [name], [icon], [type], [fields])
862# 875#
863# binary: what command does the app run with ? 876# binary: what command does the app run with ?
864# name: the name that will show up in the menu 877# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 878# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 879# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 880# a full path to an icon
868# type: what kind of application is this ? for categories: 881# type: what kind of application is this ? for categories:
869# http://standards.freedesktop.org/menu-spec/latest/apa.html 882# http://standards.freedesktop.org/menu-spec/latest/apa.html
870# path: if your app needs to startup in a specific dir 883# fields: extra fields to append to the desktop file; a printf string
871make_desktop_entry() { 884make_desktop_entry() {
872 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1 885 [[ -z $1 ]] && die "make_desktop_entry: You must specify the executable"
873 886
874 local exec=${1} 887 local exec=${1}
875 local name=${2:-${PN}} 888 local name=${2:-${PN}}
876 local icon=${3:-${PN}} 889 local icon=${3:-${PN}}
877 local type=${4} 890 local type=${4}
878 local path=${5} 891 local fields=${5}
879 892
880 if [[ -z ${type} ]] ; then 893 if [[ -z ${type} ]] ; then
881 local catmaj=${CATEGORY%%-*} 894 local catmaj=${CATEGORY%%-*}
882 local catmin=${CATEGORY##*-} 895 local catmin=${CATEGORY##*-}
883 case ${catmaj} in 896 case ${catmaj} in
884 app) 897 app)
885 case ${catmin} in 898 case ${catmin} in
886 accessibility) type=Accessibility;; 899 accessibility) type=Accessibility;;
887 admin) type=System;; 900 admin) type=System;;
888 antivirus) type=System;; 901 antivirus) type=System;;
889 arch) type=Archiving;; 902 arch) type=Archiving;;
890 backup) type=Archiving;; 903 backup) type=Archiving;;
891 cdr) type=DiscBurning;; 904 cdr) type=DiscBurning;;
892 dicts) type=Dictionary;; 905 dicts) type=Dictionary;;
893 doc) type=Documentation;; 906 doc) type=Documentation;;
894 editors) type=TextEditor;; 907 editors) type=TextEditor;;
895 emacs) type=TextEditor;; 908 emacs) type=TextEditor;;
896 emulation) type=Emulator;; 909 emulation) type=Emulator;;
897 laptop) type=HardwareSettings;; 910 laptop) type=HardwareSettings;;
898 office) type=Office;; 911 office) type=Office;;
899 pda) type=PDA;; 912 pda) type=PDA;;
900 vim) type=TextEditor;; 913 vim) type=TextEditor;;
901 xemacs) type=TextEditor;; 914 xemacs) type=TextEditor;;
902 *) type=;;
903 esac 915 esac
904 ;; 916 ;;
905 917
906 dev) 918 dev)
907 type="Development" 919 type="Development"
908 ;; 920 ;;
909 921
910 games) 922 games)
911 case ${catmin} in 923 case ${catmin} in
912 action|fps) type=ActionGame;; 924 action|fps) type=ActionGame;;
913 arcade) type=ArcadeGame;; 925 arcade) type=ArcadeGame;;
914 board) type=BoardGame;; 926 board) type=BoardGame;;
915 emulation) type=Emulator;; 927 emulation) type=Emulator;;
916 kids) type=KidsGame;; 928 kids) type=KidsGame;;
917 puzzle) type=LogicGame;; 929 puzzle) type=LogicGame;;
918 roguelike) type=RolePlaying;; 930 roguelike) type=RolePlaying;;
919 rpg) type=RolePlaying;; 931 rpg) type=RolePlaying;;
920 simulation) type=Simulation;; 932 simulation) type=Simulation;;
921 sports) type=SportsGame;; 933 sports) type=SportsGame;;
922 strategy) type=StrategyGame;; 934 strategy) type=StrategyGame;;
923 *) type=;;
924 esac 935 esac
925 type="Game;${type}" 936 type="Game;${type}"
926 ;; 937 ;;
927 938
928 gnome) 939 gnome)
937 type="Network;Email" 948 type="Network;Email"
938 ;; 949 ;;
939 950
940 media) 951 media)
941 case ${catmin} in 952 case ${catmin} in
953 gfx)
942 gfx) type=Graphics;; 954 type=Graphics
955 ;;
956 *)
957 case ${catmin} in
943 radio) type=Tuner;; 958 radio) type=Tuner;;
944 sound) type=Audio;; 959 sound) type=Audio;;
945 tv) type=TV;; 960 tv) type=TV;;
946 video) type=Video;; 961 video) type=Video;;
947 *) type=;; 962 esac
963 type="AudioVideo;${type}"
964 ;;
948 esac 965 esac
949 type="AudioVideo;${type}"
950 ;; 966 ;;
951 967
952 net) 968 net)
953 case ${catmin} in 969 case ${catmin} in
954 dialup) type=Dialup;; 970 dialup) type=Dialup;;
955 ftp) type=FileTransfer;; 971 ftp) type=FileTransfer;;
956 im) type=InstantMessaging;; 972 im) type=InstantMessaging;;
957 irc) type=IRCClient;; 973 irc) type=IRCClient;;
958 mail) type=Email;; 974 mail) type=Email;;
959 news) type=News;; 975 news) type=News;;
960 nntp) type=News;; 976 nntp) type=News;;
961 p2p) type=FileTransfer;; 977 p2p) type=FileTransfer;;
962 *) type=;; 978 voip) type=Telephony;;
963 esac 979 esac
964 type="Network;${type}" 980 type="Network;${type}"
965 ;; 981 ;;
966 982
967 sci) 983 sci)
968 case ${catmin} in 984 case ${catmin} in
969 astro*) type=Astronomy;; 985 astro*) type=Astronomy;;
970 bio*) type=Biology;; 986 bio*) type=Biology;;
971 calc*) type=Calculator;; 987 calc*) type=Calculator;;
972 chem*) type=Chemistry;; 988 chem*) type=Chemistry;;
973 elec*) type=Electronics;; 989 elec*) type=Electronics;;
974 geo*) type=Geology;; 990 geo*) type=Geology;;
975 math*) type=Math;; 991 math*) type=Math;;
976 physics) type=Physics;; 992 physics) type=Physics;;
977 visual*) type=DataVisualization;; 993 visual*) type=DataVisualization;;
978 *) type=;;
979 esac 994 esac
980 type="Science;${type}" 995 type="Education;Science;${type}"
981 ;; 996 ;;
982 997
983 sys) 998 sys)
984 type="System" 999 type="System"
985 ;; 1000 ;;
986 1001
987 www) 1002 www)
988 case ${catmin} in 1003 case ${catmin} in
989 client) type=WebBrowser;; 1004 client) type=WebBrowser;;
990 *) type=;;
991 esac 1005 esac
992 type="Network" 1006 type="Network;${type}"
993 ;; 1007 ;;
994 1008
995 *) 1009 *)
996 type= 1010 type=
997 ;; 1011 ;;
1002 else 1016 else
1003 local desktop_name="${PN}-${SLOT}" 1017 local desktop_name="${PN}-${SLOT}"
1004 fi 1018 fi
1005 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop" 1019 local desktop="${T}/$(echo ${exec} | sed 's:[[:space:]/:]:_:g')-${desktop_name}.desktop"
1006 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop 1020 #local desktop=${T}/${exec%% *:-${desktop_name}}.desktop
1021
1022 # Don't append another ";" when a valid category value is provided.
1023 type=${type%;}${type:+;}
1024
1025 eshopts_push -s extglob
1026 if [[ -n ${icon} && ${icon} != /* ]] && [[ ${icon} == *.xpm || ${icon} == *.png || ${icon} == *.svg ]]; then
1027 ewarn "As described in the Icon Theme Specification, icon file extensions are not"
1028 ewarn "allowed in .desktop files if the value is not an absolute path."
1029 icon=${icon%.@(xpm|png|svg)}
1030 fi
1031 eshopts_pop
1007 1032
1008 cat <<-EOF > "${desktop}" 1033 cat <<-EOF > "${desktop}"
1009 [Desktop Entry] 1034 [Desktop Entry]
1010 Name=${name} 1035 Name=${name}
1011 Type=Application 1036 Type=Application
1012 Comment=${DESCRIPTION} 1037 Comment=${DESCRIPTION}
1013 Exec=${exec} 1038 Exec=${exec}
1014 TryExec=${exec%% *} 1039 TryExec=${exec%% *}
1015 Icon=${icon} 1040 Icon=${icon}
1016 Categories=${type}; 1041 Categories=${type}
1017 EOF 1042 EOF
1018 1043
1019 [[ ${path} ]] && echo "Path=${path}" >> "${desktop}" 1044 if [[ ${fields:-=} != *=* ]] ; then
1045 # 5th arg used to be value to Path=
1046 ewarn "make_desktop_entry: update your 5th arg to read Path=${fields}"
1047 fields="Path=${fields}"
1048 fi
1049 [[ -n ${fields} ]] && printf '%b\n' "${fields}" >> "${desktop}"
1020 1050
1021 ( 1051 (
1022 # wrap the env here so that the 'insinto' call 1052 # wrap the env here so that the 'insinto' call
1023 # doesn't corrupt the env of the caller 1053 # doesn't corrupt the env of the caller
1024 insinto /usr/share/applications 1054 insinto /usr/share/applications
1025 doins "${desktop}" 1055 doins "${desktop}"
1026 ) 1056 ) || die "installing desktop file failed"
1027} 1057}
1028 1058
1029# @FUNCTION: validate_desktop_entries 1059# @FUNCTION: validate_desktop_entries
1030# @USAGE: [directories] 1060# @USAGE: [directories]
1031# @MAINTAINER: 1061# @MAINTAINER:
1310 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'" 1340 [[ -z ${src} ]] && die "Could not locate source for '${src_input}'"
1311 1341
1312 local shrtsrc=$(basename "${src}") 1342 local shrtsrc=$(basename "${src}")
1313 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1343 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1314 if [[ -z ${skip} ]] ; then 1344 if [[ -z ${skip} ]] ; then
1315 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}') 1345 local ver=$(grep -m1 -a '#.*Makeself' "${src}" | awk '{print $NF}')
1316 local skip=0 1346 local skip=0
1317 exe=tail 1347 exe=tail
1318 case ${ver} in 1348 case ${ver} in
1319 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1349 1.5.*|1.6.0-nv) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1320 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1350 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1322 2.0|2.0.1) 1352 2.0|2.0.1)
1323 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-) 1353 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1324 ;; 1354 ;;
1325 2.1.1) 1355 2.1.1)
1326 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-) 1356 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1327 let skip="skip + 1" 1357 (( skip++ ))
1328 ;; 1358 ;;
1329 2.1.2) 1359 2.1.2)
1330 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1) 1360 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1331 let skip="skip + 1" 1361 (( skip++ ))
1332 ;; 1362 ;;
1333 2.1.3) 1363 2.1.3)
1334 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1364 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1335 let skip="skip + 1" 1365 (( skip++ ))
1336 ;; 1366 ;;
1337 2.1.4|2.1.5) 1367 2.1.4|2.1.5)
1338 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1368 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1339 skip=$(head -n ${skip} "${src}" | wc -c) 1369 skip=$(head -n ${skip} "${src}" | wc -c)
1340 exe="dd" 1370 exe="dd"
1349 esac 1379 esac
1350 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1380 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1351 fi 1381 fi
1352 case ${exe} in 1382 case ${exe} in
1353 tail) exe="tail -n +${skip} '${src}'";; 1383 tail) exe="tail -n +${skip} '${src}'";;
1354 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1384 dd) exe="dd ibs=${skip} skip=1 if='${src}'";;
1355 *) die "makeself cant handle exe '${exe}'" 1385 *) die "makeself cant handle exe '${exe}'"
1356 esac 1386 esac
1357 1387
1358 # lets grab the first few bytes of the file to figure out what kind of archive it is 1388 # lets grab the first few bytes of the file to figure out what kind of archive it is
1359 local tmpfile=$(emktemp) 1389 local tmpfile=$(emktemp)
1492 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}} 1522 export CDROM_ROOT=${CD_ROOT_1:-${CD_ROOT}}
1493 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1523 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1494 export CDROM_SET=-1 1524 export CDROM_SET=-1
1495 for f in ${CDROM_CHECK_1//:/ } ; do 1525 for f in ${CDROM_CHECK_1//:/ } ; do
1496 ((++CDROM_SET)) 1526 ((++CDROM_SET))
1497 [[ -e ${CD_ROOT}/${f} ]] && break 1527 [[ -e ${CDROM_ROOT}/${f} ]] && break
1498 done 1528 done
1499 export CDROM_MATCH=${f} 1529 export CDROM_MATCH=${f}
1500 return 1530 return
1501 fi 1531 fi
1502 1532

Legend:
Removed from v.1.332  
changed lines
  Added in v.1.349

  ViewVC Help
Powered by ViewVC 1.1.20