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

Diff of /eclass/eutils.eclass

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

Revision 1.104 Revision 1.157
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.104 2004/09/17 21:19:49 wolf31o2 Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.157 2005/03/07 17:45:07 carlo Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib
12ECLASS=eutils 13ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
16 17
17DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
18 63
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 64# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
21# outputting to a terminal, don't wait. For compatability purposes, the argument 66# outputting to a terminal, don't wait. For compatability purposes, the argument
22# must be an integer greater than zero. 67# must be an integer greater than zero.
41 sleep 1 86 sleep 1
42 done 87 done
43 fi 88 fi
44} 89}
45 90
46# This function simply returns the desired lib directory. With portage
47# 2.0.51, we now have support for installing libraries to lib32/lib64
48# to accomidate the needs of multilib systems. It's no longer a good idea
49# to assume all libraries will end up in lib. Replace any (sane) instances
50# where lib is named directly with $(get_libdir) if possible.
51#
52# Travis Tilley <lv@gentoo.org> (24 Aug 2004)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96}
97
98# This function generate linker scripts in /usr/lib for dynamic 91# This function generate linker scripts in /usr/lib for dynamic
99# libs in /lib. This is to fix linking problems when you have 92# libs in /lib. This is to fix linking problems when you have
100# the .so in /lib, and the .a in /usr/lib. What happens is that 93# the .so in /lib, and the .a in /usr/lib. What happens is that
101# in some cases when linking dynamic, the .a in /usr/lib is used 94# in some cases when linking dynamic, the .a in /usr/lib is used
102# instead of the .so in /lib due to gcc/libtool tweaking ld's 95# instead of the .so in /lib due to gcc/libtool tweaking ld's
112# to point to the latest version of the library present. 105# to point to the latest version of the library present.
113# 106#
114# <azarah@gentoo.org> (26 Oct 2002) 107# <azarah@gentoo.org> (26 Oct 2002)
115# 108#
116gen_usr_ldscript() { 109gen_usr_ldscript() {
110 local libdir="$(get_libdir)"
117 # Just make sure it exists 111 # Just make sure it exists
118 dodir /usr/$(get_libdir) 112 dodir /usr/${libdir}
119 113
120 cat > ${D}/usr/$(get_libdir)/$1 <<"END_LDSCRIPT" 114 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT
121/* GNU ld script 115/* GNU ld script
122 Because Gentoo have critical dynamic libraries 116 Because Gentoo have critical dynamic libraries
123 in /lib, and the static versions in /usr/lib, we 117 in /lib, and the static versions in /usr/lib, we
124 need to have a "fake" dynamic lib in /usr/lib, 118 need to have a "fake" dynamic lib in /usr/lib,
125 otherwise we run into linking problems. 119 otherwise we run into linking problems.
126 See bug #4411 on http://bugs.gentoo.org/ for 120 See bug #4411 on http://bugs.gentoo.org/ for
127 more info. */ 121 more info. */
122GROUP ( /${libdir}/${1} )
128END_LDSCRIPT 123END_LDSCRIPT
129 124 fperms a+x "/usr/${libdir}/${1}"
130 echo "GROUP ( /$(get_libdir)/libxxx )" >> ${D}/usr/$(get_libdir)/$1
131 dosed "s:libxxx:$1:" /usr/$(get_libdir)/$1
132
133 return 0
134} 125}
135 126
136# Simple function to draw a line consisting of '=' the same length as $* 127# Simple function to draw a line consisting of '=' the same length as $*
137# 128#
138# <azarah@gentoo.org> (11 Nov 2002) 129# <azarah@gentoo.org> (11 Nov 2002)
223 local x="" 214 local x=""
224 215
225 if [ "$#" -gt 1 ] 216 if [ "$#" -gt 1 ]
226 then 217 then
227 local m="" 218 local m=""
228 einfo "${#} patches to apply..." 219 einfo "${#} patches to apply ..."
229 for m in "$@" ; do 220 for m in "$@" ; do
230 epatch "${m}" 221 epatch "${m}"
231 done 222 done
232 return 0 223 return 0
233 fi 224 fi
247 local EPATCH_SOURCE="$1/*" 238 local EPATCH_SOURCE="$1/*"
248 else 239 else
249 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 240 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
250 fi 241 fi
251 else 242 else
252 if [ ! -d ${EPATCH_SOURCE} ] 243 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
253 then 244 then
254 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 245 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
255 then 246 then
256 EPATCH_SOURCE="$1" 247 EPATCH_SOURCE="$1"
257 fi 248 fi
258 249
259 echo 250 echo
260 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 251 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
261 eerror 252 eerror
262 eerror " ${EPATCH_SOURCE}" 253 eerror " ${EPATCH_SOURCE}"
254 eerror " ( ${EPATCH_SOURCE##*/} )"
263 echo 255 echo
264 die "Cannot find \$EPATCH_SOURCE!" 256 die "Cannot find \$EPATCH_SOURCE!"
265 fi 257 fi
266 258
267 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 259 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
286 ;; 278 ;;
287 esac 279 esac
288 280
289 if [ "${SINGLE_PATCH}" = "no" ] 281 if [ "${SINGLE_PATCH}" = "no" ]
290 then 282 then
291 einfo "Applying various patches (bugfixes/updates)..." 283 einfo "Applying various patches (bugfixes/updates) ..."
292 fi 284 fi
293 for x in ${EPATCH_SOURCE} 285 for x in ${EPATCH_SOURCE}
294 do 286 do
295 # New ARCH dependant patch naming scheme... 287 # New ARCH dependant patch naming scheme ...
296 # 288 #
297 # ???_arch_foo.patch 289 # ???_arch_foo.patch
298 # 290 #
299 if [ -f ${x} ] && \ 291 if [ -f ${x} ] && \
300 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 292 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
301 [ "${EPATCH_FORCE}" = "yes" ]) 293 [ "${EPATCH_FORCE}" = "yes" ])
302 then 294 then
303 local count=0 295 local count=0
304 local popts="${EPATCH_OPTS}" 296 local popts="${EPATCH_OPTS}"
297 local patchname=${x##*/}
305 298
306 if [ -n "${EPATCH_EXCLUDE}" ] 299 if [ -n "${EPATCH_EXCLUDE}" ]
307 then 300 then
308 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 301 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
309 then 302 then
310 continue 303 continue
311 fi 304 fi
312 fi 305 fi
313 306
315 then 308 then
316 if [ -n "${EPATCH_SINGLE_MSG}" ] 309 if [ -n "${EPATCH_SINGLE_MSG}" ]
317 then 310 then
318 einfo "${EPATCH_SINGLE_MSG}" 311 einfo "${EPATCH_SINGLE_MSG}"
319 else 312 else
320 einfo "Applying ${x##*/}..." 313 einfo "Applying ${patchname} ..."
321 fi 314 fi
322 else 315 else
323 einfo " ${x##*/}..." 316 einfo " ${patchname} ..."
324 fi 317 fi
325 318
326 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 319 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
327 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 320 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
328 321
329 # Allow for prefix to differ ... im lazy, so shoot me :/ 322 # Allow for prefix to differ ... im lazy, so shoot me :/
330 while [ "${count}" -lt 5 ] 323 while [ "${count}" -lt 5 ]
331 do 324 do
332 # Generate some useful debug info ... 325 # Generate some useful debug info ...
333 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 326 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 327 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
335 328
336 if [ "${PATCH_SUFFIX}" != "patch" ] 329 if [ "${PATCH_SUFFIX}" != "patch" ]
337 then 330 then
338 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 331 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
339 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 else 333 else
341 PATCH_TARGET="${x}" 334 PATCH_TARGET="${x}"
342 fi 335 fi
343 336
344 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 337 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
345 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 338 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 339
347 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 341 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 342
350 if [ "${PATCH_SUFFIX}" != "patch" ] 343 if [ "${PATCH_SUFFIX}" != "patch" ]
351 then 344 then
352 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 345 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
353 then 346 then
354 echo 347 echo
355 eerror "Could not extract patch!" 348 eerror "Could not extract patch!"
356 #die "Could not extract patch!" 349 #die "Could not extract patch!"
357 count=5 350 count=5
358 break 351 break
359 fi 352 fi
360 fi 353 fi
361 354
362 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 355 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
363 then 356 then
364 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 357 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 358 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 359 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 360 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
368 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 361 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
369 362
370 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 363 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
371 364
372 if [ "$?" -ne 0 ] 365 if [ "$?" -ne 0 ]
373 then 366 then
374 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 367 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
375 echo 368 echo
376 eerror "A dry-run of patch command succeeded, but actually" 369 eerror "A dry-run of patch command succeeded, but actually"
377 eerror "applying the patch failed!" 370 eerror "applying the patch failed!"
378 #die "Real world sux compared to the dreamworld!" 371 #die "Real world sux compared to the dreamworld!"
379 count=5 372 count=5
380 fi 373 fi
381 374
382 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 375 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
383 376
384 break 377 break
385 fi 378 fi
386 379
387 count=$((count + 1)) 380 count=$((count + 1))
393 fi 386 fi
394 387
395 if [ "${count}" -eq 5 ] 388 if [ "${count}" -eq 5 ]
396 then 389 then
397 echo 390 echo
398 eerror "Failed Patch: ${x##*/}!" 391 eerror "Failed Patch: ${patchname}!"
399 eerror 392 eerror
400 eerror "Include in your bugreport the contents of:" 393 eerror "Include in your bugreport the contents of:"
401 eerror 394 eerror
402 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 395 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
403 echo 396 echo
404 die "Failed Patch: ${x##*/}!" 397 die "Failed Patch: ${patchname}!"
405 fi 398 fi
406 399
407 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 400 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
408 401
409 eend 0 402 eend 0
410 fi 403 fi
411 done 404 done
412 if [ "${SINGLE_PATCH}" = "no" ] 405 if [ "${SINGLE_PATCH}" = "no" ]
440 433
441 return 1; 434 return 1;
442 } 435 }
443 END 436 END
444 437
445 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 438 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
446 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 439 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
447 then 440 then
448 echo "yes" 441 echo "yes"
449 einfon "Checking what PTHREADS implementation we have ... " 442 einfon "Checking what PTHREADS implementation we have ..."
450 if ${T}/nptl 443 if ${T}/nptl
451 then 444 then
452 return 0 445 return 0
453 else 446 else
454 return 1 447 return 1
530 523
531 if [ -n "${ADMINPARAM}" ] 524 if [ -n "${ADMINPARAM}" ]
532 then 525 then
533 if [ "${jobs}" -gt "${ADMINPARAM}" ] 526 if [ "${jobs}" -gt "${ADMINPARAM}" ]
534 then 527 then
535 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 528 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
536 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 529 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
537 else 530 else
538 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 531 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
539 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 532 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
540 fi 533 fi
541 fi 534 fi
542} 535}
543 536
544# Cheap replacement for when debianutils (and thus mktemp) 537# Cheap replacement for when debianutils (and thus mktemp)
545# does not exist on the users system 538# does not exist on the users system
546# vapier@gentoo.org 539# vapier@gentoo.org
547# 540#
548# Takes just 1 parameter (the directory to create tmpfile in) 541# Takes just 1 optional parameter (the directory to create tmpfile in)
549mymktemp() { 542emktemp() {
543 local exe="touch"
544 [ "$1" == "-d" ] && exe="mkdir" && shift
550 local topdir="$1" 545 local topdir="$1"
551 546
552 [ -z "${topdir}" ] && topdir=/tmp 547 if [ -z "${topdir}" ]
553 if [ "`which mktemp 2>/dev/null`" ]
554 then 548 then
555 mktemp -p ${topdir} 549 [ -z "${T}" ] \
556 else 550 && topdir="/tmp" \
551 || topdir="${T}"
552 fi
553
554 if [ -z "$(type -p mktemp)" ]
555 then
556 local tmp=/
557 while [ -e "${tmp}" ] ; do
557 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 558 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
558 touch ${tmp} 559 done
560 ${exe} "${tmp}"
559 echo ${tmp} 561 echo "${tmp}"
562 else
563 [ "${exe}" == "touch" ] \
564 && exe="-p" \
565 || exe="-d"
566 mktemp ${exe} "${topdir}"
560 fi 567 fi
561} 568}
562 569
563# Small wrapper for getent (Linux) and nidump (Mac OS X) 570# Small wrapper for getent (Linux), nidump (Mac OS X),
564# used in enewuser()/enewgroup() 571# and pw (FreeBSD) used in enewuser()/enewgroup()
565# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 572# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
573# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
566# 574#
567# egetent(database, key) 575# egetent(database, key)
568egetent() { 576egetent() {
569 if use macos || use ppc-macos ; then 577 if useq ppc-macos ; then
570 case "$2" in 578 case "$2" in
571 *[!0-9]*) # Non numeric 579 *[!0-9]*) # Non numeric
572 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 580 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
573 ;; 581 ;;
574 *) # Numeric 582 *) # Numeric
575 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 583 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
576 ;; 584 ;;
577 esac 585 esac
586 elif useq x86-fbsd ; then
587 local action
588 if [ "$1" == "passwd" ]
589 then
590 action="user"
578 else 591 else
592 action="group"
593 fi
594 pw show "${action}" "$2" -q
595 else
596 which nscd >& /dev/null && nscd -i "$1"
579 getent $1 $2 597 getent "$1" "$2"
580 fi 598 fi
581} 599}
582 600
583# Simplify/standardize adding users to the system 601# Simplify/standardize adding users to the system
584# vapier@gentoo.org 602# vapier@gentoo.org
630 euid="next" 648 euid="next"
631 fi 649 fi
632 if [ "${euid}" == "next" ] 650 if [ "${euid}" == "next" ]
633 then 651 then
634 local pwrange 652 local pwrange
635 if use macos || use ppc-macos ; then 653 if [ "${USERLAND}" == "BSD" ] ; then
636 pwrange="`jot 898 101`" 654 pwrange="`jot 898 101`"
637 else 655 else
638 pwrange="`seq 101 999`" 656 pwrange="`seq 101 999`"
639 fi 657 fi
640 for euid in ${pwrange} ; do 658 for euid in ${pwrange} ; do
652 then 670 then
653 eerror "A shell was specified but it does not exist !" 671 eerror "A shell was specified but it does not exist !"
654 die "${eshell} does not exist" 672 die "${eshell} does not exist"
655 fi 673 fi
656 else 674 else
675 if [ "${USERLAND}" == "BSD" ]
676 then
677 eshell="/usr/bin/false"
678 else
657 eshell="/bin/false" 679 eshell="/bin/false"
680 fi
658 fi 681 fi
659 einfo " - Shell: ${eshell}" 682 einfo " - Shell: ${eshell}"
660 opts="${opts} -s ${eshell}" 683 opts="${opts} -s ${eshell}"
661 684
662 # handle homedir 685 # handle homedir
671 # handle groups 694 # handle groups
672 local egroups="$1"; shift 695 local egroups="$1"; shift
673 if [ ! -z "${egroups}" ] 696 if [ ! -z "${egroups}" ]
674 then 697 then
675 local oldifs="${IFS}" 698 local oldifs="${IFS}"
699 local defgroup="" exgroups=""
700
676 export IFS="," 701 export IFS=","
677 for g in ${egroups} 702 for g in ${egroups}
678 do 703 do
704 export IFS="${oldifs}"
679 if [ -z "`egetent group \"${g}\"`" ] 705 if [ -z "`egetent group \"${g}\"`" ]
680 then 706 then
681 eerror "You must add group ${g} to the system first" 707 eerror "You must add group ${g} to the system first"
682 die "${g} is not a valid GID" 708 die "${g} is not a valid GID"
683 fi 709 fi
710 if [ -z "${defgroup}" ]
711 then
712 defgroup="${g}"
713 else
714 exgroups="${exgroups},${g}"
715 fi
716 export IFS=","
684 done 717 done
685 export IFS="${oldifs}" 718 export IFS="${oldifs}"
719
686 opts="${opts} -g ${egroups}" 720 opts="${opts} -g ${defgroup}"
721 if [ ! -z "${exgroups}" ]
722 then
723 opts="${opts} -G ${exgroups:1}"
724 fi
687 else 725 else
688 egroups="(none)" 726 egroups="(none)"
689 fi 727 fi
690 einfo " - Groups: ${egroups}" 728 einfo " - Groups: ${egroups}"
691 729
692 # handle extra and add the user 730 # handle extra and add the user
693 local eextra="$@" 731 local eextra="$@"
694 local oldsandbox="${SANDBOX_ON}" 732 local oldsandbox="${SANDBOX_ON}"
695 export SANDBOX_ON="0" 733 export SANDBOX_ON="0"
696 if use macos || use ppc-macos ; 734 if useq ppc-macos
697 then 735 then
698 ### Make the user 736 ### Make the user
699 if [ -z "${eextra}" ] 737 if [ -z "${eextra}" ]
700 then 738 then
701 dscl . create /users/${euser} uid ${euid} 739 dscl . create /users/${euser} uid ${euid}
702 dscl . create /users/${euser} shell ${eshell} 740 dscl . create /users/${euser} shell ${eshell}
703 dscl . create /users/${euser} home ${ehome} 741 dscl . create /users/${euser} home ${ehome}
704 dscl . create /users/${euser} realname "added by portage for ${PN}" 742 dscl . create /users/${euser} realname "added by portage for ${PN}"
705 ### Add the user to the groups specified 743 ### Add the user to the groups specified
744 local oldifs="${IFS}"
745 export IFS=","
706 for g in ${egroups} 746 for g in ${egroups}
707 do 747 do
708 dscl . merge /groups/${g} users ${euser} 748 dscl . merge /groups/${g} users ${euser}
709 done 749 done
750 export IFS="${oldifs}"
710 else 751 else
711 einfo "Extra options are not supported on macos yet" 752 einfo "Extra options are not supported on macos yet"
712 einfo "Please report the ebuild along with the info below" 753 einfo "Please report the ebuild along with the info below"
713 einfo "eextra: ${eextra}" 754 einfo "eextra: ${eextra}"
714 die "Required function missing" 755 die "Required function missing"
756 fi
757 elif use x86-fbsd ; then
758 if [ -z "${eextra}" ]
759 then
760 pw useradd ${euser} ${opts} \
761 -c "added by portage for ${PN}" \
762 die "enewuser failed"
763 else
764 einfo " - Extra: ${eextra}"
765 pw useradd ${euser} ${opts} \
766 -c ${eextra} || die "enewuser failed"
715 fi 767 fi
716 else 768 else
717 if [ -z "${eextra}" ] 769 if [ -z "${eextra}" ]
718 then 770 then
719 useradd ${opts} ${euser} \ 771 useradd ${opts} ${euser} \
770 then 822 then
771 if [ "${egid}" -gt 0 ] 823 if [ "${egid}" -gt 0 ]
772 then 824 then
773 if [ -z "`egetent group ${egid}`" ] 825 if [ -z "`egetent group ${egid}`" ]
774 then 826 then
775 if use macos || use ppc-macos ; then 827 if useq ppc-macos ; then
776 opts="${opts} ${egid}" 828 opts="${opts} ${egid}"
777 else 829 else
778 opts="${opts} -g ${egid}" 830 opts="${opts} -g ${egid}"
779 fi 831 fi
780 else 832 else
794 opts="${opts} ${eextra}" 846 opts="${opts} ${eextra}"
795 847
796 # add the group 848 # add the group
797 local oldsandbox="${SANDBOX_ON}" 849 local oldsandbox="${SANDBOX_ON}"
798 export SANDBOX_ON="0" 850 export SANDBOX_ON="0"
799 if use macos || use ppc-macos ; 851 if useq ppc-macos ; then
800 then
801 if [ ! -z "${eextra}" ]; 852 if [ ! -z "${eextra}" ];
802 then 853 then
803 einfo "Extra options are not supported on macos yet" 854 einfo "Extra options are not supported on macos yet"
804 einfo "Please report the ebuild along with the info below" 855 einfo "Please report the ebuild along with the info below"
805 einfo "eextra: ${eextra}" 856 einfo "eextra: ${eextra}"
813 [ -z "`egetent group ${egid}`" ] && break 864 [ -z "`egetent group ${egid}`" ] && break
814 done 865 done
815 esac 866 esac
816 dscl . create /groups/${egroup} gid ${egid} 867 dscl . create /groups/${egroup} gid ${egid}
817 dscl . create /groups/${egroup} passwd '*' 868 dscl . create /groups/${egroup} passwd '*'
869 elif use x86-fbsd ; then
870 case ${egid} in
871 *[!0-9]*) # Non numeric
872 for egid in `jot 898 101`; do
873 [ -z "`egetent group ${egid}`" ] && break
874 done
875 esac
876 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
818 else 877 else
819 groupadd ${opts} ${egroup} || die "enewgroup failed" 878 groupadd ${opts} ${egroup} || die "enewgroup failed"
820 fi 879 fi
821 export SANDBOX_ON="${oldsandbox}" 880 export SANDBOX_ON="${oldsandbox}"
822} 881}
823 882
824# Simple script to replace 'dos2unix' binaries 883# Simple script to replace 'dos2unix' binaries
825# vapier@gentoo.org 884# vapier@gentoo.org
826# 885#
827# edos2unix(file, <more files>...) 886# edos2unix(file, <more files> ...)
828edos2unix() { 887edos2unix() {
829 for f in "$@" 888 for f in "$@"
830 do 889 do
831 cp "${f}" ${T}/edos2unix 890 cp "${f}" ${T}/edos2unix
832 sed 's/\r$//' ${T}/edos2unix > "${f}" 891 sed 's/\r$//' ${T}/edos2unix > "${f}"
833 done 892 done
834} 893}
835 894
895
896##############################################################
897# START: Handle .desktop files and menu entries #
898# maybe this should be separated into a new eclass some time #
899# lanius@gentoo.org #
900##############################################################
901
836# Make a desktop file ! 902# Make a desktop file !
837# Great for making those icons in kde/gnome startmenu ! 903# Great for making those icons in kde/gnome startmenu !
838# Amaze your friends ! Get the women ! Join today ! 904# Amaze your friends ! Get the women ! Join today !
839# gnome2 /usr/share/applications
840# gnome1 /usr/share/gnome/apps/
841# KDE ${KDEDIR}/share/applnk /usr/share/applnk
842# 905#
843# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 906# make_desktop_entry(<binary>, [name], [icon], [type], [path])
844# 907#
845# binary: what binary does the app run with ? 908# binary: what binary does the app run with ?
846# name: the name that will show up in the menu 909# name: the name that will show up in the menu
847# icon: give your little like a pretty little icon ... 910# icon: give your little like a pretty little icon ...
848# this can be relative (to /usr/share/pixmaps) or 911# this can be relative (to /usr/share/pixmaps) or
849# a full path to an icon 912# a full path to an icon
850# type: what kind of application is this ? for categories: 913# type: what kind of application is this ? for categories:
851# http://www.freedesktop.org/standards/menu-spec/ 914# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
852# path: if your app needs to startup in a specific dir 915# path: if your app needs to startup in a specific dir
853make_desktop_entry() { 916make_desktop_entry() {
854 [ -z "$1" ] && eerror "You must specify the executable" && return 1 917 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1
855 918
856 local exec="${1}" 919 local exec="${1}"
857 local name="${2:-${PN}}" 920 local name="${2:-${PN}}"
858 local icon="${3:-${PN}.png}" 921 local icon="${3:-${PN}.png}"
859 local type="${4}" 922 local type="${4}"
878 type= 941 type=
879 subdir= 942 subdir=
880 ;; 943 ;;
881 esac 944 esac
882 fi 945 fi
883 local desktop="${T}/${exec}.desktop" 946 local desktop="${T}/${exec%% *}-${P}.desktop"
884 947
885echo "[Desktop Entry] 948echo "[Desktop Entry]
886Encoding=UTF-8 949Encoding=UTF-8
887Version=0.9.2 950Version=0.9.2
888Name=${name} 951Name=${name}
891Exec=${exec} 954Exec=${exec}
892Path=${path} 955Path=${path}
893Icon=${icon} 956Icon=${icon}
894Categories=Application;${type};" > "${desktop}" 957Categories=Application;${type};" > "${desktop}"
895 958
896 if [ -d "/usr/share/applications" ]
897 then
898 insinto /usr/share/applications 959 insinto /usr/share/applications
899 doins "${desktop}" 960 doins "${desktop}"
900 fi
901
902 #if [ -d "/usr/share/gnome/apps" ]
903 #then
904 # insinto /usr/share/gnome/apps/Games
905 # doins ${desktop}
906 #fi
907
908 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
909 #then
910 # for ver in /usr/kde/*
911 # do
912 # insinto ${ver}/share/applnk/Games
913 # doins ${desktop}
914 # done
915 #fi
916
917 if [ -d "/usr/share/applnk" ]
918 then
919 insinto /usr/share/applnk/${subdir}
920 doins "${desktop}"
921 fi
922 961
923 return 0 962 return 0
924} 963}
964
965# Make a GDM/KDM Session file
966#
967# make_desktop_entry(<title>, <command>)
968# title: File to execute to start the Window Manager
969# command: Name of the Window Manager
970
971make_session_desktop() {
972
973 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
974 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
975
976 local title="${1}"
977 local command="${2}"
978 local desktop="${T}/${wm}.desktop"
979
980echo "[Desktop Entry]
981Encoding=UTF-8
982Name=${title}
983Comment=This session logs you into ${title}
984Exec=${command}
985TryExec=${command}
986Type=Application" > "${desktop}"
987
988 insinto /usr/share/xsessions
989 doins "${desktop}"
990
991 return 0
992}
993
994domenu() {
995 local i
996 local j
997 insinto /usr/share/applications
998 for i in ${@}
999 do
1000 if [ -f "${i}" ];
1001 then
1002 doins ${i}
1003 elif [ -d "${i}" ];
1004 then
1005 for j in ${i}/*.desktop
1006 do
1007 doins ${j}
1008 done
1009 fi
1010 done
1011}
1012
1013doicon() {
1014 local i
1015 local j
1016 insinto /usr/share/pixmaps
1017 for i in ${@}
1018 do
1019 if [ -f "${i}" ];
1020 then
1021 doins ${i}
1022 elif [ -d "${i}" ];
1023 then
1024 for j in ${i}/*.png
1025 do
1026 doins ${j}
1027 done
1028 fi
1029 done
1030}
1031
1032##############################################################
1033# END: Handle .desktop files and menu entries #
1034##############################################################
1035
925 1036
926# for internal use only (unpack_pdv and unpack_makeself) 1037# for internal use only (unpack_pdv and unpack_makeself)
927find_unpackable_file() { 1038find_unpackable_file() {
928 local src="$1" 1039 local src="$1"
929 if [ -z "${src}" ] 1040 if [ -z "${src}" ]
975 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1086 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
976 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1087 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
977 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1088 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
978 1089
979 # grab metadata for debug reasons 1090 # grab metadata for debug reasons
980 local metafile="`mymktemp ${T}`" 1091 local metafile="$(emktemp)"
981 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1092 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
982 1093
983 # rip out the final file name from the metadata 1094 # rip out the final file name from the metadata
984 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1095 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
985 datafile="`basename ${datafile}`" 1096 datafile="`basename ${datafile}`"
986 1097
987 # now lets uncompress/untar the file if need be 1098 # now lets uncompress/untar the file if need be
988 local tmpfile="`mymktemp ${T}`" 1099 local tmpfile="$(emktemp)"
989 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1100 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
990 1101
991 local iscompressed="`file -b ${tmpfile}`" 1102 local iscompressed="`file -b ${tmpfile}`"
992 if [ "${iscompressed:0:8}" == "compress" ] ; then 1103 if [ "${iscompressed:0:8}" == "compress" ] ; then
993 iscompressed=1 1104 iscompressed=1
1038# Unpack those pesky makeself generated files ... 1149# Unpack those pesky makeself generated files ...
1039# They're shell scripts with the binary package tagged onto 1150# They're shell scripts with the binary package tagged onto
1040# the end of the archive. Loki utilized the format as does 1151# the end of the archive. Loki utilized the format as does
1041# many other game companies. 1152# many other game companies.
1042# 1153#
1043# Usage: unpack_makeself [file to unpack] [offset] 1154# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1044# - If the file is not specified then unpack will utilize ${A}. 1155# - If the file is not specified then unpack will utilize ${A}.
1045# - If the offset is not specified then we will attempt to extract 1156# - If the offset is not specified then we will attempt to extract
1046# the proper offset from the script itself. 1157# the proper offset from the script itself.
1047unpack_makeself() { 1158unpack_makeself() {
1048 local src="`find_unpackable_file $1`" 1159 local src="$(find_unpackable_file "$1")"
1049 local skip="$2" 1160 local skip="$2"
1161 local exe="$3"
1050 1162
1051 local shrtsrc="`basename ${src}`" 1163 local shrtsrc="$(basename "${src}")"
1052 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1164 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1053 if [ -z "${skip}" ] 1165 if [ -z "${skip}" ]
1054 then 1166 then
1055 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1167 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1056 local skip=0 1168 local skip=0
1169 exe=tail
1057 case ${ver} in 1170 case ${ver} in
1058 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1171 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1059 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1172 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1060 ;; 1173 ;;
1061 2.0|2.0.1) 1174 2.0|2.0.1)
1062 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1175 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1063 ;; 1176 ;;
1064 2.1.1) 1177 2.1.1)
1065 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 1178 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1066 let skip="skip + 1" 1179 let skip="skip + 1"
1067 ;; 1180 ;;
1068 2.1.2) 1181 2.1.2)
1069 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` 1182 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1070 let skip="skip + 1" 1183 let skip="skip + 1"
1071 ;; 1184 ;;
1072 2.1.3) 1185 2.1.3)
1073 skip=`grep -a ^offset= ${src} | awk '{print $3}'` 1186 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1074 let skip="skip + 1" 1187 let skip="skip + 1"
1188 ;;
1189 2.1.4)
1190 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1191 skip=$(head -n ${skip} "${src}" | wc -c)
1192 exe="dd"
1075 ;; 1193 ;;
1076 *) 1194 *)
1077 eerror "I'm sorry, but I was unable to support the Makeself file." 1195 eerror "I'm sorry, but I was unable to support the Makeself file."
1078 eerror "The version I detected was '${ver}'." 1196 eerror "The version I detected was '${ver}'."
1079 eerror "Please file a bug about the file ${shrtsrc} at" 1197 eerror "Please file a bug about the file ${shrtsrc} at"
1081 die "makeself version '${ver}' not supported" 1199 die "makeself version '${ver}' not supported"
1082 ;; 1200 ;;
1083 esac 1201 esac
1084 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1202 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1085 fi 1203 fi
1204 case ${exe} in
1205 tail) exe="tail -n +${skip} '${src}'";;
1206 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1207 *) die "makeself cant handle exe '${exe}'"
1208 esac
1086 1209
1087 # lets grab the first few bytes of the file to figure out what kind of archive it is 1210 # lets grab the first few bytes of the file to figure out what kind of archive it is
1088 local tmpfile="`mymktemp ${T}`" 1211 local tmpfile="$(emktemp)"
1089 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1212 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1090 local filetype="`file -b ${tmpfile}`" 1213 local filetype="$(file -b "${tmpfile}")"
1091 case ${filetype} in 1214 case ${filetype} in
1092 *tar\ archive) 1215 *tar\ archive)
1093 tail -n +${skip} ${src} | tar --no-same-owner -xf - 1216 eval ${exe} | tar --no-same-owner -xf -
1094 ;; 1217 ;;
1095 bzip2*) 1218 bzip2*)
1096 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1219 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1097 ;; 1220 ;;
1098 gzip*) 1221 gzip*)
1099 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1222 eval ${exe} | tar --no-same-owner -xzf -
1100 ;; 1223 ;;
1101 compress*) 1224 compress*)
1102 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf - 1225 eval ${exe} | gunzip | tar --no-same-owner -xf -
1103 ;; 1226 ;;
1104 *) 1227 *)
1105 eerror "Unknown filetype \"${filetype}\" ?" 1228 eerror "Unknown filetype \"${filetype}\" ?"
1106 false 1229 false
1107 ;; 1230 ;;
1129 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1252 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
1130 local l="`basename ${lic}`" 1253 local l="`basename ${lic}`"
1131 1254
1132 # here is where we check for the licenses the user already 1255 # here is where we check for the licenses the user already
1133 # accepted ... if we don't find a match, we make the user accept 1256 # accepted ... if we don't find a match, we make the user accept
1257 local shopts=$-
1134 local alic 1258 local alic
1259 set -o noglob #so that bash doesn't expand "*"
1135 for alic in ${ACCEPT_LICENSE} ; do 1260 for alic in ${ACCEPT_LICENSE} ; do
1136 [ "${alic}" == "*" ] && return 0 1261 if [[ ${alic} == * || ${alic} == ${l} ]]; then
1137 [ "${alic}" == "${l}" ] && return 0 1262 set +o noglob; set -${shopts} #reset old shell opts
1263 return 0
1264 fi
1138 done 1265 done
1266 set +o noglob; set -$shopts #reset old shell opts
1139 1267
1140 local licmsg="`mymktemp ${T}`" 1268 local licmsg="$(emktemp)"
1141 cat << EOF > ${licmsg} 1269 cat << EOF > ${licmsg}
1142********************************************************** 1270**********************************************************
1143The following license outlines the terms of use of this 1271The following license outlines the terms of use of this
1144package. You MUST accept this license for installation to 1272package. You MUST accept this license for installation to
1145continue. When you are done viewing, hit 'q'. If you 1273continue. When you are done viewing, hit 'q'. If you
1193 export CDROM_TOTAL_CDS=${cdcnt} 1321 export CDROM_TOTAL_CDS=${cdcnt}
1194 export CDROM_CURRENT_CD=1 1322 export CDROM_CURRENT_CD=1
1195 1323
1196 # now we see if the user gave use CD_ROOT ... 1324 # now we see if the user gave use CD_ROOT ...
1197 # if they did, let's just believe them that it's correct 1325 # if they did, let's just believe them that it's correct
1198 if [ ! -z "${CD_ROOT}" ] ; then 1326 if [[ ! -z ${CD_ROOT} ]] ; then
1199 export CDROM_ROOT="${CD_ROOT}" 1327 export CDROM_ROOT=${CD_ROOT}
1200 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1328 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1201 return 1329 return
1202 fi 1330 fi
1203 # do the same for CD_ROOT_X 1331 # do the same for CD_ROOT_X
1204 if [ ! -z "${CD_ROOT_1}" ] ; then 1332 if [[ ! -z ${CD_ROOT_1} ]] ; then
1205 local var= 1333 local var=
1206 cdcnt=0 1334 cdcnt=0
1207 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1335 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1208 cdcnt=$((cdcnt + 1)) 1336 cdcnt=$((cdcnt + 1))
1209 var="CD_ROOT_${cdcnt}" 1337 var="CD_ROOT_${cdcnt}"
1210 if [ -z "${!var}" ] ; then 1338 if [[ -z ${!var} ]] ; then
1211 eerror "You must either use just the CD_ROOT" 1339 eerror "You must either use just the CD_ROOT"
1212 eerror "or specify ALL the CD_ROOT_X variables." 1340 eerror "or specify ALL the CD_ROOT_X variables."
1213 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1341 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1214 die "could not locate CD_ROOT_${cdcnt}" 1342 die "could not locate CD_ROOT_${cdcnt}"
1215 fi 1343 fi
1218 export CDROM_ROOT=${CDROM_ROOTS_1} 1346 export CDROM_ROOT=${CDROM_ROOTS_1}
1219 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1347 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1220 return 1348 return
1221 fi 1349 fi
1222 1350
1223 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1351 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1224 einfon "This ebuild will need the " 1352 einfon "This ebuild will need the "
1225 if [ -z "${CDROM_NAME}" ] ; then 1353 if [[ -z ${CDROM_NAME} ]] ; then
1226 echo "cdrom for ${PN}." 1354 echo "cdrom for ${PN}."
1227 else 1355 else
1228 echo "${CDROM_NAME}." 1356 echo "${CDROM_NAME}."
1229 fi 1357 fi
1230 echo 1358 echo
1231 einfo "If you do not have the CD, but have the data files" 1359 einfo "If you do not have the CD, but have the data files"
1232 einfo "mounted somewhere on your filesystem, just export" 1360 einfo "mounted somewhere on your filesystem, just export"
1233 einfo "the variable CD_ROOT so that it points to the" 1361 einfo "the variable CD_ROOT so that it points to the"
1234 einfo "directory containing the files." 1362 einfo "directory containing the files."
1235 echo 1363 echo
1364 einfo "For example:"
1365 einfo "export CD_ROOT=/mnt/cdrom"
1366 echo
1236 else 1367 else
1237 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1368 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1238 cdcnt=0 1369 cdcnt=0
1239 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1370 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1240 cdcnt=$((cdcnt + 1)) 1371 cdcnt=$((cdcnt + 1))
1241 var="CDROM_NAME_${cdcnt}" 1372 var="CDROM_NAME_${cdcnt}"
1242 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1373 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1243 done 1374 done
1244 echo 1375 echo
1245 einfo "If you do not have the CDs, but have the data files" 1376 einfo "If you do not have the CDs, but have the data files"
1246 einfo "mounted somewhere on your filesystem, just export" 1377 einfo "mounted somewhere on your filesystem, just export"
1247 einfo "the following variables so they point to the right place:" 1378 einfo "the following variables so they point to the right place:"
1248 einfon "" 1379 einfon ""
1249 cdcnt=0 1380 cdcnt=0
1250 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1381 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1251 cdcnt=$((cdcnt + 1)) 1382 cdcnt=$((cdcnt + 1))
1252 echo -n " CD_ROOT_${cdcnt}" 1383 echo -n " CD_ROOT_${cdcnt}"
1253 done 1384 done
1254 echo 1385 echo
1255 einfo "Or, if you have all the files in the same place, or" 1386 einfo "Or, if you have all the files in the same place, or"
1256 einfo "you only have one cdrom, you can export CD_ROOT" 1387 einfo "you only have one cdrom, you can export CD_ROOT"
1257 einfo "and that place will be used as the same data source" 1388 einfo "and that place will be used as the same data source"
1258 einfo "for all the CDs." 1389 einfo "for all the CDs."
1259 echo 1390 echo
1391 einfo "For example:"
1392 einfo "export CD_ROOT_1=/mnt/cdrom"
1393 echo
1260 fi 1394 fi
1261 export CDROM_CURRENT_CD=0 1395 export CDROM_CURRENT_CD=0
1262 cdrom_load_next_cd 1396 cdrom_load_next_cd
1263} 1397}
1264 1398
1268# remember, you can only go forward in the cd chain, you can't go back. 1402# remember, you can only go forward in the cd chain, you can't go back.
1269cdrom_load_next_cd() { 1403cdrom_load_next_cd() {
1270 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1404 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1271 local var= 1405 local var=
1272 1406
1273 if [ ! -z "${CD_ROOT}" ] ; then 1407 if [[ ! -z ${CD_ROOT} ]] ; then
1274 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1408 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1275 return 1409 return
1276 fi 1410 fi
1277 1411
1278 unset CDROM_ROOT 1412 unset CDROM_ROOT
1279 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1413 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1280 if [ -z "${!var}" ] ; then 1414 if [[ -z ${!var} ]] ; then
1281 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1415 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1282 cdrom_locate_file_on_cd ${!var} 1416 cdrom_locate_file_on_cd ${!var}
1283 else 1417 else
1284 export CDROM_ROOT="${!var}" 1418 export CDROM_ROOT=${!var}
1285 fi 1419 fi
1286 1420
1287 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1421 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1288} 1422}
1289 1423
1293# found, then a message asking for the user to insert the cdrom will be 1427# found, then a message asking for the user to insert the cdrom will be
1294# displayed and we'll hang out here until: 1428# displayed and we'll hang out here until:
1295# (1) the file is found on a mounted cdrom 1429# (1) the file is found on a mounted cdrom
1296# (2) the user hits CTRL+C 1430# (2) the user hits CTRL+C
1297cdrom_locate_file_on_cd() { 1431cdrom_locate_file_on_cd() {
1298 while [ -z "${CDROM_ROOT}" ] ; do 1432 while [[ -z ${CDROM_ROOT} ]] ; do
1299 local dir="$(dirname ${@})" 1433 local dir="$(dirname ${@})"
1300 local file="$(basename ${@})" 1434 local file="$(basename ${@})"
1301 local mline="" 1435 local mline=""
1302 local showedmsg=0 1436 local showedmsg=0
1303 1437
1304 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1438 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1305 [ -d "${mline}/${dir}" ] || continue 1439 [[ -d ${mline}/${dir} ]] || continue
1306 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1440 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1307 && export CDROM_ROOT=${mline} 1441 && export CDROM_ROOT=${mline}
1308 done 1442 done
1309 1443
1310 if [ -z "${CDROM_ROOT}" ] ; then 1444 if [[ -z ${CDROM_ROOT} ]] ; then
1311 echo 1445 echo
1312 if [ ${showedmsg} -eq 0 ] ; then 1446 if [[ ${showedmsg} -eq 0 ]] ; then
1313 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1447 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1314 if [ -z "${CDROM_NAME}" ] ; then 1448 if [[ -z ${CDROM_NAME} ]] ; then
1315 einfo "Please insert the cdrom for ${PN} now !" 1449 einfo "Please insert the cdrom for ${PN} now !"
1316 else 1450 else
1317 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1451 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1318 fi 1452 fi
1319 else 1453 else
1320 if [ -z "${CDROM_NAME_1}" ] ; then 1454 if [[ -z ${CDROM_NAME_1} ]] ; then
1321 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1455 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1322 else 1456 else
1323 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1457 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1324 einfo "Please insert+mount the ${!var} cdrom now !" 1458 einfo "Please insert+mount the ${!var} cdrom now !"
1325 fi 1459 fi
1345# directories and uses the intersection of the lists. 1479# directories and uses the intersection of the lists.
1346# The -u builds a list of po files found in all the 1480# The -u builds a list of po files found in all the
1347# directories and uses the union of the lists. 1481# directories and uses the union of the lists.
1348strip-linguas() { 1482strip-linguas() {
1349 local ls newls 1483 local ls newls
1350 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1484 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1351 local op="$1"; shift 1485 local op=$1; shift
1352 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1486 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1353 local d f 1487 local d f
1354 for d in "$@" ; do 1488 for d in "$@" ; do
1355 if [ "${op}" == "-u" ] ; then 1489 if [[ ${op} == "-u" ]] ; then
1356 newls="${ls}" 1490 newls=${ls}
1357 else 1491 else
1358 newls="" 1492 newls=""
1359 fi 1493 fi
1360 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1494 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1361 if [ "${op}" == "-i" ] ; then 1495 if [[ ${op} == "-i" ]] ; then
1362 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1496 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1363 else 1497 else
1364 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1498 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1365 fi 1499 fi
1366 done 1500 done
1367 ls="${newls}" 1501 ls=${newls}
1368 done 1502 done
1369 ls="${ls//.po}" 1503 ls=${ls//.po}
1370 else 1504 else
1371 ls="$@" 1505 ls=$@
1372 fi 1506 fi
1373 1507
1374 ls=" ${ls} " 1508 ls=" ${ls} "
1375 newls="" 1509 newls=""
1376 for f in ${LINGUAS} ; do 1510 for f in ${LINGUAS} ; do
1377 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1511 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1378 nl="${newls} ${f}" 1512 newls="${newls} ${f}"
1379 else 1513 else
1380 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1514 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1381 fi 1515 fi
1382 done 1516 done
1383 if [ -z "${newls}" ] ; then 1517 if [[ -z ${newls} ]] ; then
1384 unset LINGUAS 1518 unset LINGUAS
1385 else 1519 else
1386 export LINGUAS="${newls}" 1520 export LINGUAS=${newls:1}
1521 fi
1522}
1523
1524# moved from kernel.eclass since they are generally useful outside of
1525# kernel.eclass -iggy (20041002)
1526
1527# the following functions are useful in kernel module ebuilds, etc.
1528# for an example see ivtv or drbd ebuilds
1529
1530# set's ARCH to match what the kernel expects
1531set_arch_to_kernel() {
1532 i=10
1533 while ((i--)) ; do
1534 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1535 done
1536 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1537 case ${ARCH} in
1538 x86) export ARCH="i386";;
1539 amd64) export ARCH="x86_64";;
1540 hppa) export ARCH="parisc";;
1541 mips) export ARCH="mips";;
1542 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1543 *) export ARCH="${ARCH}";;
1544 esac
1545}
1546
1547# set's ARCH back to what portage expects
1548set_arch_to_portage() {
1549 i=10
1550 while ((i--)) ; do
1551 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1552 done
1553 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1554}
1555
1556# Jeremy Huddleston <eradicator@gentoo.org>:
1557# preserve_old_lib /path/to/libblah.so.0
1558# preserve_old_lib_notify /path/to/libblah.so.0
1559#
1560# These functions are useful when a lib in your package changes --soname. Such
1561# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1562# would break packages that link against it. Most people get around this
1563# by using the portage SLOT mechanism, but that is not always a relevant
1564# solution, so instead you can add the following to your ebuilds:
1565#
1566# src_install() {
1567# ...
1568# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1569# ...
1570# }
1571#
1572# pkg_postinst() {
1573# ...
1574# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1575# ...
1576# }
1577
1578preserve_old_lib() {
1579 LIB=$1
1580
1581 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1582 SONAME=`basename ${LIB}`
1583 DIRNAME=`dirname ${LIB}`
1584
1585 dodir ${DIRNAME}
1586 cp ${ROOT}${LIB} ${D}${DIRNAME}
1587 touch ${D}${LIB}
1588 fi
1589}
1590
1591preserve_old_lib_notify() {
1592 LIB=$1
1593
1594 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1595 SONAME=`basename ${LIB}`
1596
1597 einfo "An old version of an installed library was detected on your system."
1598 einfo "In order to avoid breaking packages that link against is, this older version"
1599 einfo "is not being removed. In order to make full use of this newer version,"
1600 einfo "you will need to execute the following command:"
1601 einfo " revdep-rebuild --soname ${SONAME}"
1602 einfo
1603 einfo "After doing that, you can safely remove ${LIB}"
1604 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1605 fi
1606}
1607
1608# Hack for people to figure out if a package was built with
1609# certain USE flags
1610#
1611# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1612# ex: built_with_use xchat gtk2
1613#
1614# Flags: -a all USE flags should be utilized
1615# -o at least one USE flag should be utilized
1616# Note: the default flag is '-a'
1617built_with_use() {
1618 local opt=$1
1619 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1620
1621 local PKG=$(best_version $1)
1622 shift
1623
1624 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1625 [[ ! -e ${USEFILE} ]] && return 1
1626
1627 local USE_BUILT=$(<${USEFILE})
1628 while [[ $# -gt 0 ]] ; do
1629 if [[ ${opt} = "-o" ]] ; then
1630 has $1 ${USE_BUILT} && return 0
1631 else
1632 has $1 ${USE_BUILT} || return 1
1387 fi 1633 fi
1634 shift
1635 done
1636 [[ ${opt} = "-a" ]]
1388} 1637}
1638
1639# Many configure scripts wrongly bail when a C++ compiler
1640# could not be detected. #73450
1641epunt_cxx() {
1642 local dir=$1
1643 [[ -z ${dir} ]] && dir=${S}
1644 ebegin "Removing useless C++ checks"
1645 local f
1646 for f in $(find ${dir} -name configure) ; do
1647 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1648 done
1649 eend 0
1650}
1651
1652# dopamd <file> [more files]
1653#
1654# Install pam auth config file in /etc/pam.d
1655dopamd() {
1656 [[ -z $1 ]] && die "dopamd requires at least one argument"
1657
1658 use pam || return 0
1659
1660 insinto /etc/pam.d
1661 # these are the default doins options, but be explicit just in case
1662 insopts -m 0644 -o root -g root
1663 doins "$@" || die "failed to install $@"
1664}
1665# newpamd <old name> <new name>
1666#
1667# Install pam file <old name> as <new name> in /etc/pam.d
1668newpamd() {
1669 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1670
1671 use pam || return 0
1672
1673 insinto /etc/pam.d
1674 # these are the default doins options, but be explicit just in case
1675 insopts -m 0644 -o root -g root
1676 newins "$1" "$2" || die "failed to install $1 as $2"
1677}

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

  ViewVC Help
Powered by ViewVC 1.1.20