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

Diff of /eclass/eutils.eclass

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

Revision 1.132 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.132 2004/12/26 22:23:35 vapier 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...
59#
60# For now, this is restricted to the sparc64-multilib ${PROFILE_ARCH} as it
61# is still in testing.
62get_libdir() {
63 LIBDIR_TEST=$(type econf)
64 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
65 # if there is an override, we want to use that... always.
66 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
67 # We don't need to know the verison of portage. We only need to know
68 # if there is support for CONF_LIBDIR in econf and co.
69 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
70 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
71 # # and if there isnt an override, and we're using a version of
72 # # portage without CONF_LIBDIR support, force the use of lib. dolib
73 # # and friends from portage 2.0.50 wont be too happy otherwise.
74 # CONF_LIBDIR="lib"
75 #fi
76 elif [ "${PROFILE_ARCH}" = "sparc64-multilib" ]; then # Using eradicator's LIBDIR_<abi> approach...
77 CONF_LIBDIR="$(get_abi_LIBDIR)"
78 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
79 # will be <portage-2.0.51_pre20
80 CONF_LIBDIR="lib"
81 fi
82 # and of course, default to lib if CONF_LIBDIR isnt set
83 echo ${CONF_LIBDIR:=lib}
84 unset LIBDIR_TEST
85}
86
87get_multilibdir() {
88 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_multilibdir called, but it shouldn't be needed on sparc64-multilib"
89 echo ${CONF_MULTILIBDIR:=lib32}
90}
91
92# Sometimes you need to override the value returned by get_libdir. A good
93# example of this is xorg-x11, where lib32 isnt a supported configuration,
94# and where lib64 -must- be used on amd64 (for applications that need lib
95# to be 32bit, such as adobe acrobat). Note that this override also bypasses
96# portage version sanity checking.
97# get_libdir_override expects one argument, the result get_libdir should
98# return:
99#
100# get_libdir_override lib64
101#
102# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
103get_libdir_override() {
104 [ "${PROFILE_ARCH}" = "sparc64-multilib" ] && die "get_libdir_override called, but it shouldn't be needed on sparc64-multilib..."
105 CONF_LIBDIR="$1"
106 CONF_LIBDIR_OVERRIDE="$1"
107}
108
109# This function generate linker scripts in /usr/lib for dynamic 46# This function generate linker scripts in /usr/lib for dynamic
110# 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
111# 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
112# 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
113# 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
127gen_usr_ldscript() { 64gen_usr_ldscript() {
128 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
129 # Just make sure it exists 66 # Just make sure it exists
130 dodir /usr/${libdir} 67 dodir /usr/${libdir}
131 68
69 for lib in "${@}" ; do
132 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
133/* GNU ld script 71 /* GNU ld script
134 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
135 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
136 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
137 otherwise we run into linking problems. 75 otherwise we run into linking problems.
138 See bug #4411 on http://bugs.gentoo.org/ for 76
139 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
140GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
141END_LDSCRIPT 80 END_LDSCRIPT
142 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
143} 83}
144 84
145# 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()
146# 87#
147# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
148# 89#
149draw_line() { 90draw_line() {
150 local i=0 91 local i=0
176EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
177# Default extension for patches 118# Default extension for patches
178EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
179# Default options for patch 120# Default options for patch
180# 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
181EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
182# 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,
183# and not the full path .. 125# and not the full path ..
184EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
185# Change the printed message for a single patch. 127# Change the printed message for a single patch.
186EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
187# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
188# 132#
189# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
190# 134#
191EPATCH_FORCE="no" 135EPATCH_FORCE="no"
222# hand its a directory, it will set EPATCH_SOURCE to this. 166# hand its a directory, it will set EPATCH_SOURCE to this.
223# 167#
224# <azarah@gentoo.org> (10 Nov 2002) 168# <azarah@gentoo.org> (10 Nov 2002)
225# 169#
226epatch() { 170epatch() {
171 _epatch_assert() { local _pipestatus=${PIPESTATUS[*]}; [[ ${_pipestatus// /} -eq 0 ]] ; }
227 local PIPE_CMD="" 172 local PIPE_CMD=""
228 local STDERR_TARGET="${T}/$$.out" 173 local STDERR_TARGET="${T}/$$.out"
229 local PATCH_TARGET="${T}/$$.patch" 174 local PATCH_TARGET="${T}/$$.patch"
230 local PATCH_SUFFIX="" 175 local PATCH_SUFFIX=""
231 local SINGLE_PATCH="no" 176 local SINGLE_PATCH="no"
232 local x="" 177 local x=""
233 178
179 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
180
234 if [ "$#" -gt 1 ] 181 if [ "$#" -gt 1 ]
235 then 182 then
236 local m="" 183 local m=""
237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do 184 for m in "$@" ; do
239 epatch "${m}" 185 epatch "${m}"
240 done 186 done
241 return 0 187 return 0
242 fi 188 fi
267 213
268 echo 214 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 215 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270 eerror 216 eerror
271 eerror " ${EPATCH_SOURCE}" 217 eerror " ${EPATCH_SOURCE}"
218 eerror " ( ${EPATCH_SOURCE##*/} )"
272 echo 219 echo
273 die "Cannot find \$EPATCH_SOURCE!" 220 die "Cannot find \$EPATCH_SOURCE!"
274 fi 221 fi
275 222
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 223 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
295 ;; 242 ;;
296 esac 243 esac
297 244
298 if [ "${SINGLE_PATCH}" = "no" ] 245 if [ "${SINGLE_PATCH}" = "no" ]
299 then 246 then
300 einfo "Applying various patches (bugfixes/updates) ..." 247 einfo "${EPATCH_MULTI_MSG}"
301 fi 248 fi
302 for x in ${EPATCH_SOURCE} 249 for x in ${EPATCH_SOURCE}
303 do 250 do
304 # New ARCH dependant patch naming scheme ... 251 # New ARCH dependant patch naming scheme ...
305 # 252 #
306 # ???_arch_foo.patch 253 # ???_arch_foo.patch
307 # 254 #
308 if [ -f ${x} ] && \ 255 if [ -f ${x} ] && \
309 ([ "${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}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ]) 257 [ "${EPATCH_FORCE}" = "yes" ])
311 then 258 then
312 local count=0 259 local count=0
313 local popts="${EPATCH_OPTS}" 260 local popts="${EPATCH_OPTS}"
261 local patchname=${x##*/}
314 262
315 if [ -n "${EPATCH_EXCLUDE}" ] 263 if [ -n "${EPATCH_EXCLUDE}" ]
316 then 264 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 265 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318 then 266 then
319 continue 267 continue
320 fi 268 fi
321 fi 269 fi
322 270
324 then 272 then
325 if [ -n "${EPATCH_SINGLE_MSG}" ] 273 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then 274 then
327 einfo "${EPATCH_SINGLE_MSG}" 275 einfo "${EPATCH_SINGLE_MSG}"
328 else 276 else
329 einfo "Applying ${x##*/} ..." 277 einfo "Applying ${patchname} ..."
330 fi 278 fi
331 else 279 else
332 einfo " ${x##*/} ..." 280 einfo " ${patchname} ..."
333 fi 281 fi
334 282
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 284 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 285
338 # Allow for prefix to differ ... im lazy, so shoot me :/ 286 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ] 287 while [ "${count}" -lt 5 ]
340 do 288 do
341 # Generate some useful debug info ... 289 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 291 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 292
345 if [ "${PATCH_SUFFIX}" != "patch" ] 293 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then 294 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 296 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 else 297 else
350 PATCH_TARGET="${x}" 298 PATCH_TARGET="${x}"
351 fi 299 fi
352 300
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 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##*/}
355 303
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 305 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
358 306
359 if [ "${PATCH_SUFFIX}" != "patch" ] 307 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then 308 then
361 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
362 then 310 then
363 echo 311 echo
364 eerror "Could not extract patch!" 312 eerror "Could not extract patch!"
365 #die "Could not extract patch!" 313 #die "Could not extract patch!"
366 count=5 314 count=5
367 break 315 break
368 fi 316 fi
369 fi 317 fi
370 318
371 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
372 then 320 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 325 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
378 326
379 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
380 329
381 if [ "$?" -ne 0 ] 330 if [ "$?" -ne 0 ]
382 then 331 then
383 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##*/}
384 echo 333 echo
385 eerror "A dry-run of patch command succeeded, but actually" 334 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!" 335 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!" 336 #die "Real world sux compared to the dreamworld!"
388 count=5 337 count=5
389 fi 338 fi
390 339
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 340 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
392 341
393 break 342 break
394 fi 343 fi
395 344
396 count=$((count + 1)) 345 count=$((count + 1))
402 fi 351 fi
403 352
404 if [ "${count}" -eq 5 ] 353 if [ "${count}" -eq 5 ]
405 then 354 then
406 echo 355 echo
407 eerror "Failed Patch: ${x##*/}!" 356 eerror "Failed Patch: ${patchname} !"
357 eerror " ( ${PATCH_TARGET} )"
408 eerror 358 eerror
409 eerror "Include in your bugreport the contents of:" 359 eerror "Include in your bugreport the contents of:"
410 eerror 360 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 361 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 362 echo
413 die "Failed Patch: ${x##*/}!" 363 die "Failed Patch: ${patchname}!"
414 fi 364 fi
415 365
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 366 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 367
418 eend 0 368 eend 0
419 fi 369 fi
420 done 370 done
421 if [ "${SINGLE_PATCH}" = "no" ] 371 if [ "${SINGLE_PATCH}" = "no" ]
422 then 372 then
423 einfo "Done with patching" 373 einfo "Done with patching"
424 fi 374 fi
425} 375}
426 376
427# This function return true if we are using the NPTL pthreads
428# implementation.
429#
430# <azarah@gentoo.org> (06 March 2003)
431#
432have_NPTL() {
433 cat > ${T}/test-nptl.c <<-"END"
434 #define _XOPEN_SOURCE
435 #include <unistd.h>
436 #include <stdio.h>
437
438 int main()
439 {
440 char buf[255];
441 char *str = buf;
442
443 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
444 if (NULL != str) {
445 printf("%s\n", str);
446 if (NULL != strstr(str, "NPTL"))
447 return 0;
448 }
449
450 return 1;
451 }
452 END
453
454 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
455 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
456 then
457 echo "yes"
458 einfon "Checking what PTHREADS implementation we have ..."
459 if ${T}/nptl
460 then
461 return 0
462 else
463 return 1
464 fi
465 else
466 echo "no"
467 fi
468
469 return 1
470}
471
472# This function check how many cpu's are present, and then set
473# -j in MAKEOPTS accordingly.
474#
475# Thanks to nall <nall@gentoo.org> for this.
476#
477get_number_of_jobs() {
478 local jobs=0
479
480 if [ ! -r /proc/cpuinfo ]
481 then
482 return 1
483 fi
484
485 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
486 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
487 then
488 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
489 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
490 ADMINPARAM="${ADMINPARAM/-j}"
491 fi
492
493 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
494
495 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
496 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
497 then
498 # these archs will always have "[Pp]rocessor"
499 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
500
501 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
502 then
503 # sparc always has "ncpus active"
504 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
505
506 elif [ "${ARCH}" = "alpha" ]
507 then
508 # alpha has "cpus active", but only when compiled with SMP
509 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
510 then
511 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
512 else
513 jobs=2
514 fi
515
516 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
517 then
518 # ppc has "processor", but only when compiled with SMP
519 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
520 then
521 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
522 else
523 jobs=2
524 fi
525 elif [ "${ARCH}" = "s390" ]
526 then
527 # s390 has "# processors : "
528 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
529 else
530 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
531 die "Unknown ARCH -- ${ARCH}!"
532 fi
533
534 # Make sure the number is valid ...
535 if [ "${jobs}" -lt 1 ]
536 then
537 jobs=1
538 fi
539
540 if [ -n "${ADMINPARAM}" ]
541 then
542 if [ "${jobs}" -gt "${ADMINPARAM}" ]
543 then
544 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
545 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
546 else
547 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
548 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
549 fi
550 fi
551}
552
553# Cheap replacement for when debianutils (and thus mktemp) 377# Cheap replacement for when debianutils (and thus mktemp)
554# does not exist on the users system 378# does not exist on the users system
555# vapier@gentoo.org 379# vapier@gentoo.org
556# 380#
557# Takes just 1 optional parameter (the directory to create tmpfile in) 381# Takes just 1 optional parameter (the directory to create tmpfile in)
558emktemp() { 382emktemp() {
559 local exe="touch" 383 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift 384 [[ $1 == -d ]] && exe="mkdir" && shift
561 local topdir="$1" 385 local topdir=$1
562 386
563 if [ -z "${topdir}" ] 387 if [[ -z ${topdir} ]] ; then
564 then
565 [ -z "${T}" ] \ 388 [[ -z ${T} ]] \
566 && topdir="/tmp" \ 389 && topdir="/tmp" \
567 || topdir="${T}" 390 || topdir=${T}
568 fi 391 fi
569 392
570 if [ -z "$(type -p mktemp)" ] 393 if [[ -z $(type -p mktemp) ]] ; then
571 then
572 local tmp=/ 394 local tmp=/
573 while [ -e "${tmp}" ] ; do 395 while [[ -e ${tmp} ]] ; do
574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 396 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
575 done 397 done
576 ${exe} "${tmp}" 398 ${exe} "${tmp}" || ${exe} -p "${tmp}"
577 echo "${tmp}" 399 echo "${tmp}"
578 else 400 else
579 [ "${exe}" == "touch" ] \ 401 [[ ${exe} == "touch" ]] \
580 && exe="-p" \ 402 && exe="-p" \
581 || exe="-d" 403 || exe="-d"
582 mktemp ${exe} "${topdir}" 404 mktemp ${exe} "${topdir}"
583 fi 405 fi
584} 406}
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590# 412#
591# egetent(database, key) 413# egetent(database, key)
592egetent() { 414egetent() {
593 if useq ppc-macos ; then 415 case ${CHOST} in
416 *-darwin*)
594 case "$2" in 417 case "$2" in
595 *[!0-9]*) # Non numeric 418 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;; 420 ;;
598 *) # Numeric 421 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 422 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;; 423 ;;
601 esac 424 esac
602 elif useq x86-fbsd ; then 425 ;;
603 local action 426 *-freebsd*)
604 if [ "$1" == "passwd" ] 427 local opts action="user"
605 then 428 [[ $1 == "passwd" ]] || action="group"
606 action="user" 429
607 else 430 # lookup by uid/gid
608 action="group" 431 if [[ $2 == [[:digit:]]* ]] ; then
432 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
609 fi 433 fi
434
610 pw show "${action}" "$2" -q 435 pw show ${action} ${opts} "$2" -q
611 else 436 ;;
437 *-netbsd*)
438 grep "$2:\*:" /etc/$1
439 ;;
440 *)
612 which nscd >& /dev/null && nscd -i "$1" 441 type -p nscd >& /dev/null && nscd -i "$1"
613 getent "$1" "$2" 442 getent "$1" "$2"
614 fi 443 ;;
444 esac
615} 445}
616 446
617# Simplify/standardize adding users to the system 447# Simplify/standardize adding users to the system
618# vapier@gentoo.org 448# vapier@gentoo.org
619# 449#
627# homedir: /dev/null 457# homedir: /dev/null
628# groups: none 458# groups: none
629# extra: comment of 'added by portage for ${PN}' 459# extra: comment of 'added by portage for ${PN}'
630enewuser() { 460enewuser() {
631 # get the username 461 # get the username
632 local euser="$1"; shift 462 local euser=$1; shift
633 if [ -z "${euser}" ] 463 if [[ -z ${euser} ]] ; then
634 then
635 eerror "No username specified !" 464 eerror "No username specified !"
636 die "Cannot call enewuser without a username" 465 die "Cannot call enewuser without a username"
637 fi 466 fi
638 467
639 # lets see if the username already exists 468 # lets see if the username already exists
640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 469 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
641 then
642 return 0 470 return 0
643 fi 471 fi
644 einfo "Adding user '${euser}' to your system ..." 472 einfo "Adding user '${euser}' to your system ..."
645 473
646 # options to pass to useradd 474 # options to pass to useradd
647 local opts= 475 local opts=
648 476
649 # handle uid 477 # handle uid
650 local euid="$1"; shift 478 local euid=$1; shift
651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 479 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
652 then
653 if [ "${euid}" -gt 0 ] 480 if [[ ${euid} -gt 0 ]] ; then
654 then
655 if [ ! -z "`egetent passwd ${euid}`" ] 481 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
656 then
657 euid="next" 482 euid="next"
658 fi 483 fi
659 else 484 else
660 eerror "Userid given but is not greater than 0 !" 485 eerror "Userid given but is not greater than 0 !"
661 die "${euid} is not a valid UID" 486 die "${euid} is not a valid UID"
662 fi 487 fi
663 else 488 else
664 euid="next" 489 euid="next"
665 fi 490 fi
666 if [ "${euid}" == "next" ] 491 if [[ ${euid} == "next" ]] ; then
667 then 492 for euid in $(seq 101 999) ; do
668 local pwrange
669 if [ "${USERLAND}" == "BSD" ] ; then
670 pwrange="`jot 898 101`"
671 else
672 pwrange="`seq 101 999`"
673 fi
674 for euid in ${pwrange} ; do
675 [ -z "`egetent passwd ${euid}`" ] && break 493 [[ -z $(egetent passwd ${euid}) ]] && break
676 done 494 done
677 fi 495 fi
678 opts="${opts} -u ${euid}" 496 opts="${opts} -u ${euid}"
679 einfo " - Userid: ${euid}" 497 einfo " - Userid: ${euid}"
680 498
681 # handle shell 499 # handle shell
682 local eshell="$1"; shift 500 local eshell=$1; shift
683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 501 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
684 then
685 if [ ! -e "${eshell}" ] 502 if [[ ! -e ${eshell} ]] ; then
686 then
687 eerror "A shell was specified but it does not exist !" 503 eerror "A shell was specified but it does not exist !"
688 die "${eshell} does not exist" 504 die "${eshell} does not exist"
689 fi 505 fi
690 else 506 else
691 if [ "${USERLAND}" == "BSD" ] 507 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
692 then 508 [[ -x ${ROOT}${shell} ]] && break
693 eshell="/usr/bin/false" 509 done
694 else 510
695 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"
696 fi 514 fi
515
516 eshell=${shell}
697 fi 517 fi
698 einfo " - Shell: ${eshell}" 518 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 519 opts="${opts} -s ${eshell}"
700 520
701 # handle homedir 521 # handle homedir
702 local ehome="$1"; shift 522 local ehome=$1; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 523 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
704 then
705 ehome="/dev/null" 524 ehome="/dev/null"
706 fi 525 fi
707 einfo " - Home: ${ehome}" 526 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 527 opts="${opts} -d ${ehome}"
709 528
710 # handle groups 529 # handle groups
711 local egroups="$1"; shift 530 local egroups=$1; shift
712 if [ ! -z "${egroups}" ] 531 if [[ ! -z ${egroups} ]] ; then
713 then
714 local oldifs="${IFS}" 532 local oldifs=${IFS}
715 local defgroup="" exgroups="" 533 local defgroup="" exgroups=""
716 534
717 export IFS="," 535 export IFS=","
718 for g in ${egroups} 536 for g in ${egroups} ; do
719 do
720 export IFS="${oldifs}" 537 export IFS=${oldifs}
721 if [ -z "`egetent group \"${g}\"`" ] 538 if [[ -z $(egetent group "${g}") ]] ; then
722 then
723 eerror "You must add group ${g} to the system first" 539 eerror "You must add group ${g} to the system first"
724 die "${g} is not a valid GID" 540 die "${g} is not a valid GID"
725 fi 541 fi
726 if [ -z "${defgroup}" ] 542 if [[ -z ${defgroup} ]] ; then
727 then
728 defgroup="${g}" 543 defgroup=${g}
729 else 544 else
730 exgroups="${exgroups},${g}" 545 exgroups="${exgroups},${g}"
731 fi 546 fi
732 export IFS="," 547 export IFS=","
733 done 548 done
734 export IFS="${oldifs}" 549 export IFS=${oldifs}
735 550
736 opts="${opts} -g ${defgroup}" 551 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ] 552 if [[ ! -z ${exgroups} ]] ; then
738 then
739 opts="${opts} -G ${exgroups:1}" 553 opts="${opts} -G ${exgroups:1}"
740 fi 554 fi
741 else 555 else
742 egroups="(none)" 556 egroups="(none)"
743 fi 557 fi
744 einfo " - Groups: ${egroups}" 558 einfo " - Groups: ${egroups}"
745 559
746 # handle extra and add the user 560 # handle extra and add the user
747 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}" 561 local oldsandbox=${SANDBOX_ON}
749 export SANDBOX_ON="0" 562 export SANDBOX_ON="0"
750 if useq ppc-macos 563 case ${CHOST} in
751 then 564 *-darwin*)
752 ### Make the user 565 ### Make the user
753 if [ -z "${eextra}" ] 566 if [[ -z $@ ]] ; then
754 then
755 dscl . create /users/${euser} uid ${euid} 567 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell} 568 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome} 569 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}" 570 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified 571 ### Add the user to the groups specified
760 local oldifs="${IFS}" 572 local oldifs=${IFS}
761 export IFS="," 573 export IFS=","
762 for g in ${egroups} 574 for g in ${egroups} ; do
763 do
764 dscl . merge /groups/${g} users ${euser} 575 dscl . merge /groups/${g} users ${euser}
765 done 576 done
766 export IFS="${oldifs}" 577 export IFS=${oldifs}
767 else 578 else
768 einfo "Extra options are not supported on macos yet" 579 einfo "Extra options are not supported on Darwin yet"
769 einfo "Please report the ebuild along with the info below" 580 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}" 581 einfo "eextra: $@"
771 die "Required function missing" 582 die "Required function missing"
772 fi 583 fi
773 elif use x86-fbsd ; then 584 ;;
774 if [ -z "${eextra}" ] 585 *-freebsd*)
775 then 586 if [[ -z $@ ]] ; then
776 pw useradd ${euser} ${opts} \ 587 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
778 die "enewuser failed" 589 die "enewuser failed"
779 else 590 else
780 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
781 pw useradd ${euser} ${opts} \ 592 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed" 593 "$@" || die "enewuser failed"
783 fi 594 fi
595 ;;
596
597 *-netbsd*)
598 if [[ -z $@ ]] ; then
599 useradd ${opts} ${euser} || die "enewuser failed"
784 else 600 else
785 if [ -z "${eextra}" ] 601 einfo " - Extra: $@"
786 then 602 useradd ${opts} ${euser} "$@" || die "enewuser failed"
603 fi
604 ;;
605 *)
606 if [[ -z $@ ]] ; then
787 useradd ${opts} ${euser} \ 607 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \ 608 -c "added by portage for ${PN}" \
789 || die "enewuser failed" 609 || die "enewuser failed"
790 else 610 else
791 einfo " - Extra: ${eextra}" 611 einfo " - Extra: $@"
792 useradd ${opts} ${euser} ${eextra} \ 612 useradd ${opts} ${euser} "$@" \
793 || die "enewuser failed" 613 || die "enewuser failed"
794 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}"
795 fi 623 fi
624
796 export SANDBOX_ON="${oldsandbox}" 625 export SANDBOX_ON=${oldsandbox}
797
798 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
799 then
800 einfo " - Creating ${ehome} in ${D}"
801 dodir ${ehome}
802 fowners ${euser} ${ehome}
803 fperms 755 ${ehome}
804 fi
805} 626}
806 627
807# Simplify/standardize adding groups to the system 628# Simplify/standardize adding groups to the system
808# vapier@gentoo.org 629# vapier@gentoo.org
809# 630#
838 then 659 then
839 if [ "${egid}" -gt 0 ] 660 if [ "${egid}" -gt 0 ]
840 then 661 then
841 if [ -z "`egetent group ${egid}`" ] 662 if [ -z "`egetent group ${egid}`" ]
842 then 663 then
843 if useq ppc-macos ; then 664 if [[ "${CHOST}" == *-darwin* ]]; then
844 opts="${opts} ${egid}" 665 opts="${opts} ${egid}"
845 else 666 else
846 opts="${opts} -g ${egid}" 667 opts="${opts} -g ${egid}"
847 fi 668 fi
848 else 669 else
862 opts="${opts} ${eextra}" 683 opts="${opts} ${eextra}"
863 684
864 # add the group 685 # add the group
865 local oldsandbox="${SANDBOX_ON}" 686 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0" 687 export SANDBOX_ON="0"
867 if useq ppc-macos ; then 688 case ${CHOST} in
689 *-darwin*)
868 if [ ! -z "${eextra}" ]; 690 if [ ! -z "${eextra}" ];
869 then 691 then
870 einfo "Extra options are not supported on macos yet" 692 einfo "Extra options are not supported on Darwin/OS X yet"
871 einfo "Please report the ebuild along with the info below" 693 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}" 694 einfo "eextra: ${eextra}"
873 die "Required function missing" 695 die "Required function missing"
874 fi 696 fi
875 697
876 # If we need the next available 698 # If we need the next available
877 case ${egid} in 699 case ${egid} in
878 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
879 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
880 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
881 done 703 done
882 esac 704 esac
883 dscl . create /groups/${egroup} gid ${egid} 705 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*' 706 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then 707 ;;
708
709 *-freebsd*)
886 case ${egid} in 710 case ${egid} in
887 *[!0-9]*) # Non numeric 711 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do 712 for egid in $(seq 101 999); do
889 [ -z "`egetent group ${egid}`" ] && break 713 [ -z "`egetent group ${egid}`" ] && break
890 done 714 done
891 esac 715 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 716 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
893 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 *)
894 groupadd ${opts} ${egroup} || die "enewgroup failed" 730 groupadd ${opts} ${egroup} || die "enewgroup failed"
895 fi 731 ;;
732 esac
896 export SANDBOX_ON="${oldsandbox}" 733 export SANDBOX_ON="${oldsandbox}"
897} 734}
898 735
899# Simple script to replace 'dos2unix' binaries 736# Simple script to replace 'dos2unix' binaries
900# vapier@gentoo.org 737# vapier@gentoo.org
906 cp "${f}" ${T}/edos2unix 743 cp "${f}" ${T}/edos2unix
907 sed 's/\r$//' ${T}/edos2unix > "${f}" 744 sed 's/\r$//' ${T}/edos2unix > "${f}"
908 done 745 done
909} 746}
910 747
748
749##############################################################
750# START: Handle .desktop files and menu entries #
751# maybe this should be separated into a new eclass some time #
752# lanius@gentoo.org #
753##############################################################
754
911# Make a desktop file ! 755# Make a desktop file !
912# Great for making those icons in kde/gnome startmenu ! 756# Great for making those icons in kde/gnome startmenu !
913# Amaze your friends ! Get the women ! Join today ! 757# Amaze your friends ! Get the women ! Join today !
914# 758#
915# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 759# make_desktop_entry(<binary>, [name], [icon], [type], [path])
918# name: the name that will show up in the menu 762# name: the name that will show up in the menu
919# icon: give your little like a pretty little icon ... 763# icon: give your little like a pretty little icon ...
920# this can be relative (to /usr/share/pixmaps) or 764# this can be relative (to /usr/share/pixmaps) or
921# a full path to an icon 765# a full path to an icon
922# type: what kind of application is this ? for categories: 766# type: what kind of application is this ? for categories:
923# http://www.freedesktop.org/standards/menu-spec/ 767# http://www.freedesktop.org/Standards/desktop-entry-spec
924# path: if your app needs to startup in a specific dir 768# path: if your app needs to startup in a specific dir
925make_desktop_entry() { 769make_desktop_entry() {
926 [ -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
927 771
928 local exec="${1}" 772 local exec=${1}
929 local name="${2:-${PN}}" 773 local name=${2:-${PN}}
930 local icon="${3:-${PN}.png}" 774 local icon=${3:-${PN}.png}
931 local type="${4}" 775 local type=${4}
932 local subdir="${6}" 776 local path=${5}
933 local path="${5:-${GAMES_BINDIR}}" 777
934 if [ -z "${type}" ] 778 if [[ -z ${type} ]] ; then
935 then 779 local catmaj=${CATEGORY%%-*}
936 case ${CATEGORY} in 780 local catmin=${CATEGORY##*-}
937 "app-emulation") 781 case ${catmaj} in
938 type=Emulator 782 app)
939 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
940 ;; 796 ;;
941 "games-"*) 797
942 type=Game 798 dev)
943 subdir="Games" 799 type="Development"
944 ;; 800 ;;
945 "net-"*) 801
946 type=Network 802 games)
947 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}"
948 ;; 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
949 *) 872 *)
950 type= 873 type=
951 subdir=
952 ;; 874 ;;
953 esac 875 esac
954 fi 876 fi
877 if [ "${SLOT}" == "0" ] ; then
878 local desktop_name="${PN}"
879 else
880 local desktop_name="${PN}-${SLOT}"
881 fi
955 local desktop="${T}/${exec}.desktop" 882 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
956 883
957echo "[Desktop Entry] 884echo "[Desktop Entry]
958Encoding=UTF-8 885Encoding=UTF-8
959Version=0.9.2 886Version=0.9.2
960Name=${name} 887Name=${name}
963Exec=${exec} 890Exec=${exec}
964Path=${path} 891Path=${path}
965Icon=${icon} 892Icon=${icon}
966Categories=Application;${type};" > "${desktop}" 893Categories=Application;${type};" > "${desktop}"
967 894
895 (
896 # wrap the env here so that the 'insinto' call
897 # doesn't corrupt the env of the caller
898 insinto /usr/share/applications
899 doins "${desktop}"
900 )
901}
902
903# Make a GDM/KDM Session file
904#
905# make_desktop_entry(<title>, <command>)
906# title: File to execute to start the Window Manager
907# command: Name of the Window Manager
908
909make_session_desktop() {
910 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
911 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
912
913 local title=$1
914 local command=$2
915 local desktop=${T}/${wm}.desktop
916
917echo "[Desktop Entry]
918Encoding=UTF-8
919Name=${title}
920Comment=This session logs you into ${title}
921Exec=${command}
922TryExec=${command}
923Type=Application" > "${desktop}"
924
925 insinto /usr/share/xsessions
926 doins "${desktop}"
927}
928
929domenu() {
930 local i j
968 insinto /usr/share/applications 931 insinto /usr/share/applications
969 doins "${desktop}" 932 for i in "$@" ; do
970 933 if [[ -f ${i} ]] ; then
971 return 0 934 doins "${i}"
935 elif [[ -d ${i} ]] ; then
936 for j in "${i}"/*.desktop ; do
937 doins "${j}"
938 done
939 fi
940 done
972} 941}
942newmenu() {
943 insinto /usr/share/applications
944 newins "$1" "$2"
945}
946
947doicon() {
948 local i j
949 insinto /usr/share/pixmaps
950 for i in "$@" ; do
951 if [[ -f ${i} ]] ; then
952 doins "${i}"
953 elif [[ -d ${i} ]] ; then
954 for j in "${i}"/*.png ; do
955 doins "${j}"
956 done
957 fi
958 done
959}
960newicon() {
961 insinto /usr/share/pixmaps
962 newins "$1" "$2"
963}
964
965##############################################################
966# END: Handle .desktop files and menu entries #
967##############################################################
968
973 969
974# for internal use only (unpack_pdv and unpack_makeself) 970# for internal use only (unpack_pdv and unpack_makeself)
975find_unpackable_file() { 971find_unpackable_file() {
976 local src="$1" 972 local src=$1
977 if [ -z "${src}" ] 973 if [[ -z ${src} ]] ; then
978 then
979 src="${DISTDIR}/${A}" 974 src=${DISTDIR}/${A}
980 else 975 else
981 if [ -e "${DISTDIR}/${src}" ] 976 if [[ -e ${DISTDIR}/${src} ]] ; then
982 then
983 src="${DISTDIR}/${src}" 977 src=${DISTDIR}/${src}
984 elif [ -e "${PWD}/${src}" ] 978 elif [[ -e ${PWD}/${src} ]] ; then
985 then
986 src="${PWD}/${src}" 979 src=${PWD}/${src}
987 elif [ -e "${src}" ] 980 elif [[ -e ${src} ]] ; then
988 then
989 src="${src}" 981 src=${src}
990 fi
991 fi 982 fi
992 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 983 fi
984 [[ ! -e ${src} ]] && return 1
993 echo "${src}" 985 echo "${src}"
994} 986}
995 987
996# Unpack those pesky pdv generated files ... 988# Unpack those pesky pdv generated files ...
997# They're self-unpacking programs with the binary package stuffed in 989# They're self-unpacking programs with the binary package stuffed in
1012# lseek 1004# lseek
1013# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 1005# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1014# lseek(3, -4, SEEK_END) = 2981250 1006# lseek(3, -4, SEEK_END) = 2981250
1015# 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.
1016unpack_pdv() { 1008unpack_pdv() {
1017 local src="`find_unpackable_file $1`" 1009 local src=$(find_unpackable_file $1)
1018 local sizeoff_t="$2" 1010 local sizeoff_t=$2
1019 1011
1012 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1020 [ -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 :("
1021 1014
1022 local shrtsrc="`basename ${src}`" 1015 local shrtsrc=$(basename "${src}")
1023 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1016 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1024 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1017 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1025 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\"`
1026 1019
1027 # grab metadata for debug reasons 1020 # grab metadata for debug reasons
1091# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1084# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1092# - If the file is not specified then unpack will utilize ${A}. 1085# - If the file is not specified then unpack will utilize ${A}.
1093# - 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
1094# the proper offset from the script itself. 1087# the proper offset from the script itself.
1095unpack_makeself() { 1088unpack_makeself() {
1096 local src="$(find_unpackable_file "$1")" 1089 local src=$(find_unpackable_file "$1")
1097 local skip="$2" 1090 local skip=$2
1098 local exe="$3" 1091 local exe=$3
1099 1092
1093 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1094
1100 local shrtsrc="$(basename "${src}")" 1095 local shrtsrc=$(basename "${src}")
1101 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1096 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1102 if [ -z "${skip}" ] 1097 if [[ -z ${skip} ]] ; then
1103 then
1104 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1098 local ver=$(grep -a '#.*Makeself' "${src}" | awk '{print $NF}')
1105 local skip=0 1099 local skip=0
1106 exe=tail 1100 exe=tail
1107 case ${ver} in 1101 case ${ver} in
1108 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
1109 skip=$(grep -a ^skip= "${src}" | cut -d= -f2) 1103 skip=$(grep -a ^skip= "${src}" | cut -d= -f2)
1121 ;; 1115 ;;
1122 2.1.3) 1116 2.1.3)
1123 skip=`grep -a ^offset= "${src}" | awk '{print $3}'` 1117 skip=`grep -a ^offset= "${src}" | awk '{print $3}'`
1124 let skip="skip + 1" 1118 let skip="skip + 1"
1125 ;; 1119 ;;
1126 2.1.4) 1120 2.1.4|2.1.5)
1127 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)
1128 skip=$(head -n ${skip} "${src}" | wc -c) 1122 skip=$(head -n ${skip} "${src}" | wc -c)
1129 exe="dd" 1123 exe="dd"
1130 ;; 1124 ;;
1131 *) 1125 *)
1176check_license() { 1170check_license() {
1177 local lic=$1 1171 local lic=$1
1178 if [ -z "${lic}" ] ; then 1172 if [ -z "${lic}" ] ; then
1179 lic="${PORTDIR}/licenses/${LICENSE}" 1173 lic="${PORTDIR}/licenses/${LICENSE}"
1180 else 1174 else
1181 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1175 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1182 lic="${PORTDIR}/licenses/${src}" 1176 lic="${PORTDIR}/licenses/${lic}"
1183 elif [ -e "${PWD}/${src}" ] ; then 1177 elif [ -e "${PWD}/${lic}" ] ; then
1184 lic="${PWD}/${src}" 1178 lic="${PWD}/${lic}"
1185 elif [ -e "${src}" ] ; then 1179 elif [ -e "${lic}" ] ; then
1186 lic="${src}" 1180 lic="${lic}"
1187 fi
1188 fi 1181 fi
1182 fi
1189 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1183 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1190 local l="`basename ${lic}`" 1184 local l="`basename ${lic}`"
1191 1185
1192 # here is where we check for the licenses the user already 1186 # here is where we check for the licenses the user already
1193 # 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
1194 local shopts=$- 1188 local shopts=$-
1365# displayed and we'll hang out here until: 1359# displayed and we'll hang out here until:
1366# (1) the file is found on a mounted cdrom 1360# (1) the file is found on a mounted cdrom
1367# (2) the user hits CTRL+C 1361# (2) the user hits CTRL+C
1368cdrom_locate_file_on_cd() { 1362cdrom_locate_file_on_cd() {
1369 while [[ -z ${CDROM_ROOT} ]] ; do 1363 while [[ -z ${CDROM_ROOT} ]] ; do
1370 local dir="$(dirname ${@})" 1364 local dir=$(dirname "$*")
1371 local file="$(basename ${@})" 1365 local file=$(basename "$*")
1372 local mline="" 1366 local mline=""
1373 local showedmsg=0 1367 local showedmsg=0
1374 1368
1375 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
1376 [[ -d ${mline}/${dir} ]] || continue 1370 [[ -d ${mline}/${dir} ]] || continue
1377 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1371 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1378 && export CDROM_ROOT=${mline} 1372 && export CDROM_ROOT=${mline}
1379 done 1373 done
1380 1374
1381 if [[ -z ${CDROM_ROOT} ]] ; then 1375 if [[ -z ${CDROM_ROOT} ]] ; then
1382 echo 1376 echo
1397 fi 1391 fi
1398 showedmsg=1 1392 showedmsg=1
1399 fi 1393 fi
1400 einfo "Press return to scan for the cd again" 1394 einfo "Press return to scan for the cd again"
1401 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."
1402 read 1401 read
1403 fi 1402 fi
1404 done 1403 done
1405} 1404}
1406 1405
1416# directories and uses the intersection of the lists. 1415# directories and uses the intersection of the lists.
1417# 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
1418# directories and uses the union of the lists. 1417# directories and uses the union of the lists.
1419strip-linguas() { 1418strip-linguas() {
1420 local ls newls 1419 local ls newls
1421 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1420 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1422 local op="$1"; shift 1421 local op=$1; shift
1423 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1422 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1424 local d f 1423 local d f
1425 for d in "$@" ; do 1424 for d in "$@" ; do
1426 if [ "${op}" == "-u" ] ; then 1425 if [[ ${op} == "-u" ]] ; then
1427 newls="${ls}" 1426 newls=${ls}
1428 else 1427 else
1429 newls="" 1428 newls=""
1430 fi 1429 fi
1431 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1430 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1432 if [ "${op}" == "-i" ] ; then 1431 if [[ ${op} == "-i" ]] ; then
1433 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1432 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1434 else 1433 else
1435 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1434 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1436 fi 1435 fi
1437 done 1436 done
1438 ls="${newls}" 1437 ls=${newls}
1439 done 1438 done
1440 ls="${ls//.po}" 1439 ls=${ls//.po}
1441 else 1440 else
1442 ls="$@" 1441 ls=$@
1443 fi 1442 fi
1444 1443
1445 ls=" ${ls} " 1444 ls=" ${ls} "
1446 newls="" 1445 newls=""
1447 for f in ${LINGUAS} ; do 1446 for f in ${LINGUAS} ; do
1448 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1447 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1449 newls="${newls} ${f}" 1448 newls="${newls} ${f}"
1450 else 1449 else
1451 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1450 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1452 fi 1451 fi
1453 done 1452 done
1454 if [ -z "${newls}" ] ; then 1453 if [[ -z ${newls} ]] ; then
1455 unset LINGUAS 1454 export LINGUAS=""
1456 else 1455 else
1457 export LINGUAS="${newls}" 1456 export LINGUAS=${newls:1}
1458 fi 1457 fi
1459} 1458}
1460 1459
1461# moved from kernel.eclass since they are generally useful outside of 1460# moved from kernel.eclass since they are generally useful outside of
1462# kernel.eclass -iggy (20041002) 1461# kernel.eclass -iggy (20041002)
1464# the following functions are useful in kernel module ebuilds, etc. 1463# the following functions are useful in kernel module ebuilds, etc.
1465# for an example see ivtv or drbd ebuilds 1464# for an example see ivtv or drbd ebuilds
1466 1465
1467# set's ARCH to match what the kernel expects 1466# set's ARCH to match what the kernel expects
1468set_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
1469 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1472 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1470 case ${ARCH} in 1473 case ${ARCH} in
1471 x86) export ARCH="i386";; 1474 x86) export ARCH="i386";;
1472 amd64) export ARCH="x86_64";; 1475 amd64) export ARCH="x86_64";;
1473 hppa) export ARCH="parisc";; 1476 hppa) export ARCH="parisc";;
1474 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!
1475 *) export ARCH="${ARCH}";; 1479 *) export ARCH="${ARCH}";;
1476 esac 1480 esac
1477} 1481}
1478 1482
1479# set's ARCH back to what portage expects 1483# set's ARCH back to what portage expects
1480set_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
1481 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1489 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1482} 1490}
1483 1491
1484# Jeremy Huddleston <eradicator@gentoo.org>: 1492# Jeremy Huddleston <eradicator@gentoo.org>:
1485# preserve_old_lib /path/to/libblah.so.0 1493# preserve_old_lib /path/to/libblah.so.0
1515 touch ${D}${LIB} 1523 touch ${D}${LIB}
1516 fi 1524 fi
1517} 1525}
1518 1526
1519preserve_old_lib_notify() { 1527preserve_old_lib_notify() {
1520 LIB=$1 1528 LIB=$1
1521 1529
1522 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1530 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1523 SONAME=`basename ${LIB}` 1531 SONAME=`basename ${LIB}`
1524 1532
1525 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."
1526 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"
1527 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,"
1528 einfo "you will need to execute the following command:" 1536 ewarn "you will need to execute the following command:"
1529 einfo " revdep-rebuild --soname ${SONAME}" 1537 ewarn " revdep-rebuild --soname ${SONAME}"
1530 einfo 1538 ewarn
1531 einfo "After doing that, you can safely remove ${LIB}" 1539 ewarn "After doing that, you can safely remove ${LIB}"
1532 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1540 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1533 fi 1541 fi
1534} 1542}
1535 1543
1536# 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
1537# certain USE flags 1545# certain USE flags
1538# 1546#
1539# 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>
1540# ex: built_with_use xchat gtk2 1548# ex: built_with_use xchat gtk2
1541# 1549#
1562 shift 1570 shift
1563 done 1571 done
1564 [[ ${opt} = "-a" ]] 1572 [[ ${opt} = "-a" ]]
1565} 1573}
1566 1574
1567# Many configure scripts wrongly bail when a C++ compiler 1575# Many configure scripts wrongly bail when a C++ compiler
1568# could not be detected. #73450 1576# could not be detected. #73450
1569epunt_cxx() { 1577epunt_cxx() {
1570 local dir=$1 1578 local dir=$1
1571 [[ -z ${dir} ]] && dir=${S} 1579 [[ -z ${dir} ]] && dir=${S}
1572 ebegin "Removing useless C++ checks" 1580 ebegin "Removing useless C++ checks"
1575 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
1576 done 1584 done
1577 eend 0 1585 eend 0
1578} 1586}
1579 1587
1580# get_abi_var <VAR> [<ABI>] 1588# dopamd <file> [more files]
1581# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1582# 1589#
1583# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1590# Install pam auth config file in /etc/pam.d
1584# and getting a more multilib-aware portage layout. It may end up being used, but for now 1591dopamd() {
1585# it is subject to removal if a better way is worked out. 1592 [[ -z $1 ]] && die "dopamd requires at least one argument"
1586# 1593
1587# ex: 1594 use pam || return 0
1588# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32 1595
1596 INSDESTTREE=/etc/pam.d \
1597 doins "$@" || die "failed to install $@"
1598}
1599# newpamd <old name> <new name>
1589# 1600#
1590# 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
1591# This will hopefully be added to portage soon... 1602newpamd() {
1592# 1603 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1593# If <ABI> is not specified, ${ABI} is used. 1604
1594# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used. 1605 use pam || return 0
1595# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string. 1606
1596# 1607 INSDESTTREE=/etc/pam.d \
1597# Jeremy Huddleston <eradicator@gentoo.org> 1608 newins "$1" "$2" || die "failed to install $1 as $2"
1598get_abi_var() { 1609}
1599 local flag=$1 1610
1600 local abi 1611# make a wrapper script ...
1601 if [ $# -gt 1 ]; then 1612# NOTE: this was originally games_make_wrapper, but I noticed other places where
1602 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:-.}"
1603 elif [ -n "${ABI}" ]; then 1628if [ -n "${libdir}" ] ; then
1604 abi=${ABI} 1629 if [ "\${LD_LIBRARY_PATH+set}" = "set" ] ; then
1605 elif [ -n "${DEFAULT_ABI}" ]; then 1630 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1606 abi=${DEFAULT_ABI}
1607 else 1631 else
1608 return 1 1632 export LD_LIBRARY_PATH="${libdir}"
1633 fi
1609 fi 1634fi
1610 eval echo \${${flag}_${abi}} 1635exec ${bin} "\$@"
1636EOF
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
1611} 1644}
1612
1613get_abi_CFLAGS() { get_abi_var CFLAGS $1; }
1614get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1615get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1616get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1617

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

  ViewVC Help
Powered by ViewVC 1.1.20