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

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

  ViewVC Help
Powered by ViewVC 1.1.20