/[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.157
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.157 2005/03/07 17:45:07 carlo 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}!"
408 eerror 392 eerror
409 eerror "Include in your bugreport the contents of:" 393 eerror "Include in your bugreport the contents of:"
410 eerror 394 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 396 echo
413 die "Failed Patch: ${x##*/}!" 397 die "Failed Patch: ${patchname}!"
414 fi 398 fi
415 399
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 400 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 401
418 eend 0 402 eend 0
419 fi 403 fi
420 done 404 done
421 if [ "${SINGLE_PATCH}" = "no" ] 405 if [ "${SINGLE_PATCH}" = "no" ]
906 cp "${f}" ${T}/edos2unix 890 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 891 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 892 done
909} 893}
910 894
895
896##############################################################
897# START: Handle .desktop files and menu entries #
898# maybe this should be separated into a new eclass some time #
899# lanius@gentoo.org #
900##############################################################
901
911# Make a desktop file ! 902# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 903# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 904# Amaze your friends ! Get the women ! Join today !
914# 905#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 906# make_desktop_entry(<binary>, [name], [icon], [type], [path])
918# name: the name that will show up in the menu 909# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 910# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 911# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 912# a full path to an icon
922# type: what kind of application is this ? for categories: 913# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
924# path: if your app needs to startup in a specific dir 915# path: if your app needs to startup in a specific dir
925make_desktop_entry() { 916make_desktop_entry() {
926 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1
927 918
928 local exec="${1}" 919 local exec="${1}"
950 type= 941 type=
951 subdir= 942 subdir=
952 ;; 943 ;;
953 esac 944 esac
954 fi 945 fi
955 local desktop="${T}/${exec}.desktop" 946 local desktop="${T}/${exec%% *}-${P}.desktop"
956 947
957echo "[Desktop Entry] 948echo "[Desktop Entry]
958Encoding=UTF-8 949Encoding=UTF-8
959Version=0.9.2 950Version=0.9.2
960Name=${name} 951Name=${name}
968 insinto /usr/share/applications 959 insinto /usr/share/applications
969 doins "${desktop}" 960 doins "${desktop}"
970 961
971 return 0 962 return 0
972} 963}
964
965# Make a GDM/KDM Session file
966#
967# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager
969# command: Name of the Window Manager
970
971make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
974 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
975
976 local title="${1}"
977 local command="${2}"
978 local desktop="${T}/${wm}.desktop"
979
980echo "[Desktop Entry]
981Encoding=UTF-8
982Name=${title}
983Comment=This session logs you into ${title}
984Exec=${command}
985TryExec=${command}
986Type=Application" > "${desktop}"
987
988 insinto /usr/share/xsessions
989 doins "${desktop}"
990
991 return 0
992}
993
994domenu() {
995 local i
996 local j
997 insinto /usr/share/applications
998 for i in ${@}
999 do
1000 if [ -f "${i}" ];
1001 then
1002 doins ${i}
1003 elif [ -d "${i}" ];
1004 then
1005 for j in ${i}/*.desktop
1006 do
1007 doins ${j}
1008 done
1009 fi
1010 done
1011}
1012
1013doicon() {
1014 local i
1015 local j
1016 insinto /usr/share/pixmaps
1017 for i in ${@}
1018 do
1019 if [ -f "${i}" ];
1020 then
1021 doins ${i}
1022 elif [ -d "${i}" ];
1023 then
1024 for j in ${i}/*.png
1025 do
1026 doins ${j}
1027 done
1028 fi
1029 done
1030}
1031
1032##############################################################
1033# END: Handle .desktop files and menu entries #
1034##############################################################
1035
973 1036
974# for internal use only (unpack_pdv and unpack_makeself) 1037# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 1038find_unpackable_file() {
976 local src="$1" 1039 local src="$1"
977 if [ -z "${src}" ] 1040 if [ -z "${src}" ]
1258 export CDROM_TOTAL_CDS=${cdcnt} 1321 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1322 export CDROM_CURRENT_CD=1
1260 1323
1261 # now we see if the user gave use CD_ROOT ... 1324 # now we see if the user gave use CD_ROOT ...
1262 # if they did, let's just believe them that it's correct 1325 # if they did, let's just believe them that it's correct
1263 if [ ! -z "${CD_ROOT}" ] ; then 1326 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1327 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1329 return
1267 fi 1330 fi
1268 # do the same for CD_ROOT_X 1331 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1332 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1333 local var=
1271 cdcnt=0 1334 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1336 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1337 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1338 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1339 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1340 eerror "or specify ALL the CD_ROOT_X variables."
1278 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1341 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1279 die "could not locate CD_ROOT_${cdcnt}" 1342 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1343 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1346 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1348 return
1286 fi 1349 fi
1287 1350
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1351 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1352 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1353 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1354 echo "cdrom for ${PN}."
1292 else 1355 else
1293 echo "${CDROM_NAME}." 1356 echo "${CDROM_NAME}."
1294 fi 1357 fi
1295 echo 1358 echo
1296 einfo "If you do not have the CD, but have the data files" 1359 einfo "If you do not have the CD, but have the data files"
1297 einfo "mounted somewhere on your filesystem, just export" 1360 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1361 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1362 einfo "directory containing the files."
1300 echo 1363 echo
1364 einfo "For example:"
1365 einfo "export CD_ROOT=/mnt/cdrom"
1366 echo
1301 else 1367 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1368 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1369 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1371 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1372 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1373 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1374 done
1309 echo 1375 echo
1310 einfo "If you do not have the CDs, but have the data files" 1376 einfo "If you do not have the CDs, but have the data files"
1311 einfo "mounted somewhere on your filesystem, just export" 1377 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1378 einfo "the following variables so they point to the right place:"
1313 einfon "" 1379 einfon ""
1314 cdcnt=0 1380 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1381 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1382 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1383 echo -n " CD_ROOT_${cdcnt}"
1318 done 1384 done
1319 echo 1385 echo
1320 einfo "Or, if you have all the files in the same place, or" 1386 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" 1387 einfo "you only have one cdrom, you can export CD_ROOT"
1322 einfo "and that place will be used as the same data source" 1388 einfo "and that place will be used as the same data source"
1323 einfo "for all the CDs." 1389 einfo "for all the CDs."
1324 echo 1390 echo
1391 einfo "For example:"
1392 einfo "export CD_ROOT_1=/mnt/cdrom"
1393 echo
1325 fi 1394 fi
1326 export CDROM_CURRENT_CD=0 1395 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1396 cdrom_load_next_cd
1328} 1397}
1329 1398
1333# remember, you can only go forward in the cd chain, you can't go back. 1402# remember, you can only go forward in the cd chain, you can't go back.
1334cdrom_load_next_cd() { 1403cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1404 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1405 local var=
1337 1406
1338 if [ ! -z "${CD_ROOT}" ] ; then 1407 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1408 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1409 return
1341 fi 1410 fi
1342 1411
1343 unset CDROM_ROOT 1412 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1413 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1414 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1415 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1416 cdrom_locate_file_on_cd ${!var}
1348 else 1417 else
1349 export CDROM_ROOT="${!var}" 1418 export CDROM_ROOT=${!var}
1350 fi 1419 fi
1351 1420
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1421 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1422}
1354 1423
1358# found, then a message asking for the user to insert the cdrom will be 1427# found, then a message asking for the user to insert the cdrom will be
1359# displayed and we'll hang out here until: 1428# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1429# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1430# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1431cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1432 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1433 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1434 local file="$(basename ${@})"
1366 local mline="" 1435 local mline=""
1367 local showedmsg=0 1436 local showedmsg=0
1368 1437
1369 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1370 [ -d "${mline}/${dir}" ] || continue 1439 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1372 && export CDROM_ROOT=${mline} 1441 && export CDROM_ROOT=${mline}
1373 done 1442 done
1374 1443
1375 if [ -z "${CDROM_ROOT}" ] ; then 1444 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1445 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1446 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1447 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1448 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1449 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1450 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1451 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1452 fi
1384 else 1453 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1454 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1455 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1456 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1457 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1458 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1459 fi
1410# directories and uses the intersection of the lists. 1479# directories and uses the intersection of the lists.
1411# The -u builds a list of po files found in all the 1480# The -u builds a list of po files found in all the
1412# directories and uses the union of the lists. 1481# directories and uses the union of the lists.
1413strip-linguas() { 1482strip-linguas() {
1414 local ls newls 1483 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1484 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1485 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1486 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1487 local d f
1419 for d in "$@" ; do 1488 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1489 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1490 newls=${ls}
1422 else 1491 else
1423 newls="" 1492 newls=""
1424 fi 1493 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1494 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1495 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1496 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1497 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1498 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1499 fi
1431 done 1500 done
1432 ls="${newls}" 1501 ls=${newls}
1433 done 1502 done
1434 ls="${ls//.po}" 1503 ls=${ls//.po}
1435 else 1504 else
1436 ls="$@" 1505 ls=$@
1437 fi 1506 fi
1438 1507
1439 ls=" ${ls} " 1508 ls=" ${ls} "
1440 newls="" 1509 newls=""
1441 for f in ${LINGUAS} ; do 1510 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1511 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 newls="${newls} ${f}" 1512 newls="${newls} ${f}"
1444 else 1513 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1515 fi
1447 done 1516 done
1448 if [ -z "${newls}" ] ; then 1517 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1518 unset LINGUAS
1450 else 1519 else
1451 export LINGUAS="${newls}" 1520 export LINGUAS=${newls:1}
1452 fi 1521 fi
1453} 1522}
1454 1523
1455# moved from kernel.eclass since they are generally useful outside of 1524# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1525# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1527# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1528# for an example see ivtv or drbd ebuilds
1460 1529
1461# set's ARCH to match what the kernel expects 1530# set's ARCH to match what the kernel expects
1462set_arch_to_kernel() { 1531set_arch_to_kernel() {
1532 i=10
1533 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1537 case ${ARCH} in
1465 x86) export ARCH="i386";; 1538 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1539 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1540 hppa) export ARCH="parisc";;
1468 mips) export ARCH="mips";; 1541 mips) export ARCH="mips";;
1542 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}";; 1543 *) export ARCH="${ARCH}";;
1470 esac 1544 esac
1471} 1545}
1472 1546
1473# set's ARCH back to what portage expects 1547# set's ARCH back to what portage expects
1474set_arch_to_portage() { 1548set_arch_to_portage() {
1549 i=10
1550 while ((i--)) ; do
1551 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1552 done
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1553 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1554}
1477 1555
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1556# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1557# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1587 touch ${D}${LIB}
1510 fi 1588 fi
1511} 1589}
1512 1590
1513preserve_old_lib_notify() { 1591preserve_old_lib_notify() {
1514 LIB=$1 1592 LIB=$1
1515 1593
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1595 SONAME=`basename ${LIB}`
1518 1596
1519 einfo "An old version of an installed library was detected on your system." 1597 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" 1598 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," 1599 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:" 1600 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1601 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1602 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1603 einfo "After doing that, you can safely remove ${LIB}"
1526 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1527 fi 1605 fi
1528} 1606}
1529 1607
1530# Hack for people to figure out if a package was built with 1608# Hack for people to figure out if a package was built with
1531# certain USE flags 1609# certain USE flags
1532# 1610#
1533# Usage: built_with_use <DEPEND ATOM> <List of USE flags> 1611# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1534# ex: built_with_use xchat gtk2 1612# ex: built_with_use xchat gtk2
1613#
1614# Flags: -a all USE flags should be utilized
1615# -o at least one USE flag should be utilized
1616# Note: the default flag is '-a'
1535built_with_use() { 1617built_with_use() {
1618 local opt=$1
1619 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1620
1536 local PKG=$(portageq best_version ${ROOT} $1) 1621 local PKG=$(best_version $1)
1622 shift
1623
1537 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE" 1624 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1538 [[ ! -e ${USEFILE} ]] && return 1 1625 [[ ! -e ${USEFILE} ]] && return 1
1539 1626
1540 local USE_BUILT=$(<${USEFILE}) 1627 local USE_BUILT=$(<${USEFILE})
1541
1542 shift
1543 while [ $# -gt 0 ] ; do 1628 while [[ $# -gt 0 ]] ; do
1629 if [[ ${opt} = "-o" ]] ; then
1630 has $1 ${USE_BUILT} && return 0
1631 else
1544 has $1 ${USE_BUILT} || return 1 1632 has $1 ${USE_BUILT} || return 1
1633 fi
1545 shift 1634 shift
1546 done 1635 done
1547 return 0 1636 [[ ${opt} = "-a" ]]
1548} 1637}
1549 1638
1550# Many configure scripts wrongly bail when a C++ compiler 1639# Many configure scripts wrongly bail when a C++ compiler
1551# could not be detected. #73450 1640# could not be detected. #73450
1552epunt_cxx() { 1641epunt_cxx() {
1553 local dir=$1 1642 local dir=$1
1554 [[ -z ${dir} ]] && dir=${S} 1643 [[ -z ${dir} ]] && dir=${S}
1555 ebegin "Removing useless C++ checks" 1644 ebegin "Removing useless C++ checks"
1558 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1647 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1559 done 1648 done
1560 eend 0 1649 eend 0
1561} 1650}
1562 1651
1563# get_abi_var <VAR> [<ABI>] 1652# dopamd <file> [more files]
1564# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1565# 1653#
1566# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1654# 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 1655dopamd() {
1568# it is subject to removal if a better way is worked out. 1656 [[ -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 1657
1596get_abi_CFLAGS() { get_abi_var CFLAGS $1; } 1658 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 1659
1660 insinto /etc/pam.d
1661 # these are the default doins options, but be explicit just in case
1662 insopts -m 0644 -o root -g root
1663 doins "$@" || die "failed to install $@"
1664}
1665# newpamd <old name> <new name>
1666#
1667# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670
1671 use pam || return 0
1672
1673 insinto /etc/pam.d
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1676 newins "$1" "$2" || die "failed to install $1 as $2"
1677}

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

  ViewVC Help
Powered by ViewVC 1.1.20