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

Diff of /eclass/eutils.eclass

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

Revision 1.117 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.117 2004/10/09 18:25:43 vapier 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)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96}
97
98# This function generate linker scripts in /usr/lib for dynamic 91# This function generate linker scripts in /usr/lib for dynamic
99# 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
100# 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
101# 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
102# 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
221 local x="" 214 local x=""
222 215
223 if [ "$#" -gt 1 ] 216 if [ "$#" -gt 1 ]
224 then 217 then
225 local m="" 218 local m=""
226 einfo "${#} patches to apply..." 219 einfo "${#} patches to apply ..."
227 for m in "$@" ; do 220 for m in "$@" ; do
228 epatch "${m}" 221 epatch "${m}"
229 done 222 done
230 return 0 223 return 0
231 fi 224 fi
245 local EPATCH_SOURCE="$1/*" 238 local EPATCH_SOURCE="$1/*"
246 else 239 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 240 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 241 fi
249 else 242 else
250 if [ ! -d ${EPATCH_SOURCE} ] 243 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 244 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 245 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 246 then
254 EPATCH_SOURCE="$1" 247 EPATCH_SOURCE="$1"
255 fi 248 fi
256 249
257 echo 250 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 251 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 252 eerror
260 eerror " ${EPATCH_SOURCE}" 253 eerror " ${EPATCH_SOURCE}"
254 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 255 echo
262 die "Cannot find \$EPATCH_SOURCE!" 256 die "Cannot find \$EPATCH_SOURCE!"
263 fi 257 fi
264 258
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 259 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 278 ;;
285 esac 279 esac
286 280
287 if [ "${SINGLE_PATCH}" = "no" ] 281 if [ "${SINGLE_PATCH}" = "no" ]
288 then 282 then
289 einfo "Applying various patches (bugfixes/updates)..." 283 einfo "Applying various patches (bugfixes/updates) ..."
290 fi 284 fi
291 for x in ${EPATCH_SOURCE} 285 for x in ${EPATCH_SOURCE}
292 do 286 do
293 # New ARCH dependant patch naming scheme... 287 # New ARCH dependant patch naming scheme ...
294 # 288 #
295 # ???_arch_foo.patch 289 # ???_arch_foo.patch
296 # 290 #
297 if [ -f ${x} ] && \ 291 if [ -f ${x} ] && \
298 ([ "${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}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 293 [ "${EPATCH_FORCE}" = "yes" ])
300 then 294 then
301 local count=0 295 local count=0
302 local popts="${EPATCH_OPTS}" 296 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/}
303 298
304 if [ -n "${EPATCH_EXCLUDE}" ] 299 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 300 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 301 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 302 then
308 continue 303 continue
309 fi 304 fi
310 fi 305 fi
311 306
313 then 308 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 309 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 310 then
316 einfo "${EPATCH_SINGLE_MSG}" 311 einfo "${EPATCH_SINGLE_MSG}"
317 else 312 else
318 einfo "Applying ${x##*/}..." 313 einfo "Applying ${patchname} ..."
319 fi 314 fi
320 else 315 else
321 einfo " ${x##*/}..." 316 einfo " ${patchname} ..."
322 fi 317 fi
323 318
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 319 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 321
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 322 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 323 while [ "${count}" -lt 5 ]
329 do 324 do
330 # Generate some useful debug info ... 325 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 328
334 if [ "${PATCH_SUFFIX}" != "patch" ] 329 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 330 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 333 else
339 PATCH_TARGET="${x}" 334 PATCH_TARGET="${x}"
340 fi 335 fi
341 336
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 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##*/}
344 339
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 342
348 if [ "${PATCH_SUFFIX}" != "patch" ] 343 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 344 then
350 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
351 then 346 then
352 echo 347 echo
353 eerror "Could not extract patch!" 348 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 349 #die "Could not extract patch!"
355 count=5 350 count=5
356 break 351 break
357 fi 352 fi
358 fi 353 fi
359 354
360 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
361 then 356 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 362
368 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
369 364
370 if [ "$?" -ne 0 ] 365 if [ "$?" -ne 0 ]
371 then 366 then
372 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##*/}
373 echo 368 echo
374 eerror "A dry-run of patch command succeeded, but actually" 369 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 370 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 371 #die "Real world sux compared to the dreamworld!"
377 count=5 372 count=5
378 fi 373 fi
379 374
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 375 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 376
382 break 377 break
383 fi 378 fi
384 379
385 count=$((count + 1)) 380 count=$((count + 1))
391 fi 386 fi
392 387
393 if [ "${count}" -eq 5 ] 388 if [ "${count}" -eq 5 ]
394 then 389 then
395 echo 390 echo
396 eerror "Failed Patch: ${x##*/}!" 391 eerror "Failed Patch: ${patchname}!"
397 eerror 392 eerror
398 eerror "Include in your bugreport the contents of:" 393 eerror "Include in your bugreport the contents of:"
399 eerror 394 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 396 echo
402 die "Failed Patch: ${x##*/}!" 397 die "Failed Patch: ${patchname}!"
403 fi 398 fi
404 399
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 400 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 401
407 eend 0 402 eend 0
408 fi 403 fi
409 done 404 done
410 if [ "${SINGLE_PATCH}" = "no" ] 405 if [ "${SINGLE_PATCH}" = "no" ]
438 433
439 return 1; 434 return 1;
440 } 435 }
441 END 436 END
442 437
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then 440 then
446 echo "yes" 441 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... " 442 einfon "Checking what PTHREADS implementation we have ..."
448 if ${T}/nptl 443 if ${T}/nptl
449 then 444 then
450 return 0 445 return 0
451 else 446 else
452 return 1 447 return 1
528 523
529 if [ -n "${ADMINPARAM}" ] 524 if [ -n "${ADMINPARAM}" ]
530 then 525 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ] 526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then 527 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else 530 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi 533 fi
539 fi 534 fi
540} 535}
541 536
543# does not exist on the users system 538# does not exist on the users system
544# vapier@gentoo.org 539# vapier@gentoo.org
545# 540#
546# Takes just 1 optional parameter (the directory to create tmpfile in) 541# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 542emktemp() {
543 local exe="touch"
544 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 545 local topdir="$1"
549 546
550 if [ -z "${topdir}" ] 547 if [ -z "${topdir}" ]
551 then 548 then
552 [ -z "${T}" ] \ 549 [ -z "${T}" ] \
558 then 555 then
559 local tmp=/ 556 local tmp=/
560 while [ -e "${tmp}" ] ; do 557 while [ -e "${tmp}" ] ; do
561 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
562 done 559 done
563 touch "${tmp}" 560 ${exe} "${tmp}"
564 echo "${tmp}" 561 echo "${tmp}"
565 else 562 else
563 [ "${exe}" == "touch" ] \
564 && exe="-p" \
565 || exe="-d"
566 mktemp -p "${topdir}" 566 mktemp ${exe} "${topdir}"
567 fi 567 fi
568} 568}
569 569
570# Small wrapper for getent (Linux), nidump (Mac OS X), 570# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 571# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 574#
575# egetent(database, key) 575# egetent(database, key)
576egetent() { 576egetent() {
577 if useq macos || useq ppc-macos ; then 577 if useq ppc-macos ; then
578 case "$2" in 578 case "$2" in
579 *[!0-9]*) # Non numeric 579 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 581 ;;
582 *) # Numeric 582 *) # Numeric
729 729
730 # handle extra and add the user 730 # handle extra and add the user
731 local eextra="$@" 731 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 732 local oldsandbox="${SANDBOX_ON}"
733 export SANDBOX_ON="0" 733 export SANDBOX_ON="0"
734 if useq macos || useq ppc-macos ; 734 if useq ppc-macos
735 then 735 then
736 ### Make the user 736 ### Make the user
737 if [ -z "${eextra}" ] 737 if [ -z "${eextra}" ]
738 then 738 then
739 dscl . create /users/${euser} uid ${euid} 739 dscl . create /users/${euser} uid ${euid}
822 then 822 then
823 if [ "${egid}" -gt 0 ] 823 if [ "${egid}" -gt 0 ]
824 then 824 then
825 if [ -z "`egetent group ${egid}`" ] 825 if [ -z "`egetent group ${egid}`" ]
826 then 826 then
827 if useq macos || useq ppc-macos ; then 827 if useq ppc-macos ; then
828 opts="${opts} ${egid}" 828 opts="${opts} ${egid}"
829 else 829 else
830 opts="${opts} -g ${egid}" 830 opts="${opts} -g ${egid}"
831 fi 831 fi
832 else 832 else
846 opts="${opts} ${eextra}" 846 opts="${opts} ${eextra}"
847 847
848 # add the group 848 # add the group
849 local oldsandbox="${SANDBOX_ON}" 849 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 850 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 851 if useq ppc-macos ; then
852 then
853 if [ ! -z "${eextra}" ]; 852 if [ ! -z "${eextra}" ];
854 then 853 then
855 einfo "Extra options are not supported on macos yet" 854 einfo "Extra options are not supported on macos yet"
856 einfo "Please report the ebuild along with the info below" 855 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 856 einfo "eextra: ${eextra}"
882} 881}
883 882
884# Simple script to replace 'dos2unix' binaries 883# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 884# vapier@gentoo.org
886# 885#
887# edos2unix(file, <more files>...) 886# edos2unix(file, <more files> ...)
888edos2unix() { 887edos2unix() {
889 for f in "$@" 888 for f in "$@"
890 do 889 do
891 cp "${f}" ${T}/edos2unix 890 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}" 891 sed 's/\r$//' ${T}/edos2unix > "${f}"
893 done 892 done
894} 893}
895 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
896# Make a desktop file ! 902# Make a desktop file !
897# Great for making those icons in kde/gnome startmenu ! 903# Great for making those icons in kde/gnome startmenu !
898# Amaze your friends ! Get the women ! Join today ! 904# Amaze your friends ! Get the women ! Join today !
899# gnome2 /usr/share/applications
900# gnome1 /usr/share/gnome/apps/
901# KDE ${KDEDIR}/share/applnk /usr/share/applnk
902# 905#
903# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 906# make_desktop_entry(<binary>, [name], [icon], [type], [path])
904# 907#
905# binary: what binary does the app run with ? 908# binary: what binary does the app run with ?
906# name: the name that will show up in the menu 909# name: the name that will show up in the menu
907# icon: give your little like a pretty little icon ... 910# icon: give your little like a pretty little icon ...
908# this can be relative (to /usr/share/pixmaps) or 911# this can be relative (to /usr/share/pixmaps) or
909# a full path to an icon 912# a full path to an icon
910# type: what kind of application is this ? for categories: 913# type: what kind of application is this ? for categories:
911# http://www.freedesktop.org/standards/menu-spec/ 914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
912# path: if your app needs to startup in a specific dir 915# path: if your app needs to startup in a specific dir
913make_desktop_entry() { 916make_desktop_entry() {
914 [ -z "$1" ] && eerror "You must specify the executable" && return 1 917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1
915 918
916 local exec="${1}" 919 local exec="${1}"
917 local name="${2:-${PN}}" 920 local name="${2:-${PN}}"
918 local icon="${3:-${PN}.png}" 921 local icon="${3:-${PN}.png}"
919 local type="${4}" 922 local type="${4}"
938 type= 941 type=
939 subdir= 942 subdir=
940 ;; 943 ;;
941 esac 944 esac
942 fi 945 fi
943 local desktop="${T}/${exec}.desktop" 946 local desktop="${T}/${exec%% *}-${P}.desktop"
944 947
945echo "[Desktop Entry] 948echo "[Desktop Entry]
946Encoding=UTF-8 949Encoding=UTF-8
947Version=0.9.2 950Version=0.9.2
948Name=${name} 951Name=${name}
951Exec=${exec} 954Exec=${exec}
952Path=${path} 955Path=${path}
953Icon=${icon} 956Icon=${icon}
954Categories=Application;${type};" > "${desktop}" 957Categories=Application;${type};" > "${desktop}"
955 958
956 if [ -d "/usr/share/applications" ]
957 then
958 insinto /usr/share/applications 959 insinto /usr/share/applications
959 doins "${desktop}" 960 doins "${desktop}"
960 fi
961
962 #if [ -d "/usr/share/gnome/apps" ]
963 #then
964 # insinto /usr/share/gnome/apps/Games
965 # doins ${desktop}
966 #fi
967
968 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
969 #then
970 # for ver in /usr/kde/*
971 # do
972 # insinto ${ver}/share/applnk/Games
973 # doins ${desktop}
974 # done
975 #fi
976
977 if [ -d "/usr/share/applnk" ]
978 then
979 insinto /usr/share/applnk/${subdir}
980 doins "${desktop}"
981 fi
982 961
983 return 0 962 return 0
984} 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
985 1036
986# for internal use only (unpack_pdv and unpack_makeself) 1037# for internal use only (unpack_pdv and unpack_makeself)
987find_unpackable_file() { 1038find_unpackable_file() {
988 local src="$1" 1039 local src="$1"
989 if [ -z "${src}" ] 1040 if [ -z "${src}" ]
1270 export CDROM_TOTAL_CDS=${cdcnt} 1321 export CDROM_TOTAL_CDS=${cdcnt}
1271 export CDROM_CURRENT_CD=1 1322 export CDROM_CURRENT_CD=1
1272 1323
1273 # now we see if the user gave use CD_ROOT ... 1324 # now we see if the user gave use CD_ROOT ...
1274 # 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
1275 if [ ! -z "${CD_ROOT}" ] ; then 1326 if [[ ! -z ${CD_ROOT} ]] ; then
1276 export CDROM_ROOT="${CD_ROOT}" 1327 export CDROM_ROOT=${CD_ROOT}
1277 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1278 return 1329 return
1279 fi 1330 fi
1280 # do the same for CD_ROOT_X 1331 # do the same for CD_ROOT_X
1281 if [ ! -z "${CD_ROOT_1}" ] ; then 1332 if [[ ! -z ${CD_ROOT_1} ]] ; then
1282 local var= 1333 local var=
1283 cdcnt=0 1334 cdcnt=0
1284 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1285 cdcnt=$((cdcnt + 1)) 1336 cdcnt=$((cdcnt + 1))
1286 var="CD_ROOT_${cdcnt}" 1337 var="CD_ROOT_${cdcnt}"
1287 if [ -z "${!var}" ] ; then 1338 if [[ -z ${!var} ]] ; then
1288 eerror "You must either use just the CD_ROOT" 1339 eerror "You must either use just the CD_ROOT"
1289 eerror "or specify ALL the CD_ROOT_X variables." 1340 eerror "or specify ALL the CD_ROOT_X variables."
1290 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."
1291 die "could not locate CD_ROOT_${cdcnt}" 1342 die "could not locate CD_ROOT_${cdcnt}"
1292 fi 1343 fi
1295 export CDROM_ROOT=${CDROM_ROOTS_1} 1346 export CDROM_ROOT=${CDROM_ROOTS_1}
1296 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1297 return 1348 return
1298 fi 1349 fi
1299 1350
1300 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1351 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1301 einfon "This ebuild will need the " 1352 einfon "This ebuild will need the "
1302 if [ -z "${CDROM_NAME}" ] ; then 1353 if [[ -z ${CDROM_NAME} ]] ; then
1303 echo "cdrom for ${PN}." 1354 echo "cdrom for ${PN}."
1304 else 1355 else
1305 echo "${CDROM_NAME}." 1356 echo "${CDROM_NAME}."
1306 fi 1357 fi
1307 echo 1358 echo
1308 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"
1309 einfo "mounted somewhere on your filesystem, just export" 1360 einfo "mounted somewhere on your filesystem, just export"
1310 einfo "the variable CD_ROOT so that it points to the" 1361 einfo "the variable CD_ROOT so that it points to the"
1311 einfo "directory containing the files." 1362 einfo "directory containing the files."
1312 echo 1363 echo
1364 einfo "For example:"
1365 einfo "export CD_ROOT=/mnt/cdrom"
1366 echo
1313 else 1367 else
1314 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1368 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1315 cdcnt=0 1369 cdcnt=0
1316 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1317 cdcnt=$((cdcnt + 1)) 1371 cdcnt=$((cdcnt + 1))
1318 var="CDROM_NAME_${cdcnt}" 1372 var="CDROM_NAME_${cdcnt}"
1319 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1373 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1320 done 1374 done
1321 echo 1375 echo
1322 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"
1323 einfo "mounted somewhere on your filesystem, just export" 1377 einfo "mounted somewhere on your filesystem, just export"
1324 einfo "the following variables so they point to the right place:" 1378 einfo "the following variables so they point to the right place:"
1325 einfon "" 1379 einfon ""
1326 cdcnt=0 1380 cdcnt=0
1327 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1381 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1328 cdcnt=$((cdcnt + 1)) 1382 cdcnt=$((cdcnt + 1))
1329 echo -n " CD_ROOT_${cdcnt}" 1383 echo -n " CD_ROOT_${cdcnt}"
1330 done 1384 done
1331 echo 1385 echo
1332 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"
1333 einfo "you only have one cdrom, you can export CD_ROOT" 1387 einfo "you only have one cdrom, you can export CD_ROOT"
1334 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"
1335 einfo "for all the CDs." 1389 einfo "for all the CDs."
1336 echo 1390 echo
1391 einfo "For example:"
1392 einfo "export CD_ROOT_1=/mnt/cdrom"
1393 echo
1337 fi 1394 fi
1338 export CDROM_CURRENT_CD=0 1395 export CDROM_CURRENT_CD=0
1339 cdrom_load_next_cd 1396 cdrom_load_next_cd
1340} 1397}
1341 1398
1345# 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.
1346cdrom_load_next_cd() { 1403cdrom_load_next_cd() {
1347 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1404 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1348 local var= 1405 local var=
1349 1406
1350 if [ ! -z "${CD_ROOT}" ] ; then 1407 if [[ ! -z ${CD_ROOT} ]] ; then
1351 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1408 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1352 return 1409 return
1353 fi 1410 fi
1354 1411
1355 unset CDROM_ROOT 1412 unset CDROM_ROOT
1356 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1413 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1357 if [ -z "${!var}" ] ; then 1414 if [[ -z ${!var} ]] ; then
1358 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1415 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1359 cdrom_locate_file_on_cd ${!var} 1416 cdrom_locate_file_on_cd ${!var}
1360 else 1417 else
1361 export CDROM_ROOT="${!var}" 1418 export CDROM_ROOT=${!var}
1362 fi 1419 fi
1363 1420
1364 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1421 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1365} 1422}
1366 1423
1370# 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
1371# displayed and we'll hang out here until: 1428# displayed and we'll hang out here until:
1372# (1) the file is found on a mounted cdrom 1429# (1) the file is found on a mounted cdrom
1373# (2) the user hits CTRL+C 1430# (2) the user hits CTRL+C
1374cdrom_locate_file_on_cd() { 1431cdrom_locate_file_on_cd() {
1375 while [ -z "${CDROM_ROOT}" ] ; do 1432 while [[ -z ${CDROM_ROOT} ]] ; do
1376 local dir="$(dirname ${@})" 1433 local dir="$(dirname ${@})"
1377 local file="$(basename ${@})" 1434 local file="$(basename ${@})"
1378 local mline="" 1435 local mline=""
1379 local showedmsg=0 1436 local showedmsg=0
1380 1437
1381 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
1382 [ -d "${mline}/${dir}" ] || continue 1439 [[ -d ${mline}/${dir} ]] || continue
1383 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1384 && export CDROM_ROOT=${mline} 1441 && export CDROM_ROOT=${mline}
1385 done 1442 done
1386 1443
1387 if [ -z "${CDROM_ROOT}" ] ; then 1444 if [[ -z ${CDROM_ROOT} ]] ; then
1388 echo 1445 echo
1389 if [ ${showedmsg} -eq 0 ] ; then 1446 if [[ ${showedmsg} -eq 0 ]] ; then
1390 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1447 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1391 if [ -z "${CDROM_NAME}" ] ; then 1448 if [[ -z ${CDROM_NAME} ]] ; then
1392 einfo "Please insert the cdrom for ${PN} now !" 1449 einfo "Please insert the cdrom for ${PN} now !"
1393 else 1450 else
1394 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1451 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1395 fi 1452 fi
1396 else 1453 else
1397 if [ -z "${CDROM_NAME_1}" ] ; then 1454 if [[ -z ${CDROM_NAME_1} ]] ; then
1398 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1455 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1399 else 1456 else
1400 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1457 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1401 einfo "Please insert+mount the ${!var} cdrom now !" 1458 einfo "Please insert+mount the ${!var} cdrom now !"
1402 fi 1459 fi
1422# directories and uses the intersection of the lists. 1479# directories and uses the intersection of the lists.
1423# 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
1424# directories and uses the union of the lists. 1481# directories and uses the union of the lists.
1425strip-linguas() { 1482strip-linguas() {
1426 local ls newls 1483 local ls newls
1427 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1484 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1428 local op="$1"; shift 1485 local op=$1; shift
1429 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1486 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1430 local d f 1487 local d f
1431 for d in "$@" ; do 1488 for d in "$@" ; do
1432 if [ "${op}" == "-u" ] ; then 1489 if [[ ${op} == "-u" ]] ; then
1433 newls="${ls}" 1490 newls=${ls}
1434 else 1491 else
1435 newls="" 1492 newls=""
1436 fi 1493 fi
1437 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1494 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1438 if [ "${op}" == "-i" ] ; then 1495 if [[ ${op} == "-i" ]] ; then
1439 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1496 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1440 else 1497 else
1441 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1498 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1442 fi 1499 fi
1443 done 1500 done
1444 ls="${newls}" 1501 ls=${newls}
1445 done 1502 done
1446 ls="${ls//.po}" 1503 ls=${ls//.po}
1447 else 1504 else
1448 ls="$@" 1505 ls=$@
1449 fi 1506 fi
1450 1507
1451 ls=" ${ls} " 1508 ls=" ${ls} "
1452 newls="" 1509 newls=""
1453 for f in ${LINGUAS} ; do 1510 for f in ${LINGUAS} ; do
1454 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1511 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1455 nl="${newls} ${f}" 1512 newls="${newls} ${f}"
1456 else 1513 else
1457 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1458 fi 1515 fi
1459 done 1516 done
1460 if [ -z "${newls}" ] ; then 1517 if [[ -z ${newls} ]] ; then
1461 unset LINGUAS 1518 unset LINGUAS
1462 else 1519 else
1463 export LINGUAS="${newls}" 1520 export LINGUAS=${newls:1}
1464 fi 1521 fi
1465} 1522}
1466 1523
1467# moved from kernel.eclass since they are generally useful outside of 1524# moved from kernel.eclass since they are generally useful outside of
1468# kernel.eclass -iggy (20041002) 1525# kernel.eclass -iggy (20041002)
1470# the following functions are useful in kernel module ebuilds, etc. 1527# the following functions are useful in kernel module ebuilds, etc.
1471# for an example see ivtv or drbd ebuilds 1528# for an example see ivtv or drbd ebuilds
1472 1529
1473# set's ARCH to match what the kernel expects 1530# set's ARCH to match what the kernel expects
1474set_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
1475 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1476 case ${ARCH} in 1537 case ${ARCH} in
1477 x86) export ARCH="i386";; 1538 x86) export ARCH="i386";;
1478 amd64) export ARCH="x86_64";; 1539 amd64) export ARCH="x86_64";;
1479 hppa) export ARCH="parisc";; 1540 hppa) export ARCH="parisc";;
1480 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!
1481 *) export ARCH="${ARCH}";; 1543 *) export ARCH="${ARCH}";;
1482 esac 1544 esac
1483} 1545}
1484 1546
1485# set's ARCH back to what portage expects 1547# set's ARCH back to what portage expects
1486set_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
1487 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1553 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1488} 1554}
1489 1555
1490# Jeremy Huddleston <eradicator@gentoo.org>: 1556# Jeremy Huddleston <eradicator@gentoo.org>:
1491# preserve_old_lib /path/to/libblah.so.0 1557# preserve_old_lib /path/to/libblah.so.0
1521 touch ${D}${LIB} 1587 touch ${D}${LIB}
1522 fi 1588 fi
1523} 1589}
1524 1590
1525preserve_old_lib_notify() { 1591preserve_old_lib_notify() {
1526 LIB=$1 1592 LIB=$1
1527 1593
1528 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1529 SONAME=`basename ${LIB}` 1595 SONAME=`basename ${LIB}`
1530 1596
1531 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."
1532 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"
1533 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,"
1534 einfo "you will need to execute the following command:" 1600 einfo "you will need to execute the following command:"
1535 einfo " revdep-rebuild --soname ${SONAME}" 1601 einfo " revdep-rebuild --soname ${SONAME}"
1536 einfo 1602 einfo
1537 einfo "After doing that, you can safely remove ${LIB}" 1603 einfo "After doing that, you can safely remove ${LIB}"
1538 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1539 fi 1605 fi
1540} 1606}
1607
1608# Hack for people to figure out if a package was built with
1609# certain USE flags
1610#
1611# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
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'
1617built_with_use() {
1618 local opt=$1
1619 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1620
1621 local PKG=$(best_version $1)
1622 shift
1623
1624 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1625 [[ ! -e ${USEFILE} ]] && return 1
1626
1627 local USE_BUILT=$(<${USEFILE})
1628 while [[ $# -gt 0 ]] ; do
1629 if [[ ${opt} = "-o" ]] ; then
1630 has $1 ${USE_BUILT} && return 0
1631 else
1632 has $1 ${USE_BUILT} || return 1
1633 fi
1634 shift
1635 done
1636 [[ ${opt} = "-a" ]]
1637}
1638
1639# Many configure scripts wrongly bail when a C++ compiler
1640# could not be detected. #73450
1641epunt_cxx() {
1642 local dir=$1
1643 [[ -z ${dir} ]] && dir=${S}
1644 ebegin "Removing useless C++ checks"
1645 local f
1646 for f in $(find ${dir} -name configure) ; do
1647 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1648 done
1649 eend 0
1650}
1651
1652# dopamd <file> [more files]
1653#
1654# Install pam auth config file in /etc/pam.d
1655dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657
1658 use pam || return 0
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.117  
changed lines
  Added in v.1.157

  ViewVC Help
Powered by ViewVC 1.1.20