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

Diff of /eclass/eutils.eclass

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

Revision 1.136 Revision 1.212
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.136 2005/01/07 11:13:38 eradicator Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.212 2005/10/22 02:32:48 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
12ECLASS=eutils 12inherit multilib portability
13INHERITED="$INHERITED $ECLASS"
14 13
15DEPEND="!bootstrap? ( sys-devel/patch )" 14DEPEND="!bootstrap? ( sys-devel/patch )"
15# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 16
17DESCRIPTION="Based on the ${ECLASS} eclass" 17DESCRIPTION="Based on the ${ECLASS} eclass"
18 18
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 19# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
41 sleep 1 41 sleep 1
42 done 42 done
43 fi 43 fi
44} 44}
45 45
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)
53#
54# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004):
55# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set,
56# fall back on old behavior. Any profile that has these set should also
57# depend on a newer version of portage (not yet released) which uses these
58# over CONF_LIBDIR in econf, dolib, etc...
59get_libdir() {
60 LIBDIR_TEST=$(type econf)
61 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
62 # if there is an override, we want to use that... always.
63 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
64 # We don't need to know the verison of portage. We only need to know
65 # if there is support for CONF_LIBDIR in econf and co.
66 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
67 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
68 # # and if there isnt an override, and we're using a version of
69 # # portage without CONF_LIBDIR support, force the use of lib. dolib
70 # # and friends from portage 2.0.50 wont be too happy otherwise.
71 # CONF_LIBDIR="lib"
72 #fi
73 elif [ -n "$(get_abi_LIBDIR)" ]; then # Using eradicator's LIBDIR_<abi> approach...
74 CONF_LIBDIR="$(get_abi_LIBDIR)"
75 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
76 # will be <portage-2.0.51_pre20
77 CONF_LIBDIR="lib"
78 fi
79 # and of course, default to lib if CONF_LIBDIR isnt set
80 echo ${CONF_LIBDIR:=lib}
81 unset LIBDIR_TEST
82}
83
84get_multilibdir() {
85 [ -n "$(get_abi_LIBDIR)" ] && die "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
86 echo ${CONF_MULTILIBDIR:=lib32}
87}
88
89# Sometimes you need to override the value returned by get_libdir. A good
90# example of this is xorg-x11, where lib32 isnt a supported configuration,
91# and where lib64 -must- be used on amd64 (for applications that need lib
92# to be 32bit, such as adobe acrobat). Note that this override also bypasses
93# portage version sanity checking.
94# get_libdir_override expects one argument, the result get_libdir should
95# return:
96#
97# get_libdir_override lib64
98#
99# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
100get_libdir_override() {
101 [ -n "$(get_abi_LIBDIR)" ] && die "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
102 CONF_LIBDIR="$1"
103 CONF_LIBDIR_OVERRIDE="$1"
104}
105
106# This function generate linker scripts in /usr/lib for dynamic 46# This function generate linker scripts in /usr/lib for dynamic
107# libs in /lib. This is to fix linking problems when you have 47# libs in /lib. This is to fix linking problems when you have
108# the .so in /lib, and the .a in /usr/lib. What happens is that 48# the .so in /lib, and the .a in /usr/lib. What happens is that
109# in some cases when linking dynamic, the .a in /usr/lib is used 49# in some cases when linking dynamic, the .a in /usr/lib is used
110# instead of the .so in /lib due to gcc/libtool tweaking ld's 50# instead of the .so in /lib due to gcc/libtool tweaking ld's
124gen_usr_ldscript() { 64gen_usr_ldscript() {
125 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
126 # Just make sure it exists 66 # Just make sure it exists
127 dodir /usr/${libdir} 67 dodir /usr/${libdir}
128 68
69 for lib in "${@}" ; do
129 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
130/* GNU ld script 71 /* GNU ld script
131 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
132 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
133 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
134 otherwise we run into linking problems. 75 otherwise we run into linking problems.
135 See bug #4411 on http://bugs.gentoo.org/ for 76
136 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
137GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
138END_LDSCRIPT 80 END_LDSCRIPT
139 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
140} 83}
141 84
142# Simple function to draw a line consisting of '=' the same length as $* 85# Simple function to draw a line consisting of '=' the same length as $*
86# - only to be used by epatch()
143# 87#
144# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
145# 89#
146draw_line() { 90draw_line() {
147 local i=0 91 local i=0
173EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
174# Default extension for patches 118# Default extension for patches
175EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
176# Default options for patch 120# Default options for patch
177# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 121# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
178EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
179# List of patches not to apply. Not this is only file names, 124# List of patches not to apply. Not this is only file names,
180# and not the full path .. 125# and not the full path ..
181EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
182# Change the printed message for a single patch. 127# Change the printed message for a single patch.
183EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
184# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
185# 132#
186# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
187# 134#
188EPATCH_FORCE="no" 135EPATCH_FORCE="no"
219# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
220# 167#
221# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
222# 169#
223epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
224 local PIPE_CMD="" 172 local PIPE_CMD=""
225 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
226 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
227 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
228 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
229 local x="" 177 local x=""
230 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
231 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
232 then 182 then
233 local m="" 183 local m=""
234 einfo "${#} patches to apply ..."
235 for m in "$@" ; do 184 for m in "$@" ; do
236 epatch "${m}" 185 epatch "${m}"
237 done 186 done
238 return 0 187 return 0
239 fi 188 fi
264 213
265 echo 214 echo
266 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 215 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
267 eerror 216 eerror
268 eerror " ${EPATCH_SOURCE}" 217 eerror " ${EPATCH_SOURCE}"
218 eerror " ( ${EPATCH_SOURCE##*/} )"
269 echo 219 echo
270 die "Cannot find \$EPATCH_SOURCE!" 220 die "Cannot find \$EPATCH_SOURCE!"
271 fi 221 fi
272 222
273 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 223 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
292 ;; 242 ;;
293 esac 243 esac
294 244
295 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
296 then 246 then
297 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
298 fi 248 fi
299 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
300 do 250 do
301 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
302 # 252 #
303 # ???_arch_foo.patch 253 # ???_arch_foo.patch
304 # 254 #
305 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
306 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 256 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
307 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
308 then 258 then
309 local count=0 259 local count=0
310 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/}
311 262
312 if [ -n "${EPATCH_EXCLUDE}" ] 263 if [ -n "${EPATCH_EXCLUDE}" ]
313 then 264 then
314 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 265 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
315 then 266 then
316 continue 267 continue
317 fi 268 fi
318 fi 269 fi
319 270
321 then 272 then
322 if [ -n "${EPATCH_SINGLE_MSG}" ] 273 if [ -n "${EPATCH_SINGLE_MSG}" ]
323 then 274 then
324 einfo "${EPATCH_SINGLE_MSG}" 275 einfo "${EPATCH_SINGLE_MSG}"
325 else 276 else
326 einfo "Applying ${x##*/} ..." 277 einfo "Applying ${patchname} ..."
327 fi 278 fi
328 else 279 else
329 einfo " ${x##*/} ..." 280 einfo " ${patchname} ..."
330 fi 281 fi
331 282
332 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 284 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
334 285
335 # Allow for prefix to differ ... im lazy, so shoot me :/ 286 # Allow for prefix to differ ... im lazy, so shoot me :/
336 while [ "${count}" -lt 5 ] 287 while [ "${count}" -lt 5 ]
337 do 288 do
338 # Generate some useful debug info ... 289 # Generate some useful debug info ...
339 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
340 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
341 292
342 if [ "${PATCH_SUFFIX}" != "patch" ] 293 if [ "${PATCH_SUFFIX}" != "patch" ]
343 then 294 then
344 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
345 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 else 297 else
347 PATCH_TARGET="${x}" 298 PATCH_TARGET="${x}"
348 fi 299 fi
349 300
350 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
351 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
352 303
353 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 306
356 if [ "${PATCH_SUFFIX}" != "patch" ] 307 if [ "${PATCH_SUFFIX}" != "patch" ]
357 then 308 then
358 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 309 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
359 then 310 then
360 echo 311 echo
361 eerror "Could not extract patch!" 312 eerror "Could not extract patch!"
362 #die "Could not extract patch!" 313 #die "Could not extract patch!"
363 count=5 314 count=5
364 break 315 break
365 fi 316 fi
366 fi 317 fi
367 318
368 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 319 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f ; _epatch_assert) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
369 then 320 then
370 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
371 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
372 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
373 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 326
376 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 327 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
328 _epatch_assert
377 329
378 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
379 then 331 then
380 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 332 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
381 echo 333 echo
382 eerror "A dry-run of patch command succeeded, but actually" 334 eerror "A dry-run of patch command succeeded, but actually"
383 eerror "applying the patch failed!" 335 eerror "applying the patch failed!"
384 #die "Real world sux compared to the dreamworld!" 336 #die "Real world sux compared to the dreamworld!"
385 count=5 337 count=5
386 fi 338 fi
387 339
388 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
389 341
390 break 342 break
391 fi 343 fi
392 344
393 count=$((count + 1)) 345 count=$((count + 1))
399 fi 351 fi
400 352
401 if [ "${count}" -eq 5 ] 353 if [ "${count}" -eq 5 ]
402 then 354 then
403 echo 355 echo
404 eerror "Failed Patch: ${x##*/}!" 356 eerror "Failed Patch: ${patchname} !"
357 eerror " ( ${PATCH_TARGET} )"
405 eerror 358 eerror
406 eerror "Include in your bugreport the contents of:" 359 eerror "Include in your bugreport the contents of:"
407 eerror 360 eerror
408 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 361 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
409 echo 362 echo
410 die "Failed Patch: ${x##*/}!" 363 die "Failed Patch: ${patchname}!"
411 fi 364 fi
412 365
413 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 366 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
414 367
415 eend 0 368 eend 0
416 fi 369 fi
417 done 370 done
418 if [ "${SINGLE_PATCH}" = "no" ] 371 if [ "${SINGLE_PATCH}" = "no" ]
419 then 372 then
420 einfo "Done with patching" 373 einfo "Done with patching"
421 fi 374 fi
422} 375}
423 376
424# This function return true if we are using the NPTL pthreads
425# implementation.
426#
427# <azarah@gentoo.org> (06 March 2003)
428#
429have_NPTL() {
430 cat > ${T}/test-nptl.c <<-"END"
431 #define _XOPEN_SOURCE
432 #include <unistd.h>
433 #include <stdio.h>
434
435 int main()
436 {
437 char buf[255];
438 char *str = buf;
439
440 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
441 if (NULL != str) {
442 printf("%s\n", str);
443 if (NULL != strstr(str, "NPTL"))
444 return 0;
445 }
446
447 return 1;
448 }
449 END
450
451 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
452 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
453 then
454 echo "yes"
455 einfon "Checking what PTHREADS implementation we have ..."
456 if ${T}/nptl
457 then
458 return 0
459 else
460 return 1
461 fi
462 else
463 echo "no"
464 fi
465
466 return 1
467}
468
469# This function check how many cpu's are present, and then set
470# -j in MAKEOPTS accordingly.
471#
472# Thanks to nall <nall@gentoo.org> for this.
473#
474get_number_of_jobs() {
475 local jobs=0
476
477 if [ ! -r /proc/cpuinfo ]
478 then
479 return 1
480 fi
481
482 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
483 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
484 then
485 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
486 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
487 ADMINPARAM="${ADMINPARAM/-j}"
488 fi
489
490 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
491
492 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
493 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
494 then
495 # these archs will always have "[Pp]rocessor"
496 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
497
498 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
499 then
500 # sparc always has "ncpus active"
501 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
502
503 elif [ "${ARCH}" = "alpha" ]
504 then
505 # alpha has "cpus active", but only when compiled with SMP
506 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
507 then
508 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
509 else
510 jobs=2
511 fi
512
513 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
514 then
515 # ppc has "processor", but only when compiled with SMP
516 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
517 then
518 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
519 else
520 jobs=2
521 fi
522 elif [ "${ARCH}" = "s390" ]
523 then
524 # s390 has "# processors : "
525 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
526 else
527 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
528 die "Unknown ARCH -- ${ARCH}!"
529 fi
530
531 # Make sure the number is valid ...
532 if [ "${jobs}" -lt 1 ]
533 then
534 jobs=1
535 fi
536
537 if [ -n "${ADMINPARAM}" ]
538 then
539 if [ "${jobs}" -gt "${ADMINPARAM}" ]
540 then
541 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
542 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
543 else
544 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
545 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
546 fi
547 fi
548}
549
550# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
551# does not exist on the users system 378# does not exist on the users system
552# vapier@gentoo.org 379# vapier@gentoo.org
553# 380#
554# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
555emktemp() { 382emktemp() {
556 local exe="touch" 383 local exe="touch"
557 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
558 local topdir="$1" 385 local topdir=$1
559 386
560 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
561 then
562 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
563 && topdir="/tmp" \ 389 && topdir="/tmp" \
564 || topdir="${T}" 390 || topdir=${T}
565 fi 391 fi
566 392
567 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
568 then
569 local tmp=/ 394 local tmp=/
570 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
571 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
572 done 397 done
573 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
574 echo "${tmp}" 399 echo "${tmp}"
575 else 400 else
576 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
577 && exe="-p" \ 402 && exe="-p" \
578 || exe="-d" 403 || exe="-d"
579 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
580 fi 405 fi
581} 406}
585# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
586# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
587# 412#
588# egetent(database, key) 413# egetent(database, key)
589egetent() { 414egetent() {
590 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
591 case "$2" in 417 case "$2" in
592 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
593 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
594 ;; 420 ;;
595 *) # Numeric 421 *) # Numeric
596 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
597 ;; 423 ;;
598 esac 424 esac
599 elif useq x86-fbsd ; then 425 ;;
600 local action 426 *-freebsd*)
601 if [ "$1" == "passwd" ] 427 local opts action="user"
602 then 428 [[ $1 == "passwd" ]] || action="group"
603 action="user" 429
604 else 430 # lookup by uid/gid
605 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
606 fi 433 fi
434
607 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
608 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
609 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
610 getent "$1" "$2" 442 getent "$1" "$2"
611 fi 443 ;;
444 esac
612} 445}
613 446
614# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
615# vapier@gentoo.org 448# vapier@gentoo.org
616# 449#
624# homedir: /dev/null 457# homedir: /dev/null
625# groups: none 458# groups: none
626# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
627enewuser() { 460enewuser() {
628 # get the username 461 # get the username
629 local euser="$1"; shift 462 local euser=$1; shift
630 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
631 then
632 eerror "No username specified !" 464 eerror "No username specified !"
633 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
634 fi 466 fi
635 467
636 # lets see if the username already exists 468 # lets see if the username already exists
637 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
638 then
639 return 0 470 return 0
640 fi 471 fi
641 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
642 473
643 # options to pass to useradd 474 # options to pass to useradd
644 local opts= 475 local opts=
645 476
646 # handle uid 477 # handle uid
647 local euid="$1"; shift 478 local euid=$1; shift
648 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
649 then
650 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
651 then
652 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
653 then
654 euid="next" 482 euid="next"
655 fi 483 fi
656 else 484 else
657 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
658 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
659 fi 487 fi
660 else 488 else
661 euid="next" 489 euid="next"
662 fi 490 fi
663 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
664 then 492 for euid in $(seq 101 999) ; do
665 local pwrange
666 if [ "${USERLAND}" == "BSD" ] ; then
667 pwrange="`jot 898 101`"
668 else
669 pwrange="`seq 101 999`"
670 fi
671 for euid in ${pwrange} ; do
672 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
673 done 494 done
674 fi 495 fi
675 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
676 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
677 498
678 # handle shell 499 # handle shell
679 local eshell="$1"; shift 500 local eshell=$1; shift
680 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
681 then
682 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
683 then
684 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
685 die "${eshell} does not exist" 504 die "${eshell} does not exist"
686 fi 505 fi
687 else 506 else
688 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
689 then 508 [[ -x ${ROOT}${shell} ]] && break
690 eshell="/usr/bin/false" 509 done
691 else 510
692 eshell="/bin/false" 511 if [[ ${shell} == "/dev/null" ]] ; then
512 eerror "Unable to identify the shell to use"
513 die "Unable to identify the shell to use"
693 fi 514 fi
515
516 eshell=${shell}
694 fi 517 fi
695 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
696 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
697 520
698 # handle homedir 521 # handle homedir
699 local ehome="$1"; shift 522 local ehome=$1; shift
700 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
701 then
702 ehome="/dev/null" 524 ehome="/dev/null"
703 fi 525 fi
704 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
705 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
706 528
707 # handle groups 529 # handle groups
708 local egroups="$1"; shift 530 local egroups=$1; shift
709 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
710 then
711 local oldifs="${IFS}" 532 local oldifs=${IFS}
712 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
713 534
714 export IFS="," 535 export IFS=","
715 for g in ${egroups} 536 for g in ${egroups} ; do
716 do
717 export IFS="${oldifs}" 537 export IFS=${oldifs}
718 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
719 then
720 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
721 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
722 fi 541 fi
723 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
724 then
725 defgroup="${g}" 543 defgroup=${g}
726 else 544 else
727 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
728 fi 546 fi
729 export IFS="," 547 export IFS=","
730 done 548 done
731 export IFS="${oldifs}" 549 export IFS=${oldifs}
732 550
733 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
734 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
735 then
736 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
737 fi 554 fi
738 else 555 else
739 egroups="(none)" 556 egroups="(none)"
740 fi 557 fi
741 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
742 559
743 # handle extra and add the user 560 # handle extra and add the user
744 local eextra="$@"
745 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
746 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
747 if useq ppc-macos 563 case ${CHOST} in
748 then 564 *-darwin*)
749 ### Make the user 565 ### Make the user
750 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
751 then
752 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
753 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
754 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
755 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
756 ### Add the user to the groups specified 571 ### Add the user to the groups specified
757 local oldifs="${IFS}" 572 local oldifs=${IFS}
758 export IFS="," 573 export IFS=","
759 for g in ${egroups} 574 for g in ${egroups} ; do
760 do
761 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
762 done 576 done
763 export IFS="${oldifs}" 577 export IFS=${oldifs}
764 else 578 else
765 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
766 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
767 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
768 die "Required function missing" 582 die "Required function missing"
769 fi 583 fi
770 elif use x86-fbsd ; then 584 ;;
771 if [ -z "${eextra}" ] 585 *-freebsd*)
772 then 586 if [[ -z $@ ]] ; then
773 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
774 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
775 die "enewuser failed" 589 die "enewuser failed"
776 else 590 else
777 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
778 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
779 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
780 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
781 else 600 else
782 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
783 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
784 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
785 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
786 || die "enewuser failed" 609 || die "enewuser failed"
787 else 610 else
788 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
789 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
790 || die "enewuser failed" 613 || die "enewuser failed"
791 fi 614 fi
615 ;;
616 esac
617
618 if [[ ! -e ${ROOT}/${ehome} ]] ; then
619 einfo " - Creating ${ehome} in ${ROOT}"
620 mkdir -p "${ROOT}/${ehome}"
621 chown ${euser} "${ROOT}/${ehome}"
622 chmod 755 "${ROOT}/${ehome}"
792 fi 623 fi
624
793 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
794
795 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
796 then
797 einfo " - Creating ${ehome} in ${D}"
798 dodir ${ehome}
799 fowners ${euser} ${ehome}
800 fperms 755 ${ehome}
801 fi
802} 626}
803 627
804# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
805# vapier@gentoo.org 629# vapier@gentoo.org
806# 630#
835 then 659 then
836 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
837 then 661 then
838 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
839 then 663 then
840 if useq ppc-macos ; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
841 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
842 else 666 else
843 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
844 fi 668 fi
845 else 669 else
859 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
860 684
861 # add the group 685 # add the group
862 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
863 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
864 if useq ppc-macos ; then 688 case ${CHOST} in
689 *-darwin*)
865 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
866 then 691 then
867 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
868 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
869 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
870 die "Required function missing" 695 die "Required function missing"
871 fi 696 fi
872 697
873 # If we need the next available 698 # If we need the next available
874 case ${egid} in 699 case ${egid} in
875 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
876 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
877 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
878 done 703 done
879 esac 704 esac
880 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
881 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
882 elif use x86-fbsd ; then 707 ;;
708
709 *-freebsd*)
883 case ${egid} in 710 case ${egid} in
884 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
885 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
886 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
887 done 714 done
888 esac 715 esac
889 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
890 else 717 ;;
718
719 *-netbsd*)
720 case ${egid} in
721 *[!0-9]*) # Non numeric
722 for egid in $(seq 101 999); do
723 [ -z "`egetent group ${egid}`" ] && break
724 done
725 esac
726 groupadd -g ${egid} ${egroup} || die "enewgroup failed"
727 ;;
728
729 *)
891 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
892 fi 731 ;;
732 esac
893 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
894} 734}
895 735
896# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
897# vapier@gentoo.org 737# vapier@gentoo.org
922# name: the name that will show up in the menu 762# name: the name that will show up in the menu
923# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
924# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
925# a full path to an icon 765# a full path to an icon
926# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
927# http://www.freedesktop.org/standards/menu-spec/ 767# http://www.freedesktop.org/Standards/desktop-entry-spec
928# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
929make_desktop_entry() { 769make_desktop_entry() {
930 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 770 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
931 771
932 local exec="${1}" 772 local exec=${1}
933 local name="${2:-${PN}}" 773 local name=${2:-${PN}}
934 local icon="${3:-${PN}.png}" 774 local icon=${3:-${PN}.png}
935 local type="${4}" 775 local type=${4}
936 local subdir="${6}" 776 local path=${5}
937 local path="${5:-${GAMES_BINDIR}}" 777
938 if [ -z "${type}" ] 778 if [[ -z ${type} ]] ; then
939 then 779 local catmaj=${CATEGORY%%-*}
940 case ${CATEGORY} in 780 local catmin=${CATEGORY##*-}
941 "app-emulation") 781 case ${catmaj} in
942 type=Emulator 782 app)
943 subdir="Emulation" 783 case ${catmin} in
784 admin) type=System;;
785 cdr) type=DiscBurning;;
786 dicts) type=Dictionary;;
787 editors) type=TextEditor;;
788 emacs) type=TextEditor;;
789 emulation) type=Emulator;;
790 laptop) type=HardwareSettings;;
791 office) type=Office;;
792 vim) type=TextEditor;;
793 xemacs) type=TextEditor;;
794 *) type=;;
795 esac
944 ;; 796 ;;
945 "games-"*) 797
946 type=Game 798 dev)
947 subdir="Games" 799 type="Development"
948 ;; 800 ;;
949 "net-"*) 801
950 type=Network 802 games)
951 subdir="${type}" 803 case ${catmin} in
804 action) type=ActionGame;;
805 arcade) type=ArcadeGame;;
806 board) type=BoardGame;;
807 kid) type=KidsGame;;
808 emulation) type=Emulator;;
809 puzzle) type=LogicGame;;
810 rpg) type=RolePlaying;;
811 roguelike) type=RolePlaying;;
812 simulation) type=Simulation;;
813 sports) type=SportsGame;;
814 strategy) type=StrategyGame;;
815 *) type=;;
816 esac
817 type="Game;${type}"
952 ;; 818 ;;
819
820 mail)
821 type="Network;Email"
822 ;;
823
824 media)
825 case ${catmin} in
826 gfx) type=Graphics;;
827 radio) type=Tuner;;
828 sound) type=Audio;;
829 tv) type=TV;;
830 video) type=Video;;
831 *) type=;;
832 esac
833 type="AudioVideo;${type}"
834 ;;
835
836 net)
837 case ${catmin} in
838 dialup) type=Dialup;;
839 ftp) type=FileTransfer;;
840 im) type=InstantMessaging;;
841 irc) type=IRCClient;;
842 mail) type=Email;;
843 news) type=News;;
844 nntp) type=News;;
845 p2p) type=FileTransfer;;
846 *) type=;;
847 esac
848 type="Network;${type}"
849 ;;
850
851 sci)
852 case ${catmin} in
853 astro*) type=Astronomoy;;
854 bio*) type=Biology;;
855 calc*) type=Calculator;;
856 chem*) type=Chemistry;;
857 geo*) type=Geology;;
858 math*) type=Math;;
859 *) type=;;
860 esac
861 type="Science;${type}"
862 ;;
863
864 www)
865 case ${catmin} in
866 client) type=WebBrowser;;
867 *) type=;;
868 esac
869 type="Network"
870 ;;
871
953 *) 872 *)
954 type= 873 type=
955 subdir=
956 ;; 874 ;;
957 esac 875 esac
958 fi 876 fi
877 if [ "${SLOT}" == "0" ] ; then
878 local desktop_name="${PN}"
879 else
880 local desktop_name="${PN}-${SLOT}"
881 fi
959 local desktop="${T}/${exec}.desktop" 882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
960 883
961echo "[Desktop Entry] 884echo "[Desktop Entry]
962Encoding=UTF-8 885Encoding=UTF-8
963Version=0.9.2 886Version=0.9.2
964Name=${name} 887Name=${name}
967Exec=${exec} 890Exec=${exec}
968Path=${path} 891Path=${path}
969Icon=${icon} 892Icon=${icon}
970Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
971 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
972 insinto /usr/share/applications 898 insinto /usr/share/applications
973 doins "${desktop}" 899 doins "${desktop}"
974 900 )
975 return 0
976} 901}
977 902
978# Make a GDM/KDM Session file 903# Make a GDM/KDM Session file
979# 904#
980# make_desktop_entry(<title>, <command>) 905# make_desktop_entry(<title>, <command>)
981# title: File to execute to start the Window Manager 906# title: File to execute to start the Window Manager
982# command: Name of the Window Manager 907# command: Name of the Window Manager
983 908
984make_session_desktop() { 909make_session_desktop() {
985
986 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 910 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
987 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 911 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
988 912
989 local title="${1}" 913 local title=$1
990 local command="${2}" 914 local command=$2
991 local desktop="${T}/${wm}.desktop" 915 local desktop=${T}/${wm}.desktop
992 916
993echo "[Desktop Entry] 917echo "[Desktop Entry]
994Encoding=UTF-8 918Encoding=UTF-8
995Name=${title} 919Name=${title}
996Comment=This session logs you into ${title} 920Comment=This session logs you into ${title}
998TryExec=${command} 922TryExec=${command}
999Type=Application" > "${desktop}" 923Type=Application" > "${desktop}"
1000 924
1001 insinto /usr/share/xsessions 925 insinto /usr/share/xsessions
1002 doins "${desktop}" 926 doins "${desktop}"
1003
1004 return 0
1005} 927}
1006 928
1007domenu() { 929domenu() {
1008 local i 930 local i j
1009 local j
1010 insinto /usr/share/applications 931 insinto /usr/share/applications
1011 for i in ${@} 932 for i in "$@" ; do
1012 do
1013 if [ -f "${i}" ]; 933 if [[ -f ${i} ]] ; then
1014 then
1015 doins ${i} 934 doins "${i}"
1016 elif [ -d "${i}" ]; 935 elif [[ -d ${i} ]] ; then
1017 then
1018 for j in ${i}/*.desktop 936 for j in "${i}"/*.desktop ; do
1019 do
1020 doins ${j} 937 doins "${j}"
1021 done 938 done
1022 fi 939 fi
1023 done 940 done
1024} 941}
942newmenu() {
943 insinto /usr/share/applications
944 newins "$1" "$2"
945}
1025 946
1026doicon() { 947doicon() {
1027 local i 948 local i j
1028 local j
1029 insinto /usr/share/pixmaps 949 insinto /usr/share/pixmaps
1030 for i in ${@} 950 for i in "$@" ; do
1031 do
1032 if [ -f "${i}" ]; 951 if [[ -f ${i} ]] ; then
1033 then
1034 doins ${i} 952 doins "${i}"
1035 elif [ -d "${i}" ]; 953 elif [[ -d ${i} ]] ; then
1036 then
1037 for j in ${i}/*.png 954 for j in "${i}"/*.png ; do
1038 do
1039 doins ${j} 955 doins "${j}"
1040 done 956 done
1041 fi 957 fi
1042 done 958 done
959}
960newicon() {
961 insinto /usr/share/pixmaps
962 newins "$1" "$2"
1043} 963}
1044 964
1045############################################################## 965##############################################################
1046# END: Handle .desktop files and menu entries # 966# END: Handle .desktop files and menu entries #
1047############################################################## 967##############################################################
1048 968
1049 969
1050# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
1051find_unpackable_file() { 971find_unpackable_file() {
1052 local src="$1" 972 local src=$1
1053 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
1054 then
1055 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
1056 else 975 else
1057 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
1058 then
1059 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
1060 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
1061 then
1062 src="${PWD}/${src}" 979 src=${PWD}/${src}
1063 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
1064 then
1065 src="${src}" 981 src=${src}
1066 fi
1067 fi 982 fi
1068 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
1069 echo "${src}" 985 echo "${src}"
1070} 986}
1071 987
1072# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
1073# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
1088# lseek 1004# lseek
1089# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1090# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
1091# thus we would pass in the value of '4' as the second parameter. 1007# thus we would pass in the value of '4' as the second parameter.
1092unpack_pdv() { 1008unpack_pdv() {
1093 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
1094 local sizeoff_t="$2" 1010 local sizeoff_t=$2
1095 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1096 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1013 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1097 1014
1098 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
1099 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1100 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1101 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1018 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1102 1019
1103 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1167# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1168# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1169# - If the offset is not specified then we will attempt to extract 1086# - If the offset is not specified then we will attempt to extract
1170# the proper offset from the script itself. 1087# the proper offset from the script itself.
1171unpack_makeself() { 1088unpack_makeself() {
1172 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1173 local skip="$2" 1090 local skip=$2
1174 local exe="$3" 1091 local exe=$3
1175 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1176 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1177 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1178 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1179 then
1180 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1181 local skip=0 1099 local skip=0
1182 exe=tail 1100 exe=tail
1183 case ${ver} in 1101 case ${ver} in
1184 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same 1102 1.5.*) # tested 1.5.{3,4,5} ... guessing 1.5.x series is same
1185 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1197 ;; 1115 ;;
1198 2.1.3) 1116 2.1.3)
1199 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1200 let skip="skip + 1" 1118 let skip="skip + 1"
1201 ;; 1119 ;;
1202 2.1.4) 1120 2.1.4|2.1.5)
1203 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1) 1121 skip=$(grep -a offset=.*head.*wc "${src}" | awk '{print $3}' | head -n 1)
1204 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1205 exe="dd" 1123 exe="dd"
1206 ;; 1124 ;;
1207 *) 1125 *)
1252check_license() { 1170check_license() {
1253 local lic=$1 1171 local lic=$1
1254 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1255 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1256 else 1174 else
1257 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1258 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1259 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1260 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1261 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1262 lic="${src}" 1180 lic="${lic}"
1263 fi
1264 fi 1181 fi
1182 fi
1265 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1266 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1267 1185
1268 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1269 # accepted ... if we don't find a match, we make the user accept 1187 # accepted ... if we don't find a match, we make the user accept
1270 local shopts=$- 1188 local shopts=$-
1441# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1442# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1443# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1444cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1445 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1446 local dir="$(dirname ${@})" 1364 local dir=$(dirname "$*")
1447 local file="$(basename ${@})" 1365 local file=$(basename "$*")
1448 local mline="" 1366 local mline=""
1449 local showedmsg=0 1367 local showedmsg=0
1450 1368
1451 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1369 for mline in $(mount | egrep -e '(iso|cdrom|fs=cdfss)' | awk '{print $3}') ; do
1452 [[ -d ${mline}/${dir} ]] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1453 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1454 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1455 done 1373 done
1456 1374
1457 if [[ -z ${CDROM_ROOT} ]] ; then 1375 if [[ -z ${CDROM_ROOT} ]] ; then
1458 echo 1376 echo
1473 fi 1391 fi
1474 showedmsg=1 1392 showedmsg=1
1475 fi 1393 fi
1476 einfo "Press return to scan for the cd again" 1394 einfo "Press return to scan for the cd again"
1477 einfo "or hit CTRL+C to abort the emerge." 1395 einfo "or hit CTRL+C to abort the emerge."
1396 echo
1397 einfo "If you are having trouble with the detection"
1398 einfo "of your CD, it is possible that you do not have"
1399 einfo "Joliet support enabled in your kernel. Please"
1400 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1478 read 1401 read
1479 fi 1402 fi
1480 done 1403 done
1481} 1404}
1482 1405
1492# directories and uses the intersection of the lists. 1415# directories and uses the intersection of the lists.
1493# The -u builds a list of po files found in all the 1416# The -u builds a list of po files found in all the
1494# directories and uses the union of the lists. 1417# directories and uses the union of the lists.
1495strip-linguas() { 1418strip-linguas() {
1496 local ls newls 1419 local ls newls
1497 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1420 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1498 local op="$1"; shift 1421 local op=$1; shift
1499 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1422 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1500 local d f 1423 local d f
1501 for d in "$@" ; do 1424 for d in "$@" ; do
1502 if [ "${op}" == "-u" ] ; then 1425 if [[ ${op} == "-u" ]] ; then
1503 newls="${ls}" 1426 newls=${ls}
1504 else 1427 else
1505 newls="" 1428 newls=""
1506 fi 1429 fi
1507 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1430 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1508 if [ "${op}" == "-i" ] ; then 1431 if [[ ${op} == "-i" ]] ; then
1509 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1432 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1510 else 1433 else
1511 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1434 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1512 fi 1435 fi
1513 done 1436 done
1514 ls="${newls}" 1437 ls=${newls}
1515 done 1438 done
1516 ls="${ls//.po}" 1439 ls=${ls//.po}
1517 else 1440 else
1518 ls="$@" 1441 ls=$@
1519 fi 1442 fi
1520 1443
1521 ls=" ${ls} " 1444 ls=" ${ls} "
1522 newls="" 1445 newls=""
1523 for f in ${LINGUAS} ; do 1446 for f in ${LINGUAS} ; do
1524 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1447 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1525 newls="${newls} ${f}" 1448 newls="${newls} ${f}"
1526 else 1449 else
1527 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1450 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1528 fi 1451 fi
1529 done 1452 done
1530 if [ -z "${newls}" ] ; then 1453 if [[ -z ${newls} ]] ; then
1531 unset LINGUAS 1454 export LINGUAS=""
1532 else 1455 else
1533 export LINGUAS="${newls}" 1456 export LINGUAS=${newls:1}
1534 fi 1457 fi
1535} 1458}
1536 1459
1537# moved from kernel.eclass since they are generally useful outside of 1460# moved from kernel.eclass since they are generally useful outside of
1538# kernel.eclass -iggy (20041002) 1461# kernel.eclass -iggy (20041002)
1540# the following functions are useful in kernel module ebuilds, etc. 1463# the following functions are useful in kernel module ebuilds, etc.
1541# for an example see ivtv or drbd ebuilds 1464# for an example see ivtv or drbd ebuilds
1542 1465
1543# set's ARCH to match what the kernel expects 1466# set's ARCH to match what the kernel expects
1544set_arch_to_kernel() { 1467set_arch_to_kernel() {
1468 i=10
1469 while ((i--)) ; do
1470 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1471 done
1545 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1472 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1546 case ${ARCH} in 1473 case ${ARCH} in
1547 x86) export ARCH="i386";; 1474 x86) export ARCH="i386";;
1548 amd64) export ARCH="x86_64";; 1475 amd64) export ARCH="x86_64";;
1549 hppa) export ARCH="parisc";; 1476 hppa) export ARCH="parisc";;
1550 mips) export ARCH="mips";; 1477 mips) export ARCH="mips";;
1478 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!
1551 *) export ARCH="${ARCH}";; 1479 *) export ARCH="${ARCH}";;
1552 esac 1480 esac
1553} 1481}
1554 1482
1555# set's ARCH back to what portage expects 1483# set's ARCH back to what portage expects
1556set_arch_to_portage() { 1484set_arch_to_portage() {
1485 i=10
1486 while ((i--)) ; do
1487 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1488 done
1557 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1489 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1558} 1490}
1559 1491
1560# Jeremy Huddleston <eradicator@gentoo.org>: 1492# Jeremy Huddleston <eradicator@gentoo.org>:
1561# preserve_old_lib /path/to/libblah.so.0 1493# preserve_old_lib /path/to/libblah.so.0
1596 LIB=$1 1528 LIB=$1
1597 1529
1598 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1530 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1599 SONAME=`basename ${LIB}` 1531 SONAME=`basename ${LIB}`
1600 1532
1601 einfo "An old version of an installed library was detected on your system." 1533 ewarn "An old version of an installed library was detected on your system."
1602 einfo "In order to avoid breaking packages that link against is, this older version" 1534 ewarn "In order to avoid breaking packages that link against it, this older version"
1603 einfo "is not being removed. In order to make full use of this newer version," 1535 ewarn "is not being removed. In order to make full use of this newer version,"
1604 einfo "you will need to execute the following command:" 1536 ewarn "you will need to execute the following command:"
1605 einfo " revdep-rebuild --soname ${SONAME}" 1537 ewarn " revdep-rebuild --soname ${SONAME}"
1606 einfo 1538 ewarn
1607 einfo "After doing that, you can safely remove ${LIB}" 1539 ewarn "After doing that, you can safely remove ${LIB}"
1608 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1609 fi 1541 fi
1610} 1542}
1611 1543
1612# Hack for people to figure out if a package was built with 1544# Hack for people to figure out if a package was built with
1613# certain USE flags 1545# certain USE flags
1614# 1546#
1615# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1547# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1616# ex: built_with_use xchat gtk2 1548# ex: built_with_use xchat gtk2
1617# 1549#
1638 shift 1570 shift
1639 done 1571 done
1640 [[ ${opt} = "-a" ]] 1572 [[ ${opt} = "-a" ]]
1641} 1573}
1642 1574
1643# Many configure scripts wrongly bail when a C++ compiler 1575# Many configure scripts wrongly bail when a C++ compiler
1644# could not be detected. #73450 1576# could not be detected. #73450
1645epunt_cxx() { 1577epunt_cxx() {
1646 local dir=$1 1578 local dir=$1
1647 [[ -z ${dir} ]] && dir=${S} 1579 [[ -z ${dir} ]] && dir=${S}
1648 ebegin "Removing useless C++ checks" 1580 ebegin "Removing useless C++ checks"
1651 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1583 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1652 done 1584 done
1653 eend 0 1585 eend 0
1654} 1586}
1655 1587
1656# get_abi_var <VAR> [<ABI>] 1588# dopamd <file> [more files]
1657# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1658# 1589#
1659# ex: 1590# Install pam auth config file in /etc/pam.d
1660# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1591dopamd() {
1592 [[ -z $1 ]] && die "dopamd requires at least one argument"
1593
1594 use pam || return 0
1595
1596 INSDESTTREE=/etc/pam.d \
1597 doins "$@" || die "failed to install $@"
1598}
1599# newpamd <old name> <new name>
1661# 1600#
1662# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)" 1601# Install pam file <old name> as <new name> in /etc/pam.d
1663# This will hopefully be added to portage soon... 1602newpamd() {
1664# 1603 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1665# If <ABI> is not specified, ${ABI} is used. 1604
1666# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1605 use pam || return 0
1667# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1606
1668# 1607 INSDESTTREE=/etc/pam.d \
1669# Jeremy Huddleston <eradicator@gentoo.org> 1608 newins "$1" "$2" || die "failed to install $1 as $2"
1670get_abi_var() { 1609}
1671 local flag=$1 1610
1672 local abi 1611# make a wrapper script ...
1673 if [ $# -gt 1 ]; then 1612# NOTE: this was originally games_make_wrapper, but I noticed other places where
1674 abi=$1 1613# this could be used, so I have moved it here and made it not games-specific
1614# -- wolf31o2
1615# $1 == wrapper name
1616# $2 == binary to run
1617# $3 == directory to chdir before running binary
1618# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1619# $5 == path for wrapper
1620make_wrapper() {
1621 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1622 local tmpwrapper=$(emktemp)
1623 # We don't want to quote ${bin} so that people can pass complex
1624 # things as $bin ... "./someprog --args"
1625 cat << EOF > "${tmpwrapper}"
1626#!/bin/sh
1627cd "${chdir:-.}"
1675 elif [ -n "${ABI}" ]; then 1628if [ -n "${libdir}" ] ; then
1676 abi=${ABI} 1629 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1677 elif [ -n "${DEFAULT_ABI}" ]; then 1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1678 abi=${DEFAULT_ABI}
1679 else 1631 else
1680 return 1 1632 export LD_LIBRARY_PATH="${libdir}"
1633 fi
1681 fi 1634fi
1682 1635exec ${bin} "\$@"
1683 local var="${flag}_${abi}" 1636EOF
1684 echo ${!var} 1637 chmod go+rx "${tmpwrapper}"
1638 if [[ -n ${path} ]] ; then
1639 exeinto "${path}"
1640 newexe "${tmpwrapper}" "${wrapper}"
1641 else
1642 newbin "${tmpwrapper}" "${wrapper}"
1643 fi
1685} 1644}
1686
1687get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1688get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1689get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1690get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1691

Legend:
Removed from v.1.136  
changed lines
  Added in v.1.212

  ViewVC Help
Powered by ViewVC 1.1.20