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

Diff of /eclass/eutils.eclass

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

Revision 1.112 Revision 1.206
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.112 2004/10/05 03:43:02 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.206 2005/10/07 16:21:48 flameeyes 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)
53get_libdir() {
54 LIBDIR_TEST=$(type econf)
55 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then
56 # if there is an override, we want to use that... always.
57 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}"
58 # We don't need to know the verison of portage. We only need to know
59 # if there is support for CONF_LIBDIR in econf and co.
60 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09
61 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then
62 # # and if there isnt an override, and we're using a version of
63 # # portage without CONF_LIBDIR support, force the use of lib. dolib
64 # # and friends from portage 2.0.50 wont be too happy otherwise.
65 # CONF_LIBDIR="lib"
66 #fi
67 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
68 # will be <portage-2.0.51_pre20
69 CONF_LIBDIR="lib"
70 fi
71 # and of course, default to lib if CONF_LIBDIR isnt set
72 echo ${CONF_LIBDIR:=lib}
73 unset LIBDIR_TEST
74}
75
76
77get_multilibdir() {
78 echo ${CONF_MULTILIBDIR:=lib32}
79}
80
81
82# Sometimes you need to override the value returned by get_libdir. A good
83# example of this is xorg-x11, where lib32 isnt a supported configuration,
84# and where lib64 -must- be used on amd64 (for applications that need lib
85# to be 32bit, such as adobe acrobat). Note that this override also bypasses
86# portage version sanity checking.
87# get_libdir_override expects one argument, the result get_libdir should
88# return:
89#
90# get_libdir_override lib64
91#
92# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
93get_libdir_override() {
94 CONF_LIBDIR="$1"
95 CONF_LIBDIR_OVERRIDE="$1"
96}
97
98# This function generate linker scripts in /usr/lib for dynamic 46# This function generate linker scripts in /usr/lib for dynamic
99# 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
100# 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
101# 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
102# 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
116gen_usr_ldscript() { 64gen_usr_ldscript() {
117 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
118 # Just make sure it exists 66 # Just make sure it exists
119 dodir /usr/${libdir} 67 dodir /usr/${libdir}
120 68
69 for lib in "${@}" ; do
121 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
122/* GNU ld script 71 /* GNU ld script
123 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
124 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
125 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
126 otherwise we run into linking problems. 75 otherwise we run into linking problems.
127 See bug #4411 on http://bugs.gentoo.org/ for 76
128 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
129GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
130END_LDSCRIPT 80 END_LDSCRIPT
131 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
132} 83}
133 84
134# 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()
135# 87#
136# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
137# 89#
138draw_line() { 90draw_line() {
139 local i=0 91 local i=0
165EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
166# Default extension for patches 118# Default extension for patches
167EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
168# Default options for patch 120# Default options for patch
169# 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
170EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
171# 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,
172# and not the full path .. 125# and not the full path ..
173EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
174# Change the printed message for a single patch. 127# Change the printed message for a single patch.
175EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
176# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
177# 132#
178# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
179# 134#
180EPATCH_FORCE="no" 135EPATCH_FORCE="no"
218 local PATCH_TARGET="${T}/$$.patch" 173 local PATCH_TARGET="${T}/$$.patch"
219 local PATCH_SUFFIX="" 174 local PATCH_SUFFIX=""
220 local SINGLE_PATCH="no" 175 local SINGLE_PATCH="no"
221 local x="" 176 local x=""
222 177
178 unset P4CONFIG P4PORT P4USER # keep perforce at bay #56402
179
223 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
224 then 181 then
225 local m="" 182 local m=""
226 einfo "${#} patches to apply..."
227 for m in "$@" ; do 183 for m in "$@" ; do
228 epatch "${m}" 184 epatch "${m}"
229 done 185 done
230 return 0 186 return 0
231 fi 187 fi
245 local EPATCH_SOURCE="$1/*" 201 local EPATCH_SOURCE="$1/*"
246 else 202 else
247 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}" 203 local EPATCH_SOURCE="$1/*.${EPATCH_SUFFIX}"
248 fi 204 fi
249 else 205 else
250 if [ ! -d ${EPATCH_SOURCE} ] 206 if [ ! -d ${EPATCH_SOURCE} ] || [ -n "$1" ]
251 then 207 then
252 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ] 208 if [ -n "$1" -a "${EPATCH_SOURCE}" = "${WORKDIR}/patch" ]
253 then 209 then
254 EPATCH_SOURCE="$1" 210 EPATCH_SOURCE="$1"
255 fi 211 fi
256 212
257 echo 213 echo
258 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:" 214 eerror "Cannot find \$EPATCH_SOURCE! Value for \$EPATCH_SOURCE is:"
259 eerror 215 eerror
260 eerror " ${EPATCH_SOURCE}" 216 eerror " ${EPATCH_SOURCE}"
217 eerror " ( ${EPATCH_SOURCE##*/} )"
261 echo 218 echo
262 die "Cannot find \$EPATCH_SOURCE!" 219 die "Cannot find \$EPATCH_SOURCE!"
263 fi 220 fi
264 221
265 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}" 222 local EPATCH_SOURCE="${EPATCH_SOURCE}/*.${EPATCH_SUFFIX}"
284 ;; 241 ;;
285 esac 242 esac
286 243
287 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
288 then 245 then
289 einfo "Applying various patches (bugfixes/updates)..." 246 einfo "${EPATCH_MULTI_MSG}"
290 fi 247 fi
291 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
292 do 249 do
293 # New ARCH dependant patch naming scheme... 250 # New ARCH dependant patch naming scheme ...
294 # 251 #
295 # ???_arch_foo.patch 252 # ???_arch_foo.patch
296 # 253 #
297 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
298 ([ "${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}" ] || \
299 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
300 then 257 then
301 local count=0 258 local count=0
302 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
303 261
304 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
305 then 263 then
306 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
307 then 265 then
308 continue 266 continue
309 fi 267 fi
310 fi 268 fi
311 269
313 then 271 then
314 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
315 then 273 then
316 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
317 else 275 else
318 einfo "Applying ${x##*/}..." 276 einfo "Applying ${patchname} ..."
319 fi 277 fi
320 else 278 else
321 einfo " ${x##*/}..." 279 einfo " ${patchname} ..."
322 fi 280 fi
323 281
324 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
325 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
326 284
327 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
328 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
329 do 287 do
330 # Generate some useful debug info ... 288 # Generate some useful debug info ...
331 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
332 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
333 291
334 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
335 then 293 then
336 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
337 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
338 else 296 else
339 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
340 fi 298 fi
341 299
342 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
343 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##*/}
344 302
345 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
346 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
347 305
348 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
349 then 307 then
350 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
351 then 309 then
352 echo 310 echo
353 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
354 #die "Could not extract patch!" 312 #die "Could not extract patch!"
355 count=5 313 count=5
356 break 314 break
357 fi 315 fi
358 fi 316 fi
359 317
360 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
361 then 319 then
362 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
363 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
364 echo "ACTUALLY APPLYING ${x##*/}..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
365 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
366 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
367 325
368 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
369 327
370 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
371 then 329 then
372 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##*/}
373 echo 331 echo
374 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
375 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
376 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
377 count=5 335 count=5
378 fi 336 fi
379 337
380 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
381 339
382 break 340 break
383 fi 341 fi
384 342
385 count=$((count + 1)) 343 count=$((count + 1))
391 fi 349 fi
392 350
393 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
394 then 352 then
395 echo 353 echo
396 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
397 eerror 356 eerror
398 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
399 eerror 358 eerror
400 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
401 echo 360 echo
402 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
403 fi 362 fi
404 363
405 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
406 365
407 eend 0 366 eend 0
408 fi 367 fi
409 done 368 done
410 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
411 then 370 then
412 einfo "Done with patching" 371 einfo "Done with patching"
413 fi 372 fi
414} 373}
415 374
416# This function return true if we are using the NPTL pthreads
417# implementation.
418#
419# <azarah@gentoo.org> (06 March 2003)
420#
421have_NPTL() {
422 cat > ${T}/test-nptl.c <<-"END"
423 #define _XOPEN_SOURCE
424 #include <unistd.h>
425 #include <stdio.h>
426
427 int main()
428 {
429 char buf[255];
430 char *str = buf;
431
432 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
433 if (NULL != str) {
434 printf("%s\n", str);
435 if (NULL != strstr(str, "NPTL"))
436 return 0;
437 }
438
439 return 1;
440 }
441 END
442
443 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ... "
444 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
445 then
446 echo "yes"
447 einfon "Checking what PTHREADS implementation we have ... "
448 if ${T}/nptl
449 then
450 return 0
451 else
452 return 1
453 fi
454 else
455 echo "no"
456 fi
457
458 return 1
459}
460
461# This function check how many cpu's are present, and then set
462# -j in MAKEOPTS accordingly.
463#
464# Thanks to nall <nall@gentoo.org> for this.
465#
466get_number_of_jobs() {
467 local jobs=0
468
469 if [ ! -r /proc/cpuinfo ]
470 then
471 return 1
472 fi
473
474 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
475 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
476 then
477 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
478 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
479 ADMINPARAM="${ADMINPARAM/-j}"
480 fi
481
482 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
483
484 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
485 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
486 then
487 # these archs will always have "[Pp]rocessor"
488 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
489
490 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
491 then
492 # sparc always has "ncpus active"
493 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
494
495 elif [ "${ARCH}" = "alpha" ]
496 then
497 # alpha has "cpus active", but only when compiled with SMP
498 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
499 then
500 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
501 else
502 jobs=2
503 fi
504
505 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
506 then
507 # ppc has "processor", but only when compiled with SMP
508 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
509 then
510 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
511 else
512 jobs=2
513 fi
514 elif [ "${ARCH}" = "s390" ]
515 then
516 # s390 has "# processors : "
517 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
518 else
519 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
520 die "Unknown ARCH -- ${ARCH}!"
521 fi
522
523 # Make sure the number is valid ...
524 if [ "${jobs}" -lt 1 ]
525 then
526 jobs=1
527 fi
528
529 if [ -n "${ADMINPARAM}" ]
530 then
531 if [ "${jobs}" -gt "${ADMINPARAM}" ]
532 then
533 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge..."
534 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
535 else
536 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge..."
537 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
538 fi
539 fi
540}
541
542# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
543# does not exist on the users system 376# does not exist on the users system
544# vapier@gentoo.org 377# vapier@gentoo.org
545# 378#
546# Takes just 1 parameter (the directory to create tmpfile in) 379# Takes just 1 optional parameter (the directory to create tmpfile in)
547mymktemp() { 380emktemp() {
381 local exe="touch"
382 [[ $1 == -d ]] && exe="mkdir" && shift
548 local topdir="$1" 383 local topdir=$1
549 384
550 [ -z "${topdir}" ] && topdir=/tmp 385 if [[ -z ${topdir} ]] ; then
551 if [ "`which mktemp 2>/dev/null`" ] 386 [[ -z ${T} ]] \
552 then 387 && topdir="/tmp" \
553 mktemp -p ${topdir} 388 || topdir=${T}
389 fi
390
391 if [[ -z $(type -p mktemp) ]] ; then
392 local tmp=/
393 while [[ -e ${tmp} ]] ; do
394 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
395 done
396 ${exe} "${tmp}" || ${exe} -p "${tmp}"
397 echo "${tmp}"
554 else 398 else
555 local tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 399 [[ ${exe} == "touch" ]] \
556 touch ${tmp} 400 && exe="-p" \
557 echo ${tmp} 401 || exe="-d"
402 mktemp ${exe} "${topdir}"
558 fi 403 fi
559} 404}
560 405
561# Small wrapper for getent (Linux), nidump (Mac OS X), 406# Small wrapper for getent (Linux), nidump (Mac OS X),
562# and pw (FreeBSD) used in enewuser()/enewgroup() 407# and pw (FreeBSD) used in enewuser()/enewgroup()
563# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 408# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
564# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 409# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
565# 410#
566# egetent(database, key) 411# egetent(database, key)
567egetent() { 412egetent() {
568 if use macos || use ppc-macos ; then 413 case ${CHOST} in
414 *-darwin*)
569 case "$2" in 415 case "$2" in
570 *[!0-9]*) # Non numeric 416 *[!0-9]*) # Non numeric
571 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
572 ;; 418 ;;
573 *) # Numeric 419 *) # Numeric
574 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 420 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
575 ;; 421 ;;
576 esac 422 esac
577 elif useq x86-fbsd ; then 423 ;;
578 local action 424 *-freebsd*)
579 if [ "$1" == "passwd" ] 425 local opts action="user"
580 then 426 [[ $1 == "passwd" ]] || action="group"
581 action="user" 427
582 else 428 # lookup by uid/gid
583 action="group" 429 if [[ $2 == [[:digit:]]* ]] ; then
430 [[ ${action} == "user" ]] && opts="-u" || opts="-g"
584 fi 431 fi
432
585 pw show "${action}" "$2" -q 433 pw show ${action} ${opts} "$2" -q
586 else 434 ;;
435 *-netbsd*)
436 grep "$2:\*:" /etc/$1
437 ;;
438 *)
439 type -p nscd >& /dev/null && nscd -i "$1"
587 getent "$1" "$2" 440 getent "$1" "$2"
588 fi 441 ;;
442 esac
589} 443}
590 444
591# Simplify/standardize adding users to the system 445# Simplify/standardize adding users to the system
592# vapier@gentoo.org 446# vapier@gentoo.org
593# 447#
601# homedir: /dev/null 455# homedir: /dev/null
602# groups: none 456# groups: none
603# extra: comment of 'added by portage for ${PN}' 457# extra: comment of 'added by portage for ${PN}'
604enewuser() { 458enewuser() {
605 # get the username 459 # get the username
606 local euser="$1"; shift 460 local euser=$1; shift
607 if [ -z "${euser}" ] 461 if [[ -z ${euser} ]] ; then
608 then
609 eerror "No username specified !" 462 eerror "No username specified !"
610 die "Cannot call enewuser without a username" 463 die "Cannot call enewuser without a username"
611 fi 464 fi
612 465
613 # lets see if the username already exists 466 # lets see if the username already exists
614 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 467 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
615 then
616 return 0 468 return 0
617 fi 469 fi
618 einfo "Adding user '${euser}' to your system ..." 470 einfo "Adding user '${euser}' to your system ..."
619 471
620 # options to pass to useradd 472 # options to pass to useradd
621 local opts= 473 local opts=
622 474
623 # handle uid 475 # handle uid
624 local euid="$1"; shift 476 local euid=$1; shift
625 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 477 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
626 then
627 if [ "${euid}" -gt 0 ] 478 if [[ ${euid} -gt 0 ]] ; then
628 then
629 if [ ! -z "`egetent passwd ${euid}`" ] 479 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
630 then
631 euid="next" 480 euid="next"
632 fi 481 fi
633 else 482 else
634 eerror "Userid given but is not greater than 0 !" 483 eerror "Userid given but is not greater than 0 !"
635 die "${euid} is not a valid UID" 484 die "${euid} is not a valid UID"
636 fi 485 fi
637 else 486 else
638 euid="next" 487 euid="next"
639 fi 488 fi
640 if [ "${euid}" == "next" ] 489 if [[ ${euid} == "next" ]] ; then
641 then 490 for euid in $(seq 101 999) ; do
642 local pwrange
643 if use macos || use ppc-macos || [ "${USERLAND}" == "BSD" ] ; then
644 pwrange="`jot 898 101`"
645 else
646 pwrange="`seq 101 999`"
647 fi
648 for euid in ${pwrange} ; do
649 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
650 done 492 done
651 fi 493 fi
652 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
653 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
654 496
655 # handle shell 497 # handle shell
656 local eshell="$1"; shift 498 local eshell=$1; shift
657 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
658 then
659 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
660 then
661 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
662 die "${eshell} does not exist" 502 die "${eshell} does not exist"
663 fi 503 fi
664 else 504 else
665 if [ "${USERLAND}" == "BSD" ] 505 for shell in /sbin/nologin /usr/sbin/nologin /bin/false /usr/bin/false /dev/null ; do
666 then 506 [[ -x ${ROOT}${shell} ]] && break
667 eshell="/usr/bin/false" 507 done
668 else 508
669 eshell="/bin/false" 509 if [[ ${shell} == "/dev/null" ]] ; then
510 eerror "Unable to identify the shell to use"
511 die "Unable to identify the shell to use"
670 fi 512 fi
513
514 eshell=${shell}
671 fi 515 fi
672 einfo " - Shell: ${eshell}" 516 einfo " - Shell: ${eshell}"
673 opts="${opts} -s ${eshell}" 517 opts="${opts} -s ${eshell}"
674 518
675 # handle homedir 519 # handle homedir
676 local ehome="$1"; shift 520 local ehome=$1; shift
677 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 521 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
678 then
679 ehome="/dev/null" 522 ehome="/dev/null"
680 fi 523 fi
681 einfo " - Home: ${ehome}" 524 einfo " - Home: ${ehome}"
682 opts="${opts} -d ${ehome}" 525 opts="${opts} -d ${ehome}"
683 526
684 # handle groups 527 # handle groups
685 local egroups="$1"; shift 528 local egroups=$1; shift
686 if [ ! -z "${egroups}" ] 529 if [[ ! -z ${egroups} ]] ; then
687 then
688 local oldifs="${IFS}" 530 local oldifs=${IFS}
689 local defgroup="" exgroups="" 531 local defgroup="" exgroups=""
690 532
691 export IFS="," 533 export IFS=","
692 for g in ${egroups} 534 for g in ${egroups} ; do
693 do 535 export IFS=${oldifs}
694 if [ -z "`egetent group \"${g}\"`" ] 536 if [[ -z $(egetent group "${g}") ]] ; then
695 then
696 eerror "You must add group ${g} to the system first" 537 eerror "You must add group ${g} to the system first"
697 die "${g} is not a valid GID" 538 die "${g} is not a valid GID"
698 fi 539 fi
699 if [ -z "${defgroup}" ] 540 if [[ -z ${defgroup} ]] ; then
700 then
701 defgroup="${g}" 541 defgroup=${g}
702 else 542 else
703 exgroups="${exgroups},${g}" 543 exgroups="${exgroups},${g}"
704 fi 544 fi
545 export IFS=","
705 done 546 done
706 export IFS="${oldifs}" 547 export IFS=${oldifs}
707 548
708 opts="${opts} -g ${defgroup}" 549 opts="${opts} -g ${defgroup}"
709 if [ ! -z "${exgroups}" ] 550 if [[ ! -z ${exgroups} ]] ; then
710 then
711 opts="${opts} -G ${exgroups:1}" 551 opts="${opts} -G ${exgroups:1}"
712 fi 552 fi
713 else 553 else
714 egroups="(none)" 554 egroups="(none)"
715 fi 555 fi
716 einfo " - Groups: ${egroups}" 556 einfo " - Groups: ${egroups}"
717 557
718 # handle extra and add the user 558 # handle extra and add the user
719 local eextra="$@"
720 local oldsandbox="${SANDBOX_ON}" 559 local oldsandbox=${SANDBOX_ON}
721 export SANDBOX_ON="0" 560 export SANDBOX_ON="0"
722 if use macos || use ppc-macos ; 561 case ${CHOST} in
723 then 562 *-darwin*)
724 ### Make the user 563 ### Make the user
725 if [ -z "${eextra}" ] 564 if [[ -z $@ ]] ; then
726 then
727 dscl . create /users/${euser} uid ${euid} 565 dscl . create /users/${euser} uid ${euid}
728 dscl . create /users/${euser} shell ${eshell} 566 dscl . create /users/${euser} shell ${eshell}
729 dscl . create /users/${euser} home ${ehome} 567 dscl . create /users/${euser} home ${ehome}
730 dscl . create /users/${euser} realname "added by portage for ${PN}" 568 dscl . create /users/${euser} realname "added by portage for ${PN}"
731 ### Add the user to the groups specified 569 ### Add the user to the groups specified
570 local oldifs=${IFS}
571 export IFS=","
732 for g in ${egroups} 572 for g in ${egroups} ; do
733 do
734 # $egroups is , delimited, not space
735 ewarn "This is code is wrong; someone on the OS X team should fix it"
736 dscl . merge /groups/${g} users ${euser} 573 dscl . merge /groups/${g} users ${euser}
737 done 574 done
575 export IFS=${oldifs}
738 else 576 else
739 einfo "Extra options are not supported on macos yet" 577 einfo "Extra options are not supported on Darwin yet"
740 einfo "Please report the ebuild along with the info below" 578 einfo "Please report the ebuild along with the info below"
741 einfo "eextra: ${eextra}" 579 einfo "eextra: $@"
742 die "Required function missing" 580 die "Required function missing"
743 fi 581 fi
744 elif use x86-fbsd ; then 582 ;;
745 if [ -z "${eextra}" ] 583 *-freebsd*)
746 then 584 if [[ -z $@ ]] ; then
747 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
748 -c "added by portage for ${PN}" \ 586 -c "added by portage for ${PN}" \
749 die "enewuser failed" 587 die "enewuser failed"
750 else 588 else
751 einfo " - Extra: ${eextra}" 589 einfo " - Extra: $@"
752 pw useradd ${euser} ${opts} \ 590 pw useradd ${euser} ${opts} \
753 -c ${eextra} || die "enewuser failed" 591 "$@" || die "enewuser failed"
754 fi 592 fi
755 else 593 ;;
756 if [ -z "${eextra}" ] 594 *)
757 then 595 if [[ -z $@ ]] ; then
758 useradd ${opts} ${euser} \ 596 useradd ${opts} ${euser} \
759 -c "added by portage for ${PN}" \ 597 -c "added by portage for ${PN}" \
760 || die "enewuser failed" 598 || die "enewuser failed"
761 else 599 else
762 einfo " - Extra: ${eextra}" 600 einfo " - Extra: $@"
763 useradd ${opts} ${euser} ${eextra} \ 601 useradd ${opts} ${euser} "$@" \
764 || die "enewuser failed" 602 || die "enewuser failed"
765 fi 603 fi
604 ;;
605 esac
606
607 if [[ ! -e ${ROOT}/${ehome} ]] ; then
608 einfo " - Creating ${ehome} in ${ROOT}"
609 mkdir -p "${ROOT}/${ehome}"
610 chown ${euser} "${ROOT}/${ehome}"
611 chmod 755 "${ROOT}/${ehome}"
766 fi 612 fi
613
767 export SANDBOX_ON="${oldsandbox}" 614 export SANDBOX_ON=${oldsandbox}
768
769 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
770 then
771 einfo " - Creating ${ehome} in ${D}"
772 dodir ${ehome}
773 fowners ${euser} ${ehome}
774 fperms 755 ${ehome}
775 fi
776} 615}
777 616
778# Simplify/standardize adding groups to the system 617# Simplify/standardize adding groups to the system
779# vapier@gentoo.org 618# vapier@gentoo.org
780# 619#
809 then 648 then
810 if [ "${egid}" -gt 0 ] 649 if [ "${egid}" -gt 0 ]
811 then 650 then
812 if [ -z "`egetent group ${egid}`" ] 651 if [ -z "`egetent group ${egid}`" ]
813 then 652 then
814 if use macos || use ppc-macos ; then 653 if [[ "${CHOST}" == *-darwin* ]]; then
815 opts="${opts} ${egid}" 654 opts="${opts} ${egid}"
816 else 655 else
817 opts="${opts} -g ${egid}" 656 opts="${opts} -g ${egid}"
818 fi 657 fi
819 else 658 else
833 opts="${opts} ${eextra}" 672 opts="${opts} ${eextra}"
834 673
835 # add the group 674 # add the group
836 local oldsandbox="${SANDBOX_ON}" 675 local oldsandbox="${SANDBOX_ON}"
837 export SANDBOX_ON="0" 676 export SANDBOX_ON="0"
838 if use macos || use ppc-macos ; 677 case ${CHOST} in
839 then 678 *-darwin*)
840 if [ ! -z "${eextra}" ]; 679 if [ ! -z "${eextra}" ];
841 then 680 then
842 einfo "Extra options are not supported on macos yet" 681 einfo "Extra options are not supported on Darwin/OS X yet"
843 einfo "Please report the ebuild along with the info below" 682 einfo "Please report the ebuild along with the info below"
844 einfo "eextra: ${eextra}" 683 einfo "eextra: ${eextra}"
845 die "Required function missing" 684 die "Required function missing"
846 fi 685 fi
847 686
848 # If we need the next available 687 # If we need the next available
849 case ${egid} in 688 case ${egid} in
850 *[!0-9]*) # Non numeric 689 *[!0-9]*) # Non numeric
851 for egid in `jot 898 101`; do 690 for egid in $(seq 101 999); do
852 [ -z "`egetent group ${egid}`" ] && break 691 [ -z "`egetent group ${egid}`" ] && break
853 done 692 done
854 esac 693 esac
855 dscl . create /groups/${egroup} gid ${egid} 694 dscl . create /groups/${egroup} gid ${egid}
856 dscl . create /groups/${egroup} passwd '*' 695 dscl . create /groups/${egroup} passwd '*'
857 elif use x86-fbsd ; then 696 ;;
697
698 *-freebsd*)
858 case ${egid} in 699 case ${egid} in
859 *[!0-9]*) # Non numeric 700 *[!0-9]*) # Non numeric
860 for egid in `jot 898 101`; do 701 for egid in $(seq 101 999); do
861 [ -z "`egetent group ${egid}`" ] && break 702 [ -z "`egetent group ${egid}`" ] && break
862 done 703 done
863 esac 704 esac
864 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed" 705 pw groupadd ${egroup} -g ${egid} || die "enewgroup failed"
865 else 706 ;;
707
708 *-netbsd*)
709 case ${egid} in
710 *[!0-9]*) # Non numeric
711 for egid in $(seq 101 999); do
712 [ -z "`egetent group ${egid}`" ] && break
713 done
714 esac
715 groupadd ${egroup} -g ${egid} || die "enewgroup failed"
716 ;;
717
718 *)
866 groupadd ${opts} ${egroup} || die "enewgroup failed" 719 groupadd ${opts} ${egroup} || die "enewgroup failed"
867 fi 720 ;;
721 esac
868 export SANDBOX_ON="${oldsandbox}" 722 export SANDBOX_ON="${oldsandbox}"
869} 723}
870 724
871# Simple script to replace 'dos2unix' binaries 725# Simple script to replace 'dos2unix' binaries
872# vapier@gentoo.org 726# vapier@gentoo.org
873# 727#
874# edos2unix(file, <more files>...) 728# edos2unix(file, <more files> ...)
875edos2unix() { 729edos2unix() {
876 for f in "$@" 730 for f in "$@"
877 do 731 do
878 cp "${f}" ${T}/edos2unix 732 cp "${f}" ${T}/edos2unix
879 sed 's/\r$//' ${T}/edos2unix > "${f}" 733 sed 's/\r$//' ${T}/edos2unix > "${f}"
880 done 734 done
881} 735}
882 736
737
738##############################################################
739# START: Handle .desktop files and menu entries #
740# maybe this should be separated into a new eclass some time #
741# lanius@gentoo.org #
742##############################################################
743
883# Make a desktop file ! 744# Make a desktop file !
884# Great for making those icons in kde/gnome startmenu ! 745# Great for making those icons in kde/gnome startmenu !
885# Amaze your friends ! Get the women ! Join today ! 746# Amaze your friends ! Get the women ! Join today !
886# gnome2 /usr/share/applications
887# gnome1 /usr/share/gnome/apps/
888# KDE ${KDEDIR}/share/applnk /usr/share/applnk
889# 747#
890# make_desktop_entry(<binary>, [name], [icon], [type], [path]) 748# make_desktop_entry(<binary>, [name], [icon], [type], [path])
891# 749#
892# binary: what binary does the app run with ? 750# binary: what binary does the app run with ?
893# name: the name that will show up in the menu 751# name: the name that will show up in the menu
894# icon: give your little like a pretty little icon ... 752# icon: give your little like a pretty little icon ...
895# this can be relative (to /usr/share/pixmaps) or 753# this can be relative (to /usr/share/pixmaps) or
896# a full path to an icon 754# a full path to an icon
897# type: what kind of application is this ? for categories: 755# type: what kind of application is this ? for categories:
898# http://www.freedesktop.org/standards/menu-spec/ 756# http://www.freedesktop.org/Standards/desktop-entry-spec
899# path: if your app needs to startup in a specific dir 757# path: if your app needs to startup in a specific dir
900make_desktop_entry() { 758make_desktop_entry() {
901 [ -z "$1" ] && eerror "You must specify the executable" && return 1 759 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
902 760
903 local exec="${1}" 761 local exec=${1}
904 local name="${2:-${PN}}" 762 local name=${2:-${PN}}
905 local icon="${3:-${PN}.png}" 763 local icon=${3:-${PN}.png}
906 local type="${4}" 764 local type=${4}
907 local subdir="${6}" 765 local path=${5}
908 local path="${5:-${GAMES_BINDIR}}" 766
909 if [ -z "${type}" ] 767 if [[ -z ${type} ]] ; then
910 then 768 local catmaj=${CATEGORY%%-*}
911 case ${CATEGORY} in 769 local catmin=${CATEGORY##*-}
912 "app-emulation") 770 case ${catmaj} in
913 type=Emulator 771 app)
914 subdir="Emulation" 772 case ${catmin} in
773 admin) type=System;;
774 cdr) type=DiscBurning;;
775 dicts) type=Dictionary;;
776 editors) type=TextEditor;;
777 emacs) type=TextEditor;;
778 emulation) type=Emulator;;
779 laptop) type=HardwareSettings;;
780 office) type=Office;;
781 vim) type=TextEditor;;
782 xemacs) type=TextEditor;;
783 *) type=;;
784 esac
915 ;; 785 ;;
916 "games-"*) 786
917 type=Game 787 dev)
918 subdir="Games" 788 type="Development"
919 ;; 789 ;;
920 "net-"*) 790
921 type=Network 791 games)
922 subdir="${type}" 792 case ${catmin} in
793 action) type=ActionGame;;
794 arcade) type=ArcadeGame;;
795 board) type=BoardGame;;
796 kid) type=KidsGame;;
797 emulation) type=Emulator;;
798 puzzle) type=LogicGame;;
799 rpg) type=RolePlaying;;
800 roguelike) type=RolePlaying;;
801 simulation) type=Simulation;;
802 sports) type=SportsGame;;
803 strategy) type=StrategyGame;;
804 *) type=;;
805 esac
806 type="Game;${type}"
923 ;; 807 ;;
808
809 mail)
810 type="Network;Email"
811 ;;
812
813 media)
814 case ${catmin} in
815 gfx) type=Graphics;;
816 radio) type=Tuner;;
817 sound) type=Audio;;
818 tv) type=TV;;
819 video) type=Video;;
820 *) type=;;
821 esac
822 type="AudioVideo;${type}"
823 ;;
824
825 net)
826 case ${catmin} in
827 dialup) type=Dialup;;
828 ftp) type=FileTransfer;;
829 im) type=InstantMessaging;;
830 irc) type=IRCClient;;
831 mail) type=Email;;
832 news) type=News;;
833 nntp) type=News;;
834 p2p) type=FileTransfer;;
835 *) type=;;
836 esac
837 type="Network;${type}"
838 ;;
839
840 sci)
841 case ${catmin} in
842 astro*) type=Astronomoy;;
843 bio*) type=Biology;;
844 calc*) type=Calculator;;
845 chem*) type=Chemistry;;
846 geo*) type=Geology;;
847 math*) type=Math;;
848 *) type=;;
849 esac
850 type="Science;${type}"
851 ;;
852
853 www)
854 case ${catmin} in
855 client) type=WebBrowser;;
856 *) type=;;
857 esac
858 type="Network"
859 ;;
860
924 *) 861 *)
925 type= 862 type=
926 subdir=
927 ;; 863 ;;
928 esac 864 esac
929 fi 865 fi
866 if [ "${SLOT}" == "0" ] ; then
867 local desktop_name="${PN}"
868 else
869 local desktop_name="${PN}-${SLOT}"
870 fi
930 local desktop="${T}/${exec}.desktop" 871 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
931 872
932echo "[Desktop Entry] 873echo "[Desktop Entry]
933Encoding=UTF-8 874Encoding=UTF-8
934Version=0.9.2 875Version=0.9.2
935Name=${name} 876Name=${name}
938Exec=${exec} 879Exec=${exec}
939Path=${path} 880Path=${path}
940Icon=${icon} 881Icon=${icon}
941Categories=Application;${type};" > "${desktop}" 882Categories=Application;${type};" > "${desktop}"
942 883
943 if [ -d "/usr/share/applications" ] 884 (
944 then 885 # wrap the env here so that the 'insinto' call
886 # doesn't corrupt the env of the caller
945 insinto /usr/share/applications 887 insinto /usr/share/applications
946 doins "${desktop}" 888 doins "${desktop}"
947 fi 889 )
890}
948 891
949 #if [ -d "/usr/share/gnome/apps" ] 892# Make a GDM/KDM Session file
950 #then 893#
951 # insinto /usr/share/gnome/apps/Games 894# make_desktop_entry(<title>, <command>)
952 # doins ${desktop} 895# title: File to execute to start the Window Manager
953 #fi 896# command: Name of the Window Manager
954 897
955 #if [ ! -z "`ls /usr/kde/* 2>/dev/null`" ] 898make_session_desktop() {
956 #then 899 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
957 # for ver in /usr/kde/* 900 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
958 # do
959 # insinto ${ver}/share/applnk/Games
960 # doins ${desktop}
961 # done
962 #fi
963 901
964 if [ -d "/usr/share/applnk" ] 902 local title=$1
965 then 903 local command=$2
966 insinto /usr/share/applnk/${subdir} 904 local desktop=${T}/${wm}.desktop
905
906echo "[Desktop Entry]
907Encoding=UTF-8
908Name=${title}
909Comment=This session logs you into ${title}
910Exec=${command}
911TryExec=${command}
912Type=Application" > "${desktop}"
913
914 insinto /usr/share/xsessions
967 doins "${desktop}" 915 doins "${desktop}"
916}
917
918domenu() {
919 local i j
920 insinto /usr/share/applications
921 for i in "$@" ; do
922 if [[ -f ${i} ]] ; then
923 doins "${i}"
924 elif [[ -d ${i} ]] ; then
925 for j in "${i}"/*.desktop ; do
926 doins "${j}"
927 done
968 fi 928 fi
969 929 done
970 return 0
971} 930}
931newmenu() {
932 insinto /usr/share/applications
933 newins "$1" "$2"
934}
935
936doicon() {
937 local i j
938 insinto /usr/share/pixmaps
939 for i in "$@" ; do
940 if [[ -f ${i} ]] ; then
941 doins "${i}"
942 elif [[ -d ${i} ]] ; then
943 for j in "${i}"/*.png ; do
944 doins "${j}"
945 done
946 fi
947 done
948}
949newicon() {
950 insinto /usr/share/pixmaps
951 newins "$1" "$2"
952}
953
954##############################################################
955# END: Handle .desktop files and menu entries #
956##############################################################
957
972 958
973# for internal use only (unpack_pdv and unpack_makeself) 959# for internal use only (unpack_pdv and unpack_makeself)
974find_unpackable_file() { 960find_unpackable_file() {
975 local src="$1" 961 local src=$1
976 if [ -z "${src}" ] 962 if [[ -z ${src} ]] ; then
977 then
978 src="${DISTDIR}/${A}" 963 src=${DISTDIR}/${A}
979 else 964 else
980 if [ -e "${DISTDIR}/${src}" ] 965 if [[ -e ${DISTDIR}/${src} ]] ; then
981 then
982 src="${DISTDIR}/${src}" 966 src=${DISTDIR}/${src}
983 elif [ -e "${PWD}/${src}" ] 967 elif [[ -e ${PWD}/${src} ]] ; then
984 then
985 src="${PWD}/${src}" 968 src=${PWD}/${src}
986 elif [ -e "${src}" ] 969 elif [[ -e ${src} ]] ; then
987 then
988 src="${src}" 970 src=${src}
989 fi
990 fi 971 fi
991 [ ! -e "${src}" ] && die "Could not find requested archive ${src}" 972 fi
973 [[ ! -e ${src} ]] && return 1
992 echo "${src}" 974 echo "${src}"
993} 975}
994 976
995# Unpack those pesky pdv generated files ... 977# Unpack those pesky pdv generated files ...
996# They're self-unpacking programs with the binary package stuffed in 978# They're self-unpacking programs with the binary package stuffed in
1011# lseek 993# lseek
1012# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin 994# root@vapier 0 pdv_unpack # strace -elseek ./hldsupdatetool.bin
1013# lseek(3, -4, SEEK_END) = 2981250 995# lseek(3, -4, SEEK_END) = 2981250
1014# thus we would pass in the value of '4' as the second parameter. 996# thus we would pass in the value of '4' as the second parameter.
1015unpack_pdv() { 997unpack_pdv() {
1016 local src="`find_unpackable_file $1`" 998 local src=$(find_unpackable_file $1)
1017 local sizeoff_t="$2" 999 local sizeoff_t=$2
1018 1000
1001 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1019 [ -z "${sizeoff_t}" ] && die "No idea what off_t size was used for this pdv :(" 1002 [[ -z ${sizeoff_t} ]] && die "No idea what off_t size was used for this pdv :("
1020 1003
1021 local shrtsrc="`basename ${src}`" 1004 local shrtsrc="`basename ${src}`"
1022 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1005 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1023 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"` 1006 local metaskip=`tail -c ${sizeoff_t} ${src} | hexdump -e \"%i\"`
1024 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"` 1007 local tailskip=`tail -c $((${sizeoff_t}*2)) ${src} | head -c ${sizeoff_t} | hexdump -e \"%i\"`
1025 1008
1026 # grab metadata for debug reasons 1009 # grab metadata for debug reasons
1027 local metafile="`mymktemp ${T}`" 1010 local metafile="$(emktemp)"
1028 tail -c +$((${metaskip}+1)) ${src} > ${metafile} 1011 tail -c +$((${metaskip}+1)) ${src} > ${metafile}
1029 1012
1030 # rip out the final file name from the metadata 1013 # rip out the final file name from the metadata
1031 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`" 1014 local datafile="`tail -c +$((${metaskip}+1)) ${src} | strings | head -n 1`"
1032 datafile="`basename ${datafile}`" 1015 datafile="`basename ${datafile}`"
1033 1016
1034 # now lets uncompress/untar the file if need be 1017 # now lets uncompress/untar the file if need be
1035 local tmpfile="`mymktemp ${T}`" 1018 local tmpfile="$(emktemp)"
1036 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile} 1019 tail -c +$((${tailskip}+1)) ${src} 2>/dev/null | head -c 512 > ${tmpfile}
1037 1020
1038 local iscompressed="`file -b ${tmpfile}`" 1021 local iscompressed="`file -b ${tmpfile}`"
1039 if [ "${iscompressed:0:8}" == "compress" ] ; then 1022 if [ "${iscompressed:0:8}" == "compress" ] ; then
1040 iscompressed=1 1023 iscompressed=1
1090# Usage: unpack_makeself [file to unpack] [offset] [tail|dd] 1073# Usage: unpack_makeself [file to unpack] [offset] [tail|dd]
1091# - If the file is not specified then unpack will utilize ${A}. 1074# - If the file is not specified then unpack will utilize ${A}.
1092# - If the offset is not specified then we will attempt to extract 1075# - If the offset is not specified then we will attempt to extract
1093# the proper offset from the script itself. 1076# the proper offset from the script itself.
1094unpack_makeself() { 1077unpack_makeself() {
1095 local src="$(find_unpackable_file "$1")" 1078 local src=$(find_unpackable_file "$1")
1096 local skip="$2" 1079 local skip=$2
1097 local exe="$3" 1080 local exe=$3
1098 1081
1082 [[ -z ${src} ]] && die "Could not locate source for '$1'"
1083
1099 local shrtsrc="$(basename "${src}")" 1084 local shrtsrc=$(basename "${src}")
1100 echo ">>> Unpacking ${shrtsrc} to ${PWD}" 1085 echo ">>> Unpacking ${shrtsrc} to ${PWD}"
1101 if [ -z "${skip}" ] 1086 if [ -z "${skip}" ]
1102 then 1087 then
1103 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`" 1088 local ver="`grep -a '#.*Makeself' ${src} | awk '{print $NF}'`"
1104 local skip=0 1089 local skip=0
1142 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";; 1127 dd) exe="dd ibs=${skip} skip=1 obs=1024 conv=sync if='${src}'";;
1143 *) die "makeself cant handle exe '${exe}'" 1128 *) die "makeself cant handle exe '${exe}'"
1144 esac 1129 esac
1145 1130
1146 # lets grab the first few bytes of the file to figure out what kind of archive it is 1131 # lets grab the first few bytes of the file to figure out what kind of archive it is
1147 local tmpfile="$(mymktemp "${T}")" 1132 local tmpfile="$(emktemp)"
1148 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}" 1133 eval ${exe} 2>/dev/null | head -c 512 > "${tmpfile}"
1149 local filetype="$(file -b "${tmpfile}")" 1134 local filetype="$(file -b "${tmpfile}")"
1150 case ${filetype} in 1135 case ${filetype} in
1151 *tar\ archive) 1136 *tar\ archive)
1152 eval ${exe} | tar --no-same-owner -xf - 1137 eval ${exe} | tar --no-same-owner -xf -
1175check_license() { 1160check_license() {
1176 local lic=$1 1161 local lic=$1
1177 if [ -z "${lic}" ] ; then 1162 if [ -z "${lic}" ] ; then
1178 lic="${PORTDIR}/licenses/${LICENSE}" 1163 lic="${PORTDIR}/licenses/${LICENSE}"
1179 else 1164 else
1180 if [ -e "${PORTDIR}/licenses/${src}" ] ; then 1165 if [ -e "${PORTDIR}/licenses/${lic}" ] ; then
1181 lic="${PORTDIR}/licenses/${src}" 1166 lic="${PORTDIR}/licenses/${lic}"
1182 elif [ -e "${PWD}/${src}" ] ; then 1167 elif [ -e "${PWD}/${lic}" ] ; then
1183 lic="${PWD}/${src}" 1168 lic="${PWD}/${lic}"
1184 elif [ -e "${src}" ] ; then 1169 elif [ -e "${lic}" ] ; then
1185 lic="${src}" 1170 lic="${lic}"
1186 fi
1187 fi 1171 fi
1172 fi
1188 [ ! -f "${lic}" ] && die "Could not find requested license ${src}" 1173 [ ! -f "${lic}" ] && die "Could not find requested license ${lic}"
1189 local l="`basename ${lic}`" 1174 local l="`basename ${lic}`"
1190 1175
1191 # here is where we check for the licenses the user already 1176 # here is where we check for the licenses the user already
1192 # accepted ... if we don't find a match, we make the user accept 1177 # accepted ... if we don't find a match, we make the user accept
1193 local shopts=$- 1178 local shopts=$-
1199 return 0 1184 return 0
1200 fi 1185 fi
1201 done 1186 done
1202 set +o noglob; set -$shopts #reset old shell opts 1187 set +o noglob; set -$shopts #reset old shell opts
1203 1188
1204 local licmsg="`mymktemp ${T}`" 1189 local licmsg="$(emktemp)"
1205 cat << EOF > ${licmsg} 1190 cat << EOF > ${licmsg}
1206********************************************************** 1191**********************************************************
1207The following license outlines the terms of use of this 1192The following license outlines the terms of use of this
1208package. You MUST accept this license for installation to 1193package. You MUST accept this license for installation to
1209continue. When you are done viewing, hit 'q'. If you 1194continue. When you are done viewing, hit 'q'. If you
1257 export CDROM_TOTAL_CDS=${cdcnt} 1242 export CDROM_TOTAL_CDS=${cdcnt}
1258 export CDROM_CURRENT_CD=1 1243 export CDROM_CURRENT_CD=1
1259 1244
1260 # now we see if the user gave use CD_ROOT ... 1245 # now we see if the user gave use CD_ROOT ...
1261 # if they did, let's just believe them that it's correct 1246 # if they did, let's just believe them that it's correct
1262 if [ ! -z "${CD_ROOT}" ] ; then 1247 if [[ ! -z ${CD_ROOT} ]] ; then
1263 export CDROM_ROOT="${CD_ROOT}" 1248 export CDROM_ROOT=${CD_ROOT}
1264 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1249 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1265 return 1250 return
1266 fi 1251 fi
1267 # do the same for CD_ROOT_X 1252 # do the same for CD_ROOT_X
1268 if [ ! -z "${CD_ROOT_1}" ] ; then 1253 if [[ ! -z ${CD_ROOT_1} ]] ; then
1269 local var= 1254 local var=
1270 cdcnt=0 1255 cdcnt=0
1271 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1256 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1272 cdcnt=$((cdcnt + 1)) 1257 cdcnt=$((cdcnt + 1))
1273 var="CD_ROOT_${cdcnt}" 1258 var="CD_ROOT_${cdcnt}"
1274 if [ -z "${!var}" ] ; then 1259 if [[ -z ${!var} ]] ; then
1275 eerror "You must either use just the CD_ROOT" 1260 eerror "You must either use just the CD_ROOT"
1276 eerror "or specify ALL the CD_ROOT_X variables." 1261 eerror "or specify ALL the CD_ROOT_X variables."
1277 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables." 1262 eerror "In this case, you will need ${CDROM_TOTAL_CDS} CD_ROOT_X variables."
1278 die "could not locate CD_ROOT_${cdcnt}" 1263 die "could not locate CD_ROOT_${cdcnt}"
1279 fi 1264 fi
1282 export CDROM_ROOT=${CDROM_ROOTS_1} 1267 export CDROM_ROOT=${CDROM_ROOTS_1}
1283 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1268 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1284 return 1269 return
1285 fi 1270 fi
1286 1271
1287 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1272 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1288 einfon "This ebuild will need the " 1273 einfon "This ebuild will need the "
1289 if [ -z "${CDROM_NAME}" ] ; then 1274 if [[ -z ${CDROM_NAME} ]] ; then
1290 echo "cdrom for ${PN}." 1275 echo "cdrom for ${PN}."
1291 else 1276 else
1292 echo "${CDROM_NAME}." 1277 echo "${CDROM_NAME}."
1293 fi 1278 fi
1294 echo 1279 echo
1295 einfo "If you do not have the CD, but have the data files" 1280 einfo "If you do not have the CD, but have the data files"
1296 einfo "mounted somewhere on your filesystem, just export" 1281 einfo "mounted somewhere on your filesystem, just export"
1297 einfo "the variable CD_ROOT so that it points to the" 1282 einfo "the variable CD_ROOT so that it points to the"
1298 einfo "directory containing the files." 1283 einfo "directory containing the files."
1299 echo 1284 echo
1285 einfo "For example:"
1286 einfo "export CD_ROOT=/mnt/cdrom"
1287 echo
1300 else 1288 else
1301 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds." 1289 einfo "This package will need access to ${CDROM_TOTAL_CDS} cds."
1302 cdcnt=0 1290 cdcnt=0
1303 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1291 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1304 cdcnt=$((cdcnt + 1)) 1292 cdcnt=$((cdcnt + 1))
1305 var="CDROM_NAME_${cdcnt}" 1293 var="CDROM_NAME_${cdcnt}"
1306 [ ! -z "${!var}" ] && einfo " CD ${cdcnt}: ${!var}" 1294 [[ ! -z ${!var} ]] && einfo " CD ${cdcnt}: ${!var}"
1307 done 1295 done
1308 echo 1296 echo
1309 einfo "If you do not have the CDs, but have the data files" 1297 einfo "If you do not have the CDs, but have the data files"
1310 einfo "mounted somewhere on your filesystem, just export" 1298 einfo "mounted somewhere on your filesystem, just export"
1311 einfo "the following variables so they point to the right place:" 1299 einfo "the following variables so they point to the right place:"
1312 einfon "" 1300 einfon ""
1313 cdcnt=0 1301 cdcnt=0
1314 while [ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ] ; do 1302 while [[ ${cdcnt} -lt ${CDROM_TOTAL_CDS} ]] ; do
1315 cdcnt=$((cdcnt + 1)) 1303 cdcnt=$((cdcnt + 1))
1316 echo -n " CD_ROOT_${cdcnt}" 1304 echo -n " CD_ROOT_${cdcnt}"
1317 done 1305 done
1318 echo 1306 echo
1319 einfo "Or, if you have all the files in the same place, or" 1307 einfo "Or, if you have all the files in the same place, or"
1320 einfo "you only have one cdrom, you can export CD_ROOT" 1308 einfo "you only have one cdrom, you can export CD_ROOT"
1321 einfo "and that place will be used as the same data source" 1309 einfo "and that place will be used as the same data source"
1322 einfo "for all the CDs." 1310 einfo "for all the CDs."
1323 echo 1311 echo
1312 einfo "For example:"
1313 einfo "export CD_ROOT_1=/mnt/cdrom"
1314 echo
1324 fi 1315 fi
1325 export CDROM_CURRENT_CD=0 1316 export CDROM_CURRENT_CD=0
1326 cdrom_load_next_cd 1317 cdrom_load_next_cd
1327} 1318}
1328 1319
1332# remember, you can only go forward in the cd chain, you can't go back. 1323# remember, you can only go forward in the cd chain, you can't go back.
1333cdrom_load_next_cd() { 1324cdrom_load_next_cd() {
1334 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1)) 1325 export CDROM_CURRENT_CD=$((CDROM_CURRENT_CD + 1))
1335 local var= 1326 local var=
1336 1327
1337 if [ ! -z "${CD_ROOT}" ] ; then 1328 if [[ ! -z ${CD_ROOT} ]] ; then
1338 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}" 1329 einfo "Using same root as before for CD #${CDROM_CURRENT_CD}"
1339 return 1330 return
1340 fi 1331 fi
1341 1332
1342 unset CDROM_ROOT 1333 unset CDROM_ROOT
1343 var=CDROM_ROOTS_${CDROM_CURRENT_CD} 1334 var=CDROM_ROOTS_${CDROM_CURRENT_CD}
1344 if [ -z "${!var}" ] ; then 1335 if [[ -z ${!var} ]] ; then
1345 var="CDROM_CHECK_${CDROM_CURRENT_CD}" 1336 var="CDROM_CHECK_${CDROM_CURRENT_CD}"
1346 cdrom_locate_file_on_cd ${!var} 1337 cdrom_locate_file_on_cd ${!var}
1347 else 1338 else
1348 export CDROM_ROOT="${!var}" 1339 export CDROM_ROOT=${!var}
1349 fi 1340 fi
1350 1341
1351 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}" 1342 einfo "Found CD #${CDROM_CURRENT_CD} root at ${CDROM_ROOT}"
1352} 1343}
1353 1344
1357# found, then a message asking for the user to insert the cdrom will be 1348# found, then a message asking for the user to insert the cdrom will be
1358# displayed and we'll hang out here until: 1349# displayed and we'll hang out here until:
1359# (1) the file is found on a mounted cdrom 1350# (1) the file is found on a mounted cdrom
1360# (2) the user hits CTRL+C 1351# (2) the user hits CTRL+C
1361cdrom_locate_file_on_cd() { 1352cdrom_locate_file_on_cd() {
1362 while [ -z "${CDROM_ROOT}" ] ; do 1353 while [[ -z ${CDROM_ROOT} ]] ; do
1363 local dir="$(dirname ${@})" 1354 local dir=$(dirname "$*")
1364 local file="$(basename ${@})" 1355 local file=$(basename "$*")
1365 local mline="" 1356 local mline=""
1366 local showedmsg=0 1357 local showedmsg=0
1367 1358
1368 for mline in `mount | egrep -e '(iso|cdrom)' | awk '{print $3}'` ; do 1359 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1369 [ -d "${mline}/${dir}" ] || continue 1360 [[ -d ${mline}/${dir} ]] || continue
1370 [ ! -z "$(find ${mline}/${dir} -iname ${file} -maxdepth 1)" ] \ 1361 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1371 && export CDROM_ROOT=${mline} 1362 && export CDROM_ROOT=${mline}
1372 done 1363 done
1373 1364
1374 if [ -z "${CDROM_ROOT}" ] ; then 1365 if [[ -z ${CDROM_ROOT} ]] ; then
1375 echo 1366 echo
1376 if [ ${showedmsg} -eq 0 ] ; then 1367 if [[ ${showedmsg} -eq 0 ]] ; then
1377 if [ ${CDROM_TOTAL_CDS} -eq 1 ] ; then 1368 if [[ ${CDROM_TOTAL_CDS} -eq 1 ]] ; then
1378 if [ -z "${CDROM_NAME}" ] ; then 1369 if [[ -z ${CDROM_NAME} ]] ; then
1379 einfo "Please insert the cdrom for ${PN} now !" 1370 einfo "Please insert the cdrom for ${PN} now !"
1380 else 1371 else
1381 einfo "Please insert the ${CDROM_NAME} cdrom now !" 1372 einfo "Please insert the ${CDROM_NAME} cdrom now !"
1382 fi 1373 fi
1383 else 1374 else
1384 if [ -z "${CDROM_NAME_1}" ] ; then 1375 if [[ -z ${CDROM_NAME_1} ]] ; then
1385 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !" 1376 einfo "Please insert cd #${CDROM_CURRENT_CD} for ${PN} now !"
1386 else 1377 else
1387 local var="CDROM_NAME_${CDROM_CURRENT_CD}" 1378 local var="CDROM_NAME_${CDROM_CURRENT_CD}"
1388 einfo "Please insert+mount the ${!var} cdrom now !" 1379 einfo "Please insert+mount the ${!var} cdrom now !"
1389 fi 1380 fi
1390 fi 1381 fi
1391 showedmsg=1 1382 showedmsg=1
1392 fi 1383 fi
1393 einfo "Press return to scan for the cd again" 1384 einfo "Press return to scan for the cd again"
1394 einfo "or hit CTRL+C to abort the emerge." 1385 einfo "or hit CTRL+C to abort the emerge."
1386 echo
1387 einfo "If you are having trouble with the detection"
1388 einfo "of your CD, it is possible that you do not have"
1389 einfo "Joliet support enabled in your kernel. Please"
1390 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1395 read 1391 read
1396 fi 1392 fi
1397 done 1393 done
1398} 1394}
1399 1395
1409# directories and uses the intersection of the lists. 1405# directories and uses the intersection of the lists.
1410# The -u builds a list of po files found in all the 1406# The -u builds a list of po files found in all the
1411# directories and uses the union of the lists. 1407# directories and uses the union of the lists.
1412strip-linguas() { 1408strip-linguas() {
1413 local ls newls 1409 local ls newls
1414 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1410 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1415 local op="$1"; shift 1411 local op=$1; shift
1416 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1412 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1417 local d f 1413 local d f
1418 for d in "$@" ; do 1414 for d in "$@" ; do
1419 if [ "${op}" == "-u" ] ; then 1415 if [[ ${op} == "-u" ]] ; then
1420 newls="${ls}" 1416 newls=${ls}
1421 else 1417 else
1422 newls="" 1418 newls=""
1423 fi 1419 fi
1424 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1420 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1425 if [ "${op}" == "-i" ] ; then 1421 if [[ ${op} == "-i" ]] ; then
1426 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1422 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1427 else 1423 else
1428 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1424 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1429 fi 1425 fi
1430 done 1426 done
1431 ls="${newls}" 1427 ls=${newls}
1432 done 1428 done
1433 ls="${ls//.po}" 1429 ls=${ls//.po}
1434 else 1430 else
1435 ls="$@" 1431 ls=$@
1436 fi 1432 fi
1437 1433
1438 ls=" ${ls} " 1434 ls=" ${ls} "
1439 newls="" 1435 newls=""
1440 for f in ${LINGUAS} ; do 1436 for f in ${LINGUAS} ; do
1441 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1437 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1442 nl="${newls} ${f}" 1438 newls="${newls} ${f}"
1443 else 1439 else
1444 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1440 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1445 fi 1441 fi
1446 done 1442 done
1447 if [ -z "${newls}" ] ; then 1443 if [[ -z ${newls} ]] ; then
1448 unset LINGUAS 1444 export LINGUAS=""
1449 else 1445 else
1450 export LINGUAS="${newls}" 1446 export LINGUAS=${newls:1}
1451 fi 1447 fi
1452} 1448}
1453 1449
1454# moved from kernel.eclass since they are generally useful outside of 1450# moved from kernel.eclass since they are generally useful outside of
1455# kernel.eclass -iggy (20041002) 1451# kernel.eclass -iggy (20041002)
1457# the following functions are useful in kernel module ebuilds, etc. 1453# the following functions are useful in kernel module ebuilds, etc.
1458# for an example see ivtv or drbd ebuilds 1454# for an example see ivtv or drbd ebuilds
1459 1455
1460# set's ARCH to match what the kernel expects 1456# set's ARCH to match what the kernel expects
1461set_arch_to_kernel() { 1457set_arch_to_kernel() {
1458 i=10
1459 while ((i--)) ; do
1460 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1461 done
1462 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1462 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1463 case ${ARCH} in 1463 case ${ARCH} in
1464 x86) export ARCH="i386";; 1464 x86) export ARCH="i386";;
1465 amd64) export ARCH="x86_64";; 1465 amd64) export ARCH="x86_64";;
1466 hppa) export ARCH="parisc";; 1466 hppa) export ARCH="parisc";;
1467 mips) export ARCH="mips";; 1467 mips) export ARCH="mips";;
1468 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!
1468 *) export ARCH="${ARCH}";; 1469 *) export ARCH="${ARCH}";;
1469 esac 1470 esac
1470} 1471}
1471 1472
1472# set's ARCH back to what portage expects 1473# set's ARCH back to what portage expects
1473set_arch_to_portage() { 1474set_arch_to_portage() {
1475 i=10
1476 while ((i--)) ; do
1477 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1478 done
1474 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1479 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1475} 1480}
1476 1481
1477# Jeremy Huddleston <eradicator@gentoo.org>: 1482# Jeremy Huddleston <eradicator@gentoo.org>:
1478# preserve_old_lib /path/to/libblah.so.0 1483# preserve_old_lib /path/to/libblah.so.0
1508 touch ${D}${LIB} 1513 touch ${D}${LIB}
1509 fi 1514 fi
1510} 1515}
1511 1516
1512preserve_old_lib_notify() { 1517preserve_old_lib_notify() {
1513 LIB=$1 1518 LIB=$1
1514 1519
1515 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1520 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1516 SONAME=`basename ${LIB}` 1521 SONAME=`basename ${LIB}`
1517 1522
1518 einfo "An old version of an installed library was detected on your system." 1523 ewarn "An old version of an installed library was detected on your system."
1519 einfo "In order to avoid breaking packages that link against is, this older version" 1524 ewarn "In order to avoid breaking packages that link against it, this older version"
1520 einfo "is not being removed. In order to make full use of this newer version," 1525 ewarn "is not being removed. In order to make full use of this newer version,"
1521 einfo "you will need to execute the following command:" 1526 ewarn "you will need to execute the following command:"
1522 einfo " revdep-rebuild --soname ${SONAME}" 1527 ewarn " revdep-rebuild --soname ${SONAME}"
1523 einfo 1528 ewarn
1524 einfo "After doing that, you can safely remove ${LIB}" 1529 ewarn "After doing that, you can safely remove ${LIB}"
1525 fi 1530 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1531 fi
1526} 1532}
1533
1534# Hack for people to figure out if a package was built with
1535# certain USE flags
1536#
1537# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1538# ex: built_with_use xchat gtk2
1539#
1540# Flags: -a all USE flags should be utilized
1541# -o at least one USE flag should be utilized
1542# Note: the default flag is '-a'
1543built_with_use() {
1544 local opt=$1
1545 [[ ${opt:0:1} = "-" ]] && shift || opt="-a"
1546
1547 local PKG=$(best_version $1)
1548 shift
1549
1550 local USEFILE="${ROOT}/var/db/pkg/${PKG}/USE"
1551 [[ ! -e ${USEFILE} ]] && return 1
1552
1553 local USE_BUILT=$(<${USEFILE})
1554 while [[ $# -gt 0 ]] ; do
1555 if [[ ${opt} = "-o" ]] ; then
1556 has $1 ${USE_BUILT} && return 0
1557 else
1558 has $1 ${USE_BUILT} || return 1
1559 fi
1560 shift
1561 done
1562 [[ ${opt} = "-a" ]]
1563}
1564
1565# Many configure scripts wrongly bail when a C++ compiler
1566# could not be detected. #73450
1567epunt_cxx() {
1568 local dir=$1
1569 [[ -z ${dir} ]] && dir=${S}
1570 ebegin "Removing useless C++ checks"
1571 local f
1572 for f in $(find ${dir} -name configure) ; do
1573 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1574 done
1575 eend 0
1576}
1577
1578# dopamd <file> [more files]
1579#
1580# Install pam auth config file in /etc/pam.d
1581dopamd() {
1582 [[ -z $1 ]] && die "dopamd requires at least one argument"
1583
1584 use pam || return 0
1585
1586 INSDESTTREE=/etc/pam.d \
1587 doins "$@" || die "failed to install $@"
1588}
1589# newpamd <old name> <new name>
1590#
1591# Install pam file <old name> as <new name> in /etc/pam.d
1592newpamd() {
1593 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1594
1595 use pam || return 0
1596
1597 INSDESTTREE=/etc/pam.d \
1598 newins "$1" "$2" || die "failed to install $1 as $2"
1599}
1600
1601# make a wrapper script ...
1602# NOTE: this was originally games_make_wrapper, but I noticed other places where
1603# this could be used, so I have moved it here and made it not games-specific
1604# -- wolf31o2
1605# $1 == wrapper name
1606# $2 == binary to run
1607# $3 == directory to chdir before running binary
1608# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1609# $5 == path for wrapper
1610make_wrapper() {
1611 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1612 local tmpwrapper=$(emktemp)
1613 # We don't want to quote ${bin} so that people can pass complex
1614 # things as $bin ... "./someprog --args"
1615 cat << EOF > "${tmpwrapper}"
1616#!/bin/sh
1617cd "${chdir:-.}"
1618if [ "\${LD_LIBRARY_PATH+set}" = "set" ] && [ -n "${libdir}" ] ; then
1619 export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1620fi
1621exec ${bin} "\$@"
1622EOF
1623 chmod go+rx "${tmpwrapper}"
1624 if [[ -n ${path} ]] ; then
1625 exeinto "${path}"
1626 newexe "${tmpwrapper}" "${wrapper}"
1627 else
1628 newbin "${tmpwrapper}" "${wrapper}"
1629 fi
1630}

Legend:
Removed from v.1.112  
changed lines
  Added in v.1.206

  ViewVC Help
Powered by ViewVC 1.1.20