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

Diff of /eclass/eutils.eclass

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

Revision 1.114 Revision 1.162
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.114 2004/10/06 04:21:08 usata Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.162 2005/03/23 12:46:11 ka0ttic 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
542# Cheap replacement for when debianutils (and thus mktemp) 542# Cheap replacement for when debianutils (and thus mktemp)
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 parameter (the directory to create tmpfile in) 546# Takes just 1 optional parameter (the directory to create tmpfile in)
547mymktemp() { 547emktemp() {
548 local exe="touch"
549 [ "$1" == "-d" ] && exe="mkdir" && shift
548 local topdir="$1" 550 local topdir="$1"
549 551
550 [ -z "${topdir}" ] && topdir=/tmp 552 if [ -z "${topdir}" ]
551 if [ "`which mktemp 2>/dev/null`" ]
552 then 553 then
553 mktemp -p ${topdir} 554 [ -z "${T}" ] \
554 else 555 && topdir="/tmp" \
556 || topdir="${T}"
557 fi
558
559 if [ -z "$(type -p mktemp)" ]
560 then
561 local tmp=/
562 while [ -e "${tmp}" ] ; do
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 563 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
556 touch ${tmp} 564 done
565 ${exe} "${tmp}"
557 echo ${tmp} 566 echo "${tmp}"
567 else
568 [ "${exe}" == "touch" ] \
569 && exe="-p" \
570 || exe="-d"
571 mktemp ${exe} "${topdir}"
558 fi 572 fi
559} 573}
560 574
561# Small wrapper for getent (Linux), nidump (Mac OS X), 575# Small wrapper for getent (Linux), nidump (Mac OS X),
562# and pw (FreeBSD) used in enewuser()/enewgroup() 576# and pw (FreeBSD) used in enewuser()/enewgroup()
563# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 577# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 578# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565# 579#
566# egetent(database, key) 580# egetent(database, key)
567egetent() { 581egetent() {
568 if useq macos || useq ppc-macos ; then 582 if useq ppc-macos ; then
569 case "$2" in 583 case "$2" in
570 *[!0-9]*) # Non numeric 584 *[!0-9]*) # Non numeric
571 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 585 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572 ;; 586 ;;
573 *) # Numeric 587 *) # Numeric
690 local defgroup="" exgroups="" 704 local defgroup="" exgroups=""
691 705
692 export IFS="," 706 export IFS=","
693 for g in ${egroups} 707 for g in ${egroups}
694 do 708 do
709 export IFS="${oldifs}"
695 if [ -z "`egetent group \"${g}\"`" ] 710 if [ -z "`egetent group \"${g}\"`" ]
696 then 711 then
697 eerror "You must add group ${g} to the system first" 712 eerror "You must add group ${g} to the system first"
698 die "${g} is not a valid GID" 713 die "${g} is not a valid GID"
699 fi 714 fi
701 then 716 then
702 defgroup="${g}" 717 defgroup="${g}"
703 else 718 else
704 exgroups="${exgroups},${g}" 719 exgroups="${exgroups},${g}"
705 fi 720 fi
721 export IFS=","
706 done 722 done
707 export IFS="${oldifs}" 723 export IFS="${oldifs}"
708 724
709 opts="${opts} -g ${defgroup}" 725 opts="${opts} -g ${defgroup}"
710 if [ ! -z "${exgroups}" ] 726 if [ ! -z "${exgroups}" ]
718 734
719 # handle extra and add the user 735 # handle extra and add the user
720 local eextra="$@" 736 local eextra="$@"
721 local oldsandbox="${SANDBOX_ON}" 737 local oldsandbox="${SANDBOX_ON}"
722 export SANDBOX_ON="0" 738 export SANDBOX_ON="0"
723 if useq macos || useq ppc-macos ; 739 if useq ppc-macos
724 then 740 then
725 ### Make the user 741 ### Make the user
726 if [ -z "${eextra}" ] 742 if [ -z "${eextra}" ]
727 then 743 then
728 dscl . create /users/${euser} uid ${euid} 744 dscl . create /users/${euser} uid ${euid}
729 dscl . create /users/${euser} shell ${eshell} 745 dscl . create /users/${euser} shell ${eshell}
730 dscl . create /users/${euser} home ${ehome} 746 dscl . create /users/${euser} home ${ehome}
731 dscl . create /users/${euser} realname "added by portage for ${PN}" 747 dscl . create /users/${euser} realname "added by portage for ${PN}"
732 ### Add the user to the groups specified 748 ### Add the user to the groups specified
749 local oldifs="${IFS}"
750 export IFS=","
733 for g in ${egroups} 751 for g in ${egroups}
734 do 752 do
735 # $egroups is , delimited, not space
736 ewarn "This is code is wrong; someone on the OS X team should fix it"
737 dscl . merge /groups/${g} users ${euser} 753 dscl . merge /groups/${g} users ${euser}
738 done 754 done
755 export IFS="${oldifs}"
739 else 756 else
740 einfo "Extra options are not supported on macos yet" 757 einfo "Extra options are not supported on macos yet"
741 einfo "Please report the ebuild along with the info below" 758 einfo "Please report the ebuild along with the info below"
742 einfo "eextra: ${eextra}" 759 einfo "eextra: ${eextra}"
743 die "Required function missing" 760 die "Required function missing"
810 then 827 then
811 if [ "${egid}" -gt 0 ] 828 if [ "${egid}" -gt 0 ]
812 then 829 then
813 if [ -z "`egetent group ${egid}`" ] 830 if [ -z "`egetent group ${egid}`" ]
814 then 831 then
815 if useq macos || useq ppc-macos ; then 832 if useq ppc-macos ; then
816 opts="${opts} ${egid}" 833 opts="${opts} ${egid}"
817 else 834 else
818 opts="${opts} -g ${egid}" 835 opts="${opts} -g ${egid}"
819 fi 836 fi
820 else 837 else
834 opts="${opts} ${eextra}" 851 opts="${opts} ${eextra}"
835 852
836 # add the group 853 # add the group
837 local oldsandbox="${SANDBOX_ON}" 854 local oldsandbox="${SANDBOX_ON}"
838 export SANDBOX_ON="0" 855 export SANDBOX_ON="0"
839 if useq macos || useq ppc-macos ; 856 if useq ppc-macos ; then
840 then
841 if [ ! -z "${eextra}" ]; 857 if [ ! -z "${eextra}" ];
842 then 858 then
843 einfo "Extra options are not supported on macos yet" 859 einfo "Extra options are not supported on macos yet"
844 einfo "Please report the ebuild along with the info below" 860 einfo "Please report the ebuild along with the info below"
845 einfo "eextra: ${eextra}" 861 einfo "eextra: ${eextra}"
870} 886}
871 887
872# Simple script to replace 'dos2unix' binaries 888# Simple script to replace 'dos2unix' binaries
873# vapier@gentoo.org 889# vapier@gentoo.org
874# 890#
875# edos2unix(file, <more files>...) 891# edos2unix(file, <more files> ...)
876edos2unix() { 892edos2unix() {
877 for f in "$@" 893 for f in "$@"
878 do 894 do
879 cp "${f}" ${T}/edos2unix 895 cp "${f}" ${T}/edos2unix
880 sed 's/\r$//' ${T}/edos2unix > "${f}" 896 sed 's/\r$//' ${T}/edos2unix > "${f}"
881 done 897 done
882} 898}
883 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
884# Make a desktop file ! 907# Make a desktop file !
885# Great for making those icons in kde/gnome startmenu ! 908# Great for making those icons in kde/gnome startmenu !
886# Amaze your friends ! Get the women ! Join today ! 909# Amaze your friends ! Get the women ! Join today !
887# gnome2 /usr/share/applications
888# gnome1 /usr/share/gnome/apps/
889# KDE ${KDEDIR}/share/applnk /usr/share/applnk
890# 910#
891# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 911# make_desktop_entry(<binary>, [name], [icon], [type], [path])
892# 912#
893# binary: what binary does the app run with ? 913# binary: what binary does the app run with ?
894# name: the name that will show up in the menu 914# name: the name that will show up in the menu
895# icon: give your little like a pretty little icon ... 915# icon: give your little like a pretty little icon ...
896# this can be relative (to /usr/share/pixmaps) or 916# this can be relative (to /usr/share/pixmaps) or
897# a full path to an icon 917# a full path to an icon
898# type: what kind of application is this ? for categories: 918# type: what kind of application is this ? for categories:
899# http://www.freedesktop.org/standards/menu-spec/ 919# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
900# path: if your app needs to startup in a specific dir 920# path: if your app needs to startup in a specific dir
901make_desktop_entry() { 921make_desktop_entry() {
902 [ -z "$1" ] && eerror "You must specify the executable" && return 1 922 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
903 923
904 local exec="${1}" 924 local exec=${1}
905 local name="${2:-${PN}}" 925 local name=${2:-${PN}}
906 local icon="${3:-${PN}.png}" 926 local icon=${3:-${PN}.png}
907 local type="${4}" 927 local type=${4}
908 local subdir="${6}" 928 local path=${5}
909 local path="${5:-${GAMES_BINDIR}}" 929
910 if [ -z "${type}" ] 930 if [[ -z ${type} ]] ; then
911 then 931 local catmaj=${CATEGORY%%-*}
912 case ${CATEGORY} in 932 local catmin=${CATEGORY##*-}
913 "app-emulation") 933 case ${catmaj} in
914 type=Emulator 934 app)
915 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
916 ;; 948 ;;
917 "games-"*) 949
918 type=Game 950 dev)
919 subdir="Games" 951 type="Development"
920 ;; 952 ;;
921 "net-"*) 953
922 type=Network 954 games)
923 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}"
924 ;; 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
925 *) 1026 *)
926 type= 1027 type=
927 subdir=
928 ;; 1028 ;;
929 esac 1029 esac
930 fi 1030 fi
1031
931 local desktop="${T}/${exec}.desktop" 1032 local desktop=${T}/${exec%% *}-${P}.desktop
932 1033
933echo "[Desktop Entry] 1034echo "[Desktop Entry]
934Encoding=UTF-8 1035Encoding=UTF-8
935Version=0.9.2 1036Version=0.9.2
936Name=${name} 1037Name=${name}
939Exec=${exec} 1040Exec=${exec}
940Path=${path} 1041Path=${path}
941Icon=${icon} 1042Icon=${icon}
942Categories=Application;${type};" > "${desktop}" 1043Categories=Application;${type};" > "${desktop}"
943 1044
944 if [ -d "/usr/share/applications" ]
945 then
946 insinto /usr/share/applications 1045 insinto /usr/share/applications
947 doins "${desktop}" 1046 doins "${desktop}"
948 fi
949
950 #if [ -d "/usr/share/gnome/apps" ]
951 #then
952 # insinto /usr/share/gnome/apps/Games
953 # doins ${desktop}
954 #fi
955
956 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
957 #then
958 # for ver in /usr/kde/*
959 # do
960 # insinto ${ver}/share/applnk/Games
961 # doins ${desktop}
962 # done
963 #fi
964
965 if [ -d "/usr/share/applnk" ]
966 then
967 insinto /usr/share/applnk/${subdir}
968 doins "${desktop}"
969 fi
970 1047
971 return 0 1048 return 0
972} 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
973 1122
974# for internal use only (unpack_pdv and unpack_makeself) 1123# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 1124find_unpackable_file() {
976 local src="$1" 1125 local src="$1"
977 if [ -z "${src}" ] 1126 if [ -z "${src}" ]
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1172 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1173 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1025 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1174 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1026 1175
1027 # grab metadata for debug reasons 1176 # grab metadata for debug reasons
1028 local metafile="`mymktemp ${T}`" 1177 local metafile="$(emktemp)"
1029 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1178 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1030 1179
1031 # rip out the final file name from the metadata 1180 # rip out the final file name from the metadata
1032 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1181 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1033 datafile="`basename ${datafile}`" 1182 datafile="`basename ${datafile}`"
1034 1183
1035 # now lets uncompress/untar the file if need be 1184 # now lets uncompress/untar the file if need be
1036 local tmpfile="`mymktemp ${T}`" 1185 local tmpfile="$(emktemp)"
1037 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1186 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1038 1187
1039 local iscompressed="`file -b ${tmpfile}`" 1188 local iscompressed="`file -b ${tmpfile}`"
1040 if [ "${iscompressed:0:8}" == "compress" ] ; then 1189 if [ "${iscompressed:0:8}" == "compress" ] ; then
1041 iscompressed=1 1190 iscompressed=1
1143 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1292 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1144 *) die "makeself cant handle exe '${exe}'" 1293 *) die "makeself cant handle exe '${exe}'"
1145 esac 1294 esac
1146 1295
1147 # lets grab the first few bytes of the file to figure out what kind of archive it is 1296 # lets grab the first few bytes of the file to figure out what kind of archive it is
1148 local tmpfile="$(mymktemp "${T}")" 1297 local tmpfile="$(emktemp)"
1149 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1298 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1150 local filetype="$(file -b "${tmpfile}")" 1299 local filetype="$(file -b "${tmpfile}")"
1151 case ${filetype} in 1300 case ${filetype} in
1152 *tar\ archive) 1301 *tar\ archive)
1153 eval ${exe} | tar --no-same-owner -xf - 1302 eval ${exe} | tar --no-same-owner -xf -
1200 return 0 1349 return 0
1201 fi 1350 fi
1202 done 1351 done
1203 set +o noglob; set -$shopts #reset old shell opts 1352 set +o noglob; set -$shopts #reset old shell opts
1204 1353
1205 local licmsg="`mymktemp ${T}`" 1354 local licmsg="$(emktemp)"
1206 cat << EOF > ${licmsg} 1355 cat << EOF > ${licmsg}
1207********************************************************** 1356**********************************************************
1208The following license outlines the terms of use of this 1357The following license outlines the terms of use of this
1209package. You MUST accept this license for installation to 1358package. You MUST accept this license for installation to
1210continue. When you are done viewing, hit 'q'. If you 1359continue. When you are done viewing, hit 'q'. If you
1258 export CDROM_TOTAL_CDS=${cdcnt} 1407 export CDROM_TOTAL_CDS=${cdcnt}
1259 export CDROM_CURRENT_CD=1 1408 export CDROM_CURRENT_CD=1
1260 1409
1261 # now we see if the user gave use CD_ROOT ... 1410 # now we see if the user gave use CD_ROOT ...
1262 # 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
1263 if [ ! -z "${CD_ROOT}" ] ; then 1412 if [[ ! -z ${CD_ROOT} ]] ; then
1264 export CDROM_ROOT="${CD_ROOT}" 1413 export CDROM_ROOT=${CD_ROOT}
1265 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1414 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1266 return 1415 return
1267 fi 1416 fi
1268 # do the same for CD_ROOT_X 1417 # do the same for CD_ROOT_X
1269 if [ ! -z "${CD_ROOT_1}" ] ; then 1418 if [[ ! -z ${CD_ROOT_1} ]] ; then
1270 local var= 1419 local var=
1271 cdcnt=0 1420 cdcnt=0
1272 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1421 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1273 cdcnt=$((cdcnt + 1)) 1422 cdcnt=$((cdcnt + 1))
1274 var="CD_ROOT_${cdcnt}" 1423 var="CD_ROOT_${cdcnt}"
1275 if [ -z "${!var}" ] ; then 1424 if [[ -z ${!var} ]] ; then
1276 eerror "You must either use just the CD_ROOT" 1425 eerror "You must either use just the CD_ROOT"
1277 eerror "or specify ALL the CD_ROOT_X variables." 1426 eerror "or specify ALL the CD_ROOT_X variables."
1278 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."
1279 die "could not locate CD_ROOT_${cdcnt}" 1428 die "could not locate CD_ROOT_${cdcnt}"
1280 fi 1429 fi
1283 export CDROM_ROOT=${CDROM_ROOTS_1} 1432 export CDROM_ROOT=${CDROM_ROOTS_1}
1284 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1433 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1285 return 1434 return
1286 fi 1435 fi
1287 1436
1288 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1437 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1289 einfon "This ebuild will need the " 1438 einfon "This ebuild will need the "
1290 if [ -z "${CDROM_NAME}" ] ; then 1439 if [[ -z ${CDROM_NAME} ]] ; then
1291 echo "cdrom for ${PN}." 1440 echo "cdrom for ${PN}."
1292 else 1441 else
1293 echo "${CDROM_NAME}." 1442 echo "${CDROM_NAME}."
1294 fi 1443 fi
1295 echo 1444 echo
1296 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"
1297 einfo "mounted somewhere on your filesystem, just export" 1446 einfo "mounted somewhere on your filesystem, just export"
1298 einfo "the variable CD_ROOT so that it points to the" 1447 einfo "the variable CD_ROOT so that it points to the"
1299 einfo "directory containing the files." 1448 einfo "directory containing the files."
1300 echo 1449 echo
1450 einfo "For example:"
1451 einfo "export CD_ROOT=/mnt/cdrom"
1452 echo
1301 else 1453 else
1302 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1454 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1303 cdcnt=0 1455 cdcnt=0
1304 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1456 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1305 cdcnt=$((cdcnt + 1)) 1457 cdcnt=$((cdcnt + 1))
1306 var="CDROM_NAME_${cdcnt}" 1458 var="CDROM_NAME_${cdcnt}"
1307 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1459 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1308 done 1460 done
1309 echo 1461 echo
1310 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"
1311 einfo "mounted somewhere on your filesystem, just export" 1463 einfo "mounted somewhere on your filesystem, just export"
1312 einfo "the following variables so they point to the right place:" 1464 einfo "the following variables so they point to the right place:"
1313 einfon "" 1465 einfon ""
1314 cdcnt=0 1466 cdcnt=0
1315 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1467 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1316 cdcnt=$((cdcnt + 1)) 1468 cdcnt=$((cdcnt + 1))
1317 echo -n " CD_ROOT_${cdcnt}" 1469 echo -n " CD_ROOT_${cdcnt}"
1318 done 1470 done
1319 echo 1471 echo
1320 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"
1321 einfo "you only have one cdrom, you can export CD_ROOT" 1473 einfo "you only have one cdrom, you can export CD_ROOT"
1322 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"
1323 einfo "for all the CDs." 1475 einfo "for all the CDs."
1324 echo 1476 echo
1477 einfo "For example:"
1478 einfo "export CD_ROOT_1=/mnt/cdrom"
1479 echo
1325 fi 1480 fi
1326 export CDROM_CURRENT_CD=0 1481 export CDROM_CURRENT_CD=0
1327 cdrom_load_next_cd 1482 cdrom_load_next_cd
1328} 1483}
1329 1484
1333# 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.
1334cdrom_load_next_cd() { 1489cdrom_load_next_cd() {
1335 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1490 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1336 local var= 1491 local var=
1337 1492
1338 if [ ! -z "${CD_ROOT}" ] ; then 1493 if [[ ! -z ${CD_ROOT} ]] ; then
1339 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1494 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1340 return 1495 return
1341 fi 1496 fi
1342 1497
1343 unset CDROM_ROOT 1498 unset CDROM_ROOT
1344 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1499 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1345 if [ -z "${!var}" ] ; then 1500 if [[ -z ${!var} ]] ; then
1346 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1501 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1347 cdrom_locate_file_on_cd ${!var} 1502 cdrom_locate_file_on_cd ${!var}
1348 else 1503 else
1349 export CDROM_ROOT="${!var}" 1504 export CDROM_ROOT=${!var}
1350 fi 1505 fi
1351 1506
1352 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1507 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1353} 1508}
1354 1509
1358# 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
1359# displayed and we'll hang out here until: 1514# displayed and we'll hang out here until:
1360# (1) the file is found on a mounted cdrom 1515# (1) the file is found on a mounted cdrom
1361# (2) the user hits CTRL+C 1516# (2) the user hits CTRL+C
1362cdrom_locate_file_on_cd() { 1517cdrom_locate_file_on_cd() {
1363 while [ -z "${CDROM_ROOT}" ] ; do 1518 while [[ -z ${CDROM_ROOT} ]] ; do
1364 local dir="$(dirname ${@})" 1519 local dir="$(dirname ${@})"
1365 local file="$(basename ${@})" 1520 local file="$(basename ${@})"
1366 local mline="" 1521 local mline=""
1367 local showedmsg=0 1522 local showedmsg=0
1368 1523
1369 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
1370 [ -d "${mline}/${dir}" ] || continue 1525 [[ -d ${mline}/${dir} ]] || continue
1371 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1526 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1372 && export CDROM_ROOT=${mline} 1527 && export CDROM_ROOT=${mline}
1373 done 1528 done
1374 1529
1375 if [ -z "${CDROM_ROOT}" ] ; then 1530 if [[ -z ${CDROM_ROOT} ]] ; then
1376 echo 1531 echo
1377 if [ ${showedmsg} -eq 0 ] ; then 1532 if [[ ${showedmsg} -eq 0 ]] ; then
1378 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1533 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1379 if [ -z "${CDROM_NAME}" ] ; then 1534 if [[ -z ${CDROM_NAME} ]] ; then
1380 einfo "Please insert the cdrom for ${PN} now !" 1535 einfo "Please insert the cdrom for ${PN} now !"
1381 else 1536 else
1382 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1537 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1383 fi 1538 fi
1384 else 1539 else
1385 if [ -z "${CDROM_NAME_1}" ] ; then 1540 if [[ -z ${CDROM_NAME_1} ]] ; then
1386 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1541 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1387 else 1542 else
1388 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1543 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1389 einfo "Please insert+mount the ${!var} cdrom now !" 1544 einfo "Please insert+mount the ${!var} cdrom now !"
1390 fi 1545 fi
1410# directories and uses the intersection of the lists. 1565# directories and uses the intersection of the lists.
1411# 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
1412# directories and uses the union of the lists. 1567# directories and uses the union of the lists.
1413strip-linguas() { 1568strip-linguas() {
1414 local ls newls 1569 local ls newls
1415 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1570 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1416 local op="$1"; shift 1571 local op=$1; shift
1417 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1572 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1418 local d f 1573 local d f
1419 for d in "$@" ; do 1574 for d in "$@" ; do
1420 if [ "${op}" == "-u" ] ; then 1575 if [[ ${op} == "-u" ]] ; then
1421 newls="${ls}" 1576 newls=${ls}
1422 else 1577 else
1423 newls="" 1578 newls=""
1424 fi 1579 fi
1425 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1580 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1426 if [ "${op}" == "-i" ] ; then 1581 if [[ ${op} == "-i" ]] ; then
1427 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1582 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1428 else 1583 else
1429 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1584 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1430 fi 1585 fi
1431 done 1586 done
1432 ls="${newls}" 1587 ls=${newls}
1433 done 1588 done
1434 ls="${ls//.po}" 1589 ls=${ls//.po}
1435 else 1590 else
1436 ls="$@" 1591 ls=$@
1437 fi 1592 fi
1438 1593
1439 ls=" ${ls} " 1594 ls=" ${ls} "
1440 newls="" 1595 newls=""
1441 for f in ${LINGUAS} ; do 1596 for f in ${LINGUAS} ; do
1442 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1597 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1443 nl="${newls} ${f}" 1598 newls="${newls} ${f}"
1444 else 1599 else
1445 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1600 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1446 fi 1601 fi
1447 done 1602 done
1448 if [ -z "${newls}" ] ; then 1603 if [[ -z ${newls} ]] ; then
1449 unset LINGUAS 1604 unset LINGUAS
1450 else 1605 else
1451 export LINGUAS="${newls}" 1606 export LINGUAS=${newls:1}
1452 fi 1607 fi
1453} 1608}
1454 1609
1455# moved from kernel.eclass since they are generally useful outside of 1610# moved from kernel.eclass since they are generally useful outside of
1456# kernel.eclass -iggy (20041002) 1611# kernel.eclass -iggy (20041002)
1458# the following functions are useful in kernel module ebuilds, etc. 1613# the following functions are useful in kernel module ebuilds, etc.
1459# for an example see ivtv or drbd ebuilds 1614# for an example see ivtv or drbd ebuilds
1460 1615
1461# set's ARCH to match what the kernel expects 1616# set's ARCH to match what the kernel expects
1462set_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
1463 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1622 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1464 case ${ARCH} in 1623 case ${ARCH} in
1465 x86) export ARCH="i386";; 1624 x86) export ARCH="i386";;
1466 amd64) export ARCH="x86_64";; 1625 amd64) export ARCH="x86_64";;
1467 hppa) export ARCH="parisc";; 1626 hppa) export ARCH="parisc";;
1468 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!
1469 *) export ARCH="${ARCH}";; 1629 *) export ARCH="${ARCH}";;
1470 esac 1630 esac
1471} 1631}
1472 1632
1473# set's ARCH back to what portage expects 1633# set's ARCH back to what portage expects
1474set_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
1475 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1639 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1476} 1640}
1477 1641
1478# Jeremy Huddleston <eradicator@gentoo.org>: 1642# Jeremy Huddleston <eradicator@gentoo.org>:
1479# preserve_old_lib /path/to/libblah.so.0 1643# preserve_old_lib /path/to/libblah.so.0
1509 touch ${D}${LIB} 1673 touch ${D}${LIB}
1510 fi 1674 fi
1511} 1675}
1512 1676
1513preserve_old_lib_notify() { 1677preserve_old_lib_notify() {
1514 LIB=$1 1678 LIB=$1
1515 1679
1516 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1680 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1517 SONAME=`basename ${LIB}` 1681 SONAME=`basename ${LIB}`
1518 1682
1519 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."
1520 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"
1521 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,"
1522 einfo "you will need to execute the following command:" 1686 einfo "you will need to execute the following command:"
1523 einfo " revdep-rebuild --soname ${SONAME}" 1687 einfo " revdep-rebuild --soname ${SONAME}"
1524 einfo 1688 einfo
1525 einfo "After doing that, you can safely remove ${LIB}" 1689 einfo "After doing that, you can safely remove ${LIB}"
1526 fi 1690 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1691 fi
1527} 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 doins "$@" || die "failed to install $@"
1748}
1749# newpamd <old name> <new name>
1750#
1751# Install pam file <old name> as <new name> in /etc/pam.d
1752newpamd() {
1753 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1754
1755 use pam || return 0
1756
1757 insinto /etc/pam.d
1758 newins "$1" "$2" || die "failed to install $1 as $2"
1759}
1760
1761# make a wrapper script ...
1762# NOTE: this was originally games_make_wrapper, but I noticed other places where
1763# this could be used, so I have moved it here and made it not games-specific
1764# -- wolf31o2
1765# $1 == wrapper name
1766# $2 == binary to run
1767# $3 == directory to chdir before running binary
1768# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1769make_wrapper() {
1770 local wrapper=$1 bin=$2 chdir=$3 libdir=$4
1771 local tmpwrapper=$(emktemp)
1772 cat << EOF > "${tmpwrapper}"
1773#!/bin/sh
1774cd "${chdir}"
1775export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1776exec ${bin} "\$@"
1777EOF
1778 chmod go+rx "${tmpwrapper}"
1779 newbin "${tmpwrapper}" "${wrapper}"
1780}

Legend:
Removed from v.1.114  
changed lines
  Added in v.1.162

  ViewVC Help
Powered by ViewVC 1.1.20