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

Diff of /eclass/eutils.eclass

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

Revision 1.92 Revision 1.163
1# Copyright 1999-2004 Gentoo Foundation 1# Copyright 1999-2005 Gentoo Foundation
2# Distributed under the terms of the GNU General Public License v2 2# Distributed under the terms of the GNU General Public License v2
3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.92 2004/08/03 17:24:52 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.163 2005/03/26 06:33:16 eradicator Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib
12ECLASS=eutils 13ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch )"
16 17
17DESCRIPTION="Based on the ${ECLASS} eclass" 18DESCRIPTION="Based on the ${ECLASS} eclass"
19
20# ecpu_check
21# Usage:
22#
23# ecpu_check array_of_cpu_flags
24#
25# array_of_cpu_flags - An array of cpu flags to check against USE flags
26#
27# Checks user USE related cpu flags against /proc/cpuinfo. If user enables a
28# cpu flag that is not supported in their processor flags, it will warn the
29# user if CROSSCOMPILE is not set to 1 ( because cross compile users are
30# obviously using different cpu flags than their own cpu ). Examples:
31#
32# CPU_FLAGS=(mmx mmx2 sse sse2)
33# ecpu_check CPU_FLAGS
34# Chris White <chriswhite@gentoo.org> (03 Feb 2005)
35
36ecpu_check() {
37 # Think about changing below to: if [ "${CROSSCOMPILE}" -ne 1 -a -e "/proc/cpuinfo" ]
38 # and dropping the else if you do not plan on adding anything to that
39 # empty block ....
40 # PS: also try to add some quoting, and consider rather using ${foo} than $foo ...
41 if [ "${CROSSCOMPILE}" != "1" -a -e "/proc/cpuinfo" ]
42 then
43 CPU_FLAGS=${1}
44 USER_CPU=`grep "flags" /proc/cpuinfo`
45
46 for flags in `seq 1 ${#CPU_FLAGS[@]}`
47 do
48 if has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && ! has ${CPU_FLAGS[${flags} - 1]} ${USE}
49 then
50 ewarn "Your system is ${CPU_FLAGS[${flags} - 1]} capable but you don't have it enabled!"
51 ewarn "You might be cross compiling (in this case set CROSSCOMPILE to 1 to disable this warning."
52 fi
53
54 if ! has ${CPU_FLAGS[${flags} - 1]} ${USER_CPU} && has ${CPU_FLAGS[${flags} -1]} ${USE}
55 then
56 ewarn "You have ${CPU_FLAGS[${flags} - 1]} support enabled but your processor doesn't"
57 ewarn "Seem to support it! You might be cross compiling or do not have /proc filesystem"
58 ewarn "enabled. If either is the case, set CROSSCOMPILE to 1 to disable this warning."
59 fi
60 done
61 fi
62}
63
64# Wait for the supplied number of seconds. If no argument is supplied, defaults
65# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
66# outputting to a terminal, don't wait. For compatability purposes, the argument
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
89}
18 90
19# This function generate linker scripts in /usr/lib for dynamic 91# This function generate linker scripts in /usr/lib for dynamic
20# 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
21# 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
22# in some cases when linking dynamic, the .a in /usr/lib is used 94# in some cases when linking dynamic, the .a in /usr/lib is used
33# to point to the latest version of the library present. 105# to point to the latest version of the library present.
34# 106#
35# <azarah@gentoo.org> (26 Oct 2002) 107# <azarah@gentoo.org> (26 Oct 2002)
36# 108#
37gen_usr_ldscript() { 109gen_usr_ldscript() {
38 110 local libdir="$(get_libdir)"
39 # Just make sure it exists 111 # Just make sure it exists
40 dodir /usr/lib 112 dodir /usr/${libdir}
41 113
114 for lib in "${@}" ; do
42 cat > ${D}/usr/lib/$1 <<"END_LDSCRIPT" 115 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
43/* GNU ld script 116 /* GNU ld script
44 Because Gentoo have critical dynamic libraries 117 Since Gentoo has critical dynamic libraries
45 in /lib, and the static versions in /usr/lib, we 118 in /lib, and the static versions in /usr/lib,
46 need to have a "fake" dynamic lib in /usr/lib, 119 we need to have a "fake" dynamic lib in /usr/lib,
47 otherwise we run into linking problems. 120 otherwise we run into linking problems.
48 See bug #4411 on http://bugs.gentoo.org/ for 121
49 more info. */ 122 See bug http://bugs.gentoo.org/4411 for more info.
50GROUP ( /lib/libxxx ) 123 */
124 GROUP ( /${libdir}/${lib} )
51END_LDSCRIPT 125 END_LDSCRIPT
52 126 fperms a+x "/usr/${libdir}/${lib}"
53 dosed "s:libxxx:$1:" /usr/lib/$1 127 done
54
55 return 0
56} 128}
57 129
58# Simple function to draw a line consisting of '=' the same length as $* 130# Simple function to draw a line consisting of '=' the same length as $*
59# 131#
60# <azarah@gentoo.org> (11 Nov 2002) 132# <azarah@gentoo.org> (11 Nov 2002)
144 local SINGLE_PATCH="no" 216 local SINGLE_PATCH="no"
145 local x="" 217 local x=""
146 218
147 if [ "$#" -gt 1 ] 219 if [ "$#" -gt 1 ]
148 then 220 then
149 eerror "Invalid arguments to epatch()" 221 local m=""
150 die "Invalid arguments to epatch()" 222 einfo "${#} patches to apply ..."
223 for m in "$@" ; do
224 epatch "${m}"
225 done
226 return 0
151 fi 227 fi
152 228
153 if [ -n "$1" -a -f "$1" ] 229 if [ -n "$1" -a -f "$1" ]
154 then 230 then
155 SINGLE_PATCH="yes" 231 SINGLE_PATCH="yes"
165 local EPATCH_SOURCE="$1/*" 241 local EPATCH_SOURCE="$1/*"
166 else 242 else
167 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 243 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
168 fi 244 fi
169 else 245 else
170 if [ ! -d ${EPATCH_SOURCE} ] 246 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
171 then 247 then
172 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 248 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
173 then 249 then
174 EPATCH_SOURCE="$1" 250 EPATCH_SOURCE="$1"
175 fi 251 fi
176 252
177 echo 253 echo
178 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 254 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
179 eerror 255 eerror
180 eerror " ${EPATCH_SOURCE}" 256 eerror " ${EPATCH_SOURCE}"
257 eerror " ( ${EPATCH_SOURCE##*/} )"
181 echo 258 echo
182 die "Cannot find \$EPATCH_SOURCE!" 259 die "Cannot find \$EPATCH_SOURCE!"
183 fi 260 fi
184 261
185 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 262 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
204 ;; 281 ;;
205 esac 282 esac
206 283
207 if [ "${SINGLE_PATCH}" = "no" ] 284 if [ "${SINGLE_PATCH}" = "no" ]
208 then 285 then
209 einfo "Applying various patches (bugfixes/updates)..." 286 einfo "Applying various patches (bugfixes/updates) ..."
210 fi 287 fi
211 for x in ${EPATCH_SOURCE} 288 for x in ${EPATCH_SOURCE}
212 do 289 do
213 # New ARCH dependant patch naming scheme... 290 # New ARCH dependant patch naming scheme ...
214 # 291 #
215 # ???_arch_foo.patch 292 # ???_arch_foo.patch
216 # 293 #
217 if [ -f ${x} ] && \ 294 if [ -f ${x} ] && \
218 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 295 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \
219 [ "${EPATCH_FORCE}" = "yes" ]) 296 [ "${EPATCH_FORCE}" = "yes" ])
220 then 297 then
221 local count=0 298 local count=0
222 local popts="${EPATCH_OPTS}" 299 local popts="${EPATCH_OPTS}"
300 local patchname=${x##*/}
223 301
224 if [ -n "${EPATCH_EXCLUDE}" ] 302 if [ -n "${EPATCH_EXCLUDE}" ]
225 then 303 then
226 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 304 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
227 then 305 then
228 continue 306 continue
229 fi 307 fi
230 fi 308 fi
231 309
233 then 311 then
234 if [ -n "${EPATCH_SINGLE_MSG}" ] 312 if [ -n "${EPATCH_SINGLE_MSG}" ]
235 then 313 then
236 einfo "${EPATCH_SINGLE_MSG}" 314 einfo "${EPATCH_SINGLE_MSG}"
237 else 315 else
238 einfo "Applying ${x##*/}..." 316 einfo "Applying ${patchname} ..."
239 fi 317 fi
240 else 318 else
241 einfo " ${x##*/}..." 319 einfo " ${patchname} ..."
242 fi 320 fi
243 321
244 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 322 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
245 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
246 324
247 # Allow for prefix to differ ... im lazy, so shoot me :/ 325 # Allow for prefix to differ ... im lazy, so shoot me :/
248 while [ "${count}" -lt 5 ] 326 while [ "${count}" -lt 5 ]
249 do 327 do
250 # Generate some useful debug info ... 328 # Generate some useful debug info ...
251 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 329 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
252 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
253 331
254 if [ "${PATCH_SUFFIX}" != "patch" ] 332 if [ "${PATCH_SUFFIX}" != "patch" ]
255 then 333 then
256 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 334 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
257 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 335 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
258 else 336 else
259 PATCH_TARGET="${x}" 337 PATCH_TARGET="${x}"
260 fi 338 fi
261 339
262 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 340 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
263 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 341 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
264 342
265 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 343 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
266 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 344 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
267 345
268 if [ "${PATCH_SUFFIX}" != "patch" ] 346 if [ "${PATCH_SUFFIX}" != "patch" ]
269 then 347 then
270 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 348 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
271 then 349 then
272 echo 350 echo
273 eerror "Could not extract patch!" 351 eerror "Could not extract patch!"
274 #die "Could not extract patch!" 352 #die "Could not extract patch!"
275 count=5 353 count=5
276 break 354 break
277 fi 355 fi
278 fi 356 fi
279 357
280 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 358 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
281 then 359 then
282 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 360 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
283 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 361 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
284 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 362 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
285 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 363 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
286 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 364 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
287 365
288 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 366 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
289 367
290 if [ "$?" -ne 0 ] 368 if [ "$?" -ne 0 ]
291 then 369 then
292 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 370 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 echo 371 echo
294 eerror "A dry-run of patch command succeeded, but actually" 372 eerror "A dry-run of patch command succeeded, but actually"
295 eerror "applying the patch failed!" 373 eerror "applying the patch failed!"
296 #die "Real world sux compared to the dreamworld!" 374 #die "Real world sux compared to the dreamworld!"
297 count=5 375 count=5
298 fi 376 fi
299 377
300 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 378 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
301 379
302 break 380 break
303 fi 381 fi
304 382
305 count=$((count + 1)) 383 count=$((count + 1))
311 fi 389 fi
312 390
313 if [ "${count}" -eq 5 ] 391 if [ "${count}" -eq 5 ]
314 then 392 then
315 echo 393 echo
316 eerror "Failed Patch: ${x##*/}!" 394 eerror "Failed Patch: ${patchname} !"
395 eerror " ( ${PATCH_TARGET} )"
317 eerror 396 eerror
318 eerror "Include in your bugreport the contents of:" 397 eerror "Include in your bugreport the contents of:"
319 eerror 398 eerror
320 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 399 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
321 echo 400 echo
322 die "Failed Patch: ${x##*/}!" 401 die "Failed Patch: ${patchname}!"
323 fi 402 fi
324 403
325 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 404 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 405
327 eend 0 406 eend 0
328 fi 407 fi
329 done 408 done
330 if [ "${SINGLE_PATCH}" = "no" ] 409 if [ "${SINGLE_PATCH}" = "no" ]
336# This function return true if we are using the NPTL pthreads 415# This function return true if we are using the NPTL pthreads
337# implementation. 416# implementation.
338# 417#
339# <azarah@gentoo.org> (06 March 2003) 418# <azarah@gentoo.org> (06 March 2003)
340# 419#
341
342have_NPTL() { 420have_NPTL() {
343
344 cat > ${T}/test-nptl.c <<-"END" 421 cat > ${T}/test-nptl.c <<-"END"
345 #define _XOPEN_SOURCE 422 #define _XOPEN_SOURCE
346 #include <unistd.h> 423 #include <unistd.h>
347 #include <stdio.h> 424 #include <stdio.h>
348 425
360 437
361 return 1; 438 return 1;
362 } 439 }
363 END 440 END
364 441
365 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... " 442 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
366 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null 443 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
367 then 444 then
368 echo "yes" 445 echo "yes"
369 einfon "Checking what PTHREADS implementation we have ... " 446 einfon "Checking what PTHREADS implementation we have ..."
370 if ${T}/nptl 447 if ${T}/nptl
371 then 448 then
372 return 0 449 return 0
373 else 450 else
374 return 1 451 return 1
450 527
451 if [ -n "${ADMINPARAM}" ] 528 if [ -n "${ADMINPARAM}" ]
452 then 529 then
453 if [ "${jobs}" -gt "${ADMINPARAM}" ] 530 if [ "${jobs}" -gt "${ADMINPARAM}" ]
454 then 531 then
455 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..." 532 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
456 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}" 533 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
457 else 534 else
458 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..." 535 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
459 export MAKEOPTS="${MAKEOPTS} -j${jobs}" 536 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
460 fi 537 fi
461 fi 538 fi
462} 539}
463 540
464# Cheap replacement for when debianutils (and thus mktemp) 541# Cheap replacement for when debianutils (and thus mktemp)
465# does not exist on the users system 542# does not exist on the users system
466# vapier@gentoo.org 543# vapier@gentoo.org
467# 544#
468# Takes just 1 parameter (the directory to create tmpfile in) 545# Takes just 1 optional parameter (the directory to create tmpfile in)
469mymktemp() { 546emktemp() {
547 local exe="touch"
548 [ "$1" == "-d" ] && exe="mkdir" && shift
470 local topdir="$1" 549 local topdir="$1"
471 550
472 [ -z "${topdir}" ] && topdir=/tmp 551 if [ -z "${topdir}" ]
473 if [ "`which mktemp 2>/dev/null`" ]
474 then 552 then
475 mktemp -p ${topdir} 553 [ -z "${T}" ] \
476 else 554 && topdir="/tmp" \
555 || topdir="${T}"
556 fi
557
558 if [ -z "$(type -p mktemp)" ]
559 then
560 local tmp=/
561 while [ -e "${tmp}" ] ; do
477 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 562 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}"
478 touch ${tmp} 563 done
564 ${exe} "${tmp}"
479 echo ${tmp} 565 echo "${tmp}"
566 else
567 [ "${exe}" == "touch" ] \
568 && exe="-p" \
569 || exe="-d"
570 mktemp ${exe} "${topdir}"
480 fi 571 fi
481} 572}
482 573
483# Small wrapper for getent (Linux) and nidump (Mac OS X) 574# Small wrapper for getent (Linux), nidump (Mac OS X),
484# used in enewuser()/enewgroup() 575# and pw (FreeBSD) used in enewuser()/enewgroup()
485# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 576# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
577# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
486# 578#
487# egetent(database, key) 579# egetent(database, key)
488egetent() { 580egetent() {
489 if [ "${ARCH}" == "macos" ] ; then 581 if useq ppc-macos ; then
490 case "$2" in 582 case "$2" in
491 *[!0-9]*) # Non numeric 583 *[!0-9]*) # Non numeric
492 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 584 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
493 ;; 585 ;;
494 *) # Numeric 586 *) # Numeric
495 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 587 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
496 ;; 588 ;;
497 esac 589 esac
590 elif useq x86-fbsd ; then
591 local action
592 if [ "$1" == "passwd" ]
593 then
594 action="user"
498 else 595 else
596 action="group"
597 fi
598 pw show "${action}" "$2" -q
599 else
600 which nscd >& /dev/null && nscd -i "$1"
499 getent $1 $2 601 getent "$1" "$2"
500 fi 602 fi
501} 603}
502 604
503# Simplify/standardize adding users to the system 605# Simplify/standardize adding users to the system
504# vapier@gentoo.org 606# vapier@gentoo.org
550 euid="next" 652 euid="next"
551 fi 653 fi
552 if [ "${euid}" == "next" ] 654 if [ "${euid}" == "next" ]
553 then 655 then
554 local pwrange 656 local pwrange
555 if [ "${ARCH}" == "macos" ] ; then 657 if [ "${USERLAND}" == "BSD" ] ; then
556 pwrange="`jot 898 101`" 658 pwrange="`jot 898 101`"
557 else 659 else
558 pwrange="`seq 101 999`" 660 pwrange="`seq 101 999`"
559 fi 661 fi
560 for euid in ${pwrange} ; do 662 for euid in ${pwrange} ; do
572 then 674 then
573 eerror "A shell was specified but it does not exist !" 675 eerror "A shell was specified but it does not exist !"
574 die "${eshell} does not exist" 676 die "${eshell} does not exist"
575 fi 677 fi
576 else 678 else
679 if [ "${USERLAND}" == "BSD" ]
680 then
681 eshell="/usr/bin/false"
682 else
577 eshell="/bin/false" 683 eshell="/bin/false"
684 fi
578 fi 685 fi
579 einfo " - Shell: ${eshell}" 686 einfo " - Shell: ${eshell}"
580 opts="${opts} -s ${eshell}" 687 opts="${opts} -s ${eshell}"
581 688
582 # handle homedir 689 # handle homedir
591 # handle groups 698 # handle groups
592 local egroups="$1"; shift 699 local egroups="$1"; shift
593 if [ ! -z "${egroups}" ] 700 if [ ! -z "${egroups}" ]
594 then 701 then
595 local oldifs="${IFS}" 702 local oldifs="${IFS}"
703 local defgroup="" exgroups=""
704
596 export IFS="," 705 export IFS=","
597 for g in ${egroups} 706 for g in ${egroups}
598 do 707 do
708 export IFS="${oldifs}"
599 if [ -z "`egetent group \"${g}\"`" ] 709 if [ -z "`egetent group \"${g}\"`" ]
600 then 710 then
601 eerror "You must add group ${g} to the system first" 711 eerror "You must add group ${g} to the system first"
602 die "${g} is not a valid GID" 712 die "${g} is not a valid GID"
603 fi 713 fi
714 if [ -z "${defgroup}" ]
715 then
716 defgroup="${g}"
717 else
718 exgroups="${exgroups},${g}"
719 fi
720 export IFS=","
604 done 721 done
605 export IFS="${oldifs}" 722 export IFS="${oldifs}"
723
606 opts="${opts} -g ${egroups}" 724 opts="${opts} -g ${defgroup}"
725 if [ ! -z "${exgroups}" ]
726 then
727 opts="${opts} -G ${exgroups:1}"
728 fi
607 else 729 else
608 egroups="(none)" 730 egroups="(none)"
609 fi 731 fi
610 einfo " - Groups: ${egroups}" 732 einfo " - Groups: ${egroups}"
611 733
612 # handle extra and add the user 734 # handle extra and add the user
613 local eextra="$@" 735 local eextra="$@"
614 local oldsandbox="${SANDBOX_ON}" 736 local oldsandbox="${SANDBOX_ON}"
615 export SANDBOX_ON="0" 737 export SANDBOX_ON="0"
616 if [ "${ARCH}" == "macos" ]; 738 if useq ppc-macos
617 then 739 then
618 ### Make the user 740 ### Make the user
619 if [ -z "${eextra}" ] 741 if [ -z "${eextra}" ]
620 then 742 then
621 dscl . create /users/${euser} uid ${euid} 743 dscl . create /users/${euser} uid ${euid}
622 dscl . create /users/${euser} shell ${eshell} 744 dscl . create /users/${euser} shell ${eshell}
623 dscl . create /users/${euser} home ${ehome} 745 dscl . create /users/${euser} home ${ehome}
624 dscl . create /users/${euser} realname "added by portage for ${PN}" 746 dscl . create /users/${euser} realname "added by portage for ${PN}"
625 ### Add the user to the groups specified 747 ### Add the user to the groups specified
748 local oldifs="${IFS}"
749 export IFS=","
626 for g in ${egroups} 750 for g in ${egroups}
627 do 751 do
628 dscl . merge /groups/${g} users ${euser} 752 dscl . merge /groups/${g} users ${euser}
629 done 753 done
754 export IFS="${oldifs}"
630 else 755 else
631 einfo "Extra options are not supported on macos yet" 756 einfo "Extra options are not supported on macos yet"
632 einfo "Please report the ebuild along with the info below" 757 einfo "Please report the ebuild along with the info below"
633 einfo "eextra: ${eextra}" 758 einfo "eextra: ${eextra}"
634 die "Required function missing" 759 die "Required function missing"
760 fi
761 elif use x86-fbsd ; then
762 if [ -z "${eextra}" ]
763 then
764 pw useradd ${euser} ${opts} \
765 -c "added by portage for ${PN}" \
766 die "enewuser failed"
767 else
768 einfo " - Extra: ${eextra}"
769 pw useradd ${euser} ${opts} \
770 -c ${eextra} || die "enewuser failed"
635 fi 771 fi
636 else 772 else
637 if [ -z "${eextra}" ] 773 if [ -z "${eextra}" ]
638 then 774 then
639 useradd ${opts} ${euser} \ 775 useradd ${opts} ${euser} \
690 then 826 then
691 if [ "${egid}" -gt 0 ] 827 if [ "${egid}" -gt 0 ]
692 then 828 then
693 if [ -z "`egetent group ${egid}`" ] 829 if [ -z "`egetent group ${egid}`" ]
694 then 830 then
695 if [ "${ARCH}" == "macos" ] ; then 831 if useq ppc-macos ; then
696 opts="${opts} ${egid}" 832 opts="${opts} ${egid}"
697 else 833 else
698 opts="${opts} -g ${egid}" 834 opts="${opts} -g ${egid}"
699 fi 835 fi
700 else 836 else
714 opts="${opts} ${eextra}" 850 opts="${opts} ${eextra}"
715 851
716 # add the group 852 # add the group
717 local oldsandbox="${SANDBOX_ON}" 853 local oldsandbox="${SANDBOX_ON}"
718 export SANDBOX_ON="0" 854 export SANDBOX_ON="0"
719 if [ "${ARCH}" == "macos" ]; 855 if useq ppc-macos ; then
720 then
721 if [ ! -z "${eextra}" ]; 856 if [ ! -z "${eextra}" ];
722 then 857 then
723 einfo "Extra options are not supported on macos yet" 858 einfo "Extra options are not supported on macos yet"
724 einfo "Please report the ebuild along with the info below" 859 einfo "Please report the ebuild along with the info below"
725 einfo "eextra: ${eextra}" 860 einfo "eextra: ${eextra}"
726 die "Required function missing" 861 die "Required function missing"
727 fi 862 fi
728 863
729 # If we need the next available 864 # If we need the next available
730 case ${egid} in 865 case ${egid} in
731 *[!0-9]*) # Non numeric 866 *[!0-9]*) # Non numeric
732 for egid in `jot 898 101`; do 867 for egid in `jot 898 101`; do
733 [ -z "`egetent group ${egid}`" ] && break 868 [ -z "`egetent group ${egid}`" ] && break
734 done 869 done
735 esac 870 esac
736 dscl . create /groups/${egroup} gid ${egid} 871 dscl . create /groups/${egroup} gid ${egid}
737 dscl . create /groups/${egroup} passwd '*' 872 dscl . create /groups/${egroup} passwd '*'
873 elif use x86-fbsd ; then
874 case ${egid} in
875 *[!0-9]*) # Non numeric
876 for egid in `jot 898 101`; do
877 [ -z "`egetent group ${egid}`" ] && break
878 done
879 esac
880 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
738 else 881 else
739 groupadd ${opts} ${egroup} || die "enewgroup failed" 882 groupadd ${opts} ${egroup} || die "enewgroup failed"
740 fi 883 fi
741 export SANDBOX_ON="${oldsandbox}" 884 export SANDBOX_ON="${oldsandbox}"
742} 885}
743 886
744# Simple script to replace 'dos2unix' binaries 887# Simple script to replace 'dos2unix' binaries
745# vapier@gentoo.org 888# vapier@gentoo.org
746# 889#
747# edos2unix(file, <more files>...) 890# edos2unix(file, <more files> ...)
748edos2unix() { 891edos2unix() {
749 for f in "$@" 892 for f in "$@"
750 do 893 do
751 cp "${f}" ${T}/edos2unix 894 cp "${f}" ${T}/edos2unix
752 sed 's/\r$//' ${T}/edos2unix > "${f}" 895 sed 's/\r$//' ${T}/edos2unix > "${f}"
753 done 896 done
754} 897}
755 898
899
900##############################################################
901# START: Handle .desktop files and menu entries #
902# maybe this should be separated into a new eclass some time #
903# lanius@gentoo.org #
904##############################################################
905
756# Make a desktop file ! 906# Make a desktop file !
757# Great for making those icons in kde/gnome startmenu ! 907# Great for making those icons in kde/gnome startmenu !
758# Amaze your friends ! Get the women ! Join today ! 908# Amaze your friends ! Get the women ! Join today !
759# gnome2 /usr/share/applications
760# gnome1 /usr/share/gnome/apps/
761# KDE ${KDEDIR}/share/applnk /usr/share/applnk
762# 909#
763# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 910# make_desktop_entry(<binary>, [name], [icon], [type], [path])
764# 911#
765# binary: what binary does the app run with ? 912# binary: what binary does the app run with ?
766# name: the name that will show up in the menu 913# name: the name that will show up in the menu
767# icon: give your little like a pretty little icon ... 914# icon: give your little like a pretty little icon ...
768# this can be relative (to /usr/share/pixmaps) or 915# this can be relative (to /usr/share/pixmaps) or
769# a full path to an icon 916# a full path to an icon
770# type: what kind of application is this ? for categories: 917# type: what kind of application is this ? for categories:
771# http://www.freedesktop.org/standards/menu-spec/ 918# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
772# path: if your app needs to startup in a specific dir 919# path: if your app needs to startup in a specific dir
773make_desktop_entry() { 920make_desktop_entry() {
774 [ -z "$1" ] && eerror "You must specify the executable" && return 1 921 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
775 922
776 local exec="${1}" 923 local exec=${1}
777 local name="${2:-${PN}}" 924 local name=${2:-${PN}}
778 local icon="${3:-${PN}.png}" 925 local icon=${3:-${PN}.png}
779 local type="${4}" 926 local type=${4}
780 local subdir="${6}" 927 local path=${5}
781 local path="${5:-${GAMES_PREFIX}}" 928
782 if [ -z "${type}" ] 929 if [[ -z ${type} ]] ; then
783 then 930 local catmaj=${CATEGORY%%-*}
784 case ${CATEGORY} in 931 local catmin=${CATEGORY##*-}
785 "app-emulation") 932 case ${catmaj} in
786 type=Emulator 933 app)
787 subdir="Emulation" 934 case ${catmin} in
935 admin) type=System;;
936 cdr) type=DiscBurning;;
937 dicts) type=Dictionary;;
938 editors) type=TextEditor;;
939 emacs) type=TextEditor;;
940 emulation) type=Emulator;;
941 laptop) type=HardwareSettings;;
942 office) type=Office;;
943 vim) type=TextEditor;;
944 xemacs) type=TextEditor;;
945 *) type=;;
946 esac
788 ;; 947 ;;
789 "games-"*) 948
790 type=Game 949 dev)
791 subdir="Games" 950 type="Development"
792 ;; 951 ;;
793 "net-"*) 952
794 type=Network 953 games)
795 subdir="${type}" 954 [[ -z ${path} ]] && path=${GAMES_BINDIR}
955
956 case ${catmin} in
957 action) type=ActionGame;;
958 arcade) type=ArcadeGame;;
959 board) type=BoardGame;;
960 kid) type=KidsGame;;
961 emulation) type=Emulator;;
962 puzzle) type=LogicGame;;
963 rpg) type=RolePlaying;;
964 roguelike) type=RolePlaying;;
965 simulation) type=Simulation;;
966 sports) type=SportsGame;;
967 strategy) type=StrategyGame;;
968 *) type=;;
969 esac
970 type="Game;${type}"
796 ;; 971 ;;
972
973 mail)
974 type="Network;Email"
975 ;;
976
977 media)
978 case ${catmin} in
979 gfx) type=Graphics;;
980 radio) type=Tuner;;
981 sound) type=Audio;;
982 tv) type=TV;;
983 video) type=Video;;
984 *) type=;;
985 esac
986 type="AudioVideo;${type}"
987 ;;
988
989 net)
990 case ${catmin} in
991 dialup) type=Dialup;;
992 ftp) type=FileTransfer;;
993 im) type=InstantMessaging;;
994 irc) type=IRCClient;;
995 mail) type=Email;;
996 news) type=News;;
997 nntp) type=News;;
998 p2p) type=FileTransfer;;
999 *) type=;;
1000 esac
1001 type="Network;${type}"
1002 ;;
1003
1004 sci)
1005 case ${catmin} in
1006 astro*) type=Astronomoy;;
1007 bio*) type=Biology;;
1008 calc*) type=Calculator;;
1009 chem*) type=Chemistry;;
1010 geo*) type=Geology;;
1011 math*) type=Math;;
1012 *) type=;;
1013 esac
1014 type="Science;${type}"
1015 ;;
1016
1017 www)
1018 case ${catmin} in
1019 client) type=WebBrowser;;
1020 *) type=;;
1021 esac
1022 type="Network"
1023 ;;
1024
797 *) 1025 *)
798 type= 1026 type=
799 subdir=
800 ;; 1027 ;;
801 esac 1028 esac
802 fi 1029 fi
1030
803 local desktop="${T}/${exec}.desktop" 1031 local desktop=${T}/${exec%% *}-${P}.desktop
804 1032
805echo "[Desktop Entry] 1033echo "[Desktop Entry]
806Encoding=UTF-8 1034Encoding=UTF-8
807Version=0.9.2 1035Version=0.9.2
808Name=${name} 1036Name=${name}
809Type=Application 1037Type=Application
810Comment=${DESCRIPTION} 1038Comment=${DESCRIPTION}
811Exec=${exec} 1039Exec=${exec}
812Path=${path} 1040Path=${path}
813Icon=${icon} 1041Icon=${icon}
814Categories=Application;${type};" > ${desktop} 1042Categories=Application;${type};" > "${desktop}"
815 1043
816 if [ -d "/usr/share/applications" ]
817 then
818 insinto /usr/share/applications 1044 insinto /usr/share/applications
819 doins ${desktop} 1045 doins "${desktop}"
820 fi
821
822 #if [ -d "/usr/share/gnome/apps" ]
823 #then
824 # insinto /usr/share/gnome/apps/Games
825 # doins ${desktop}
826 #fi
827
828 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ]
829 #then
830 # for ver in /usr/kde/*
831 # do
832 # insinto ${ver}/share/applnk/Games
833 # doins ${desktop}
834 # done
835 #fi
836
837 if [ -d "/usr/share/applnk" ]
838 then
839 insinto /usr/share/applnk/${subdir}
840 doins ${desktop}
841 fi
842 1046
843 return 0 1047 return 0
844} 1048}
1049
1050# Make a GDM/KDM Session file
1051#
1052# make_desktop_entry(<title>, <command>)
1053# title: File to execute to start the Window Manager
1054# command: Name of the Window Manager
1055
1056make_session_desktop() {
1057
1058 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1
1059 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1
1060
1061 local title="${1}"
1062 local command="${2}"
1063 local desktop="${T}/${wm}.desktop"
1064
1065echo "[Desktop Entry]
1066Encoding=UTF-8
1067Name=${title}
1068Comment=This session logs you into ${title}
1069Exec=${command}
1070TryExec=${command}
1071Type=Application" > "${desktop}"
1072
1073 insinto /usr/share/xsessions
1074 doins "${desktop}"
1075
1076 return 0
1077}
1078
1079domenu() {
1080 local i
1081 local j
1082 insinto /usr/share/applications
1083 for i in ${@}
1084 do
1085 if [ -f "${i}" ];
1086 then
1087 doins ${i}
1088 elif [ -d "${i}" ];
1089 then
1090 for j in ${i}/*.desktop
1091 do
1092 doins ${j}
1093 done
1094 fi
1095 done
1096}
1097
1098doicon() {
1099 local i
1100 local j
1101 insinto /usr/share/pixmaps
1102 for i in ${@}
1103 do
1104 if [ -f "${i}" ];
1105 then
1106 doins ${i}
1107 elif [ -d "${i}" ];
1108 then
1109 for j in ${i}/*.png
1110 do
1111 doins ${j}
1112 done
1113 fi
1114 done
1115}
1116
1117##############################################################
1118# END: Handle .desktop files and menu entries #
1119##############################################################
1120
845 1121
846# for internal use only (unpack_pdv and unpack_makeself) 1122# for internal use only (unpack_pdv and unpack_makeself)
847find_unpackable_file() { 1123find_unpackable_file() {
848 local src="$1" 1124 local src="$1"
849 if [ -z "${src}" ] 1125 if [ -z "${src}" ]
895 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1171 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
896 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1172 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
897 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1173 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
898 1174
899 # grab metadata for debug reasons 1175 # grab metadata for debug reasons
900 local metafile="`mymktemp ${T}`" 1176 local metafile="$(emktemp)"
901 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1177 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
902 1178
903 # rip out the final file name from the metadata 1179 # rip out the final file name from the metadata
904 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1180 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
905 datafile="`basename ${datafile}`" 1181 datafile="`basename ${datafile}`"
906 1182
907 # now lets uncompress/untar the file if need be 1183 # now lets uncompress/untar the file if need be
908 local tmpfile="`mymktemp ${T}`" 1184 local tmpfile="$(emktemp)"
909 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1185 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
910 1186
911 local iscompressed="`file -b ${tmpfile}`" 1187 local iscompressed="`file -b ${tmpfile}`"
912 if [ "${iscompressed:0:8}" == "compress" ] ; then 1188 if [ "${iscompressed:0:8}" == "compress" ] ; then
913 iscompressed=1 1189 iscompressed=1
958# Unpack those pesky makeself generated files ... 1234# Unpack those pesky makeself generated files ...
959# They're shell scripts with the binary package tagged onto 1235# They're shell scripts with the binary package tagged onto
960# the end of the archive. Loki utilized the format as does 1236# the end of the archive. Loki utilized the format as does
961# many other game companies. 1237# many other game companies.
962# 1238#
963# Usage: unpack_makeself [file to unpack] [offset] 1239# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
964# - If the file is not specified then unpack will utilize ${A}. 1240# - If the file is not specified then unpack will utilize ${A}.
965# - If the offset is not specified then we will attempt to extract 1241# - If the offset is not specified then we will attempt to extract
966# the proper offset from the script itself. 1242# the proper offset from the script itself.
967unpack_makeself() { 1243unpack_makeself() {
968 local src="`find_unpackable_file $1`" 1244 local src="$(find_unpackable_file "$1")"
969 local skip="$2" 1245 local skip="$2"
1246 local exe="$3"
970 1247
971 local shrtsrc="`basename ${src}`" 1248 local shrtsrc="$(basename "${src}")"
972 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1249 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
973 if [ -z "${skip}" ] 1250 if [ -z "${skip}" ]
974 then 1251 then
975 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1252 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
976 local skip=0 1253 local skip=0
1254 exe=tail
977 case ${ver} in 1255 case ${ver} in
978 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1256 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
979 skip=`grep -a ^skip= ${src} | cut -d= -f2` 1257 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
980 ;; 1258 ;;
981 2.0|2.0.1) 1259 2.0|2.0.1)
982 skip=`grep -a ^$'\t'tail ${src} | awk '{print $2}' | cut -b2-` 1260 skip=$(grep -a ^$'\t'tail "${src}" | awk '{print $2}' | cut -b2-)
983 ;; 1261 ;;
984 2.1.1) 1262 2.1.1)
985 skip=`grep -a ^offset= ${src} | awk '{print $2}' | cut -b2-` 1263 skip=$(grep -a ^offset= "${src}" | awk '{print $2}' | cut -b2-)
986 let skip="skip + 1" 1264 let skip="skip + 1"
987 ;; 1265 ;;
988 2.1.2) 1266 2.1.2)
989 skip=`grep -a ^offset= ${src} | awk '{print $3}' | head -n 1` 1267 skip=$(grep -a ^offset= "${src}" | awk '{print $3}' | head -n 1)
990 let skip="skip + 1" 1268 let skip="skip + 1"
991 ;; 1269 ;;
992 2.1.3) 1270 2.1.3)
993 skip=`grep -a ^offset= ${src} | awk '{print $3}'` 1271 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
994 let skip="skip + 1" 1272 let skip="skip + 1"
1273 ;;
1274 2.1.4)
1275 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1276 skip=$(head -n ${skip} "${src}" | wc -c)
1277 exe="dd"
995 ;; 1278 ;;
996 *) 1279 *)
997 eerror "I'm sorry, but I was unable to support the Makeself file." 1280 eerror "I'm sorry, but I was unable to support the Makeself file."
998 eerror "The version I detected was '${ver}'." 1281 eerror "The version I detected was '${ver}'."
999 eerror "Please file a bug about the file ${shrtsrc} at" 1282 eerror "Please file a bug about the file ${shrtsrc} at"
1001 die "makeself version '${ver}' not supported" 1284 die "makeself version '${ver}' not supported"
1002 ;; 1285 ;;
1003 esac 1286 esac
1004 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset" 1287 debug-print "Detected Makeself version ${ver} ... using ${skip} as offset"
1005 fi 1288 fi
1289 case ${exe} in
1290 tail) exe="tail -n +${skip} '${src}'";;
1291 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1292 *) die "makeself cant handle exe '${exe}'"
1293 esac
1006 1294
1007 # lets grab the first few bytes of the file to figure out what kind of archive it is 1295 # lets grab the first few bytes of the file to figure out what kind of archive it is
1008 local tmpfile="`mymktemp ${T}`" 1296 local tmpfile="$(emktemp)"
1009 tail -n +${skip} ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1297 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1010 local filetype="`file -b ${tmpfile}`" 1298 local filetype="$(file -b "${tmpfile}")"
1011 case ${filetype} in 1299 case ${filetype} in
1012 *tar\ archive) 1300 *tar\ archive)
1013 tail -n +${skip} ${src} | tar --no-same-owner -xf - 1301 eval ${exe} | tar --no-same-owner -xf -
1014 ;; 1302 ;;
1015 bzip2*) 1303 bzip2*)
1016 tail -n +${skip} ${src} | bzip2 -dc | tar --no-same-owner -xf - 1304 eval ${exe} | bzip2 -dc | tar --no-same-owner -xf -
1017 ;; 1305 ;;
1018 gzip*) 1306 gzip*)
1019 tail -n +${skip} ${src} | tar --no-same-owner -xzf - 1307 eval ${exe} | tar --no-same-owner -xzf -
1308 ;;
1309 compress*)
1310 eval ${exe} | gunzip | tar --no-same-owner -xf -
1020 ;; 1311 ;;
1021 *) 1312 *)
1313 eerror "Unknown filetype \"${filetype}\" ?"
1022 false 1314 false
1023 ;; 1315 ;;
1024 esac 1316 esac
1025 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})" 1317 assert "failure unpacking (${filetype}) makeself ${shrtsrc} ('${ver}' +${skip})"
1026} 1318}
1045 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1337 [ ! -f "${lic}" ] && die "Could not find requested license ${src}"
1046 local l="`basename ${lic}`" 1338 local l="`basename ${lic}`"
1047 1339
1048 # here is where we check for the licenses the user already 1340 # here is where we check for the licenses the user already
1049 # accepted ... if we don't find a match, we make the user accept 1341 # accepted ... if we don't find a match, we make the user accept
1342 local shopts=$-
1050 local alic 1343 local alic
1344 set -o noglob #so that bash doesn't expand "*"
1051 for alic in "${ACCEPT_LICENSE}" ; do 1345 for alic in ${ACCEPT_LICENSE} ; do
1052 [ "${alic}" == "*" ] && return 0 1346 if [[ ${alic} == * || ${alic} == ${l} ]]; then
1053 [ "${alic}" == "${l}" ] && return 0 1347 set +o noglob; set -${shopts} #reset old shell opts
1348 return 0
1349 fi
1054 done 1350 done
1351 set +o noglob; set -$shopts #reset old shell opts
1055 1352
1056 local licmsg="`mymktemp ${T}`" 1353 local licmsg="$(emktemp)"
1057 cat << EOF > ${licmsg} 1354 cat << EOF > ${licmsg}
1058********************************************************** 1355**********************************************************
1059The following license outlines the terms of use of this 1356The following license outlines the terms of use of this
1060package. You MUST accept this license for installation to 1357package. You MUST accept this license for installation to
1061continue. When you are done viewing, hit 'q'. If you 1358continue. When you are done viewing, hit 'q'. If you
1109 export CDROM_TOTAL_CDS=${cdcnt} 1406 export CDROM_TOTAL_CDS=${cdcnt}
1110 export CDROM_CURRENT_CD=1 1407 export CDROM_CURRENT_CD=1
1111 1408
1112 # now we see if the user gave use CD_ROOT ... 1409 # now we see if the user gave use CD_ROOT ...
1113 # if they did, let's just believe them that it's correct 1410 # if they did, let's just believe them that it's correct
1114 if [ ! -z "${CD_ROOT}" ] ; then 1411 if [[ ! -z ${CD_ROOT} ]] ; then
1115 export CDROM_ROOT="${CD_ROOT}" 1412 export CDROM_ROOT=${CD_ROOT}
1116 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1413 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1117 return 1414 return
1118 fi 1415 fi
1119 # do the same for CD_ROOT_X 1416 # do the same for CD_ROOT_X
1120 if [ ! -z "${CD_ROOT_1}" ] ; then 1417 if [[ ! -z ${CD_ROOT_1} ]] ; then
1121 local var= 1418 local var=
1122 cdcnt=0 1419 cdcnt=0
1123 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1420 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1124 cdcnt=$((cdcnt + 1)) 1421 cdcnt=$((cdcnt + 1))
1125 var="CD_ROOT_${cdcnt}" 1422 var="CD_ROOT_${cdcnt}"
1126 if [ -z "${!var}" ] ; then 1423 if [[ -z ${!var} ]] ; then
1127 eerror "You must either use just the CD_ROOT" 1424 eerror "You must either use just the CD_ROOT"
1128 eerror "or specify ALL the CD_ROOT_X variables." 1425 eerror "or specify ALL the CD_ROOT_X variables."
1129 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1426 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1130 die "could not locate CD_ROOT_${cdcnt}" 1427 die "could not locate CD_ROOT_${cdcnt}"
1131 fi 1428 fi
1134 export CDROM_ROOT=${CDROM_ROOTS_1} 1431 export CDROM_ROOT=${CDROM_ROOTS_1}
1135 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1432 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1136 return 1433 return
1137 fi 1434 fi
1138 1435
1139 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1436 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1140 einfon "This ebuild will need the " 1437 einfon "This ebuild will need the "
1141 if [ -z "${CDROM_NAME}" ] ; then 1438 if [[ -z ${CDROM_NAME} ]] ; then
1142 echo "cdrom for ${PN}." 1439 echo "cdrom for ${PN}."
1143 else 1440 else
1144 echo "${CDROM_NAME}." 1441 echo "${CDROM_NAME}."
1145 fi 1442 fi
1146 echo 1443 echo
1147 einfo "If you do not have the CD, but have the data files" 1444 einfo "If you do not have the CD, but have the data files"
1148 einfo "mounted somewhere on your filesystem, just export" 1445 einfo "mounted somewhere on your filesystem, just export"
1149 einfo "the variable CD_ROOT so that it points to the" 1446 einfo "the variable CD_ROOT so that it points to the"
1150 einfo "directory containing the files." 1447 einfo "directory containing the files."
1151 echo 1448 echo
1449 einfo "For example:"
1450 einfo "export CD_ROOT=/mnt/cdrom"
1451 echo
1152 else 1452 else
1153 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1453 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1154 cdcnt=0 1454 cdcnt=0
1155 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1455 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1156 cdcnt=$((cdcnt + 1)) 1456 cdcnt=$((cdcnt + 1))
1157 var="CDROM_NAME_${cdcnt}" 1457 var="CDROM_NAME_${cdcnt}"
1158 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1458 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1159 done 1459 done
1160 echo 1460 echo
1161 einfo "If you do not have the CDs, but have the data files" 1461 einfo "If you do not have the CDs, but have the data files"
1162 einfo "mounted somewhere on your filesystem, just export" 1462 einfo "mounted somewhere on your filesystem, just export"
1163 einfo "the following variables so they point to the right place:" 1463 einfo "the following variables so they point to the right place:"
1164 einfon "" 1464 einfon ""
1165 cdcnt=0 1465 cdcnt=0
1166 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1466 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1167 cdcnt=$((cdcnt + 1)) 1467 cdcnt=$((cdcnt + 1))
1168 echo -n " CD_ROOT_${cdcnt}" 1468 echo -n " CD_ROOT_${cdcnt}"
1169 done 1469 done
1170 echo 1470 echo
1171 einfo "Or, if you have all the files in the same place, or" 1471 einfo "Or, if you have all the files in the same place, or"
1172 einfo "you only have one cdrom, you can export CD_ROOT" 1472 einfo "you only have one cdrom, you can export CD_ROOT"
1173 einfo "and that place will be used as the same data source" 1473 einfo "and that place will be used as the same data source"
1174 einfo "for all the CDs." 1474 einfo "for all the CDs."
1175 echo 1475 echo
1476 einfo "For example:"
1477 einfo "export CD_ROOT_1=/mnt/cdrom"
1478 echo
1176 fi 1479 fi
1177 export CDROM_CURRENT_CD=0 1480 export CDROM_CURRENT_CD=0
1178 cdrom_load_next_cd 1481 cdrom_load_next_cd
1179} 1482}
1180 1483
1184# remember, you can only go forward in the cd chain, you can't go back. 1487# remember, you can only go forward in the cd chain, you can't go back.
1185cdrom_load_next_cd() { 1488cdrom_load_next_cd() {
1186 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1489 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1187 local var= 1490 local var=
1188 1491
1189 if [ ! -z "${CD_ROOT}" ] ; then 1492 if [[ ! -z ${CD_ROOT} ]] ; then
1190 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1493 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1191 return 1494 return
1192 fi 1495 fi
1193 1496
1194 unset CDROM_ROOT 1497 unset CDROM_ROOT
1195 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1498 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1196 if [ -z "${!var}" ] ; then 1499 if [[ -z ${!var} ]] ; then
1197 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1500 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1198 cdrom_locate_file_on_cd ${!var} 1501 cdrom_locate_file_on_cd ${!var}
1199 else 1502 else
1200 export CDROM_ROOT="${!var}" 1503 export CDROM_ROOT=${!var}
1201 fi 1504 fi
1202 1505
1203 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1506 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1204} 1507}
1205 1508
1209# found, then a message asking for the user to insert the cdrom will be 1512# found, then a message asking for the user to insert the cdrom will be
1210# displayed and we'll hang out here until: 1513# displayed and we'll hang out here until:
1211# (1) the file is found on a mounted cdrom 1514# (1) the file is found on a mounted cdrom
1212# (2) the user hits CTRL+C 1515# (2) the user hits CTRL+C
1213cdrom_locate_file_on_cd() { 1516cdrom_locate_file_on_cd() {
1214 while [ -z "${CDROM_ROOT}" ] ; do 1517 while [[ -z ${CDROM_ROOT} ]] ; do
1215 local dir="$(dirname ${@})" 1518 local dir="$(dirname ${@})"
1216 local file="$(basename ${@})" 1519 local file="$(basename ${@})"
1217 local mline="" 1520 local mline=""
1218 local showedmsg=0 1521 local showedmsg=0
1219 1522
1220 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1523 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1221 [ -d "${mline}/${dir}" ] || continue 1524 [[ -d ${mline}/${dir} ]] || continue
1222 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1525 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \
1223 && export CDROM_ROOT=${mline} 1526 && export CDROM_ROOT=${mline}
1224 done 1527 done
1225 1528
1226 if [ -z "${CDROM_ROOT}" ] ; then 1529 if [[ -z ${CDROM_ROOT} ]] ; then
1227 echo 1530 echo
1228 if [ ${showedmsg} -eq 0 ] ; then 1531 if [[ ${showedmsg} -eq 0 ]] ; then
1229 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1532 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1230 if [ -z "${CDROM_NAME}" ] ; then 1533 if [[ -z ${CDROM_NAME} ]] ; then
1231 einfo "Please insert the cdrom for ${PN} now !" 1534 einfo "Please insert the cdrom for ${PN} now !"
1232 else 1535 else
1233 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1536 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1234 fi 1537 fi
1235 else 1538 else
1236 if [ -z "${CDROM_NAME_1}" ] ; then 1539 if [[ -z ${CDROM_NAME_1} ]] ; then
1237 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1540 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1238 else 1541 else
1239 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1542 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1240 einfo "Please insert+mount the ${!var} cdrom now !" 1543 einfo "Please insert+mount the ${!var} cdrom now !"
1241 fi 1544 fi
1247 read 1550 read
1248 fi 1551 fi
1249 done 1552 done
1250} 1553}
1251 1554
1252# Make sure that LINGUAS only contains languages that 1555# Make sure that LINGUAS only contains languages that
1253# a package can support 1556# a package can support
1254# 1557#
1255# usage: strip-linguas <allow LINGUAS> 1558# usage: strip-linguas <allow LINGUAS>
1256# strip-linguas -i <directories of .po files> 1559# strip-linguas -i <directories of .po files>
1257# strip-linguas -u <directories of .po files> 1560# strip-linguas -u <directories of .po files>
1258# 1561#
1259# The first form allows you to specify a list of LINGUAS. 1562# The first form allows you to specify a list of LINGUAS.
1260# The -i builds a list of po files found in all the 1563# The -i builds a list of po files found in all the
1261# directories and uses the intersection of the lists. 1564# directories and uses the intersection of the lists.
1262# The -u builds a list of po files found in all the 1565# The -u builds a list of po files found in all the
1263# directories and uses the union of the lists. 1566# directories and uses the union of the lists.
1264strip-linguas() { 1567strip-linguas() {
1265 local ls newls 1568 local ls newls
1266 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1569 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1267 local op="$1"; shift 1570 local op=$1; shift
1268 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1571 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1269 local d f 1572 local d f
1270 for d in "$@" ; do 1573 for d in "$@" ; do
1271 if [ "${op}" == "-u" ] ; then 1574 if [[ ${op} == "-u" ]] ; then
1272 newls="${ls}" 1575 newls=${ls}
1273 else 1576 else
1274 newls="" 1577 newls=""
1275 fi 1578 fi
1276 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1579 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1277 if [ "${op}" == "-i" ] ; then 1580 if [[ ${op} == "-i" ]] ; then
1278 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1581 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1279 else 1582 else
1280 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1583 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1281 fi 1584 fi
1282 done 1585 done
1283 ls="${newls}" 1586 ls=${newls}
1284 done 1587 done
1285 ls="${ls//.po}" 1588 ls=${ls//.po}
1286 else 1589 else
1287 ls="$@" 1590 ls=$@
1288 fi 1591 fi
1289 1592
1290 ls=" ${ls} " 1593 ls=" ${ls} "
1291 newls="" 1594 newls=""
1292 for f in ${LINGUAS} ; do 1595 for f in ${LINGUAS} ; do
1293 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1596 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1294 nl="${newls} ${f}" 1597 newls="${newls} ${f}"
1295 else 1598 else
1296 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1599 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1297 fi 1600 fi
1298 done 1601 done
1299 if [ -z "${newls}" ] ; then 1602 if [[ -z ${newls} ]] ; then
1300 unset LINGUAS 1603 unset LINGUAS
1301 else 1604 else
1302 export LINGUAS="${newls}" 1605 export LINGUAS=${newls:1}
1606 fi
1607}
1608
1609# moved from kernel.eclass since they are generally useful outside of
1610# kernel.eclass -iggy (20041002)
1611
1612# the following functions are useful in kernel module ebuilds, etc.
1613# for an example see ivtv or drbd ebuilds
1614
1615# set's ARCH to match what the kernel expects
1616set_arch_to_kernel() {
1617 i=10
1618 while ((i--)) ; do
1619 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1620 done
1621 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1622 case ${ARCH} in
1623 x86) export ARCH="i386";;
1624 amd64) export ARCH="x86_64";;
1625 hppa) export ARCH="parisc";;
1626 mips) export ARCH="mips";;
1627 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1628 *) export ARCH="${ARCH}";;
1629 esac
1630}
1631
1632# set's ARCH back to what portage expects
1633set_arch_to_portage() {
1634 i=10
1635 while ((i--)) ; do
1636 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1637 done
1638 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1639}
1640
1641# Jeremy Huddleston <eradicator@gentoo.org>:
1642# preserve_old_lib /path/to/libblah.so.0
1643# preserve_old_lib_notify /path/to/libblah.so.0
1644#
1645# These functions are useful when a lib in your package changes --soname. Such
1646# an example might be from libogg.so.0 to libogg.so.1. Removing libogg.so.0
1647# would break packages that link against it. Most people get around this
1648# by using the portage SLOT mechanism, but that is not always a relevant
1649# solution, so instead you can add the following to your ebuilds:
1650#
1651# src_install() {
1652# ...
1653# preserve_old_lib /usr/$(get_libdir)/libogg.so.0
1654# ...
1655# }
1656#
1657# pkg_postinst() {
1658# ...
1659# preserve_old_lib_notify /usr/$(get_libdir)/libogg.so.0
1660# ...
1661# }
1662
1663preserve_old_lib() {
1664 LIB=$1
1665
1666 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1667 SONAME=`basename ${LIB}`
1668 DIRNAME=`dirname ${LIB}`
1669
1670 dodir ${DIRNAME}
1671 cp ${ROOT}${LIB} ${D}${DIRNAME}
1672 touch ${D}${LIB}
1673 fi
1674}
1675
1676preserve_old_lib_notify() {
1677 LIB=$1
1678
1679 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1680 SONAME=`basename ${LIB}`
1681
1682 einfo "An old version of an installed library was detected on your system."
1683 einfo "In order to avoid breaking packages that link against is, this older version"
1684 einfo "is not being removed. In order to make full use of this newer version,"
1685 einfo "you will need to execute the following command:"
1686 einfo " revdep-rebuild --soname ${SONAME}"
1687 einfo
1688 einfo "After doing that, you can safely remove ${LIB}"
1689 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1690 fi
1691}
1692
1693# Hack for people to figure out if a package was built with
1694# certain USE flags
1695#
1696# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1697# ex: built_with_use xchat gtk2
1698#
1699# Flags: -a all USE flags should be utilized
1700# -o at least one USE flag should be utilized
1701# Note: the default flag is '-a'
1702built_with_use() {
1703 local opt=$1
1704 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1705
1706 local PKG=$(best_version $1)
1707 shift
1708
1709 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1710 [[ ! -e ${USEFILE} ]] && return 1
1711
1712 local USE_BUILT=$(<${USEFILE})
1713 while [[ $# -gt 0 ]] ; do
1714 if [[ ${opt} = "-o" ]] ; then
1715 has $1 ${USE_BUILT} && return 0
1716 else
1717 has $1 ${USE_BUILT} || return 1
1303 fi 1718 fi
1719 shift
1720 done
1721 [[ ${opt} = "-a" ]]
1304} 1722}
1723
1724# Many configure scripts wrongly bail when a C++ compiler
1725# could not be detected. #73450
1726epunt_cxx() {
1727 local dir=$1
1728 [[ -z ${dir} ]] && dir=${S}
1729 ebegin "Removing useless C++ checks"
1730 local f
1731 for f in $(find ${dir} -name configure) ; do
1732 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1733 done
1734 eend 0
1735}
1736
1737# dopamd <file> [more files]
1738#
1739# Install pam auth config file in /etc/pam.d
1740dopamd() {
1741 [[ -z $1 ]] && die "dopamd requires at least one argument"
1742
1743 use pam || return 0
1744
1745 insinto /etc/pam.d
1746 doins "$@" || die "failed to install $@"
1747}
1748# newpamd <old name> <new name>
1749#
1750# Install pam file <old name> as <new name> in /etc/pam.d
1751newpamd() {
1752 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1753
1754 use pam || return 0
1755
1756 insinto /etc/pam.d
1757 newins "$1" "$2" || die "failed to install $1 as $2"
1758}
1759
1760# make a wrapper script ...
1761# NOTE: this was originally games_make_wrapper, but I noticed other places where
1762# this could be used, so I have moved it here and made it not games-specific
1763# -- wolf31o2
1764# $1 == wrapper name
1765# $2 == binary to run
1766# $3 == directory to chdir before running binary
1767# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1768make_wrapper() {
1769 local wrapper=$1 bin=$2 chdir=$3 libdir=$4
1770 local tmpwrapper=$(emktemp)
1771 cat << EOF > "${tmpwrapper}"
1772#!/bin/sh
1773cd "${chdir}"
1774export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1775exec ${bin} "\$@"
1776EOF
1777 chmod go+rx "${tmpwrapper}"
1778 newbin "${tmpwrapper}" "${wrapper}"
1779}

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

  ViewVC Help
Powered by ViewVC 1.1.20