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

Diff of /eclass/eutils.eclass

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

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

  ViewVC Help
Powered by ViewVC 1.1.20