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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.144  
changed lines
  Added in v.1.218

  ViewVC Help
Powered by ViewVC 1.1.20