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

Diff of /eclass/eutils.eclass

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

Revision 1.128 Revision 1.158
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 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.128 2004/12/23 09:20:45 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.158 2005/03/17 02:45:10 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib
12ECLASS=eutils 13ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
16 17
17DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
18 63
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 64# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 66# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 67# must be an integer greater than zero.
41 sleep 1 86 sleep 1
42 done 87 done
43 fi 88 fi
44} 89}
45 90
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53#
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56# fall back on old behavior. Any profile that has these set should also
57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc...
59#
60# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it
61# is still in testing.
62get_libdir() {
63 LIBDIR_TEST=$(type econf)
64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
65 # if there is an override, we want to use that... always.
66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
67 # We don't need to know the verison of portage. We only need to know
68 # if there is support for CONF_LIBDIR in econf and co.
69 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
70 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
71 # # and if there isnt an override, and we're using a version of
72 # # portage without CONF_LIBDIR support, force the use of lib. dolib
73 # # and friends from portage 2.0.50 wont be too happy otherwise.
74 # CONF_LIBDIR="lib"
75 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79 # will be <portage-2.0.51_pre20
80 CONF_LIBDIR="lib"
81 fi
82 # and of course, default to lib if CONF_LIBDIR isnt set
83 echo ${CONF_LIBDIR:=lib}
84 unset LIBDIR_TEST
85}
86
87get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
89 echo ${CONF_MULTILIBDIR:=lib32}
90}
91
92# Sometimes you need to override the value returned by get_libdir. A good
93# example of this is xorg-x11, where lib32 isnt a supported configuration,
94# and where lib64 -must- be used on amd64 (for applications that need lib
95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
96# portage version sanity checking.
97# get_libdir_override expects one argument, the result get_libdir should
98# return:
99#
100# get_libdir_override lib64
101#
102# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
103get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
105 CONF_LIBDIR="$1"
106 CONF_LIBDIR_OVERRIDE="$1"
107}
108
109# This function generate linker scripts in /usr/lib for dynamic 91# This function generate linker scripts in /usr/lib for dynamic
110# libs in /lib. This is to fix linking problems when you have 92# libs in /lib. This is to fix linking problems when you have
111# the .so in /lib, and the .a in /usr/lib. What happens is that 93# the .so in /lib, and the .a in /usr/lib. What happens is that
112# in some cases when linking dynamic, the .a in /usr/lib is used 94# in some cases when linking dynamic, the .a in /usr/lib is used
113# instead of the .so in /lib due to gcc/libtool tweaking ld's 95# instead of the .so in /lib due to gcc/libtool tweaking ld's
267 249
268 echo 250 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 251 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270 eerror 252 eerror
271 eerror " ${EPATCH_SOURCE}" 253 eerror " ${EPATCH_SOURCE}"
254 eerror " ( ${EPATCH_SOURCE##*/} )"
272 echo 255 echo
273 die "Cannot find \$EPATCH_SOURCE!" 256 die "Cannot find \$EPATCH_SOURCE!"
274 fi 257 fi
275 258
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 259 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ]) 293 [ "${EPATCH_FORCE}" = "yes" ])
311 then 294 then
312 local count=0 295 local count=0
313 local popts="${EPATCH_OPTS}" 296 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/}
314 298
315 if [ -n "${EPATCH_EXCLUDE}" ] 299 if [ -n "${EPATCH_EXCLUDE}" ]
316 then 300 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 301 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318 then 302 then
319 continue 303 continue
320 fi 304 fi
321 fi 305 fi
322 306
324 then 308 then
325 if [ -n "${EPATCH_SINGLE_MSG}" ] 309 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then 310 then
327 einfo "${EPATCH_SINGLE_MSG}" 311 einfo "${EPATCH_SINGLE_MSG}"
328 else 312 else
329 einfo "Applying ${x##*/} ..." 313 einfo "Applying ${patchname} ..."
330 fi 314 fi
331 else 315 else
332 einfo " ${x##*/} ..." 316 einfo " ${patchname} ..."
333 fi 317 fi
334 318
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 319 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 321
338 # Allow for prefix to differ ... im lazy, so shoot me :/ 322 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ] 323 while [ "${count}" -lt 5 ]
340 do 324 do
341 # Generate some useful debug info ... 325 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 328
345 if [ "${PATCH_SUFFIX}" != "patch" ] 329 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then 330 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 else 333 else
350 PATCH_TARGET="${x}" 334 PATCH_TARGET="${x}"
351 fi 335 fi
352 336
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 338 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 339
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
358 342
359 if [ "${PATCH_SUFFIX}" != "patch" ] 343 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then 344 then
361 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 345 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
362 then 346 then
363 echo 347 echo
364 eerror "Could not extract patch!" 348 eerror "Could not extract patch!"
365 #die "Could not extract patch!" 349 #die "Could not extract patch!"
366 count=5 350 count=5
367 break 351 break
368 fi 352 fi
369 fi 353 fi
370 354
371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
372 then 356 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
378 362
379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
380 364
381 if [ "$?" -ne 0 ] 365 if [ "$?" -ne 0 ]
382 then 366 then
383 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
384 echo 368 echo
385 eerror "A dry-run of patch command succeeded, but actually" 369 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!" 370 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!" 371 #die "Real world sux compared to the dreamworld!"
388 count=5 372 count=5
389 fi 373 fi
390 374
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 375 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
392 376
393 break 377 break
394 fi 378 fi
395 379
396 count=$((count + 1)) 380 count=$((count + 1))
402 fi 386 fi
403 387
404 if [ "${count}" -eq 5 ] 388 if [ "${count}" -eq 5 ]
405 then 389 then
406 echo 390 echo
407 eerror "Failed Patch: ${x##*/}!" 391 eerror "Failed Patch: ${patchname} !"
392 eerror " ( ${PATCH_TARGET} )"
408 eerror 393 eerror
409 eerror "Include in your bugreport the contents of:" 394 eerror "Include in your bugreport the contents of:"
410 eerror 395 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 396 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 397 echo
413 die "Failed Patch: ${x##*/}!" 398 die "Failed Patch: ${patchname}!"
414 fi 399 fi
415 400
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 401 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 402
418 eend 0 403 eend 0
419 fi 404 fi
420 done 405 done
421 if [ "${SINGLE_PATCH}" = "no" ] 406 if [ "${SINGLE_PATCH}" = "no" ]
906 cp "${f}" ${T}/edos2unix 891 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 892 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 893 done
909} 894}
910 895
896
897##############################################################
898# START: Handle .desktop files and menu entries #
899# maybe this should be separated into a new eclass some time #
900# lanius@gentoo.org #
901##############################################################
902
911# Make a desktop file ! 903# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 904# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 905# Amaze your friends ! Get the women ! Join today !
914# 906#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 907# make_desktop_entry(<binary>, [name], [icon], [type], [path])
918# name: the name that will show up in the menu 910# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 911# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 912# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 913# a full path to an icon
922# type: what kind of application is this ? for categories: 914# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 915# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
924# path: if your app needs to startup in a specific dir 916# path: if your app needs to startup in a specific dir
925make_desktop_entry() { 917make_desktop_entry() {
926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 918 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
927 919
928 local exec="${1}" 920 local exec=${1}
929 local name="${2:-${PN}}" 921 local name=${2:-${PN}}
930 local icon="${3:-${PN}.png}" 922 local icon=${3:-${PN}.png}
931 local type="${4}" 923 local type=${4}
932 local subdir="${6}" 924 local path=${5}
933 local path="${5:-${GAMES_BINDIR}}" 925
934 if [ -z "${type}" ] 926 if [[ -z ${type} ]] ; then
935 then 927 local catmaj=${CATEGORY%%-*}
936 case ${CATEGORY} in 928 local catmin=${CATEGORY##*-}
937 "app-emulation") 929 case ${catmaj} in
938 type=Emulator 930 app)
939 subdir="Emulation" 931 case ${catmin} in
932 admin) type=System;;
933 cdr) type=DiscBurning;;
934 dicts) type=Dictionary;;
935 editors) type=TextEditor;;
936 emacs) type=TextEditor;;
937 emulation) type=Emulator;;
938 laptop) type=HardwareSettings;;
939 office) type=Office;;
940 vim) type=TextEditor;;
941 xemacs) type=TextEditor;;
942 *) type=;;
943 esac
940 ;; 944 ;;
941 "games-"*) 945
942 type=Game 946 dev)
943 subdir="Games" 947 type=Development
944 ;; 948 ;;
949
950 games)
951 [[ -z ${path} ]] && path=${GAMES_BINDIR}
952
953 case ${catmin} in
954 action) type=ActionGame;;
955 arcade) type=ArcadeGame;;
956 board) type=BoardGame;;
957 kid) type=KidsGame;;
958 emulation) type=Emulator;;
959 puzzle) type=LogicGame;;
960 rpg) type=RolePlaying;;
961 roguelike) type=RolePlaying;;
962 simulation) type=Simulation;;
963 sports) type=SportsGame;;
964 strategy) type=StrategyGame;;
965 *) type=;;
966 esac
967 type=Game;${type}
968 ;;
969
970 mail)
971 type=Network;Email
972 ;;
973
974 media)
975 case ${catmin} in
976 gfx) type=Graphics;;
977 radio) type=Tuner;;
978 sound) type=Audio;;
979 tv) type=TV;;
980 video) type=Video;;
981 *) type=;;
982 esac
983 type=AudioVideo;${type}
984 ;;
985
945 "net-"*) 986 net)
987 case ${catmin} in
988 dialup) type=Dialup;;
989 ftp) type=FileTransfer;;
990 im) type=InstantMessaging;;
991 irc) type=IRCClient;;
992 mail) type=Email;;
993 news) type=News;;
994 nntp) type=News;;
995 p2p) type=FileTransfer;;
996 *) type=;;
997 esac
998 type=Network;${type}
999 ;;
1000
1001 sci)
1002 case ${catmin} in
1003 astro*) type=Astronomoy;;
1004 bio*) type=Biology;;
1005 calc*) type=Calculator;;
1006 chem*) type=Chemistry;;
1007 geo*) type=Geology;;
1008 math*) type=Math;;
1009 *) type=;;
1010 esac
1011 type=Science;${type}
1012 ;;
1013
1014 www)
1015 case ${catmin} in
1016 client) type=WebBrowser;;
1017 *) type=;;
1018 esac
946 type=Network 1019 type=Network
947 subdir="${type}"
948 ;; 1020 ;;
1021
949 *) 1022 *)
950 type= 1023 type=
951 subdir=
952 ;; 1024 ;;
953 esac 1025 esac
954 fi 1026 fi
1027
955 local desktop="${T}/${exec}.desktop" 1028 local desktop=${T}/${exec%% *}-${P}.desktop
956 1029
957echo "[Desktop Entry] 1030echo "[Desktop Entry]
958Encoding=UTF-8 1031Encoding=UTF-8
959Version=0.9.2 1032Version=0.9.2
960Name=${name} 1033Name=${name}
968 insinto /usr/share/applications 1041 insinto /usr/share/applications
969 doins "${desktop}" 1042 doins "${desktop}"
970 1043
971 return 0 1044 return 0
972} 1045}
1046
1047# Make a GDM/KDM Session file
1048#
1049# make_desktop_entry(<title>, <command>)
1050# title: File to execute to start the Window Manager
1051# command: Name of the Window Manager
1052
1053make_session_desktop() {
1054
1055 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
1056 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
1057
1058 local title="${1}"
1059 local command="${2}"
1060 local desktop="${T}/${wm}.desktop"
1061
1062echo "[Desktop Entry]
1063Encoding=UTF-8
1064Name=${title}
1065Comment=This session logs you into ${title}
1066Exec=${command}
1067TryExec=${command}
1068Type=Application" > "${desktop}"
1069
1070 insinto /usr/share/xsessions
1071 doins "${desktop}"
1072
1073 return 0
1074}
1075
1076domenu() {
1077 local i
1078 local j
1079 insinto /usr/share/applications
1080 for i in ${@}
1081 do
1082 if [ -f "${i}" ];
1083 then
1084 doins ${i}
1085 elif [ -d "${i}" ];
1086 then
1087 for j in ${i}/*.desktop
1088 do
1089 doins ${j}
1090 done
1091 fi
1092 done
1093}
1094
1095doicon() {
1096 local i
1097 local j
1098 insinto /usr/share/pixmaps
1099 for i in ${@}
1100 do
1101 if [ -f "${i}" ];
1102 then
1103 doins ${i}
1104 elif [ -d "${i}" ];
1105 then
1106 for j in ${i}/*.png
1107 do
1108 doins ${j}
1109 done
1110 fi
1111 done
1112}
1113
1114##############################################################
1115# END: Handle .desktop files and menu entries #
1116##############################################################
1117
973 1118
974# for internal use only (unpack_pdv and unpack_makeself) 1119# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 1120find_unpackable_file() {
976 local src="$1" 1121 local src="$1"
977 if [ -z "${src}" ] 1122 if [ -z "${src}" ]
1258 export CDROM_TOTAL_CDS=${cdcnt} 1403 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1404 export CDROM_CURRENT_CD=1
1260 1405
1261 # now we see if the user gave use CD_ROOT ... 1406 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1407 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1408 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1409 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1410 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1411 return
1267 fi 1412 fi
1268 # do the same for CD_ROOT_X 1413 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1414 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1415 local var=
1271 cdcnt=0 1416 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1417 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1418 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1419 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1420 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1421 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1422 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1423 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1424 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1425 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1428 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1429 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1430 return
1286 fi 1431 fi
1287 1432
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1433 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1434 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1435 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1436 echo "cdrom for ${PN}."
1292 else 1437 else
1293 echo "${CDROM_NAME}." 1438 echo "${CDROM_NAME}."
1294 fi 1439 fi
1295 echo 1440 echo
1296 einfo "If you do not have the CD, but have the data files" 1441 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1442 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1443 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1444 einfo "directory containing the files."
1300 echo 1445 echo
1446 einfo "For example:"
1447 einfo "export CD_ROOT=/mnt/cdrom"
1448 echo
1301 else 1449 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1450 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1451 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1452 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1453 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1454 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1455 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1456 done
1309 echo 1457 echo
1310 einfo "If you do not have the CDs, but have the data files" 1458 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1459 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1460 einfo "the following variables so they point to the right place:"
1313 einfon "" 1461 einfon ""
1314 cdcnt=0 1462 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1463 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1464 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1465 echo -n " CD_ROOT_${cdcnt}"
1318 done 1466 done
1319 echo 1467 echo
1320 einfo "Or, if you have all the files in the same place, or" 1468 einfo "Or, if you have all the files in the same place, or"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1469 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1470 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1471 einfo "for all the CDs."
1324 echo 1472 echo
1473 einfo "For example:"
1474 einfo "export CD_ROOT_1=/mnt/cdrom"
1475 echo
1325 fi 1476 fi
1326 export CDROM_CURRENT_CD=0 1477 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1478 cdrom_load_next_cd
1328} 1479}
1329 1480
1333# remember, you can only go forward in the cd chain, you can't go back. 1484# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1485cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1486 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1487 local var=
1337 1488
1338 if [ ! -z "${CD_ROOT}" ] ; then 1489 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1490 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1491 return
1341 fi 1492 fi
1342 1493
1343 unset CDROM_ROOT 1494 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1495 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1496 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1497 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1498 cdrom_locate_file_on_cd ${!var}
1348 else 1499 else
1349 export CDROM_ROOT="${!var}" 1500 export CDROM_ROOT=${!var}
1350 fi 1501 fi
1351 1502
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1503 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1504}
1354 1505
1358# found, then a message asking for the user to insert the cdrom will be 1509# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1510# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1511# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1512# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1513cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1514 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1515 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1516 local file="$(basename ${@})"
1366 local mline="" 1517 local mline=""
1367 local showedmsg=0 1518 local showedmsg=0
1368 1519
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1520 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1521 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1522 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1372 && export CDROM_ROOT=${mline} 1523 && export CDROM_ROOT=${mline}
1373 done 1524 done
1374 1525
1375 if [ -z "${CDROM_ROOT}" ] ; then 1526 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1527 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1528 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1529 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1530 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1531 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1532 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1533 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1534 fi
1384 else 1535 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1536 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1537 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1538 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1539 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1540 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1541 fi
1410# directories and uses the intersection of the lists. 1561# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1562# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1563# directories and uses the union of the lists.
1413strip-linguas() { 1564strip-linguas() {
1414 local ls newls 1565 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1566 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1567 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1568 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1569 local d f
1419 for d in "$@" ; do 1570 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1571 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1572 newls=${ls}
1422 else 1573 else
1423 newls="" 1574 newls=""
1424 fi 1575 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1576 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1577 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1578 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1579 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1580 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1581 fi
1431 done 1582 done
1432 ls="${newls}" 1583 ls=${newls}
1433 done 1584 done
1434 ls="${ls//.po}" 1585 ls=${ls//.po}
1435 else 1586 else
1436 ls="$@" 1587 ls=$@
1437 fi 1588 fi
1438 1589
1439 ls=" ${ls} " 1590 ls=" ${ls} "
1440 newls="" 1591 newls=""
1441 for f in ${LINGUAS} ; do 1592 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1593 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 newls="${newls} ${f}" 1594 newls="${newls} ${f}"
1444 else 1595 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1596 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1597 fi
1447 done 1598 done
1448 if [ -z "${newls}" ] ; then 1599 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1600 unset LINGUAS
1450 else 1601 else
1451 export LINGUAS="${newls}" 1602 export LINGUAS=${newls:1}
1452 fi 1603 fi
1453} 1604}
1454 1605
1455# moved from kernel.eclass since they are generally useful outside of 1606# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1607# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1609# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1610# for an example see ivtv or drbd ebuilds
1460 1611
1461# set's ARCH to match what the kernel expects 1612# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1613set_arch_to_kernel() {
1614 i=10
1615 while ((i--)) ; do
1616 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1617 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1618 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1619 case ${ARCH} in
1465 x86) export ARCH="i386";; 1620 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1621 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1622 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1623 mips) export ARCH="mips";;
1624 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!
1469 *) export ARCH="${ARCH}";; 1625 *) export ARCH="${ARCH}";;
1470 esac 1626 esac
1471} 1627}
1472 1628
1473# set's ARCH back to what portage expects 1629# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1630set_arch_to_portage() {
1631 i=10
1632 while ((i--)) ; do
1633 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1634 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1635 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1636}
1477 1637
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1638# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1639# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1669 touch ${D}${LIB}
1510 fi 1670 fi
1511} 1671}
1512 1672
1513preserve_old_lib_notify() { 1673preserve_old_lib_notify() {
1514 LIB=$1 1674 LIB=$1
1515 1675
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1676 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1677 SONAME=`basename ${LIB}`
1518 1678
1519 einfo "An old version of an installed library was detected on your system." 1679 einfo "An old version of an installed library was detected on your system."
1520 einfo "In order to avoid breaking packages that link against is, this older version" 1680 einfo "In order to avoid breaking packages that link against is, this older version"
1521 einfo "is not being removed. In order to make full use of this newer version," 1681 einfo "is not being removed. In order to make full use of this newer version,"
1522 einfo "you will need to execute the following command:" 1682 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1683 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1684 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1685 einfo "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1686 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1687 fi
1528} 1688}
1529 1689
1530# Hack for people to figure out if a package was built with 1690# Hack for people to figure out if a package was built with
1531# certain USE flags 1691# certain USE flags
1532# 1692#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1693# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1694# ex: built_with_use xchat gtk2
1695#
1696# Flags: -a all USE flags should be utilized
1697# -o at least one USE flag should be utilized
1698# Note: the default flag is '-a'
1535built_with_use() { 1699built_with_use() {
1700 local opt=$1
1701 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1702
1536 local PKG=$(portageq best_version ${ROOT} $1) 1703 local PKG=$(best_version $1)
1704 shift
1705
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1706 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1 1707 [[ ! -e ${USEFILE} ]] && return 1
1539 1708
1540 local USE_BUILT=$(<${USEFILE}) 1709 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1710 while [[ $# -gt 0 ]] ; do
1711 if [[ ${opt} = "-o" ]] ; then
1712 has $1 ${USE_BUILT} && return 0
1713 else
1544 has $1 ${USE_BUILT} || return 1 1714 has $1 ${USE_BUILT} || return 1
1715 fi
1545 shift 1716 shift
1546 done 1717 done
1547 return 0 1718 [[ ${opt} = "-a" ]]
1548} 1719}
1549 1720
1550# Many configure scripts wrongly bail when a C++ compiler 1721# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1722# could not be detected. #73450
1552epunt_cxx() { 1723epunt_cxx() {
1553 local dir=$1 1724 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S} 1725 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks" 1726 ebegin "Removing useless C++ checks"
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1729 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done 1730 done
1560 eend 0 1731 eend 0
1561} 1732}
1562 1733
1563# get_abi_var <VAR> [<ABI>] 1734# dopamd <file> [more files]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1735#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1736# Install pam auth config file in /etc/pam.d
1567# and getting a more multilib-aware portage layout. It may end up being used, but for now 1737dopamd() {
1568# it is subject to removal if a better way is worked out. 1738 [[ -z $1 ]] && die "dopamd requires at least one argument"
1569#
1570# ex:
1571# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1572#
1573# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1574# This will hopefully be added to portage soon...
1575#
1576# If <ABI> is not specified, ${ABI} is used.
1577# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1578# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1579#
1580# Jeremy Huddleston <eradicator@gentoo.org>
1581get_abi_var() {
1582 local flag=$1
1583 local abi
1584 if [ $# -gt 1 ]; then
1585 abi=$1
1586 elif [ -n "${ABI}" ]; then
1587 abi=${ABI}
1588 elif [ -n "${DEFAULT_ABI}" ]; then
1589 abi=${DEFAULT_ABI}
1590 else
1591 return ""
1592 fi
1593 eval echo \${${flag}_${abi}}
1594}
1595 1739
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; } 1740 use pam || return 0
1597get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1598get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1599get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1600 1741
1742 insinto /etc/pam.d
1743 # these are the default doins options, but be explicit just in case
1744 insopts -m 0644 -o root -g root
1745 doins "$@" || die "failed to install $@"
1746}
1747# newpamd <old name> <new name>
1748#
1749# Install pam file <old name> as <new name> in /etc/pam.d
1750newpamd() {
1751 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1752
1753 use pam || return 0
1754
1755 insinto /etc/pam.d
1756 # these are the default doins options, but be explicit just in case
1757 insopts -m 0644 -o root -g root
1758 newins "$1" "$2" || die "failed to install $1 as $2"
1759}

Legend:
Removed from v.1.128  
changed lines
  Added in v.1.158

  ViewVC Help
Powered by ViewVC 1.1.20