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

Diff of /eclass/eutils.eclass

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

Revision 1.118 Revision 1.161
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.118 2004/10/13 14:33:01 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.161 2005/03/23 04:30:51 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)
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
116gen_usr_ldscript() { 109gen_usr_ldscript() {
117 local libdir="$(get_libdir)" 110 local libdir="$(get_libdir)"
118 # Just make sure it exists 111 # Just make sure it exists
119 dodir /usr/${libdir} 112 dodir /usr/${libdir}
120 113
114 while [[ $# -gt 0 ]] ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 115 cat > "${D}/usr/${libdir}/$1" <<-END_LDSCRIPT
122/* GNU ld script 116 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 117 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 118 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 119 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 120 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 121
128 more info. */ 122 See bug http://bugs.gentoo.org/4411 for more info.
123 */
129GROUP ( /${libdir}/${1} ) 124 GROUP ( /${libdir}/$1 )
130END_LDSCRIPT 125 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 126 fperms a+x "/usr/${libdir}/$1"
127 shift
128 done
132} 129}
133 130
134# Simple function to draw a line consisting of '=' the same length as $* 131# Simple function to draw a line consisting of '=' the same length as $*
135# 132#
136# <azarah@gentoo.org> (11 Nov 2002) 133# <azarah@gentoo.org> (11 Nov 2002)
221 local x="" 218 local x=""
222 219
223 if [ "$#" -gt 1 ] 220 if [ "$#" -gt 1 ]
224 then 221 then
225 local m="" 222 local m=""
226 einfo "${#} patches to apply..." 223 einfo "${#} patches to apply ..."
227 for m in "$@" ; do 224 for m in "$@" ; do
228 epatch "${m}" 225 epatch "${m}"
229 done 226 done
230 return 0 227 return 0
231 fi 228 fi
245 local EPATCH_SOURCE="$1/*" 242 local EPATCH_SOURCE="$1/*"
246 else 243 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 244 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 245 fi
249 else 246 else
250 if [ ! -d ${EPATCH_SOURCE} ] 247 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 248 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 249 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 250 then
254 EPATCH_SOURCE="$1" 251 EPATCH_SOURCE="$1"
255 fi 252 fi
256 253
257 echo 254 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 255 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 256 eerror
260 eerror " ${EPATCH_SOURCE}" 257 eerror " ${EPATCH_SOURCE}"
258 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 259 echo
262 die "Cannot find \$EPATCH_SOURCE!" 260 die "Cannot find \$EPATCH_SOURCE!"
263 fi 261 fi
264 262
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 263 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 282 ;;
285 esac 283 esac
286 284
287 if [ "${SINGLE_PATCH}" = "no" ] 285 if [ "${SINGLE_PATCH}" = "no" ]
288 then 286 then
289 einfo "Applying various patches (bugfixes/updates)..." 287 einfo "Applying various patches (bugfixes/updates) ..."
290 fi 288 fi
291 for x in ${EPATCH_SOURCE} 289 for x in ${EPATCH_SOURCE}
292 do 290 do
293 # New ARCH dependant patch naming scheme... 291 # New ARCH dependant patch naming scheme ...
294 # 292 #
295 # ???_arch_foo.patch 293 # ???_arch_foo.patch
296 # 294 #
297 if [ -f ${x} ] && \ 295 if [ -f ${x} ] && \
298 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 296 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 297 [ "${EPATCH_FORCE}" = "yes" ])
300 then 298 then
301 local count=0 299 local count=0
302 local popts="${EPATCH_OPTS}" 300 local popts="${EPATCH_OPTS}"
301 local patchname=${x##*/}
303 302
304 if [ -n "${EPATCH_EXCLUDE}" ] 303 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 304 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 305 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 306 then
308 continue 307 continue
309 fi 308 fi
310 fi 309 fi
311 310
313 then 312 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 313 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 314 then
316 einfo "${EPATCH_SINGLE_MSG}" 315 einfo "${EPATCH_SINGLE_MSG}"
317 else 316 else
318 einfo "Applying ${x##*/}..." 317 einfo "Applying ${patchname} ..."
319 fi 318 fi
320 else 319 else
321 einfo " ${x##*/}..." 320 einfo " ${patchname} ..."
322 fi 321 fi
323 322
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 323 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 325
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 326 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 327 while [ "${count}" -lt 5 ]
329 do 328 do
330 # Generate some useful debug info ... 329 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 331 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 332
334 if [ "${PATCH_SUFFIX}" != "patch" ] 333 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 334 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 335 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 336 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 337 else
339 PATCH_TARGET="${x}" 338 PATCH_TARGET="${x}"
340 fi 339 fi
341 340
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 341 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 342 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 343
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 344 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 345 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 346
348 if [ "${PATCH_SUFFIX}" != "patch" ] 347 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 348 then
350 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 349 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
351 then 350 then
352 echo 351 echo
353 eerror "Could not extract patch!" 352 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 353 #die "Could not extract patch!"
355 count=5 354 count=5
356 break 355 break
357 fi 356 fi
358 fi 357 fi
359 358
360 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 359 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
361 then 360 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 361 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 362 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 363 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 364 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 365 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 366
368 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 367 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
369 368
370 if [ "$?" -ne 0 ] 369 if [ "$?" -ne 0 ]
371 then 370 then
372 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 371 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
373 echo 372 echo
374 eerror "A dry-run of patch command succeeded, but actually" 373 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 374 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 375 #die "Real world sux compared to the dreamworld!"
377 count=5 376 count=5
378 fi 377 fi
379 378
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 379 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 380
382 break 381 break
383 fi 382 fi
384 383
385 count=$((count + 1)) 384 count=$((count + 1))
391 fi 390 fi
392 391
393 if [ "${count}" -eq 5 ] 392 if [ "${count}" -eq 5 ]
394 then 393 then
395 echo 394 echo
396 eerror "Failed Patch: ${x##*/}!" 395 eerror "Failed Patch: ${patchname} !"
396 eerror " ( ${PATCH_TARGET} )"
397 eerror 397 eerror
398 eerror "Include in your bugreport the contents of:" 398 eerror "Include in your bugreport the contents of:"
399 eerror 399 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 400 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 401 echo
402 die "Failed Patch: ${x##*/}!" 402 die "Failed Patch: ${patchname}!"
403 fi 403 fi
404 404
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 405 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 406
407 eend 0 407 eend 0
408 fi 408 fi
409 done 409 done
410 if [ "${SINGLE_PATCH}" = "no" ] 410 if [ "${SINGLE_PATCH}" = "no" ]
438 438
439 return 1; 439 return 1;
440 } 440 }
441 END 441 END
442 442
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then 445 then
446 echo "yes" 446 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... " 447 einfon "Checking what PTHREADS implementation we have ..."
448 if ${T}/nptl 448 if ${T}/nptl
449 then 449 then
450 return 0 450 return 0
451 else 451 else
452 return 1 452 return 1
528 528
529 if [ -n "${ADMINPARAM}" ] 529 if [ -n "${ADMINPARAM}" ]
530 then 530 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ] 531 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then 532 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else 535 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 537 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi 538 fi
539 fi 539 fi
540} 540}
541 541
543# does not exist on the users system 543# does not exist on the users system
544# vapier@gentoo.org 544# vapier@gentoo.org
545# 545#
546# Takes just 1 optional parameter (the directory to create tmpfile in) 546# Takes just 1 optional parameter (the directory to create tmpfile in)
547emktemp() { 547emktemp() {
548 local exe="touch"
549 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 550 local topdir="$1"
549 551
550 if [ -z "${topdir}" ] 552 if [ -z "${topdir}" ]
551 then 553 then
552 [ -z "${T}" ] \ 554 [ -z "${T}" ] \
558 then 560 then
559 local tmp=/ 561 local tmp=/
560 while [ -e "${tmp}" ] ; do 562 while [ -e "${tmp}" ] ; do
561 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 563 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
562 done 564 done
563 touch "${tmp}" 565 ${exe} "${tmp}"
564 echo "${tmp}" 566 echo "${tmp}"
565 else 567 else
568 [ "${exe}" == "touch" ] \
569 && exe="-p" \
570 || exe="-d"
566 mktemp -p "${topdir}" 571 mktemp ${exe} "${topdir}"
567 fi 572 fi
568} 573}
569 574
570# Small wrapper for getent (Linux), nidump (Mac OS X), 575# Small wrapper for getent (Linux), nidump (Mac OS X),
571# and pw (FreeBSD) used in enewuser()/enewgroup() 576# and pw (FreeBSD) used in enewuser()/enewgroup()
572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 577# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 578# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
574# 579#
575# egetent(database, key) 580# egetent(database, key)
576egetent() { 581egetent() {
577 if useq macos || useq ppc-macos ; then 582 if useq ppc-macos ; then
578 case "$2" in 583 case "$2" in
579 *[!0-9]*) # Non numeric 584 *[!0-9]*) # Non numeric
580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 585 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
581 ;; 586 ;;
582 *) # Numeric 587 *) # Numeric
729 734
730 # handle extra and add the user 735 # handle extra and add the user
731 local eextra="$@" 736 local eextra="$@"
732 local oldsandbox="${SANDBOX_ON}" 737 local oldsandbox="${SANDBOX_ON}"
733 export SANDBOX_ON="0" 738 export SANDBOX_ON="0"
734 if useq macos || useq ppc-macos ; 739 if useq ppc-macos
735 then 740 then
736 ### Make the user 741 ### Make the user
737 if [ -z "${eextra}" ] 742 if [ -z "${eextra}" ]
738 then 743 then
739 dscl . create /users/${euser} uid ${euid} 744 dscl . create /users/${euser} uid ${euid}
822 then 827 then
823 if [ "${egid}" -gt 0 ] 828 if [ "${egid}" -gt 0 ]
824 then 829 then
825 if [ -z "`egetent group ${egid}`" ] 830 if [ -z "`egetent group ${egid}`" ]
826 then 831 then
827 if useq macos || useq ppc-macos ; then 832 if useq ppc-macos ; then
828 opts="${opts} ${egid}" 833 opts="${opts} ${egid}"
829 else 834 else
830 opts="${opts} -g ${egid}" 835 opts="${opts} -g ${egid}"
831 fi 836 fi
832 else 837 else
846 opts="${opts} ${eextra}" 851 opts="${opts} ${eextra}"
847 852
848 # add the group 853 # add the group
849 local oldsandbox="${SANDBOX_ON}" 854 local oldsandbox="${SANDBOX_ON}"
850 export SANDBOX_ON="0" 855 export SANDBOX_ON="0"
851 if useq macos || useq ppc-macos ; 856 if useq ppc-macos ; then
852 then
853 if [ ! -z "${eextra}" ]; 857 if [ ! -z "${eextra}" ];
854 then 858 then
855 einfo "Extra options are not supported on macos yet" 859 einfo "Extra options are not supported on macos yet"
856 einfo "Please report the ebuild along with the info below" 860 einfo "Please report the ebuild along with the info below"
857 einfo "eextra: ${eextra}" 861 einfo "eextra: ${eextra}"
882} 886}
883 887
884# Simple script to replace 'dos2unix' binaries 888# Simple script to replace 'dos2unix' binaries
885# vapier@gentoo.org 889# vapier@gentoo.org
886# 890#
887# edos2unix(file, <more files>...) 891# edos2unix(file, <more files> ...)
888edos2unix() { 892edos2unix() {
889 for f in "$@" 893 for f in "$@"
890 do 894 do
891 cp "${f}" ${T}/edos2unix 895 cp "${f}" ${T}/edos2unix
892 sed 's/\r$//' ${T}/edos2unix > "${f}" 896 sed 's/\r$//' ${T}/edos2unix > "${f}"
893 done 897 done
894} 898}
895 899
900
901##############################################################
902# START: Handle .desktop files and menu entries #
903# maybe this should be separated into a new eclass some time #
904# lanius@gentoo.org #
905##############################################################
906
896# Make a desktop file ! 907# Make a desktop file !
897# Great for making those icons in kde/gnome startmenu ! 908# Great for making those icons in kde/gnome startmenu !
898# Amaze your friends ! Get the women ! Join today ! 909# Amaze your friends ! Get the women ! Join today !
899# 910#
900# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 911# make_desktop_entry(<binary>, [name], [icon], [type], [path])
903# name: the name that will show up in the menu 914# name: the name that will show up in the menu
904# icon: give your little like a pretty little icon ... 915# icon: give your little like a pretty little icon ...
905# this can be relative (to /usr/share/pixmaps) or 916# this can be relative (to /usr/share/pixmaps) or
906# a full path to an icon 917# a full path to an icon
907# type: what kind of application is this ? for categories: 918# type: what kind of application is this ? for categories:
908# http://www.freedesktop.org/standards/menu-spec/ 919# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
909# path: if your app needs to startup in a specific dir 920# path: if your app needs to startup in a specific dir
910make_desktop_entry() { 921make_desktop_entry() {
911 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 922 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
912 923
913 local exec="${1}" 924 local exec=${1}
914 local name="${2:-${PN}}" 925 local name=${2:-${PN}}
915 local icon="${3:-${PN}.png}" 926 local icon=${3:-${PN}.png}
916 local type="${4}" 927 local type=${4}
917 local subdir="${6}" 928 local path=${5}
918 local path="${5:-${GAMES_BINDIR}}" 929
919 if [ -z "${type}" ] 930 if [[ -z ${type} ]] ; then
920 then 931 local catmaj=${CATEGORY%%-*}
921 case ${CATEGORY} in 932 local catmin=${CATEGORY##*-}
922 "app-emulation") 933 case ${catmaj} in
923 type=Emulator 934 app)
924 subdir="Emulation" 935 case ${catmin} in
936 admin) type=System;;
937 cdr) type=DiscBurning;;
938 dicts) type=Dictionary;;
939 editors) type=TextEditor;;
940 emacs) type=TextEditor;;
941 emulation) type=Emulator;;
942 laptop) type=HardwareSettings;;
943 office) type=Office;;
944 vim) type=TextEditor;;
945 xemacs) type=TextEditor;;
946 *) type=;;
947 esac
925 ;; 948 ;;
926 "games-"*) 949
927 type=Game 950 dev)
928 subdir="Games" 951 type="Development"
929 ;; 952 ;;
930 "net-"*) 953
931 type=Network 954 games)
932 subdir="${type}" 955 [[ -z ${path} ]] && path=${GAMES_BINDIR}
956
957 case ${catmin} in
958 action) type=ActionGame;;
959 arcade) type=ArcadeGame;;
960 board) type=BoardGame;;
961 kid) type=KidsGame;;
962 emulation) type=Emulator;;
963 puzzle) type=LogicGame;;
964 rpg) type=RolePlaying;;
965 roguelike) type=RolePlaying;;
966 simulation) type=Simulation;;
967 sports) type=SportsGame;;
968 strategy) type=StrategyGame;;
969 *) type=;;
970 esac
971 type="Game;${type}"
933 ;; 972 ;;
973
974 mail)
975 type="Network;Email"
976 ;;
977
978 media)
979 case ${catmin} in
980 gfx) type=Graphics;;
981 radio) type=Tuner;;
982 sound) type=Audio;;
983 tv) type=TV;;
984 video) type=Video;;
985 *) type=;;
986 esac
987 type="AudioVideo;${type}"
988 ;;
989
990 net)
991 case ${catmin} in
992 dialup) type=Dialup;;
993 ftp) type=FileTransfer;;
994 im) type=InstantMessaging;;
995 irc) type=IRCClient;;
996 mail) type=Email;;
997 news) type=News;;
998 nntp) type=News;;
999 p2p) type=FileTransfer;;
1000 *) type=;;
1001 esac
1002 type="Network;${type}"
1003 ;;
1004
1005 sci)
1006 case ${catmin} in
1007 astro*) type=Astronomoy;;
1008 bio*) type=Biology;;
1009 calc*) type=Calculator;;
1010 chem*) type=Chemistry;;
1011 geo*) type=Geology;;
1012 math*) type=Math;;
1013 *) type=;;
1014 esac
1015 type="Science;${type}"
1016 ;;
1017
1018 www)
1019 case ${catmin} in
1020 client) type=WebBrowser;;
1021 *) type=;;
1022 esac
1023 type="Network"
1024 ;;
1025
934 *) 1026 *)
935 type= 1027 type=
936 subdir=
937 ;; 1028 ;;
938 esac 1029 esac
939 fi 1030 fi
1031
940 local desktop="${T}/${exec}.desktop" 1032 local desktop=${T}/${exec%% *}-${P}.desktop
941 1033
942echo "[Desktop Entry] 1034echo "[Desktop Entry]
943Encoding=UTF-8 1035Encoding=UTF-8
944Version=0.9.2 1036Version=0.9.2
945Name=${name} 1037Name=${name}
953 insinto /usr/share/applications 1045 insinto /usr/share/applications
954 doins "${desktop}" 1046 doins "${desktop}"
955 1047
956 return 0 1048 return 0
957} 1049}
1050
1051# Make a GDM/KDM Session file
1052#
1053# make_desktop_entry(<title>, <command>)
1054# title: File to execute to start the Window Manager
1055# command: Name of the Window Manager
1056
1057make_session_desktop() {
1058
1059 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
1060 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
1061
1062 local title="${1}"
1063 local command="${2}"
1064 local desktop="${T}/${wm}.desktop"
1065
1066echo "[Desktop Entry]
1067Encoding=UTF-8
1068Name=${title}
1069Comment=This session logs you into ${title}
1070Exec=${command}
1071TryExec=${command}
1072Type=Application" > "${desktop}"
1073
1074 insinto /usr/share/xsessions
1075 doins "${desktop}"
1076
1077 return 0
1078}
1079
1080domenu() {
1081 local i
1082 local j
1083 insinto /usr/share/applications
1084 for i in ${@}
1085 do
1086 if [ -f "${i}" ];
1087 then
1088 doins ${i}
1089 elif [ -d "${i}" ];
1090 then
1091 for j in ${i}/*.desktop
1092 do
1093 doins ${j}
1094 done
1095 fi
1096 done
1097}
1098
1099doicon() {
1100 local i
1101 local j
1102 insinto /usr/share/pixmaps
1103 for i in ${@}
1104 do
1105 if [ -f "${i}" ];
1106 then
1107 doins ${i}
1108 elif [ -d "${i}" ];
1109 then
1110 for j in ${i}/*.png
1111 do
1112 doins ${j}
1113 done
1114 fi
1115 done
1116}
1117
1118##############################################################
1119# END: Handle .desktop files and menu entries #
1120##############################################################
1121
958 1122
959# for internal use only (unpack_pdv and unpack_makeself) 1123# for internal use only (unpack_pdv and unpack_makeself)
960find_unpackable_file() { 1124find_unpackable_file() {
961 local src="$1" 1125 local src="$1"
962 if [ -z "${src}" ] 1126 if [ -z "${src}" ]
1243 export CDROM_TOTAL_CDS=${cdcnt} 1407 export CDROM_TOTAL_CDS=${cdcnt}
1244 export CDROM_CURRENT_CD=1 1408 export CDROM_CURRENT_CD=1
1245 1409
1246 # now we see if the user gave use CD_ROOT ... 1410 # now we see if the user gave use CD_ROOT ...
1247 # if they did, let's just believe them that it's correct 1411 # if they did, let's just believe them that it's correct
1248 if [ ! -z "${CD_ROOT}" ] ; then 1412 if [[ ! -z ${CD_ROOT} ]] ; then
1249 export CDROM_ROOT="${CD_ROOT}" 1413 export CDROM_ROOT=${CD_ROOT}
1250 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1414 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1251 return 1415 return
1252 fi 1416 fi
1253 # do the same for CD_ROOT_X 1417 # do the same for CD_ROOT_X
1254 if [ ! -z "${CD_ROOT_1}" ] ; then 1418 if [[ ! -z ${CD_ROOT_1} ]] ; then
1255 local var= 1419 local var=
1256 cdcnt=0 1420 cdcnt=0
1257 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1421 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1258 cdcnt=$((cdcnt + 1)) 1422 cdcnt=$((cdcnt + 1))
1259 var="CD_ROOT_${cdcnt}" 1423 var="CD_ROOT_${cdcnt}"
1260 if [ -z "${!var}" ] ; then 1424 if [[ -z ${!var} ]] ; then
1261 eerror "You must either use just the CD_ROOT" 1425 eerror "You must either use just the CD_ROOT"
1262 eerror "or specify ALL the CD_ROOT_X variables." 1426 eerror "or specify ALL the CD_ROOT_X variables."
1263 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1427 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1264 die "could not locate CD_ROOT_${cdcnt}" 1428 die "could not locate CD_ROOT_${cdcnt}"
1265 fi 1429 fi
1268 export CDROM_ROOT=${CDROM_ROOTS_1} 1432 export CDROM_ROOT=${CDROM_ROOTS_1}
1269 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1433 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1270 return 1434 return
1271 fi 1435 fi
1272 1436
1273 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1437 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1274 einfon "This ebuild will need the " 1438 einfon "This ebuild will need the "
1275 if [ -z "${CDROM_NAME}" ] ; then 1439 if [[ -z ${CDROM_NAME} ]] ; then
1276 echo "cdrom for ${PN}." 1440 echo "cdrom for ${PN}."
1277 else 1441 else
1278 echo "${CDROM_NAME}." 1442 echo "${CDROM_NAME}."
1279 fi 1443 fi
1280 echo 1444 echo
1281 einfo "If you do not have the CD, but have the data files" 1445 einfo "If you do not have the CD, but have the data files"
1282 einfo "mounted somewhere on your filesystem, just export" 1446 einfo "mounted somewhere on your filesystem, just export"
1283 einfo "the variable CD_ROOT so that it points to the" 1447 einfo "the variable CD_ROOT so that it points to the"
1284 einfo "directory containing the files." 1448 einfo "directory containing the files."
1285 echo 1449 echo
1450 einfo "For example:"
1451 einfo "export CD_ROOT=/mnt/cdrom"
1452 echo
1286 else 1453 else
1287 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1454 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1288 cdcnt=0 1455 cdcnt=0
1289 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1456 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1290 cdcnt=$((cdcnt + 1)) 1457 cdcnt=$((cdcnt + 1))
1291 var="CDROM_NAME_${cdcnt}" 1458 var="CDROM_NAME_${cdcnt}"
1292 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1459 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1293 done 1460 done
1294 echo 1461 echo
1295 einfo "If you do not have the CDs, but have the data files" 1462 einfo "If you do not have the CDs, but have the data files"
1296 einfo "mounted somewhere on your filesystem, just export" 1463 einfo "mounted somewhere on your filesystem, just export"
1297 einfo "the following variables so they point to the right place:" 1464 einfo "the following variables so they point to the right place:"
1298 einfon "" 1465 einfon ""
1299 cdcnt=0 1466 cdcnt=0
1300 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1467 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1301 cdcnt=$((cdcnt + 1)) 1468 cdcnt=$((cdcnt + 1))
1302 echo -n " CD_ROOT_${cdcnt}" 1469 echo -n " CD_ROOT_${cdcnt}"
1303 done 1470 done
1304 echo 1471 echo
1305 einfo "Or, if you have all the files in the same place, or" 1472 einfo "Or, if you have all the files in the same place, or"
1306 einfo "you only have one cdrom, you can export CD_ROOT" 1473 einfo "you only have one cdrom, you can export CD_ROOT"
1307 einfo "and that place will be used as the same data source" 1474 einfo "and that place will be used as the same data source"
1308 einfo "for all the CDs." 1475 einfo "for all the CDs."
1309 echo 1476 echo
1477 einfo "For example:"
1478 einfo "export CD_ROOT_1=/mnt/cdrom"
1479 echo
1310 fi 1480 fi
1311 export CDROM_CURRENT_CD=0 1481 export CDROM_CURRENT_CD=0
1312 cdrom_load_next_cd 1482 cdrom_load_next_cd
1313} 1483}
1314 1484
1318# remember, you can only go forward in the cd chain, you can't go back. 1488# remember, you can only go forward in the cd chain, you can't go back.
1319cdrom_load_next_cd() { 1489cdrom_load_next_cd() {
1320 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1490 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1321 local var= 1491 local var=
1322 1492
1323 if [ ! -z "${CD_ROOT}" ] ; then 1493 if [[ ! -z ${CD_ROOT} ]] ; then
1324 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1494 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1325 return 1495 return
1326 fi 1496 fi
1327 1497
1328 unset CDROM_ROOT 1498 unset CDROM_ROOT
1329 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1499 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1330 if [ -z "${!var}" ] ; then 1500 if [[ -z ${!var} ]] ; then
1331 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1501 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1332 cdrom_locate_file_on_cd ${!var} 1502 cdrom_locate_file_on_cd ${!var}
1333 else 1503 else
1334 export CDROM_ROOT="${!var}" 1504 export CDROM_ROOT=${!var}
1335 fi 1505 fi
1336 1506
1337 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1507 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1338} 1508}
1339 1509
1343# found, then a message asking for the user to insert the cdrom will be 1513# found, then a message asking for the user to insert the cdrom will be
1344# displayed and we'll hang out here until: 1514# displayed and we'll hang out here until:
1345# (1) the file is found on a mounted cdrom 1515# (1) the file is found on a mounted cdrom
1346# (2) the user hits CTRL+C 1516# (2) the user hits CTRL+C
1347cdrom_locate_file_on_cd() { 1517cdrom_locate_file_on_cd() {
1348 while [ -z "${CDROM_ROOT}" ] ; do 1518 while [[ -z ${CDROM_ROOT} ]] ; do
1349 local dir="$(dirname ${@})" 1519 local dir="$(dirname ${@})"
1350 local file="$(basename ${@})" 1520 local file="$(basename ${@})"
1351 local mline="" 1521 local mline=""
1352 local showedmsg=0 1522 local showedmsg=0
1353 1523
1354 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1524 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1355 [ -d "${mline}/${dir}" ] || continue 1525 [[ -d ${mline}/${dir} ]] || continue
1356 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1526 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1357 && export CDROM_ROOT=${mline} 1527 && export CDROM_ROOT=${mline}
1358 done 1528 done
1359 1529
1360 if [ -z "${CDROM_ROOT}" ] ; then 1530 if [[ -z ${CDROM_ROOT} ]] ; then
1361 echo 1531 echo
1362 if [ ${showedmsg} -eq 0 ] ; then 1532 if [[ ${showedmsg} -eq 0 ]] ; then
1363 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1533 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1364 if [ -z "${CDROM_NAME}" ] ; then 1534 if [[ -z ${CDROM_NAME} ]] ; then
1365 einfo "Please insert the cdrom for ${PN} now !" 1535 einfo "Please insert the cdrom for ${PN} now !"
1366 else 1536 else
1367 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1537 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1368 fi 1538 fi
1369 else 1539 else
1370 if [ -z "${CDROM_NAME_1}" ] ; then 1540 if [[ -z ${CDROM_NAME_1} ]] ; then
1371 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1541 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1372 else 1542 else
1373 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1543 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1374 einfo "Please insert+mount the ${!var} cdrom now !" 1544 einfo "Please insert+mount the ${!var} cdrom now !"
1375 fi 1545 fi
1395# directories and uses the intersection of the lists. 1565# directories and uses the intersection of the lists.
1396# The -u builds a list of po files found in all the 1566# The -u builds a list of po files found in all the
1397# directories and uses the union of the lists. 1567# directories and uses the union of the lists.
1398strip-linguas() { 1568strip-linguas() {
1399 local ls newls 1569 local ls newls
1400 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1570 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1401 local op="$1"; shift 1571 local op=$1; shift
1402 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1572 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1403 local d f 1573 local d f
1404 for d in "$@" ; do 1574 for d in "$@" ; do
1405 if [ "${op}" == "-u" ] ; then 1575 if [[ ${op} == "-u" ]] ; then
1406 newls="${ls}" 1576 newls=${ls}
1407 else 1577 else
1408 newls="" 1578 newls=""
1409 fi 1579 fi
1410 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1580 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1411 if [ "${op}" == "-i" ] ; then 1581 if [[ ${op} == "-i" ]] ; then
1412 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1582 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1413 else 1583 else
1414 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1584 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1415 fi 1585 fi
1416 done 1586 done
1417 ls="${newls}" 1587 ls=${newls}
1418 done 1588 done
1419 ls="${ls//.po}" 1589 ls=${ls//.po}
1420 else 1590 else
1421 ls="$@" 1591 ls=$@
1422 fi 1592 fi
1423 1593
1424 ls=" ${ls} " 1594 ls=" ${ls} "
1425 newls="" 1595 newls=""
1426 for f in ${LINGUAS} ; do 1596 for f in ${LINGUAS} ; do
1427 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1597 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1428 nl="${newls} ${f}" 1598 newls="${newls} ${f}"
1429 else 1599 else
1430 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1600 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1431 fi 1601 fi
1432 done 1602 done
1433 if [ -z "${newls}" ] ; then 1603 if [[ -z ${newls} ]] ; then
1434 unset LINGUAS 1604 unset LINGUAS
1435 else 1605 else
1436 export LINGUAS="${newls}" 1606 export LINGUAS=${newls:1}
1437 fi 1607 fi
1438} 1608}
1439 1609
1440# moved from kernel.eclass since they are generally useful outside of 1610# moved from kernel.eclass since they are generally useful outside of
1441# kernel.eclass -iggy (20041002) 1611# kernel.eclass -iggy (20041002)
1443# the following functions are useful in kernel module ebuilds, etc. 1613# the following functions are useful in kernel module ebuilds, etc.
1444# for an example see ivtv or drbd ebuilds 1614# for an example see ivtv or drbd ebuilds
1445 1615
1446# set's ARCH to match what the kernel expects 1616# set's ARCH to match what the kernel expects
1447set_arch_to_kernel() { 1617set_arch_to_kernel() {
1618 i=10
1619 while ((i--)) ; do
1620 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1621 done
1448 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1622 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1449 case ${ARCH} in 1623 case ${ARCH} in
1450 x86) export ARCH="i386";; 1624 x86) export ARCH="i386";;
1451 amd64) export ARCH="x86_64";; 1625 amd64) export ARCH="x86_64";;
1452 hppa) export ARCH="parisc";; 1626 hppa) export ARCH="parisc";;
1453 mips) export ARCH="mips";; 1627 mips) export ARCH="mips";;
1628 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!
1454 *) export ARCH="${ARCH}";; 1629 *) export ARCH="${ARCH}";;
1455 esac 1630 esac
1456} 1631}
1457 1632
1458# set's ARCH back to what portage expects 1633# set's ARCH back to what portage expects
1459set_arch_to_portage() { 1634set_arch_to_portage() {
1635 i=10
1636 while ((i--)) ; do
1637 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1638 done
1460 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1639 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1461} 1640}
1462 1641
1463# Jeremy Huddleston <eradicator@gentoo.org>: 1642# Jeremy Huddleston <eradicator@gentoo.org>:
1464# preserve_old_lib /path/to/libblah.so.0 1643# preserve_old_lib /path/to/libblah.so.0
1494 touch ${D}${LIB} 1673 touch ${D}${LIB}
1495 fi 1674 fi
1496} 1675}
1497 1676
1498preserve_old_lib_notify() { 1677preserve_old_lib_notify() {
1499 LIB=$1 1678 LIB=$1
1500 1679
1501 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1680 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1502 SONAME=`basename ${LIB}` 1681 SONAME=`basename ${LIB}`
1503 1682
1504 einfo "An old version of an installed library was detected on your system." 1683 einfo "An old version of an installed library was detected on your system."
1505 einfo "In order to avoid breaking packages that link against is, this older version" 1684 einfo "In order to avoid breaking packages that link against is, this older version"
1506 einfo "is not being removed. In order to make full use of this newer version," 1685 einfo "is not being removed. In order to make full use of this newer version,"
1507 einfo "you will need to execute the following command:" 1686 einfo "you will need to execute the following command:"
1508 einfo " revdep-rebuild --soname ${SONAME}" 1687 einfo " revdep-rebuild --soname ${SONAME}"
1509 einfo 1688 einfo
1510 einfo "After doing that, you can safely remove ${LIB}" 1689 einfo "After doing that, you can safely remove ${LIB}"
1511 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1690 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1512 fi 1691 fi
1513} 1692}
1693
1694# Hack for people to figure out if a package was built with
1695# certain USE flags
1696#
1697# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1698# ex: built_with_use xchat gtk2
1699#
1700# Flags: -a all USE flags should be utilized
1701# -o at least one USE flag should be utilized
1702# Note: the default flag is '-a'
1703built_with_use() {
1704 local opt=$1
1705 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1706
1707 local PKG=$(best_version $1)
1708 shift
1709
1710 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1711 [[ ! -e ${USEFILE} ]] && return 1
1712
1713 local USE_BUILT=$(<${USEFILE})
1714 while [[ $# -gt 0 ]] ; do
1715 if [[ ${opt} = "-o" ]] ; then
1716 has $1 ${USE_BUILT} && return 0
1717 else
1718 has $1 ${USE_BUILT} || return 1
1719 fi
1720 shift
1721 done
1722 [[ ${opt} = "-a" ]]
1723}
1724
1725# Many configure scripts wrongly bail when a C++ compiler
1726# could not be detected. #73450
1727epunt_cxx() {
1728 local dir=$1
1729 [[ -z ${dir} ]] && dir=${S}
1730 ebegin "Removing useless C++ checks"
1731 local f
1732 for f in $(find ${dir} -name configure) ; do
1733 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1734 done
1735 eend 0
1736}
1737
1738# dopamd <file> [more files]
1739#
1740# Install pam auth config file in /etc/pam.d
1741dopamd() {
1742 [[ -z $1 ]] && die "dopamd requires at least one argument"
1743
1744 use pam || return 0
1745
1746 insinto /etc/pam.d
1747 # these are the default doins options, but be explicit just in case
1748 insopts -m 0644 -o root -g root
1749 doins "$@" || die "failed to install $@"
1750}
1751# newpamd <old name> <new name>
1752#
1753# Install pam file <old name> as <new name> in /etc/pam.d
1754newpamd() {
1755 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1756
1757 use pam || return 0
1758
1759 insinto /etc/pam.d
1760 # these are the default doins options, but be explicit just in case
1761 insopts -m 0644 -o root -g root
1762 newins "$1" "$2" || die "failed to install $1 as $2"
1763}
1764
1765# make a wrapper script ...
1766# NOTE: this was originally games_make_wrapper, but I noticed other places where
1767# this could be used, so I have moved it here and made it not games-specific
1768# -- wolf31o2
1769# $1 == wrapper name
1770# $2 == binary to run
1771# $3 == directory to chdir before running binary
1772# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1773make_wrapper() {
1774 local wrapper=$1 bin=$2 chdir=$3 libdir=$4
1775 local tmpwrapper=$(emktemp)
1776 cat << EOF > "${tmpwrapper}"
1777#!/bin/sh
1778cd "${chdir}"
1779export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1780exec ${bin} "\$@"
1781EOF
1782 chmod go+rx "${tmpwrapper}"
1783 newbin "${tmpwrapper}" "${wrapper}"
1784}

Legend:
Removed from v.1.118  
changed lines
  Added in v.1.161

  ViewVC Help
Powered by ViewVC 1.1.20