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

Diff of /eclass/eutils.eclass

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

Revision 1.99 Revision 1.168
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.99 2004/09/07 11:41:29 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.168 2005/04/29 03:59:15 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib
12ECLASS=eutils 13ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
16 17
41 sleep 1 42 sleep 1
42 done 43 done
43 fi 44 fi
44} 45}
45 46
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 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
55 # if there is an override, we want to use that... always.
56 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
57 elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
58 # and if there isnt an override, and we're using a version of
59 # portage without CONF_LIBDIR support, force the use of lib. dolib
60 # and friends from portage 2.0.50 wont be too happy otherwise.
61 CONF_LIBDIR="lib"
62 fi
63 # and of course, default to lib if CONF_LIBDIR isnt set
64 echo ${CONF_LIBDIR:=lib}
65}
66
67# Sometimes you need to override the value returned by get_libdir. A good
68# example of this is xorg-x11, where lib32 isnt a supported configuration,
69# and where lib64 -must- be used on amd64 (for applications that need lib
70# to be 32bit, such as adobe acrobat). Note that this override also bypasses
71# portage version sanity checking.
72# get_libdir_override expects one argument, the result get_libdir should
73# return:
74#
75# get_libdir_override lib64
76#
77# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
78get_libdir_override() {
79 CONF_LIBDIR="$1"
80 CONF_LIBDIR_OVERRIDE="$1"
81}
82
83# This function generate linker scripts in /usr/lib for dynamic 47# This function generate linker scripts in /usr/lib for dynamic
84# libs in /lib. This is to fix linking problems when you have 48# libs in /lib. This is to fix linking problems when you have
85# the .so in /lib, and the .a in /usr/lib. What happens is that 49# the .so in /lib, and the .a in /usr/lib. What happens is that
86# in some cases when linking dynamic, the .a in /usr/lib is used 50# in some cases when linking dynamic, the .a in /usr/lib is used
87# instead of the .so in /lib due to gcc/libtool tweaking ld's 51# instead of the .so in /lib due to gcc/libtool tweaking ld's
97# to point to the latest version of the library present. 61# to point to the latest version of the library present.
98# 62#
99# <azarah@gentoo.org> (26 Oct 2002) 63# <azarah@gentoo.org> (26 Oct 2002)
100# 64#
101gen_usr_ldscript() { 65gen_usr_ldscript() {
66 local libdir="$(get_libdir)"
102 # Just make sure it exists 67 # Just make sure it exists
103 dodir /usr/$(get_libdir) 68 dodir /usr/${libdir}
104 69
70 for lib in "${@}" ; do
105 cat > ${D}/usr/$(get_libdir)/$1 <<"END_LDSCRIPT" 71 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
106/* GNU ld script 72 /* GNU ld script
107 Because Gentoo have critical dynamic libraries 73 Since Gentoo has critical dynamic libraries
108 in /lib, and the static versions in /usr/lib, we 74 in /lib, and the static versions in /usr/lib,
109 need to have a "fake" dynamic lib in /usr/lib, 75 we need to have a "fake" dynamic lib in /usr/lib,
110 otherwise we run into linking problems. 76 otherwise we run into linking problems.
111 See bug #4411 on http://bugs.gentoo.org/ for 77
112 more info. */ 78 See bug http://bugs.gentoo.org/4411 for more info.
79 */
80 GROUP ( /${libdir}/${lib} )
113END_LDSCRIPT 81 END_LDSCRIPT
114 82 fperms a+x "/usr/${libdir}/${lib}"
115 echo "GROUP ( /$(get_libdir)/libxxx )" >> ${D}/usr/$(get_libdir)/$1 83 done
116 dosed "s:libxxx:$1:" /usr/$(get_libdir)/$1
117
118 return 0
119} 84}
120 85
121# Simple function to draw a line consisting of '=' the same length as $* 86# Simple function to draw a line consisting of '=' the same length as $*
87# - only to be used by epatch()
122# 88#
123# <azarah@gentoo.org> (11 Nov 2002) 89# <azarah@gentoo.org> (11 Nov 2002)
124# 90#
125draw_line() { 91draw_line() {
126 local i=0 92 local i=0
208 local x="" 174 local x=""
209 175
210 if [ "$#" -gt 1 ] 176 if [ "$#" -gt 1 ]
211 then 177 then
212 local m="" 178 local m=""
213 einfo "${#} patches to apply..."
214 for m in "$@" ; do 179 for m in "$@" ; do
215 epatch "${m}" 180 epatch "${m}"
216 done 181 done
217 return 0 182 return 0
218 fi 183 fi
232 local EPATCH_SOURCE="$1/*" 197 local EPATCH_SOURCE="$1/*"
233 else 198 else
234 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 199 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
235 fi 200 fi
236 else 201 else
237 if [ ! -d ${EPATCH_SOURCE} ] 202 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
238 then 203 then
239 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 204 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
240 then 205 then
241 EPATCH_SOURCE="$1" 206 EPATCH_SOURCE="$1"
242 fi 207 fi
243 208
244 echo 209 echo
245 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 210 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
246 eerror 211 eerror
247 eerror " ${EPATCH_SOURCE}" 212 eerror " ${EPATCH_SOURCE}"
213 eerror " ( ${EPATCH_SOURCE##*/} )"
248 echo 214 echo
249 die "Cannot find \$EPATCH_SOURCE!" 215 die "Cannot find \$EPATCH_SOURCE!"
250 fi 216 fi
251 217
252 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 218 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
271 ;; 237 ;;
272 esac 238 esac
273 239
274 if [ "${SINGLE_PATCH}" = "no" ] 240 if [ "${SINGLE_PATCH}" = "no" ]
275 then 241 then
276 einfo "Applying various patches (bugfixes/updates)..." 242 einfo "Applying various patches (bugfixes/updates) ..."
277 fi 243 fi
278 for x in ${EPATCH_SOURCE} 244 for x in ${EPATCH_SOURCE}
279 do 245 do
280 # New ARCH dependant patch naming scheme... 246 # New ARCH dependant patch naming scheme ...
281 # 247 #
282 # ???_arch_foo.patch 248 # ???_arch_foo.patch
283 # 249 #
284 if [ -f ${x} ] && \ 250 if [ -f ${x} ] && \
285 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 251 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
286 [ "${EPATCH_FORCE}" = "yes" ]) 252 [ "${EPATCH_FORCE}" = "yes" ])
287 then 253 then
288 local count=0 254 local count=0
289 local popts="${EPATCH_OPTS}" 255 local popts="${EPATCH_OPTS}"
256 local patchname=${x##*/}
290 257
291 if [ -n "${EPATCH_EXCLUDE}" ] 258 if [ -n "${EPATCH_EXCLUDE}" ]
292 then 259 then
293 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 260 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
294 then 261 then
295 continue 262 continue
296 fi 263 fi
297 fi 264 fi
298 265
300 then 267 then
301 if [ -n "${EPATCH_SINGLE_MSG}" ] 268 if [ -n "${EPATCH_SINGLE_MSG}" ]
302 then 269 then
303 einfo "${EPATCH_SINGLE_MSG}" 270 einfo "${EPATCH_SINGLE_MSG}"
304 else 271 else
305 einfo "Applying ${x##*/}..." 272 einfo "Applying ${patchname} ..."
306 fi 273 fi
307 else 274 else
308 einfo " ${x##*/}..." 275 einfo " ${patchname} ..."
309 fi 276 fi
310 277
311 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 278 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
312 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 279 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
313 280
314 # Allow for prefix to differ ... im lazy, so shoot me :/ 281 # Allow for prefix to differ ... im lazy, so shoot me :/
315 while [ "${count}" -lt 5 ] 282 while [ "${count}" -lt 5 ]
316 do 283 do
317 # Generate some useful debug info ... 284 # Generate some useful debug info ...
318 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 285 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
319 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 286 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
320 287
321 if [ "${PATCH_SUFFIX}" != "patch" ] 288 if [ "${PATCH_SUFFIX}" != "patch" ]
322 then 289 then
323 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
324 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 else 292 else
326 PATCH_TARGET="${x}" 293 PATCH_TARGET="${x}"
327 fi 294 fi
328 295
329 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
330 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 297 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
331 298
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 301
335 if [ "${PATCH_SUFFIX}" != "patch" ] 302 if [ "${PATCH_SUFFIX}" != "patch" ]
336 then 303 then
337 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 304 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
338 then 305 then
339 echo 306 echo
340 eerror "Could not extract patch!" 307 eerror "Could not extract patch!"
341 #die "Could not extract patch!" 308 #die "Could not extract patch!"
342 count=5 309 count=5
343 break 310 break
344 fi 311 fi
345 fi 312 fi
346 313
347 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 314 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
348 then 315 then
349 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 316 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
350 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 317 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
351 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
352 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
353 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
354 321
355 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 322 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
356 323
357 if [ "$?" -ne 0 ] 324 if [ "$?" -ne 0 ]
358 then 325 then
359 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 326 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
360 echo 327 echo
361 eerror "A dry-run of patch command succeeded, but actually" 328 eerror "A dry-run of patch command succeeded, but actually"
362 eerror "applying the patch failed!" 329 eerror "applying the patch failed!"
363 #die "Real world sux compared to the dreamworld!" 330 #die "Real world sux compared to the dreamworld!"
364 count=5 331 count=5
365 fi 332 fi
366 333
367 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 334 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
368 335
369 break 336 break
370 fi 337 fi
371 338
372 count=$((count + 1)) 339 count=$((count + 1))
378 fi 345 fi
379 346
380 if [ "${count}" -eq 5 ] 347 if [ "${count}" -eq 5 ]
381 then 348 then
382 echo 349 echo
383 eerror "Failed Patch: ${x##*/}!" 350 eerror "Failed Patch: ${patchname} !"
351 eerror " ( ${PATCH_TARGET} )"
384 eerror 352 eerror
385 eerror "Include in your bugreport the contents of:" 353 eerror "Include in your bugreport the contents of:"
386 eerror 354 eerror
387 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 355 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
388 echo 356 echo
389 die "Failed Patch: ${x##*/}!" 357 die "Failed Patch: ${patchname}!"
390 fi 358 fi
391 359
392 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 360 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
393 361
394 eend 0 362 eend 0
395 fi 363 fi
396 done 364 done
397 if [ "${SINGLE_PATCH}" = "no" ] 365 if [ "${SINGLE_PATCH}" = "no" ]
403# This function return true if we are using the NPTL pthreads 371# This function return true if we are using the NPTL pthreads
404# implementation. 372# implementation.
405# 373#
406# <azarah@gentoo.org> (06 March 2003) 374# <azarah@gentoo.org> (06 March 2003)
407# 375#
408
409have_NPTL() { 376have_NPTL() {
410
411 cat > ${T}/test-nptl.c <<-"END" 377 cat > ${T}/test-nptl.c <<-"END"
412 #define _XOPEN_SOURCE 378 #define _XOPEN_SOURCE
413 #include <unistd.h> 379 #include <unistd.h>
414 #include <stdio.h> 380 #include <stdio.h>
415 381
427 393
428 return 1; 394 return 1;
429 } 395 }
430 END 396 END
431 397
432 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 398 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
433 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 399 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
434 then 400 then
435 echo "yes" 401 echo "yes"
436 einfon "Checking what PTHREADS implementation we have ... " 402 einfon "Checking what PTHREADS implementation we have ..."
437 if ${T}/nptl 403 if ${T}/nptl
438 then 404 then
439 return 0 405 return 0
440 else 406 else
441 return 1 407 return 1
517 483
518 if [ -n "${ADMINPARAM}" ] 484 if [ -n "${ADMINPARAM}" ]
519 then 485 then
520 if [ "${jobs}" -gt "${ADMINPARAM}" ] 486 if [ "${jobs}" -gt "${ADMINPARAM}" ]
521 then 487 then
522 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 488 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
523 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 489 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
524 else 490 else
525 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 491 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
526 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 492 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
527 fi 493 fi
528 fi 494 fi
529} 495}
530 496
531# Cheap replacement for when debianutils (and thus mktemp) 497# Cheap replacement for when debianutils (and thus mktemp)
532# does not exist on the users system 498# does not exist on the users system
533# vapier@gentoo.org 499# vapier@gentoo.org
534# 500#
535# Takes just 1 parameter (the directory to create tmpfile in) 501# Takes just 1 optional parameter (the directory to create tmpfile in)
536mymktemp() { 502emktemp() {
503 local exe="touch"
504 [ "$1" == "-d" ] && exe="mkdir" && shift
537 local topdir="$1" 505 local topdir="$1"
538 506
539 [ -z "${topdir}" ] && topdir=/tmp 507 if [ -z "${topdir}" ]
540 if [ "`which mktemp 2>/dev/null`" ]
541 then 508 then
542 mktemp -p ${topdir} 509 [ -z "${T}" ] \
543 else 510 && topdir="/tmp" \
511 || topdir="${T}"
512 fi
513
514 if [ -z "$(type -p mktemp)" ]
515 then
516 local tmp=/
517 while [ -e "${tmp}" ] ; do
544 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 518 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
545 touch ${tmp} 519 done
520 ${exe} "${tmp}"
546 echo ${tmp} 521 echo "${tmp}"
522 else
523 [ "${exe}" == "touch" ] \
524 && exe="-p" \
525 || exe="-d"
526 mktemp ${exe} "${topdir}"
547 fi 527 fi
548} 528}
549 529
550# Small wrapper for getent (Linux) and nidump (Mac OS X) 530# Small wrapper for getent (Linux), nidump (Mac OS X),
551# used in enewuser()/enewgroup() 531# and pw (FreeBSD) used in enewuser()/enewgroup()
552# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 532# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
533# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
553# 534#
554# egetent(database, key) 535# egetent(database, key)
555egetent() { 536egetent() {
556 if [ "${ARCH}" == "macos" ] ; then 537 if useq ppc-macos ; then
557 case "$2" in 538 case "$2" in
558 *[!0-9]*) # Non numeric 539 *[!0-9]*) # Non numeric
559 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 540 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
560 ;; 541 ;;
561 *) # Numeric 542 *) # Numeric
562 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 543 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
563 ;; 544 ;;
564 esac 545 esac
546 elif useq x86-fbsd ; then
547 local action
548 if [ "$1" == "passwd" ]
549 then
550 action="user"
565 else 551 else
552 action="group"
553 fi
554 pw show "${action}" "$2" -q
555 else
556 which nscd >& /dev/null && nscd -i "$1"
566 getent $1 $2 557 getent "$1" "$2"
567 fi 558 fi
568} 559}
569 560
570# Simplify/standardize adding users to the system 561# Simplify/standardize adding users to the system
571# vapier@gentoo.org 562# vapier@gentoo.org
617 euid="next" 608 euid="next"
618 fi 609 fi
619 if [ "${euid}" == "next" ] 610 if [ "${euid}" == "next" ]
620 then 611 then
621 local pwrange 612 local pwrange
622 if [ "${ARCH}" == "macos" ] ; then 613 if [ "${USERLAND}" == "BSD" ] ; then
623 pwrange="`jot 898 101`" 614 pwrange="`jot 898 101`"
624 else 615 else
625 pwrange="`seq 101 999`" 616 pwrange="`seq 101 999`"
626 fi 617 fi
627 for euid in ${pwrange} ; do 618 for euid in ${pwrange} ; do
639 then 630 then
640 eerror "A shell was specified but it does not exist !" 631 eerror "A shell was specified but it does not exist !"
641 die "${eshell} does not exist" 632 die "${eshell} does not exist"
642 fi 633 fi
643 else 634 else
635 if [ "${USERLAND}" == "BSD" ]
636 then
637 eshell="/usr/bin/false"
638 else
644 eshell="/bin/false" 639 eshell="/bin/false"
640 fi
645 fi 641 fi
646 einfo " - Shell: ${eshell}" 642 einfo " - Shell: ${eshell}"
647 opts="${opts} -s ${eshell}" 643 opts="${opts} -s ${eshell}"
648 644
649 # handle homedir 645 # handle homedir
658 # handle groups 654 # handle groups
659 local egroups="$1"; shift 655 local egroups="$1"; shift
660 if [ ! -z "${egroups}" ] 656 if [ ! -z "${egroups}" ]
661 then 657 then
662 local oldifs="${IFS}" 658 local oldifs="${IFS}"
659 local defgroup="" exgroups=""
660
663 export IFS="," 661 export IFS=","
664 for g in ${egroups} 662 for g in ${egroups}
665 do 663 do
664 export IFS="${oldifs}"
666 if [ -z "`egetent group \"${g}\"`" ] 665 if [ -z "`egetent group \"${g}\"`" ]
667 then 666 then
668 eerror "You must add group ${g} to the system first" 667 eerror "You must add group ${g} to the system first"
669 die "${g} is not a valid GID" 668 die "${g} is not a valid GID"
670 fi 669 fi
670 if [ -z "${defgroup}" ]
671 then
672 defgroup="${g}"
673 else
674 exgroups="${exgroups},${g}"
675 fi
676 export IFS=","
671 done 677 done
672 export IFS="${oldifs}" 678 export IFS="${oldifs}"
679
673 opts="${opts} -g ${egroups}" 680 opts="${opts} -g ${defgroup}"
681 if [ ! -z "${exgroups}" ]
682 then
683 opts="${opts} -G ${exgroups:1}"
684 fi
674 else 685 else
675 egroups="(none)" 686 egroups="(none)"
676 fi 687 fi
677 einfo " - Groups: ${egroups}" 688 einfo " - Groups: ${egroups}"
678 689
679 # handle extra and add the user 690 # handle extra and add the user
680 local eextra="$@" 691 local eextra="$@"
681 local oldsandbox="${SANDBOX_ON}" 692 local oldsandbox="${SANDBOX_ON}"
682 export SANDBOX_ON="0" 693 export SANDBOX_ON="0"
683 if [ "${ARCH}" == "macos" ]; 694 if useq ppc-macos
684 then 695 then
685 ### Make the user 696 ### Make the user
686 if [ -z "${eextra}" ] 697 if [ -z "${eextra}" ]
687 then 698 then
688 dscl . create /users/${euser} uid ${euid} 699 dscl . create /users/${euser} uid ${euid}
689 dscl . create /users/${euser} shell ${eshell} 700 dscl . create /users/${euser} shell ${eshell}
690 dscl . create /users/${euser} home ${ehome} 701 dscl . create /users/${euser} home ${ehome}
691 dscl . create /users/${euser} realname "added by portage for ${PN}" 702 dscl . create /users/${euser} realname "added by portage for ${PN}"
692 ### Add the user to the groups specified 703 ### Add the user to the groups specified
704 local oldifs="${IFS}"
705 export IFS=","
693 for g in ${egroups} 706 for g in ${egroups}
694 do 707 do
695 dscl . merge /groups/${g} users ${euser} 708 dscl . merge /groups/${g} users ${euser}
696 done 709 done
710 export IFS="${oldifs}"
697 else 711 else
698 einfo "Extra options are not supported on macos yet" 712 einfo "Extra options are not supported on macos yet"
699 einfo "Please report the ebuild along with the info below" 713 einfo "Please report the ebuild along with the info below"
700 einfo "eextra: ${eextra}" 714 einfo "eextra: ${eextra}"
701 die "Required function missing" 715 die "Required function missing"
716 fi
717 elif use x86-fbsd ; then
718 if [ -z "${eextra}" ]
719 then
720 pw useradd ${euser} ${opts} \
721 -c "added by portage for ${PN}" \
722 die "enewuser failed"
723 else
724 einfo " - Extra: ${eextra}"
725 pw useradd ${euser} ${opts} \
726 -c ${eextra} || die "enewuser failed"
702 fi 727 fi
703 else 728 else
704 if [ -z "${eextra}" ] 729 if [ -z "${eextra}" ]
705 then 730 then
706 useradd ${opts} ${euser} \ 731 useradd ${opts} ${euser} \
757 then 782 then
758 if [ "${egid}" -gt 0 ] 783 if [ "${egid}" -gt 0 ]
759 then 784 then
760 if [ -z "`egetent group ${egid}`" ] 785 if [ -z "`egetent group ${egid}`" ]
761 then 786 then
762 if [ "${ARCH}" == "macos" ] ; then 787 if useq ppc-macos ; then
763 opts="${opts} ${egid}" 788 opts="${opts} ${egid}"
764 else 789 else
765 opts="${opts} -g ${egid}" 790 opts="${opts} -g ${egid}"
766 fi 791 fi
767 else 792 else
781 opts="${opts} ${eextra}" 806 opts="${opts} ${eextra}"
782 807
783 # add the group 808 # add the group
784 local oldsandbox="${SANDBOX_ON}" 809 local oldsandbox="${SANDBOX_ON}"
785 export SANDBOX_ON="0" 810 export SANDBOX_ON="0"
786 if [ "${ARCH}" == "macos" ]; 811 if useq ppc-macos ; then
787 then
788 if [ ! -z "${eextra}" ]; 812 if [ ! -z "${eextra}" ];
789 then 813 then
790 einfo "Extra options are not supported on macos yet" 814 einfo "Extra options are not supported on macos yet"
791 einfo "Please report the ebuild along with the info below" 815 einfo "Please report the ebuild along with the info below"
792 einfo "eextra: ${eextra}" 816 einfo "eextra: ${eextra}"
793 die "Required function missing" 817 die "Required function missing"
794 fi 818 fi
795 819
796 # If we need the next available 820 # If we need the next available
797 case ${egid} in 821 case ${egid} in
798 *[!0-9]*) # Non numeric 822 *[!0-9]*) # Non numeric
799 for egid in `jot 898 101`; do 823 for egid in `jot 898 101`; do
800 [ -z "`egetent group ${egid}`" ] && break 824 [ -z "`egetent group ${egid}`" ] && break
801 done 825 done
802 esac 826 esac
803 dscl . create /groups/${egroup} gid ${egid} 827 dscl . create /groups/${egroup} gid ${egid}
804 dscl . create /groups/${egroup} passwd '*' 828 dscl . create /groups/${egroup} passwd '*'
829 elif use x86-fbsd ; then
830 case ${egid} in
831 *[!0-9]*) # Non numeric
832 for egid in `jot 898 101`; do
833 [ -z "`egetent group ${egid}`" ] && break
834 done
835 esac
836 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
805 else 837 else
806 groupadd ${opts} ${egroup} || die "enewgroup failed" 838 groupadd ${opts} ${egroup} || die "enewgroup failed"
807 fi 839 fi
808 export SANDBOX_ON="${oldsandbox}" 840 export SANDBOX_ON="${oldsandbox}"
809} 841}
810 842
811# Simple script to replace 'dos2unix' binaries 843# Simple script to replace 'dos2unix' binaries
812# vapier@gentoo.org 844# vapier@gentoo.org
813# 845#
814# edos2unix(file, <more files>...) 846# edos2unix(file, <more files> ...)
815edos2unix() { 847edos2unix() {
816 for f in "$@" 848 for f in "$@"
817 do 849 do
818 cp "${f}" ${T}/edos2unix 850 cp "${f}" ${T}/edos2unix
819 sed 's/\r$//' ${T}/edos2unix > "${f}" 851 sed 's/\r$//' ${T}/edos2unix > "${f}"
820 done 852 done
821} 853}
822 854
855
856##############################################################
857# START: Handle .desktop files and menu entries #
858# maybe this should be separated into a new eclass some time #
859# lanius@gentoo.org #
860##############################################################
861
823# Make a desktop file ! 862# Make a desktop file !
824# Great for making those icons in kde/gnome startmenu ! 863# Great for making those icons in kde/gnome startmenu !
825# Amaze your friends ! Get the women ! Join today ! 864# Amaze your friends ! Get the women ! Join today !
826# gnome2 /usr/share/applications
827# gnome1 /usr/share/gnome/apps/
828# KDE ${KDEDIR}/share/applnk /usr/share/applnk
829# 865#
830# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 866# make_desktop_entry(<binary>, [name], [icon], [type], [path])
831# 867#
832# binary: what binary does the app run with ? 868# binary: what binary does the app run with ?
833# name: the name that will show up in the menu 869# name: the name that will show up in the menu
834# icon: give your little like a pretty little icon ... 870# icon: give your little like a pretty little icon ...
835# this can be relative (to /usr/share/pixmaps) or 871# this can be relative (to /usr/share/pixmaps) or
836# a full path to an icon 872# a full path to an icon
837# type: what kind of application is this ? for categories: 873# type: what kind of application is this ? for categories:
838# http://www.freedesktop.org/standards/menu-spec/ 874# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
839# path: if your app needs to startup in a specific dir 875# path: if your app needs to startup in a specific dir
840make_desktop_entry() { 876make_desktop_entry() {
841 [ -z "$1" ] && eerror "You must specify the executable" && return 1 877 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
842 878
843 local exec="${1}" 879 local exec=${1}
844 local name="${2:-${PN}}" 880 local name=${2:-${PN}}
845 local icon="${3:-${PN}.png}" 881 local icon=${3:-${PN}.png}
846 local type="${4}" 882 local type=${4}
847 local subdir="${6}" 883 local path=${5}
848 local path="${5:-${GAMES_PREFIX}}" 884
849 if [ -z "${type}" ] 885 if [[ -z ${type} ]] ; then
850 then 886 local catmaj=${CATEGORY%%-*}
851 case ${CATEGORY} in 887 local catmin=${CATEGORY##*-}
852 "app-emulation") 888 case ${catmaj} in
853 type=Emulator 889 app)
854 subdir="Emulation" 890 case ${catmin} in
891 admin) type=System;;
892 cdr) type=DiscBurning;;
893 dicts) type=Dictionary;;
894 editors) type=TextEditor;;
895 emacs) type=TextEditor;;
896 emulation) type=Emulator;;
897 laptop) type=HardwareSettings;;
898 office) type=Office;;
899 vim) type=TextEditor;;
900 xemacs) type=TextEditor;;
901 *) type=;;
902 esac
855 ;; 903 ;;
856 "games-"*) 904
857 type=Game 905 dev)
858 subdir="Games" 906 type="Development"
859 ;; 907 ;;
860 "net-"*) 908
861 type=Network 909 games)
862 subdir="${type}" 910 [[ -z ${path} ]] && path=${GAMES_BINDIR}
911
912 case ${catmin} in
913 action) type=ActionGame;;
914 arcade) type=ArcadeGame;;
915 board) type=BoardGame;;
916 kid) type=KidsGame;;
917 emulation) type=Emulator;;
918 puzzle) type=LogicGame;;
919 rpg) type=RolePlaying;;
920 roguelike) type=RolePlaying;;
921 simulation) type=Simulation;;
922 sports) type=SportsGame;;
923 strategy) type=StrategyGame;;
924 *) type=;;
925 esac
926 type="Game;${type}"
863 ;; 927 ;;
928
929 mail)
930 type="Network;Email"
931 ;;
932
933 media)
934 case ${catmin} in
935 gfx) type=Graphics;;
936 radio) type=Tuner;;
937 sound) type=Audio;;
938 tv) type=TV;;
939 video) type=Video;;
940 *) type=;;
941 esac
942 type="AudioVideo;${type}"
943 ;;
944
945 net)
946 case ${catmin} in
947 dialup) type=Dialup;;
948 ftp) type=FileTransfer;;
949 im) type=InstantMessaging;;
950 irc) type=IRCClient;;
951 mail) type=Email;;
952 news) type=News;;
953 nntp) type=News;;
954 p2p) type=FileTransfer;;
955 *) type=;;
956 esac
957 type="Network;${type}"
958 ;;
959
960 sci)
961 case ${catmin} in
962 astro*) type=Astronomoy;;
963 bio*) type=Biology;;
964 calc*) type=Calculator;;
965 chem*) type=Chemistry;;
966 geo*) type=Geology;;
967 math*) type=Math;;
968 *) type=;;
969 esac
970 type="Science;${type}"
971 ;;
972
973 www)
974 case ${catmin} in
975 client) type=WebBrowser;;
976 *) type=;;
977 esac
978 type="Network"
979 ;;
980
864 *) 981 *)
865 type= 982 type=
866 subdir=
867 ;; 983 ;;
868 esac 984 esac
869 fi 985 fi
986
870 local desktop="${T}/${exec}.desktop" 987 local desktop=${T}/${exec%% *}-${P}.desktop
871 988
872echo "[Desktop Entry] 989echo "[Desktop Entry]
873Encoding=UTF-8 990Encoding=UTF-8
874Version=0.9.2 991Version=0.9.2
875Name=${name} 992Name=${name}
878Exec=${exec} 995Exec=${exec}
879Path=${path} 996Path=${path}
880Icon=${icon} 997Icon=${icon}
881Categories=Application;${type};" > "${desktop}" 998Categories=Application;${type};" > "${desktop}"
882 999
883 if [ -d "/usr/share/applications" ]
884 then
885 insinto /usr/share/applications 1000 insinto /usr/share/applications
886 doins "${desktop}" 1001 doins "${desktop}"
887 fi
888
889 #if [ -d "/usr/share/gnome/apps" ]
890 #then
891 # insinto /usr/share/gnome/apps/Games
892 # doins ${desktop}
893 #fi
894
895 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
896 #then
897 # for ver in /usr/kde/*
898 # do
899 # insinto ${ver}/share/applnk/Games
900 # doins ${desktop}
901 # done
902 #fi
903
904 if [ -d "/usr/share/applnk" ]
905 then
906 insinto /usr/share/applnk/${subdir}
907 doins "${desktop}"
908 fi
909 1002
910 return 0 1003 return 0
911} 1004}
1005
1006# Make a GDM/KDM Session file
1007#
1008# make_desktop_entry(<title>, <command>)
1009# title: File to execute to start the Window Manager
1010# command: Name of the Window Manager
1011
1012make_session_desktop() {
1013 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
1014 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
1015
1016 local title=$1
1017 local command=$2
1018 local desktop=${T}/${wm}.desktop
1019
1020echo "[Desktop Entry]
1021Encoding=UTF-8
1022Name=${title}
1023Comment=This session logs you into ${title}
1024Exec=${command}
1025TryExec=${command}
1026Type=Application" > "${desktop}"
1027
1028 insinto /usr/share/xsessions
1029 doins "${desktop}"
1030}
1031
1032domenu() {
1033 local i j
1034 insinto /usr/share/applications
1035 for i in "$@" ; do
1036 if [[ -f ${i} ]] ; then
1037 doins "${i}"
1038 elif [[ -d ${i} ]] ; then
1039 for j in "${i}"/*.desktop ; do
1040 doins "${j}"
1041 done
1042 fi
1043 done
1044}
1045newmenu() {
1046 insinto /usr/share/applications
1047 newins "$1" "$2"
1048}
1049
1050doicon() {
1051 local i j
1052 insinto /usr/share/pixmaps
1053 for i in "$@" ; do
1054 if [[ -f ${i} ]] ; then
1055 doins "${i}"
1056 elif [[ -d ${i} ]] ; then
1057 for j in "${i}"/*.png ; do
1058 doins "${j}"
1059 done
1060 fi
1061 done
1062}
1063newicon() {
1064 insinto /usr/share/pixmaps
1065 newins "$1" "$2"
1066}
1067
1068##############################################################
1069# END: Handle .desktop files and menu entries #
1070##############################################################
1071
912 1072
913# for internal use only (unpack_pdv and unpack_makeself) 1073# for internal use only (unpack_pdv and unpack_makeself)
914find_unpackable_file() { 1074find_unpackable_file() {
915 local src="$1" 1075 local src="$1"
916 if [ -z "${src}" ] 1076 if [ -z "${src}" ]
962 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1122 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
963 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1123 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
964 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1124 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
965 1125
966 # grab metadata for debug reasons 1126 # grab metadata for debug reasons
967 local metafile="`mymktemp ${T}`" 1127 local metafile="$(emktemp)"
968 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1128 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
969 1129
970 # rip out the final file name from the metadata 1130 # rip out the final file name from the metadata
971 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1131 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
972 datafile="`basename ${datafile}`" 1132 datafile="`basename ${datafile}`"
973 1133
974 # now lets uncompress/untar the file if need be 1134 # now lets uncompress/untar the file if need be
975 local tmpfile="`mymktemp ${T}`" 1135 local tmpfile="$(emktemp)"
976 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1136 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
977 1137
978 local iscompressed="`file -b ${tmpfile}`" 1138 local iscompressed="`file -b ${tmpfile}`"
979 if [ "${iscompressed:0:8}" == "compress" ] ; then 1139 if [ "${iscompressed:0:8}" == "compress" ] ; then
980 iscompressed=1 1140 iscompressed=1
1025# Unpack those pesky makeself generated files ... 1185# Unpack those pesky makeself generated files ...
1026# They're shell scripts with the binary package tagged onto 1186# They're shell scripts with the binary package tagged onto
1027# the end of the archive. Loki utilized the format as does 1187# the end of the archive. Loki utilized the format as does
1028# many other game companies. 1188# many other game companies.
1029# 1189#
1030# Usage: unpack_makeself [file to unpack] [offset] 1190# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1031# - If the file is not specified then unpack will utilize ${A}. 1191# - If the file is not specified then unpack will utilize ${A}.
1032# - If the offset is not specified then we will attempt to extract 1192# - If the offset is not specified then we will attempt to extract
1033# the proper offset from the script itself. 1193# the proper offset from the script itself.
1034unpack_makeself() { 1194unpack_makeself() {
1035 local src="`find_unpackable_file $1`" 1195 local src="$(find_unpackable_file "$1")"
1036 local skip="$2" 1196 local skip="$2"
1197 local exe="$3"
1037 1198
1038 local shrtsrc="`basename ${src}`" 1199 local shrtsrc="$(basename "${src}")"
1039 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1200 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1040 if [ -z "${skip}" ] 1201 if [ -z "${skip}" ]
1041 then 1202 then
1042 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1203 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1043 local skip=0 1204 local skip=0
1205 exe=tail
1044 case ${ver} in 1206 case ${ver} in
1045 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1207 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1046 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1208 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1047 ;; 1209 ;;
1048 2.0|2.0.1) 1210 2.0|2.0.1)
1049 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1211 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
1050 ;; 1212 ;;
1051 2.1.1) 1213 2.1.1)
1052 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 1214 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
1053 let skip="skip + 1" 1215 let skip="skip + 1"
1054 ;; 1216 ;;
1055 2.1.2) 1217 2.1.2)
1056 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` 1218 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
1057 let skip="skip + 1" 1219 let skip="skip + 1"
1058 ;; 1220 ;;
1059 2.1.3) 1221 2.1.3)
1060 skip=`grep -a ^offset= ${src} | awk '{print $3}'` 1222 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1061 let skip="skip + 1" 1223 let skip="skip + 1"
1224 ;;
1225 2.1.4)
1226 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1227 skip=$(head -n ${skip} "${src}" | wc -c)
1228 exe="dd"
1062 ;; 1229 ;;
1063 *) 1230 *)
1064 eerror "I'm sorry, but I was unable to support the Makeself file." 1231 eerror "I'm sorry, but I was unable to support the Makeself file."
1065 eerror "The version I detected was '${ver}'." 1232 eerror "The version I detected was '${ver}'."
1066 eerror "Please file a bug about the file ${shrtsrc} at" 1233 eerror "Please file a bug about the file ${shrtsrc} at"
1068 die "makeself version '${ver}' not supported" 1235 die "makeself version '${ver}' not supported"
1069 ;; 1236 ;;
1070 esac 1237 esac
1071 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1238 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1072 fi 1239 fi
1240 case ${exe} in
1241 tail) exe="tail -n +${skip} '${src}'";;
1242 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1243 *) die "makeself cant handle exe '${exe}'"
1244 esac
1073 1245
1074 # lets grab the first few bytes of the file to figure out what kind of archive it is 1246 # lets grab the first few bytes of the file to figure out what kind of archive it is
1075 local tmpfile="`mymktemp ${T}`" 1247 local tmpfile="$(emktemp)"
1076 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1248 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1077 local filetype="`file -b ${tmpfile}`" 1249 local filetype="$(file -b "${tmpfile}")"
1078 case ${filetype} in 1250 case ${filetype} in
1079 *tar\ archive) 1251 *tar\ archive)
1080 tail -n +${skip} ${src} | tar --no-same-owner -xf - 1252 eval ${exe} | tar --no-same-owner -xf -
1081 ;; 1253 ;;
1082 bzip2*) 1254 bzip2*)
1083 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1255 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1084 ;; 1256 ;;
1085 gzip*) 1257 gzip*)
1086 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1258 eval ${exe} | tar --no-same-owner -xzf -
1087 ;; 1259 ;;
1088 compress*) 1260 compress*)
1089 tail -n +${skip} ${src} | gunzip | tar --no-same-owner -xf - 1261 eval ${exe} | gunzip | tar --no-same-owner -xf -
1090 ;; 1262 ;;
1091 *) 1263 *)
1092 eerror "Unknown filetype \"${filetype}\" ?" 1264 eerror "Unknown filetype \"${filetype}\" ?"
1093 false 1265 false
1094 ;; 1266 ;;
1116 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1288 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
1117 local l="`basename ${lic}`" 1289 local l="`basename ${lic}`"
1118 1290
1119 # here is where we check for the licenses the user already 1291 # here is where we check for the licenses the user already
1120 # accepted ... if we don't find a match, we make the user accept 1292 # accepted ... if we don't find a match, we make the user accept
1293 local shopts=$-
1121 local alic 1294 local alic
1295 set -o noglob #so that bash doesn't expand "*"
1122 for alic in "${ACCEPT_LICENSE}" ; do 1296 for alic in ${ACCEPT_LICENSE} ; do
1123 [ "${alic}" == "*" ] && return 0 1297 if [[ ${alic} == * || ${alic} == ${l} ]]; then
1124 [ "${alic}" == "${l}" ] && return 0 1298 set +o noglob; set -${shopts} #reset old shell opts
1299 return 0
1300 fi
1125 done 1301 done
1302 set +o noglob; set -$shopts #reset old shell opts
1126 1303
1127 local licmsg="`mymktemp ${T}`" 1304 local licmsg="$(emktemp)"
1128 cat << EOF > ${licmsg} 1305 cat << EOF > ${licmsg}
1129********************************************************** 1306**********************************************************
1130The following license outlines the terms of use of this 1307The following license outlines the terms of use of this
1131package. You MUST accept this license for installation to 1308package. You MUST accept this license for installation to
1132continue. When you are done viewing, hit 'q'. If you 1309continue. When you are done viewing, hit 'q'. If you
1180 export CDROM_TOTAL_CDS=${cdcnt} 1357 export CDROM_TOTAL_CDS=${cdcnt}
1181 export CDROM_CURRENT_CD=1 1358 export CDROM_CURRENT_CD=1
1182 1359
1183 # now we see if the user gave use CD_ROOT ... 1360 # now we see if the user gave use CD_ROOT ...
1184 # if they did, let's just believe them that it's correct 1361 # if they did, let's just believe them that it's correct
1185 if [ ! -z "${CD_ROOT}" ] ; then 1362 if [[ ! -z ${CD_ROOT} ]] ; then
1186 export CDROM_ROOT="${CD_ROOT}" 1363 export CDROM_ROOT=${CD_ROOT}
1187 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1364 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1188 return 1365 return
1189 fi 1366 fi
1190 # do the same for CD_ROOT_X 1367 # do the same for CD_ROOT_X
1191 if [ ! -z "${CD_ROOT_1}" ] ; then 1368 if [[ ! -z ${CD_ROOT_1} ]] ; then
1192 local var= 1369 local var=
1193 cdcnt=0 1370 cdcnt=0
1194 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1371 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1195 cdcnt=$((cdcnt + 1)) 1372 cdcnt=$((cdcnt + 1))
1196 var="CD_ROOT_${cdcnt}" 1373 var="CD_ROOT_${cdcnt}"
1197 if [ -z "${!var}" ] ; then 1374 if [[ -z ${!var} ]] ; then
1198 eerror "You must either use just the CD_ROOT" 1375 eerror "You must either use just the CD_ROOT"
1199 eerror "or specify ALL the CD_ROOT_X variables." 1376 eerror "or specify ALL the CD_ROOT_X variables."
1200 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1377 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1201 die "could not locate CD_ROOT_${cdcnt}" 1378 die "could not locate CD_ROOT_${cdcnt}"
1202 fi 1379 fi
1205 export CDROM_ROOT=${CDROM_ROOTS_1} 1382 export CDROM_ROOT=${CDROM_ROOTS_1}
1206 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1383 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1207 return 1384 return
1208 fi 1385 fi
1209 1386
1210 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1387 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1211 einfon "This ebuild will need the " 1388 einfon "This ebuild will need the "
1212 if [ -z "${CDROM_NAME}" ] ; then 1389 if [[ -z ${CDROM_NAME} ]] ; then
1213 echo "cdrom for ${PN}." 1390 echo "cdrom for ${PN}."
1214 else 1391 else
1215 echo "${CDROM_NAME}." 1392 echo "${CDROM_NAME}."
1216 fi 1393 fi
1217 echo 1394 echo
1218 einfo "If you do not have the CD, but have the data files" 1395 einfo "If you do not have the CD, but have the data files"
1219 einfo "mounted somewhere on your filesystem, just export" 1396 einfo "mounted somewhere on your filesystem, just export"
1220 einfo "the variable CD_ROOT so that it points to the" 1397 einfo "the variable CD_ROOT so that it points to the"
1221 einfo "directory containing the files." 1398 einfo "directory containing the files."
1222 echo 1399 echo
1400 einfo "For example:"
1401 einfo "export CD_ROOT=/mnt/cdrom"
1402 echo
1223 else 1403 else
1224 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1404 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1225 cdcnt=0 1405 cdcnt=0
1226 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1406 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1227 cdcnt=$((cdcnt + 1)) 1407 cdcnt=$((cdcnt + 1))
1228 var="CDROM_NAME_${cdcnt}" 1408 var="CDROM_NAME_${cdcnt}"
1229 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1409 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1230 done 1410 done
1231 echo 1411 echo
1232 einfo "If you do not have the CDs, but have the data files" 1412 einfo "If you do not have the CDs, but have the data files"
1233 einfo "mounted somewhere on your filesystem, just export" 1413 einfo "mounted somewhere on your filesystem, just export"
1234 einfo "the following variables so they point to the right place:" 1414 einfo "the following variables so they point to the right place:"
1235 einfon "" 1415 einfon ""
1236 cdcnt=0 1416 cdcnt=0
1237 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1417 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1238 cdcnt=$((cdcnt + 1)) 1418 cdcnt=$((cdcnt + 1))
1239 echo -n " CD_ROOT_${cdcnt}" 1419 echo -n " CD_ROOT_${cdcnt}"
1240 done 1420 done
1241 echo 1421 echo
1242 einfo "Or, if you have all the files in the same place, or" 1422 einfo "Or, if you have all the files in the same place, or"
1243 einfo "you only have one cdrom, you can export CD_ROOT" 1423 einfo "you only have one cdrom, you can export CD_ROOT"
1244 einfo "and that place will be used as the same data source" 1424 einfo "and that place will be used as the same data source"
1245 einfo "for all the CDs." 1425 einfo "for all the CDs."
1246 echo 1426 echo
1427 einfo "For example:"
1428 einfo "export CD_ROOT_1=/mnt/cdrom"
1429 echo
1247 fi 1430 fi
1248 export CDROM_CURRENT_CD=0 1431 export CDROM_CURRENT_CD=0
1249 cdrom_load_next_cd 1432 cdrom_load_next_cd
1250} 1433}
1251 1434
1255# remember, you can only go forward in the cd chain, you can't go back. 1438# remember, you can only go forward in the cd chain, you can't go back.
1256cdrom_load_next_cd() { 1439cdrom_load_next_cd() {
1257 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1440 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1258 local var= 1441 local var=
1259 1442
1260 if [ ! -z "${CD_ROOT}" ] ; then 1443 if [[ ! -z ${CD_ROOT} ]] ; then
1261 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1444 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1262 return 1445 return
1263 fi 1446 fi
1264 1447
1265 unset CDROM_ROOT 1448 unset CDROM_ROOT
1266 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1449 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1267 if [ -z "${!var}" ] ; then 1450 if [[ -z ${!var} ]] ; then
1268 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1451 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1269 cdrom_locate_file_on_cd ${!var} 1452 cdrom_locate_file_on_cd ${!var}
1270 else 1453 else
1271 export CDROM_ROOT="${!var}" 1454 export CDROM_ROOT=${!var}
1272 fi 1455 fi
1273 1456
1274 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1457 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1275} 1458}
1276 1459
1280# found, then a message asking for the user to insert the cdrom will be 1463# found, then a message asking for the user to insert the cdrom will be
1281# displayed and we'll hang out here until: 1464# displayed and we'll hang out here until:
1282# (1) the file is found on a mounted cdrom 1465# (1) the file is found on a mounted cdrom
1283# (2) the user hits CTRL+C 1466# (2) the user hits CTRL+C
1284cdrom_locate_file_on_cd() { 1467cdrom_locate_file_on_cd() {
1285 while [ -z "${CDROM_ROOT}" ] ; do 1468 while [[ -z ${CDROM_ROOT} ]] ; do
1286 local dir="$(dirname ${@})" 1469 local dir="$(dirname ${@})"
1287 local file="$(basename ${@})" 1470 local file="$(basename ${@})"
1288 local mline="" 1471 local mline=""
1289 local showedmsg=0 1472 local showedmsg=0
1290 1473
1291 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1474 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1292 [ -d "${mline}/${dir}" ] || continue 1475 [[ -d ${mline}/${dir} ]] || continue
1293 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1476 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1294 && export CDROM_ROOT=${mline} 1477 && export CDROM_ROOT=${mline}
1295 done 1478 done
1296 1479
1297 if [ -z "${CDROM_ROOT}" ] ; then 1480 if [[ -z ${CDROM_ROOT} ]] ; then
1298 echo 1481 echo
1299 if [ ${showedmsg} -eq 0 ] ; then 1482 if [[ ${showedmsg} -eq 0 ]] ; then
1300 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1483 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1301 if [ -z "${CDROM_NAME}" ] ; then 1484 if [[ -z ${CDROM_NAME} ]] ; then
1302 einfo "Please insert the cdrom for ${PN} now !" 1485 einfo "Please insert the cdrom for ${PN} now !"
1303 else 1486 else
1304 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1487 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1305 fi 1488 fi
1306 else 1489 else
1307 if [ -z "${CDROM_NAME_1}" ] ; then 1490 if [[ -z ${CDROM_NAME_1} ]] ; then
1308 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1491 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1309 else 1492 else
1310 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1493 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1311 einfo "Please insert+mount the ${!var} cdrom now !" 1494 einfo "Please insert+mount the ${!var} cdrom now !"
1312 fi 1495 fi
1318 read 1501 read
1319 fi 1502 fi
1320 done 1503 done
1321} 1504}
1322 1505
1323# Make sure that LINGUAS only contains languages that 1506# Make sure that LINGUAS only contains languages that
1324# a package can support 1507# a package can support
1325# 1508#
1326# usage: strip-linguas <allow LINGUAS> 1509# usage: strip-linguas <allow LINGUAS>
1327# strip-linguas -i <directories of .po files> 1510# strip-linguas -i <directories of .po files>
1328# strip-linguas -u <directories of .po files> 1511# strip-linguas -u <directories of .po files>
1329# 1512#
1330# The first form allows you to specify a list of LINGUAS. 1513# The first form allows you to specify a list of LINGUAS.
1331# The -i builds a list of po files found in all the 1514# The -i builds a list of po files found in all the
1332# directories and uses the intersection of the lists. 1515# directories and uses the intersection of the lists.
1333# The -u builds a list of po files found in all the 1516# The -u builds a list of po files found in all the
1334# directories and uses the union of the lists. 1517# directories and uses the union of the lists.
1335strip-linguas() { 1518strip-linguas() {
1336 local ls newls 1519 local ls newls
1337 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1520 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1338 local op="$1"; shift 1521 local op=$1; shift
1339 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1522 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1340 local d f 1523 local d f
1341 for d in "$@" ; do 1524 for d in "$@" ; do
1342 if [ "${op}" == "-u" ] ; then 1525 if [[ ${op} == "-u" ]] ; then
1343 newls="${ls}" 1526 newls=${ls}
1344 else 1527 else
1345 newls="" 1528 newls=""
1346 fi 1529 fi
1347 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1530 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1348 if [ "${op}" == "-i" ] ; then 1531 if [[ ${op} == "-i" ]] ; then
1349 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1532 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1350 else 1533 else
1351 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1534 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1352 fi 1535 fi
1353 done 1536 done
1354 ls="${newls}" 1537 ls=${newls}
1355 done 1538 done
1356 ls="${ls//.po}" 1539 ls=${ls//.po}
1357 else 1540 else
1358 ls="$@" 1541 ls=$@
1359 fi 1542 fi
1360 1543
1361 ls=" ${ls} " 1544 ls=" ${ls} "
1362 newls="" 1545 newls=""
1363 for f in ${LINGUAS} ; do 1546 for f in ${LINGUAS} ; do
1364 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1547 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1365 nl="${newls} ${f}" 1548 newls="${newls} ${f}"
1366 else 1549 else
1367 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1550 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1368 fi 1551 fi
1369 done 1552 done
1370 if [ -z "${newls}" ] ; then 1553 if [[ -z ${newls} ]] ; then
1371 unset LINGUAS 1554 export LINGUAS=""
1372 else 1555 else
1373 export LINGUAS="${newls}" 1556 export LINGUAS=${newls:1}
1557 fi
1558}
1559
1560# moved from kernel.eclass since they are generally useful outside of
1561# kernel.eclass -iggy (20041002)
1562
1563# the following functions are useful in kernel module ebuilds, etc.
1564# for an example see ivtv or drbd ebuilds
1565
1566# set's ARCH to match what the kernel expects
1567set_arch_to_kernel() {
1568 i=10
1569 while ((i--)) ; do
1570 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1571 done
1572 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1573 case ${ARCH} in
1574 x86) export ARCH="i386";;
1575 amd64) export ARCH="x86_64";;
1576 hppa) export ARCH="parisc";;
1577 mips) export ARCH="mips";;
1578 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!
1579 *) export ARCH="${ARCH}";;
1580 esac
1581}
1582
1583# set's ARCH back to what portage expects
1584set_arch_to_portage() {
1585 i=10
1586 while ((i--)) ; do
1587 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1588 done
1589 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1590}
1591
1592# Jeremy Huddleston <eradicator@gentoo.org>:
1593# preserve_old_lib /path/to/libblah.so.0
1594# preserve_old_lib_notify /path/to/libblah.so.0
1595#
1596# These functions are useful when a lib in your package changes --soname. Such
1597# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1598# would break packages that link against it. Most people get around this
1599# by using the portage SLOT mechanism, but that is not always a relevant
1600# solution, so instead you can add the following to your ebuilds:
1601#
1602# src_install() {
1603# ...
1604# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1605# ...
1606# }
1607#
1608# pkg_postinst() {
1609# ...
1610# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1611# ...
1612# }
1613
1614preserve_old_lib() {
1615 LIB=$1
1616
1617 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1618 SONAME=`basename ${LIB}`
1619 DIRNAME=`dirname ${LIB}`
1620
1621 dodir ${DIRNAME}
1622 cp ${ROOT}${LIB} ${D}${DIRNAME}
1623 touch ${D}${LIB}
1624 fi
1625}
1626
1627preserve_old_lib_notify() {
1628 LIB=$1
1629
1630 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1631 SONAME=`basename ${LIB}`
1632
1633 einfo "An old version of an installed library was detected on your system."
1634 einfo "In order to avoid breaking packages that link against is, this older version"
1635 einfo "is not being removed. In order to make full use of this newer version,"
1636 einfo "you will need to execute the following command:"
1637 einfo " revdep-rebuild --soname ${SONAME}"
1638 einfo
1639 einfo "After doing that, you can safely remove ${LIB}"
1640 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1641 fi
1642}
1643
1644# Hack for people to figure out if a package was built with
1645# certain USE flags
1646#
1647# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1648# ex: built_with_use xchat gtk2
1649#
1650# Flags: -a all USE flags should be utilized
1651# -o at least one USE flag should be utilized
1652# Note: the default flag is '-a'
1653built_with_use() {
1654 local opt=$1
1655 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1656
1657 local PKG=$(best_version $1)
1658 shift
1659
1660 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1661 [[ ! -e ${USEFILE} ]] && return 1
1662
1663 local USE_BUILT=$(<${USEFILE})
1664 while [[ $# -gt 0 ]] ; do
1665 if [[ ${opt} = "-o" ]] ; then
1666 has $1 ${USE_BUILT} && return 0
1667 else
1668 has $1 ${USE_BUILT} || return 1
1374 fi 1669 fi
1670 shift
1671 done
1672 [[ ${opt} = "-a" ]]
1375} 1673}
1674
1675# Many configure scripts wrongly bail when a C++ compiler
1676# could not be detected. #73450
1677epunt_cxx() {
1678 local dir=$1
1679 [[ -z ${dir} ]] && dir=${S}
1680 ebegin "Removing useless C++ checks"
1681 local f
1682 for f in $(find ${dir} -name configure) ; do
1683 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1684 done
1685 eend 0
1686}
1687
1688# dopamd <file> [more files]
1689#
1690# Install pam auth config file in /etc/pam.d
1691dopamd() {
1692 [[ -z $1 ]] && die "dopamd requires at least one argument"
1693
1694 use pam || return 0
1695
1696 insinto /etc/pam.d
1697 doins "$@" || die "failed to install $@"
1698}
1699# newpamd <old name> <new name>
1700#
1701# Install pam file <old name> as <new name> in /etc/pam.d
1702newpamd() {
1703 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1704
1705 use pam || return 0
1706
1707 insinto /etc/pam.d
1708 newins "$1" "$2" || die "failed to install $1 as $2"
1709}
1710
1711# make a wrapper script ...
1712# NOTE: this was originally games_make_wrapper, but I noticed other places where
1713# this could be used, so I have moved it here and made it not games-specific
1714# -- wolf31o2
1715# $1 == wrapper name
1716# $2 == binary to run
1717# $3 == directory to chdir before running binary
1718# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1719# $5 == path for wrapper
1720make_wrapper() {
1721 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1722 local tmpwrapper=$(emktemp)
1723 cat << EOF > "${tmpwrapper}"
1724#!/bin/sh
1725cd "${chdir}"
1726export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1727exec ${bin} "\$@"
1728EOF
1729 chmod go+rx "${tmpwrapper}"
1730 if [ -n "${5}" ]
1731 then
1732 exeinto ${5}
1733 newexe "${tmpwrapper}" "${wrapper}"
1734 else
1735 newbin "${tmpwrapper}" "${wrapper}"
1736 fi
1737}

Legend:
Removed from v.1.99  
changed lines
  Added in v.1.168

  ViewVC Help
Powered by ViewVC 1.1.20