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

Diff of /eclass/eutils.eclass

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

Revision 1.134 Revision 1.200
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.134 2004/12/30 21:48:23 seemant Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.200 2005/09/23 20:44:26 wolf31o2 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"
229 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
230 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
231 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
232 local x="" 176 local x=""
233 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
234 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
235 then 181 then
236 local m="" 182 local m=""
237 einfo "${#} patches to apply ..."
238 for m in "$@" ; do 183 for m in "$@" ; do
239 epatch "${m}" 184 epatch "${m}"
240 done 185 done
241 return 0 186 return 0
242 fi 187 fi
267 212
268 echo 213 echo
269 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 214 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
270 eerror 215 eerror
271 eerror " ${EPATCH_SOURCE}" 216 eerror " ${EPATCH_SOURCE}"
217 eerror " ( ${EPATCH_SOURCE##*/} )"
272 echo 218 echo
273 die "Cannot find \$EPATCH_SOURCE!" 219 die "Cannot find \$EPATCH_SOURCE!"
274 fi 220 fi
275 221
276 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 222 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
295 ;; 241 ;;
296 esac 242 esac
297 243
298 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
299 then 245 then
300 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
301 fi 247 fi
302 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
303 do 249 do
304 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
305 # 251 #
306 # ???_arch_foo.patch 252 # ???_arch_foo.patch
307 # 253 #
308 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
309 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
310 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
311 then 257 then
312 local count=0 258 local count=0
313 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
314 261
315 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
316 then 263 then
317 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
318 then 265 then
319 continue 266 continue
320 fi 267 fi
321 fi 268 fi
322 269
324 then 271 then
325 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
326 then 273 then
327 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
328 else 275 else
329 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
330 fi 277 fi
331 else 278 else
332 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
333 fi 280 fi
334 281
335 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
336 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 284
338 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
339 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
340 do 287 do
341 # Generate some useful debug info ... 288 # Generate some useful debug info ...
342 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
344 291
345 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
346 then 293 then
347 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
348 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
349 else 296 else
350 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
351 fi 298 fi
352 299
353 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
354 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 302
356 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
357 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
358 305
359 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
360 then 307 then
361 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
362 then 309 then
363 echo 310 echo
364 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
365 #die "Could not extract patch!" 312 #die "Could not extract patch!"
366 count=5 313 count=5
367 break 314 break
368 fi 315 fi
369 fi 316 fi
370 317
371 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
372 then 319 then
373 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
374 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
375 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
376 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
377 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
378 325
379 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
380 327
381 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
382 then 329 then
383 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
384 echo 331 echo
385 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
386 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
387 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
388 count=5 335 count=5
389 fi 336 fi
390 337
391 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
392 339
393 break 340 break
394 fi 341 fi
395 342
396 count=$((count + 1)) 343 count=$((count + 1))
402 fi 349 fi
403 350
404 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
405 then 352 then
406 echo 353 echo
407 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
408 eerror 356 eerror
409 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
410 eerror 358 eerror
411 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
412 echo 360 echo
413 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
414 fi 362 fi
415 363
416 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
417 365
418 eend 0 366 eend 0
419 fi 367 fi
420 done 368 done
421 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
422 then 370 then
423 einfo "Done with patching" 371 einfo "Done with patching"
424 fi 372 fi
425} 373}
426 374
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) 375# Cheap replacement for when debianutils (and thus mktemp)
554# does not exist on the users system 376# does not exist on the users system
555# vapier@gentoo.org 377# vapier@gentoo.org
556# 378#
557# Takes just 1 optional parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
558emktemp() { 380emktemp() {
559 local exe="touch" 381 local exe="touch"
560 [ "$1" == "-d" ] && exe="mkdir" && shift 382 [[ $1 == -d ]] && exe="mkdir" && shift
561 local topdir="$1" 383 local topdir=$1
562 384
563 if [ -z "${topdir}" ] 385 if [[ -z ${topdir} ]] ; then
564 then
565 [ -z "${T}" ] \ 386 [[ -z ${T} ]] \
566 && topdir="/tmp" \ 387 && topdir="/tmp" \
567 || topdir="${T}" 388 || topdir=${T}
568 fi 389 fi
569 390
570 if [ -z "$(type -p mktemp)" ] 391 if [[ -z $(type -p mktemp) ]] ; then
571 then
572 local tmp=/ 392 local tmp=/
573 while [ -e "${tmp}" ] ; do 393 while [[ -e ${tmp} ]] ; do
574 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
575 done 395 done
576 ${exe} "${tmp}" 396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
577 echo "${tmp}" 397 echo "${tmp}"
578 else 398 else
579 [ "${exe}" == "touch" ] \ 399 [[ ${exe} == "touch" ]] \
580 && exe="-p" \ 400 && exe="-p" \
581 || exe="-d" 401 || exe="-d"
582 mktemp ${exe} "${topdir}" 402 mktemp ${exe} "${topdir}"
583 fi 403 fi
584} 404}
588# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
589# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
590# 410#
591# egetent(database, key) 411# egetent(database, key)
592egetent() { 412egetent() {
593 if useq ppc-macos ; then 413 if [[ "${USERLAND}" == "Darwin" ]] ; then
594 case "$2" in 414 case "$2" in
595 *[!0-9]*) # Non numeric 415 *[!0-9]*) # Non numeric
596 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 416 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
597 ;; 417 ;;
598 *) # Numeric 418 *) # Numeric
599 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 419 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
600 ;; 420 ;;
601 esac 421 esac
602 elif useq x86-fbsd ; then 422 elif [[ "${USERLAND}" == "BSD" ]] ; then
603 local action 423 local action
604 if [ "$1" == "passwd" ] 424 if [ "$1" == "passwd" ]
605 then 425 then
606 action="user" 426 action="user"
607 else 427 else
627# homedir: /dev/null 447# homedir: /dev/null
628# groups: none 448# groups: none
629# extra: comment of 'added by portage for ${PN}' 449# extra: comment of 'added by portage for ${PN}'
630enewuser() { 450enewuser() {
631 # get the username 451 # get the username
632 local euser="$1"; shift 452 local euser=$1; shift
633 if [ -z "${euser}" ] 453 if [[ -z ${euser} ]] ; then
634 then
635 eerror "No username specified !" 454 eerror "No username specified !"
636 die "Cannot call enewuser without a username" 455 die "Cannot call enewuser without a username"
637 fi 456 fi
638 457
639 # lets see if the username already exists 458 # lets see if the username already exists
640 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 459 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
641 then
642 return 0 460 return 0
643 fi 461 fi
644 einfo "Adding user '${euser}' to your system ..." 462 einfo "Adding user '${euser}' to your system ..."
645 463
646 # options to pass to useradd 464 # options to pass to useradd
647 local opts= 465 local opts=
648 466
649 # handle uid 467 # handle uid
650 local euid="$1"; shift 468 local euid=$1; shift
651 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 469 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
652 then
653 if [ "${euid}" -gt 0 ] 470 if [[ ${euid} -gt 0 ]] ; then
654 then
655 if [ ! -z "`egetent passwd ${euid}`" ] 471 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
656 then
657 euid="next" 472 euid="next"
658 fi 473 fi
659 else 474 else
660 eerror "Userid given but is not greater than 0 !" 475 eerror "Userid given but is not greater than 0 !"
661 die "${euid} is not a valid UID" 476 die "${euid} is not a valid UID"
662 fi 477 fi
663 else 478 else
664 euid="next" 479 euid="next"
665 fi 480 fi
666 if [ "${euid}" == "next" ] 481 if [[ ${euid} == "next" ]] ; then
667 then 482 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 483 [[ -z $(egetent passwd ${euid}) ]] && break
676 done 484 done
677 fi 485 fi
678 opts="${opts} -u ${euid}" 486 opts="${opts} -u ${euid}"
679 einfo " - Userid: ${euid}" 487 einfo " - Userid: ${euid}"
680 488
681 # handle shell 489 # handle shell
682 local eshell="$1"; shift 490 local eshell=$1; shift
683 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 491 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
684 then
685 if [ ! -e "${eshell}" ] 492 if [[ ! -e ${eshell} ]] ; then
686 then
687 eerror "A shell was specified but it does not exist !" 493 eerror "A shell was specified but it does not exist !"
688 die "${eshell} does not exist" 494 die "${eshell} does not exist"
689 fi 495 fi
690 else 496 else
691 if [ "${USERLAND}" == "BSD" ] 497 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null; do
692 then 498 [[ -x ${ROOT}${shell} ]] && break;
693 eshell="/usr/bin/false" 499 done
694 else 500
695 eshell="/bin/false" 501 if [[ ${shell} == "/dev/null" ]]; then
502 eerror "Unable to identify the shell to use"
503 die "Unable to identify the shell to use"
696 fi 504 fi
505
506 eshell=${shell}
697 fi 507 fi
698 einfo " - Shell: ${eshell}" 508 einfo " - Shell: ${eshell}"
699 opts="${opts} -s ${eshell}" 509 opts="${opts} -s ${eshell}"
700 510
701 # handle homedir 511 # handle homedir
702 local ehome="$1"; shift 512 local ehome=$1; shift
703 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 513 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
704 then
705 ehome="/dev/null" 514 ehome="/dev/null"
706 fi 515 fi
707 einfo " - Home: ${ehome}" 516 einfo " - Home: ${ehome}"
708 opts="${opts} -d ${ehome}" 517 opts="${opts} -d ${ehome}"
709 518
710 # handle groups 519 # handle groups
711 local egroups="$1"; shift 520 local egroups=$1; shift
712 if [ ! -z "${egroups}" ] 521 if [[ ! -z ${egroups} ]] ; then
713 then
714 local oldifs="${IFS}" 522 local oldifs=${IFS}
715 local defgroup="" exgroups="" 523 local defgroup="" exgroups=""
716 524
717 export IFS="," 525 export IFS=","
718 for g in ${egroups} 526 for g in ${egroups} ; do
719 do
720 export IFS="${oldifs}" 527 export IFS=${oldifs}
721 if [ -z "`egetent group \"${g}\"`" ] 528 if [[ -z $(egetent group "${g}") ]] ; then
722 then
723 eerror "You must add group ${g} to the system first" 529 eerror "You must add group ${g} to the system first"
724 die "${g} is not a valid GID" 530 die "${g} is not a valid GID"
725 fi 531 fi
726 if [ -z "${defgroup}" ] 532 if [[ -z ${defgroup} ]] ; then
727 then
728 defgroup="${g}" 533 defgroup=${g}
729 else 534 else
730 exgroups="${exgroups},${g}" 535 exgroups="${exgroups},${g}"
731 fi 536 fi
732 export IFS="," 537 export IFS=","
733 done 538 done
734 export IFS="${oldifs}" 539 export IFS=${oldifs}
735 540
736 opts="${opts} -g ${defgroup}" 541 opts="${opts} -g ${defgroup}"
737 if [ ! -z "${exgroups}" ] 542 if [[ ! -z ${exgroups} ]] ; then
738 then
739 opts="${opts} -G ${exgroups:1}" 543 opts="${opts} -G ${exgroups:1}"
740 fi 544 fi
741 else 545 else
742 egroups="(none)" 546 egroups="(none)"
743 fi 547 fi
744 einfo " - Groups: ${egroups}" 548 einfo " - Groups: ${egroups}"
745 549
746 # handle extra and add the user 550 # handle extra and add the user
747 local eextra="$@"
748 local oldsandbox="${SANDBOX_ON}" 551 local oldsandbox=${SANDBOX_ON}
749 export SANDBOX_ON="0" 552 export SANDBOX_ON="0"
750 if useq ppc-macos 553 case ${USERLAND} in
751 then 554 Darwin)
752 ### Make the user 555 ### Make the user
753 if [ -z "${eextra}" ] 556 if [[ -z $@ ]] ; then
754 then
755 dscl . create /users/${euser} uid ${euid} 557 dscl . create /users/${euser} uid ${euid}
756 dscl . create /users/${euser} shell ${eshell} 558 dscl . create /users/${euser} shell ${eshell}
757 dscl . create /users/${euser} home ${ehome} 559 dscl . create /users/${euser} home ${ehome}
758 dscl . create /users/${euser} realname "added by portage for ${PN}" 560 dscl . create /users/${euser} realname "added by portage for ${PN}"
759 ### Add the user to the groups specified 561 ### Add the user to the groups specified
760 local oldifs="${IFS}" 562 local oldifs=${IFS}
761 export IFS="," 563 export IFS=","
762 for g in ${egroups} 564 for g in ${egroups} ; do
763 do
764 dscl . merge /groups/${g} users ${euser} 565 dscl . merge /groups/${g} users ${euser}
765 done 566 done
766 export IFS="${oldifs}" 567 export IFS=${oldifs}
767 else 568 else
768 einfo "Extra options are not supported on macos yet" 569 einfo "Extra options are not supported on Darwin yet"
769 einfo "Please report the ebuild along with the info below" 570 einfo "Please report the ebuild along with the info below"
770 einfo "eextra: ${eextra}" 571 einfo "eextra: $@"
771 die "Required function missing" 572 die "Required function missing"
772 fi 573 fi
773 elif use x86-fbsd ; then 574 ;;
774 if [ -z "${eextra}" ] 575 BSD)
775 then 576 if [[ -z $@ ]] ; then
776 pw useradd ${euser} ${opts} \ 577 pw useradd ${euser} ${opts} \
777 -c "added by portage for ${PN}" \ 578 -c "added by portage for ${PN}" \
778 die "enewuser failed" 579 die "enewuser failed"
779 else 580 else
780 einfo " - Extra: ${eextra}" 581 einfo " - Extra: $@"
781 pw useradd ${euser} ${opts} \ 582 pw useradd ${euser} ${opts} \
782 -c ${eextra} || die "enewuser failed" 583 "$@" || die "enewuser failed"
783 fi 584 fi
784 else 585 ;;
785 if [ -z "${eextra}" ] 586 *)
786 then 587 if [[ -z $@ ]] ; then
787 useradd ${opts} ${euser} \ 588 useradd ${opts} ${euser} \
788 -c "added by portage for ${PN}" \ 589 -c "added by portage for ${PN}" \
789 || die "enewuser failed" 590 || die "enewuser failed"
790 else 591 else
791 einfo " - Extra: ${eextra}" 592 einfo " - Extra: $@"
792 useradd ${opts} ${euser} ${eextra} \ 593 useradd ${opts} ${euser} "$@" \
793 || die "enewuser failed" 594 || die "enewuser failed"
794 fi 595 fi
596 ;;
597 esac
598
599 if [[ ! -e ${ROOT}/${ehome} ]] ; then
600 einfo " - Creating ${ehome} in ${ROOT}"
601 mkdir -p "${ROOT}/${ehome}"
602 chown ${euser} "${ROOT}/${ehome}"
603 chmod 755 "${ROOT}/${ehome}"
795 fi 604 fi
605
796 export SANDBOX_ON="${oldsandbox}" 606 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} 607}
806 608
807# Simplify/standardize adding groups to the system 609# Simplify/standardize adding groups to the system
808# vapier@gentoo.org 610# vapier@gentoo.org
809# 611#
838 then 640 then
839 if [ "${egid}" -gt 0 ] 641 if [ "${egid}" -gt 0 ]
840 then 642 then
841 if [ -z "`egetent group ${egid}`" ] 643 if [ -z "`egetent group ${egid}`" ]
842 then 644 then
843 if useq ppc-macos ; then 645 if [[ "${USERLAND}" == "Darwin" ]]; then
844 opts="${opts} ${egid}" 646 opts="${opts} ${egid}"
845 else 647 else
846 opts="${opts} -g ${egid}" 648 opts="${opts} -g ${egid}"
847 fi 649 fi
848 else 650 else
862 opts="${opts} ${eextra}" 664 opts="${opts} ${eextra}"
863 665
864 # add the group 666 # add the group
865 local oldsandbox="${SANDBOX_ON}" 667 local oldsandbox="${SANDBOX_ON}"
866 export SANDBOX_ON="0" 668 export SANDBOX_ON="0"
867 if useq ppc-macos ; then 669 if [[ "${USERLAND}" == "Darwin" ]]; then
868 if [ ! -z "${eextra}" ]; 670 if [ ! -z "${eextra}" ];
869 then 671 then
870 einfo "Extra options are not supported on macos yet" 672 einfo "Extra options are not supported on Darwin/OS X yet"
871 einfo "Please report the ebuild along with the info below" 673 einfo "Please report the ebuild along with the info below"
872 einfo "eextra: ${eextra}" 674 einfo "eextra: ${eextra}"
873 die "Required function missing" 675 die "Required function missing"
874 fi 676 fi
875 677
876 # If we need the next available 678 # If we need the next available
877 case ${egid} in 679 case ${egid} in
878 *[!0-9]*) # Non numeric 680 *[!0-9]*) # Non numeric
879 for egid in `jot 898 101`; do 681 for egid in $(seq 101 999); do
880 [ -z "`egetent group ${egid}`" ] && break 682 [ -z "`egetent group ${egid}`" ] && break
881 done 683 done
882 esac 684 esac
883 dscl . create /groups/${egroup} gid ${egid} 685 dscl . create /groups/${egroup} gid ${egid}
884 dscl . create /groups/${egroup} passwd '*' 686 dscl . create /groups/${egroup} passwd '*'
885 elif use x86-fbsd ; then 687 elif [[ "${USERLAND}" == "BSD" ]] ; then
886 case ${egid} in 688 case ${egid} in
887 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
888 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
889 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
890 done 692 done
891 esac 693 esac
892 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 694 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
893 else 695 else
925# name: the name that will show up in the menu 727# name: the name that will show up in the menu
926# icon: give your little like a pretty little icon ... 728# icon: give your little like a pretty little icon ...
927# this can be relative (to /usr/share/pixmaps) or 729# this can be relative (to /usr/share/pixmaps) or
928# a full path to an icon 730# a full path to an icon
929# type: what kind of application is this ? for categories: 731# type: what kind of application is this ? for categories:
930# http://www.freedesktop.org/standards/menu-spec/ 732# http://www.freedesktop.org/Standards/desktop-entry-spec
931# path: if your app needs to startup in a specific dir 733# path: if your app needs to startup in a specific dir
932make_desktop_entry() { 734make_desktop_entry() {
933 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 735 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
934 736
935 local exec="${1}" 737 local exec=${1}
936 local name="${2:-${PN}}" 738 local name=${2:-${PN}}
937 local icon="${3:-${PN}.png}" 739 local icon=${3:-${PN}.png}
938 local type="${4}" 740 local type=${4}
939 local subdir="${6}" 741 local path=${5}
940 local path="${5:-${GAMES_BINDIR}}" 742
941 if [ -z "${type}" ] 743 if [[ -z ${type} ]] ; then
942 then 744 local catmaj=${CATEGORY%%-*}
943 case ${CATEGORY} in 745 local catmin=${CATEGORY##*-}
944 "app-emulation") 746 case ${catmaj} in
945 type=Emulator 747 app)
946 subdir="Emulation" 748 case ${catmin} in
749 admin) type=System;;
750 cdr) type=DiscBurning;;
751 dicts) type=Dictionary;;
752 editors) type=TextEditor;;
753 emacs) type=TextEditor;;
754 emulation) type=Emulator;;
755 laptop) type=HardwareSettings;;
756 office) type=Office;;
757 vim) type=TextEditor;;
758 xemacs) type=TextEditor;;
759 *) type=;;
760 esac
947 ;; 761 ;;
948 "games-"*) 762
949 type=Game 763 dev)
950 subdir="Games" 764 type="Development"
951 ;; 765 ;;
952 "net-"*) 766
953 type=Network 767 games)
954 subdir="${type}" 768 case ${catmin} in
769 action) type=ActionGame;;
770 arcade) type=ArcadeGame;;
771 board) type=BoardGame;;
772 kid) type=KidsGame;;
773 emulation) type=Emulator;;
774 puzzle) type=LogicGame;;
775 rpg) type=RolePlaying;;
776 roguelike) type=RolePlaying;;
777 simulation) type=Simulation;;
778 sports) type=SportsGame;;
779 strategy) type=StrategyGame;;
780 *) type=;;
781 esac
782 type="Game;${type}"
955 ;; 783 ;;
784
785 mail)
786 type="Network;Email"
787 ;;
788
789 media)
790 case ${catmin} in
791 gfx) type=Graphics;;
792 radio) type=Tuner;;
793 sound) type=Audio;;
794 tv) type=TV;;
795 video) type=Video;;
796 *) type=;;
797 esac
798 type="AudioVideo;${type}"
799 ;;
800
801 net)
802 case ${catmin} in
803 dialup) type=Dialup;;
804 ftp) type=FileTransfer;;
805 im) type=InstantMessaging;;
806 irc) type=IRCClient;;
807 mail) type=Email;;
808 news) type=News;;
809 nntp) type=News;;
810 p2p) type=FileTransfer;;
811 *) type=;;
812 esac
813 type="Network;${type}"
814 ;;
815
816 sci)
817 case ${catmin} in
818 astro*) type=Astronomoy;;
819 bio*) type=Biology;;
820 calc*) type=Calculator;;
821 chem*) type=Chemistry;;
822 geo*) type=Geology;;
823 math*) type=Math;;
824 *) type=;;
825 esac
826 type="Science;${type}"
827 ;;
828
829 www)
830 case ${catmin} in
831 client) type=WebBrowser;;
832 *) type=;;
833 esac
834 type="Network"
835 ;;
836
956 *) 837 *)
957 type= 838 type=
958 subdir=
959 ;; 839 ;;
960 esac 840 esac
961 fi 841 fi
842 if [ "${SLOT}" == "0" ] ; then
843 local desktop_name="${PN}"
844 else
845 local desktop_name="${PN}-${SLOT}"
846 fi
962 local desktop="${T}/${exec}.desktop" 847 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
963 848
964echo "[Desktop Entry] 849echo "[Desktop Entry]
965Encoding=UTF-8 850Encoding=UTF-8
966Version=0.9.2 851Version=0.9.2
967Name=${name} 852Name=${name}
983# make_desktop_entry(<title>, <command>) 868# make_desktop_entry(<title>, <command>)
984# title: File to execute to start the Window Manager 869# title: File to execute to start the Window Manager
985# command: Name of the Window Manager 870# command: Name of the Window Manager
986 871
987make_session_desktop() { 872make_session_desktop() {
988
989 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 873 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
990 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 874 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
991 875
992 local title="${1}" 876 local title=$1
993 local command="${2}" 877 local command=$2
994 local desktop="${T}/${wm}.desktop" 878 local desktop=${T}/${wm}.desktop
995 879
996echo "[Desktop Entry] 880echo "[Desktop Entry]
997Encoding=UTF-8 881Encoding=UTF-8
998Name=${title} 882Name=${title}
999Comment=This session logs you into ${title} 883Comment=This session logs you into ${title}
1001TryExec=${command} 885TryExec=${command}
1002Type=Application" > "${desktop}" 886Type=Application" > "${desktop}"
1003 887
1004 insinto /usr/share/xsessions 888 insinto /usr/share/xsessions
1005 doins "${desktop}" 889 doins "${desktop}"
1006
1007 return 0
1008} 890}
1009 891
1010domenu() { 892domenu() {
1011 local i 893 local i j
1012 local j
1013 insinto /usr/share/applications 894 insinto /usr/share/applications
1014 for i in ${@} 895 for i in "$@" ; do
1015 do
1016 if [ -f "${i}" ]; 896 if [[ -f ${i} ]] ; then
1017 then
1018 doins ${i} 897 doins "${i}"
1019 elif [ -d "${i}" ]; 898 elif [[ -d ${i} ]] ; then
1020 then
1021 for j in ${i}/*.desktop 899 for j in "${i}"/*.desktop ; do
1022 do
1023 doins ${j} 900 doins "${j}"
1024 done 901 done
1025 fi 902 fi
1026 done 903 done
1027} 904}
905newmenu() {
906 insinto /usr/share/applications
907 newins "$1" "$2"
908}
1028 909
1029doicon() { 910doicon() {
1030 local i 911 local i j
1031 local j
1032 insinto /usr/share/pixmaps 912 insinto /usr/share/pixmaps
1033 for i in ${@} 913 for i in "$@" ; do
1034 do
1035 if [ -f "${i}" ]; 914 if [[ -f ${i} ]] ; then
1036 then
1037 doins ${i} 915 doins "${i}"
1038 elif [ -d "${i}" ]; 916 elif [[ -d ${i} ]] ; then
1039 then
1040 for j in ${i}/*.png 917 for j in "${i}"/*.png ; do
1041 do
1042 doins ${j} 918 doins "${j}"
1043 done 919 done
1044 fi 920 fi
1045 done 921 done
922}
923newicon() {
924 insinto /usr/share/pixmaps
925 newins "$1" "$2"
1046} 926}
1047 927
1048############################################################## 928##############################################################
1049# END: Handle .desktop files and menu entries # 929# END: Handle .desktop files and menu entries #
1050############################################################## 930##############################################################
1051 931
1052 932
1053# for internal use only (unpack_pdv and unpack_makeself) 933# for internal use only (unpack_pdv and unpack_makeself)
1054find_unpackable_file() { 934find_unpackable_file() {
1055 local src="$1" 935 local src=$1
1056 if [ -z "${src}" ] 936 if [[ -z ${src} ]] ; then
1057 then
1058 src="${DISTDIR}/${A}" 937 src=${DISTDIR}/${A}
1059 else 938 else
1060 if [ -e "${DISTDIR}/${src}" ] 939 if [[ -e ${DISTDIR}/${src} ]] ; then
1061 then
1062 src="${DISTDIR}/${src}" 940 src=${DISTDIR}/${src}
1063 elif [ -e "${PWD}/${src}" ] 941 elif [[ -e ${PWD}/${src} ]] ; then
1064 then
1065 src="${PWD}/${src}" 942 src=${PWD}/${src}
1066 elif [ -e "${src}" ] 943 elif [[ -e ${src} ]] ; then
1067 then
1068 src="${src}" 944 src=${src}
1069 fi
1070 fi 945 fi
1071 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 946 fi
947 [[ ! -e ${src} ]] && return 1
1072 echo "${src}" 948 echo "${src}"
1073} 949}
1074 950
1075# Unpack those pesky pdv generated files ... 951# Unpack those pesky pdv generated files ...
1076# They're self-unpacking programs with the binary package stuffed in 952# They're self-unpacking programs with the binary package stuffed in
1091# lseek 967# lseek
1092# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 968# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1093# lseek(3, -4, SEEK_END) = 2981250 969# lseek(3, -4, SEEK_END) = 2981250
1094# thus we would pass in the value of '4' as the second parameter. 970# thus we would pass in the value of '4' as the second parameter.
1095unpack_pdv() { 971unpack_pdv() {
1096 local src="`find_unpackable_file $1`" 972 local src=$(find_unpackable_file $1)
1097 local sizeoff_t="$2" 973 local sizeoff_t=$2
1098 974
975 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1099 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 976 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1100 977
1101 local shrtsrc="`basename ${src}`" 978 local shrtsrc="`basename ${src}`"
1102 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 979 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1103 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 980 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1104 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 981 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1170# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1047# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1171# - If the file is not specified then unpack will utilize ${A}. 1048# - If the file is not specified then unpack will utilize ${A}.
1172# - If the offset is not specified then we will attempt to extract 1049# - If the offset is not specified then we will attempt to extract
1173# the proper offset from the script itself. 1050# the proper offset from the script itself.
1174unpack_makeself() { 1051unpack_makeself() {
1175 local src="$(find_unpackable_file "$1")" 1052 local src=$(find_unpackable_file "$1")
1176 local skip="$2" 1053 local skip=$2
1177 local exe="$3" 1054 local exe=$3
1178 1055
1056 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1057
1179 local shrtsrc="$(basename "${src}")" 1058 local shrtsrc=$(basename "${src}")
1180 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1059 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1181 if [ -z "${skip}" ] 1060 if [ -z "${skip}" ]
1182 then 1061 then
1183 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1062 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1184 local skip=0 1063 local skip=0
1255check_license() { 1134check_license() {
1256 local lic=$1 1135 local lic=$1
1257 if [ -z "${lic}" ] ; then 1136 if [ -z "${lic}" ] ; then
1258 lic="${PORTDIR}/licenses/${LICENSE}" 1137 lic="${PORTDIR}/licenses/${LICENSE}"
1259 else 1138 else
1260 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1139 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1261 lic="${PORTDIR}/licenses/${src}" 1140 lic="${PORTDIR}/licenses/${lic}"
1262 elif [ -e "${PWD}/${src}" ] ; then 1141 elif [ -e "${PWD}/${lic}" ] ; then
1263 lic="${PWD}/${src}" 1142 lic="${PWD}/${lic}"
1264 elif [ -e "${src}" ] ; then 1143 elif [ -e "${lic}" ] ; then
1265 lic="${src}" 1144 lic="${lic}"
1266 fi
1267 fi 1145 fi
1146 fi
1268 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1147 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1269 local l="`basename ${lic}`" 1148 local l="`basename ${lic}`"
1270 1149
1271 # here is where we check for the licenses the user already 1150 # here is where we check for the licenses the user already
1272 # accepted ... if we don't find a match, we make the user accept 1151 # accepted ... if we don't find a match, we make the user accept
1273 local shopts=$- 1152 local shopts=$-
1444# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1445# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1446# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1447cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1448 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1449 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1450 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1451 local mline="" 1330 local mline=""
1452 local showedmsg=0 1331 local showedmsg=0
1453 1332
1454 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1455 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1456 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1457 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1458 done 1337 done
1459 1338
1460 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1461 echo 1340 echo
1476 fi 1355 fi
1477 showedmsg=1 1356 showedmsg=1
1478 fi 1357 fi
1479 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1480 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1481 read 1365 read
1482 fi 1366 fi
1483 done 1367 done
1484} 1368}
1485 1369
1495# directories and uses the intersection of the lists. 1379# directories and uses the intersection of the lists.
1496# The -u builds a list of po files found in all the 1380# The -u builds a list of po files found in all the
1497# directories and uses the union of the lists. 1381# directories and uses the union of the lists.
1498strip-linguas() { 1382strip-linguas() {
1499 local ls newls 1383 local ls newls
1500 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1501 local op="$1"; shift 1385 local op=$1; shift
1502 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1503 local d f 1387 local d f
1504 for d in "$@" ; do 1388 for d in "$@" ; do
1505 if [ "${op}" == "-u" ] ; then 1389 if [[ ${op} == "-u" ]] ; then
1506 newls="${ls}" 1390 newls=${ls}
1507 else 1391 else
1508 newls="" 1392 newls=""
1509 fi 1393 fi
1510 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1511 if [ "${op}" == "-i" ] ; then 1395 if [[ ${op} == "-i" ]] ; then
1512 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1513 else 1397 else
1514 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1515 fi 1399 fi
1516 done 1400 done
1517 ls="${newls}" 1401 ls=${newls}
1518 done 1402 done
1519 ls="${ls//.po}" 1403 ls=${ls//.po}
1520 else 1404 else
1521 ls="$@" 1405 ls=$@
1522 fi 1406 fi
1523 1407
1524 ls=" ${ls} " 1408 ls=" ${ls} "
1525 newls="" 1409 newls=""
1526 for f in ${LINGUAS} ; do 1410 for f in ${LINGUAS} ; do
1527 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1528 newls="${newls} ${f}" 1412 newls="${newls} ${f}"
1529 else 1413 else
1530 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1531 fi 1415 fi
1532 done 1416 done
1533 if [ -z "${newls}" ] ; then 1417 if [[ -z ${newls} ]] ; then
1534 unset LINGUAS 1418 export LINGUAS=""
1535 else 1419 else
1536 export LINGUAS="${newls}" 1420 export LINGUAS=${newls:1}
1537 fi 1421 fi
1538} 1422}
1539 1423
1540# moved from kernel.eclass since they are generally useful outside of 1424# moved from kernel.eclass since they are generally useful outside of
1541# kernel.eclass -iggy (20041002) 1425# kernel.eclass -iggy (20041002)
1543# the following functions are useful in kernel module ebuilds, etc. 1427# the following functions are useful in kernel module ebuilds, etc.
1544# for an example see ivtv or drbd ebuilds 1428# for an example see ivtv or drbd ebuilds
1545 1429
1546# set's ARCH to match what the kernel expects 1430# set's ARCH to match what the kernel expects
1547set_arch_to_kernel() { 1431set_arch_to_kernel() {
1432 i=10
1433 while ((i--)) ; do
1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1435 done
1548 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1549 case ${ARCH} in 1437 case ${ARCH} in
1550 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1551 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1552 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1553 mips) export ARCH="mips";; 1441 mips) export ARCH="mips";;
1442 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!
1554 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1555 esac 1444 esac
1556} 1445}
1557 1446
1558# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1559set_arch_to_portage() { 1448set_arch_to_portage() {
1449 i=10
1450 while ((i--)) ; do
1451 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1452 done
1560 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1453 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1561} 1454}
1562 1455
1563# Jeremy Huddleston <eradicator@gentoo.org>: 1456# Jeremy Huddleston <eradicator@gentoo.org>:
1564# preserve_old_lib /path/to/libblah.so.0 1457# preserve_old_lib /path/to/libblah.so.0
1599 LIB=$1 1492 LIB=$1
1600 1493
1601 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1602 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1603 1496
1604 einfo "An old version of an installed library was detected on your system." 1497 ewarn "An old version of an installed library was detected on your system."
1605 einfo "In order to avoid breaking packages that link against is, this older version" 1498 ewarn "In order to avoid breaking packages that link against it, this older version"
1606 einfo "is not being removed. In order to make full use of this newer version," 1499 ewarn "is not being removed. In order to make full use of this newer version,"
1607 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1608 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1609 einfo 1502 ewarn
1610 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1611 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1612 fi 1505 fi
1613} 1506}
1614 1507
1615# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1616# certain USE flags 1509# certain USE flags
1617# 1510#
1618# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1511# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1619# ex: built_with_use xchat gtk2 1512# ex: built_with_use xchat gtk2
1620# 1513#
1641 shift 1534 shift
1642 done 1535 done
1643 [[ ${opt} = "-a" ]] 1536 [[ ${opt} = "-a" ]]
1644} 1537}
1645 1538
1646# Many configure scripts wrongly bail when a C++ compiler 1539# Many configure scripts wrongly bail when a C++ compiler
1647# could not be detected. #73450 1540# could not be detected. #73450
1648epunt_cxx() { 1541epunt_cxx() {
1649 local dir=$1 1542 local dir=$1
1650 [[ -z ${dir} ]] && dir=${S} 1543 [[ -z ${dir} ]] && dir=${S}
1651 ebegin "Removing useless C++ checks" 1544 ebegin "Removing useless C++ checks"
1654 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1547 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1655 done 1548 done
1656 eend 0 1549 eend 0
1657} 1550}
1658 1551
1659# get_abi_var <VAR> [<ABI>] 1552# dopamd <file> [more files]
1660# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1661# 1553#
1662# This code is for testing purposes only with the sparc64-multilib ${PROFILE_ARCH} 1554# Install pam auth config file in /etc/pam.d
1663# and getting a more multilib-aware portage layout. It may end up being used, but for now 1555dopamd() {
1664# it is subject to removal if a better way is worked out. 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1665#
1666# ex:
1667# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1668#
1669# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1670# This will hopefully be added to portage soon...
1671#
1672# If <ABI> is not specified, ${ABI} is used.
1673# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1674# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1675#
1676# Jeremy Huddleston <eradicator@gentoo.org>
1677get_abi_var() {
1678 local flag=$1
1679 local abi
1680 if [ $# -gt 1 ]; then
1681 abi=$1
1682 elif [ -n "${ABI}" ]; then
1683 abi=${ABI}
1684 elif [ -n "${DEFAULT_ABI}" ]; then
1685 abi=${DEFAULT_ABI}
1686 else
1687 return 1
1688 fi
1689 eval echo \${${flag}_${abi}}
1690}
1691 1557
1692get_abi_CFLAGS() { get_abi_var CFLAGS $1; } 1558 use pam || return 0
1693get_abi_CXXFLAGS() { get_abi_var CXXFLAGS $1; }
1694get_abi_ASFLAGS() { get_abi_var ASFLAGS $1; }
1695get_abi_LIBDIR() { get_abi_var LIBDIR $1; }
1696 1559
1560 INSDESTTREE=/etc/pam.d \
1561 doins "$@" || die "failed to install $@"
1562}
1563# newpamd <old name> <new name>
1564#
1565# Install pam file <old name> as <new name> in /etc/pam.d
1566newpamd() {
1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1568
1569 use pam || return 0
1570
1571 INSDESTTREE=/etc/pam.d \
1572 newins "$1" "$2" || die "failed to install $1 as $2"
1573}
1574
1575# make a wrapper script ...
1576# NOTE: this was originally games_make_wrapper, but I noticed other places where
1577# this could be used, so I have moved it here and made it not games-specific
1578# -- wolf31o2
1579# $1 == wrapper name
1580# $2 == binary to run
1581# $3 == directory to chdir before running binary
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper
1584make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp)
1587 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh
1589cd "${chdir}"
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1591exec ${bin} "\$@"
1592EOF
1593 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ]
1595 then
1596 exeinto ${5}
1597 newexe "${tmpwrapper}" "${wrapper}"
1598 else
1599 newbin "${tmpwrapper}" "${wrapper}"
1600 fi
1601}

Legend:
Removed from v.1.134  
changed lines
  Added in v.1.200

  ViewVC Help
Powered by ViewVC 1.1.20