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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.97  
changed lines
  Added in v.1.152

  ViewVC Help
Powered by ViewVC 1.1.20