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

Diff of /eclass/eutils.eclass

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

Revision 1.143 Revision 1.194
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.143 2005/01/26 16:19:12 ka0ttic Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.194 2005/08/09 22:40:39 vapier Exp $
4# 4#
5# Author: Martin Schlemmer <azarah@gentoo.org> 5# Author: Martin Schlemmer <azarah@gentoo.org>
6# 6#
7# This eclass is for general purpose functions that most ebuilds 7# This eclass is for general purpose functions that most ebuilds
8# have to implement themselves. 8# have to implement themselves.
9# 9#
10# NB: If you add anything, please comment it! 10# NB: If you add anything, please comment it!
11 11
12inherit multilib 12inherit multilib
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 18
20# 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
21# 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
65gen_usr_ldscript() { 64gen_usr_ldscript() {
66 local libdir="$(get_libdir)" 65 local libdir="$(get_libdir)"
67 # Just make sure it exists 66 # Just make sure it exists
68 dodir /usr/${libdir} 67 dodir /usr/${libdir}
69 68
69 for lib in "${@}" ; do
70 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 70 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
71/* GNU ld script 71 /* GNU ld script
72 Because Gentoo have critical dynamic libraries 72 Since Gentoo has critical dynamic libraries
73 in /lib, and the static versions in /usr/lib, we 73 in /lib, and the static versions in /usr/lib,
74 need to have a "fake" dynamic lib in /usr/lib, 74 we need to have a "fake" dynamic lib in /usr/lib,
75 otherwise we run into linking problems. 75 otherwise we run into linking problems.
76 See bug #4411 on http://bugs.gentoo.org/ for 76
77 more info. */ 77 See bug http://bugs.gentoo.org/4411 for more info.
78 */
78GROUP ( /${libdir}/${1} ) 79 GROUP ( /${libdir}/${lib} )
79END_LDSCRIPT 80 END_LDSCRIPT
80 fperms a+x "/usr/${libdir}/${1}" 81 fperms a+x "/usr/${libdir}/${lib}"
82 done
81} 83}
82 84
83# 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()
84# 87#
85# <azarah@gentoo.org> (11 Nov 2002) 88# <azarah@gentoo.org> (11 Nov 2002)
86# 89#
87draw_line() { 90draw_line() {
88 local i=0 91 local i=0
114EPATCH_SOURCE="${WORKDIR}/patch" 117EPATCH_SOURCE="${WORKDIR}/patch"
115# Default extension for patches 118# Default extension for patches
116EPATCH_SUFFIX="patch.bz2" 119EPATCH_SUFFIX="patch.bz2"
117# Default options for patch 120# Default options for patch
118# 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
119EPATCH_OPTS="-g0" 122# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
123EPATCH_OPTS="-g0 --no-backup-if-mismatch"
120# 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,
121# and not the full path .. 125# and not the full path ..
122EPATCH_EXCLUDE="" 126EPATCH_EXCLUDE=""
123# Change the printed message for a single patch. 127# Change the printed message for a single patch.
124EPATCH_SINGLE_MSG="" 128EPATCH_SINGLE_MSG=""
129# Change the printed message for multiple patches.
130EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
125# Force applying bulk patches even if not following the style: 131# Force applying bulk patches even if not following the style:
126# 132#
127# ??_${ARCH}_foo.${EPATCH_SUFFIX} 133# ??_${ARCH}_foo.${EPATCH_SUFFIX}
128# 134#
129EPATCH_FORCE="no" 135EPATCH_FORCE="no"
170 local x="" 176 local x=""
171 177
172 if [ "$#" -gt 1 ] 178 if [ "$#" -gt 1 ]
173 then 179 then
174 local m="" 180 local m=""
175 einfo "${#} patches to apply ..."
176 for m in "$@" ; do 181 for m in "$@" ; do
177 epatch "${m}" 182 epatch "${m}"
178 done 183 done
179 return 0 184 return 0
180 fi 185 fi
234 ;; 239 ;;
235 esac 240 esac
236 241
237 if [ "${SINGLE_PATCH}" = "no" ] 242 if [ "${SINGLE_PATCH}" = "no" ]
238 then 243 then
239 einfo "Applying various patches (bugfixes/updates) ..." 244 einfo "${EPATCH_MULTI_MSG}"
240 fi 245 fi
241 for x in ${EPATCH_SOURCE} 246 for x in ${EPATCH_SOURCE}
242 do 247 do
243 # New ARCH dependant patch naming scheme ... 248 # New ARCH dependant patch naming scheme ...
244 # 249 #
245 # ???_arch_foo.patch 250 # ???_arch_foo.patch
246 # 251 #
247 if [ -f ${x} ] && \ 252 if [ -f ${x} ] && \
248 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 253 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
249 [ "${EPATCH_FORCE}" = "yes" ]) 254 [ "${EPATCH_FORCE}" = "yes" ])
250 then 255 then
251 local count=0 256 local count=0
252 local popts="${EPATCH_OPTS}" 257 local popts="${EPATCH_OPTS}"
258 local patchname=${x##*/}
253 259
254 if [ -n "${EPATCH_EXCLUDE}" ] 260 if [ -n "${EPATCH_EXCLUDE}" ]
255 then 261 then
256 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 262 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
257 then 263 then
258 continue 264 continue
259 fi 265 fi
260 fi 266 fi
261 267
263 then 269 then
264 if [ -n "${EPATCH_SINGLE_MSG}" ] 270 if [ -n "${EPATCH_SINGLE_MSG}" ]
265 then 271 then
266 einfo "${EPATCH_SINGLE_MSG}" 272 einfo "${EPATCH_SINGLE_MSG}"
267 else 273 else
268 einfo "Applying ${x##*/} ..." 274 einfo "Applying ${patchname} ..."
269 fi 275 fi
270 else 276 else
271 einfo " ${x##*/} ..." 277 einfo " ${patchname} ..."
272 fi 278 fi
273 279
274 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 280 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 281 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
276 282
277 # Allow for prefix to differ ... im lazy, so shoot me :/ 283 # Allow for prefix to differ ... im lazy, so shoot me :/
278 while [ "${count}" -lt 5 ] 284 while [ "${count}" -lt 5 ]
279 do 285 do
280 # Generate some useful debug info ... 286 # Generate some useful debug info ...
281 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 287 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 288 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
283 289
284 if [ "${PATCH_SUFFIX}" != "patch" ] 290 if [ "${PATCH_SUFFIX}" != "patch" ]
285 then 291 then
286 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 292 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 293 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
288 else 294 else
289 PATCH_TARGET="${x}" 295 PATCH_TARGET="${x}"
290 fi 296 fi
291 297
292 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 298 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 299 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
294 300
295 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 302 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
297 303
298 if [ "${PATCH_SUFFIX}" != "patch" ] 304 if [ "${PATCH_SUFFIX}" != "patch" ]
299 then 305 then
300 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 306 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
301 then 307 then
302 echo 308 echo
303 eerror "Could not extract patch!" 309 eerror "Could not extract patch!"
304 #die "Could not extract patch!" 310 #die "Could not extract patch!"
305 count=5 311 count=5
306 break 312 break
307 fi 313 fi
308 fi 314 fi
309 315
310 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 316 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
311 then 317 then
312 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 318 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 319 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
317 323
318 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 324 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
319 325
320 if [ "$?" -ne 0 ] 326 if [ "$?" -ne 0 ]
321 then 327 then
322 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 328 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
323 echo 329 echo
324 eerror "A dry-run of patch command succeeded, but actually" 330 eerror "A dry-run of patch command succeeded, but actually"
325 eerror "applying the patch failed!" 331 eerror "applying the patch failed!"
326 #die "Real world sux compared to the dreamworld!" 332 #die "Real world sux compared to the dreamworld!"
327 count=5 333 count=5
328 fi 334 fi
329 335
330 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 336 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
331 337
332 break 338 break
333 fi 339 fi
334 340
335 count=$((count + 1)) 341 count=$((count + 1))
341 fi 347 fi
342 348
343 if [ "${count}" -eq 5 ] 349 if [ "${count}" -eq 5 ]
344 then 350 then
345 echo 351 echo
346 eerror "Failed Patch: ${x##*/}!" 352 eerror "Failed Patch: ${patchname} !"
353 eerror " ( ${PATCH_TARGET} )"
347 eerror 354 eerror
348 eerror "Include in your bugreport the contents of:" 355 eerror "Include in your bugreport the contents of:"
349 eerror 356 eerror
350 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 357 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
351 echo 358 echo
352 die "Failed Patch: ${x##*/}!" 359 die "Failed Patch: ${patchname}!"
353 fi 360 fi
354 361
355 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 362 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
356 363
357 eend 0 364 eend 0
358 fi 365 fi
359 done 366 done
360 if [ "${SINGLE_PATCH}" = "no" ] 367 if [ "${SINGLE_PATCH}" = "no" ]
361 then 368 then
362 einfo "Done with patching" 369 einfo "Done with patching"
363 fi 370 fi
364} 371}
365 372
366# This function return true if we are using the NPTL pthreads
367# implementation.
368#
369# <azarah@gentoo.org> (06 March 2003)
370#
371have_NPTL() {
372 cat > ${T}/test-nptl.c <<-"END"
373 #define _XOPEN_SOURCE
374 #include <unistd.h>
375 #include <stdio.h>
376
377 int main()
378 {
379 char buf[255];
380 char *str = buf;
381
382 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
383 if (NULL != str) {
384 printf("%s\n", str);
385 if (NULL != strstr(str, "NPTL"))
386 return 0;
387 }
388
389 return 1;
390 }
391 END
392
393 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
394 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
395 then
396 echo "yes"
397 einfon "Checking what PTHREADS implementation we have ..."
398 if ${T}/nptl
399 then
400 return 0
401 else
402 return 1
403 fi
404 else
405 echo "no"
406 fi
407
408 return 1
409}
410
411# This function check how many cpu's are present, and then set
412# -j in MAKEOPTS accordingly.
413#
414# Thanks to nall <nall@gentoo.org> for this.
415#
416get_number_of_jobs() {
417 local jobs=0
418
419 if [ ! -r /proc/cpuinfo ]
420 then
421 return 1
422 fi
423
424 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
425 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
426 then
427 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
428 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
429 ADMINPARAM="${ADMINPARAM/-j}"
430 fi
431
432 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
433
434 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
435 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
436 then
437 # these archs will always have "[Pp]rocessor"
438 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
439
440 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
441 then
442 # sparc always has "ncpus active"
443 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
444
445 elif [ "${ARCH}" = "alpha" ]
446 then
447 # alpha has "cpus active", but only when compiled with SMP
448 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
449 then
450 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
451 else
452 jobs=2
453 fi
454
455 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
456 then
457 # ppc has "processor", but only when compiled with SMP
458 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
459 then
460 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
461 else
462 jobs=2
463 fi
464 elif [ "${ARCH}" = "s390" ]
465 then
466 # s390 has "# processors : "
467 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
468 else
469 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
470 die "Unknown ARCH -- ${ARCH}!"
471 fi
472
473 # Make sure the number is valid ...
474 if [ "${jobs}" -lt 1 ]
475 then
476 jobs=1
477 fi
478
479 if [ -n "${ADMINPARAM}" ]
480 then
481 if [ "${jobs}" -gt "${ADMINPARAM}" ]
482 then
483 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
484 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
485 else
486 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
487 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
488 fi
489 fi
490}
491
492# Cheap replacement for when debianutils (and thus mktemp) 373# Cheap replacement for when debianutils (and thus mktemp)
493# does not exist on the users system 374# does not exist on the users system
494# vapier@gentoo.org 375# vapier@gentoo.org
495# 376#
496# Takes just 1 optional parameter (the directory to create tmpfile in) 377# Takes just 1 optional parameter (the directory to create tmpfile in)
497emktemp() { 378emktemp() {
498 local exe="touch" 379 local exe="touch"
499 [ "$1" == "-d" ] && exe="mkdir" && shift 380 [[ $1 == -d ]] && exe="mkdir" && shift
500 local topdir="$1" 381 local topdir=$1
501 382
502 if [ -z "${topdir}" ] 383 if [[ -z ${topdir} ]] ; then
503 then
504 [ -z "${T}" ] \ 384 [[ -z ${T} ]] \
505 && topdir="/tmp" \ 385 && topdir="/tmp" \
506 || topdir="${T}" 386 || topdir=${T}
507 fi 387 fi
508 388
509 if [ -z "$(type -p mktemp)" ] 389 if [[ -z $(type -p mktemp) ]] ; then
510 then
511 local tmp=/ 390 local tmp=/
512 while [ -e "${tmp}" ] ; do 391 while [[ -e ${tmp} ]] ; do
513 tmp="${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}" 392 tmp=${topdir}/tmp.${RANDOM}.${RANDOM}.${RANDOM}
514 done 393 done
515 ${exe} "${tmp}" 394 ${exe} "${tmp}" || ${exe} -p "${tmp}"
516 echo "${tmp}" 395 echo "${tmp}"
517 else 396 else
518 [ "${exe}" == "touch" ] \ 397 [[ ${exe} == "touch" ]] \
519 && exe="-p" \ 398 && exe="-p" \
520 || exe="-d" 399 || exe="-d"
521 mktemp ${exe} "${topdir}" 400 mktemp ${exe} "${topdir}"
522 fi 401 fi
523} 402}
527# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 406# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
528# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 407# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
529# 408#
530# egetent(database, key) 409# egetent(database, key)
531egetent() { 410egetent() {
532 if useq ppc-macos ; then 411 if [[ "${USERLAND}" == "Darwin" ]] ; then
533 case "$2" in 412 case "$2" in
534 *[!0-9]*) # Non numeric 413 *[!0-9]*) # Non numeric
535 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 414 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
536 ;; 415 ;;
537 *) # Numeric 416 *) # Numeric
538 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 417 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
539 ;; 418 ;;
540 esac 419 esac
541 elif useq x86-fbsd ; then 420 elif [[ "${USERLAND}" == "BSD" ]] ; then
542 local action 421 local action
543 if [ "$1" == "passwd" ] 422 if [ "$1" == "passwd" ]
544 then 423 then
545 action="user" 424 action="user"
546 else 425 else
566# homedir: /dev/null 445# homedir: /dev/null
567# groups: none 446# groups: none
568# extra: comment of 'added by portage for ${PN}' 447# extra: comment of 'added by portage for ${PN}'
569enewuser() { 448enewuser() {
570 # get the username 449 # get the username
571 local euser="$1"; shift 450 local euser=$1; shift
572 if [ -z "${euser}" ] 451 if [[ -z ${euser} ]] ; then
573 then
574 eerror "No username specified !" 452 eerror "No username specified !"
575 die "Cannot call enewuser without a username" 453 die "Cannot call enewuser without a username"
576 fi 454 fi
577 455
578 # lets see if the username already exists 456 # lets see if the username already exists
579 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 457 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
580 then
581 return 0 458 return 0
582 fi 459 fi
583 einfo "Adding user '${euser}' to your system ..." 460 einfo "Adding user '${euser}' to your system ..."
584 461
585 # options to pass to useradd 462 # options to pass to useradd
586 local opts= 463 local opts=
587 464
588 # handle uid 465 # handle uid
589 local euid="$1"; shift 466 local euid=$1; shift
590 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 467 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
591 then
592 if [ "${euid}" -gt 0 ] 468 if [[ ${euid} -gt 0 ]] ; then
593 then
594 if [ ! -z "`egetent passwd ${euid}`" ] 469 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
595 then
596 euid="next" 470 euid="next"
597 fi 471 fi
598 else 472 else
599 eerror "Userid given but is not greater than 0 !" 473 eerror "Userid given but is not greater than 0 !"
600 die "${euid} is not a valid UID" 474 die "${euid} is not a valid UID"
601 fi 475 fi
602 else 476 else
603 euid="next" 477 euid="next"
604 fi 478 fi
605 if [ "${euid}" == "next" ] 479 if [[ ${euid} == "next" ]] ; then
606 then
607 local pwrange 480 local pwrange
608 if [ "${USERLAND}" == "BSD" ] ; then 481 if [[ ${USERLAND} == "BSD" ]] ; then
609 pwrange="`jot 898 101`" 482 pwrange=$(jot 898 101)
610 else 483 else
611 pwrange="`seq 101 999`" 484 pwrange=$(seq 101 999)
612 fi 485 fi
613 for euid in ${pwrange} ; do 486 for euid in ${pwrange} ; do
614 [ -z "`egetent passwd ${euid}`" ] && break 487 [[ -z $(egetent passwd ${euid}) ]] && break
615 done 488 done
616 fi 489 fi
617 opts="${opts} -u ${euid}" 490 opts="${opts} -u ${euid}"
618 einfo " - Userid: ${euid}" 491 einfo " - Userid: ${euid}"
619 492
620 # handle shell 493 # handle shell
621 local eshell="$1"; shift 494 local eshell=$1; shift
622 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 495 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
623 then
624 if [ ! -e "${eshell}" ] 496 if [[ ! -e ${eshell} ]] ; then
625 then
626 eerror "A shell was specified but it does not exist !" 497 eerror "A shell was specified but it does not exist !"
627 die "${eshell} does not exist" 498 die "${eshell} does not exist"
628 fi 499 fi
629 else 500 else
630 if [ "${USERLAND}" == "BSD" ] 501 case ${USERLAND} in
631 then
632 eshell="/usr/bin/false" 502 Darwin) eshell="/usr/bin/false";;
633 else 503 BSD) eshell="/usr/sbin/nologin";;
634 eshell="/bin/false" 504 *) eshell="/bin/false";;
635 fi 505 esac
636 fi 506 fi
637 einfo " - Shell: ${eshell}" 507 einfo " - Shell: ${eshell}"
638 opts="${opts} -s ${eshell}" 508 opts="${opts} -s ${eshell}"
639 509
640 # handle homedir 510 # handle homedir
641 local ehome="$1"; shift 511 local ehome=$1; shift
642 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 512 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
643 then
644 ehome="/dev/null" 513 ehome="/dev/null"
645 fi 514 fi
646 einfo " - Home: ${ehome}" 515 einfo " - Home: ${ehome}"
647 opts="${opts} -d ${ehome}" 516 opts="${opts} -d ${ehome}"
648 517
649 # handle groups 518 # handle groups
650 local egroups="$1"; shift 519 local egroups=$1; shift
651 if [ ! -z "${egroups}" ] 520 if [[ ! -z ${egroups} ]] ; then
652 then
653 local oldifs="${IFS}" 521 local oldifs=${IFS}
654 local defgroup="" exgroups="" 522 local defgroup="" exgroups=""
655 523
656 export IFS="," 524 export IFS=","
657 for g in ${egroups} 525 for g in ${egroups} ; do
658 do
659 export IFS="${oldifs}" 526 export IFS=${oldifs}
660 if [ -z "`egetent group \"${g}\"`" ] 527 if [[ -z $(egetent group "${g}") ]] ; then
661 then
662 eerror "You must add group ${g} to the system first" 528 eerror "You must add group ${g} to the system first"
663 die "${g} is not a valid GID" 529 die "${g} is not a valid GID"
664 fi 530 fi
665 if [ -z "${defgroup}" ] 531 if [[ -z ${defgroup} ]] ; then
666 then
667 defgroup="${g}" 532 defgroup=${g}
668 else 533 else
669 exgroups="${exgroups},${g}" 534 exgroups="${exgroups},${g}"
670 fi 535 fi
671 export IFS="," 536 export IFS=","
672 done 537 done
673 export IFS="${oldifs}" 538 export IFS=${oldifs}
674 539
675 opts="${opts} -g ${defgroup}" 540 opts="${opts} -g ${defgroup}"
676 if [ ! -z "${exgroups}" ] 541 if [[ ! -z ${exgroups} ]] ; then
677 then
678 opts="${opts} -G ${exgroups:1}" 542 opts="${opts} -G ${exgroups:1}"
679 fi 543 fi
680 else 544 else
681 egroups="(none)" 545 egroups="(none)"
682 fi 546 fi
683 einfo " - Groups: ${egroups}" 547 einfo " - Groups: ${egroups}"
684 548
685 # handle extra and add the user 549 # handle extra and add the user
686 local eextra="$@"
687 local oldsandbox="${SANDBOX_ON}" 550 local oldsandbox=${SANDBOX_ON}
688 export SANDBOX_ON="0" 551 export SANDBOX_ON="0"
689 if useq ppc-macos 552 case ${USERLAND} in
690 then 553 Darwin)
691 ### Make the user 554 ### Make the user
692 if [ -z "${eextra}" ] 555 if [[ -z $@ ]] ; then
693 then
694 dscl . create /users/${euser} uid ${euid} 556 dscl . create /users/${euser} uid ${euid}
695 dscl . create /users/${euser} shell ${eshell} 557 dscl . create /users/${euser} shell ${eshell}
696 dscl . create /users/${euser} home ${ehome} 558 dscl . create /users/${euser} home ${ehome}
697 dscl . create /users/${euser} realname "added by portage for ${PN}" 559 dscl . create /users/${euser} realname "added by portage for ${PN}"
698 ### Add the user to the groups specified 560 ### Add the user to the groups specified
699 local oldifs="${IFS}" 561 local oldifs=${IFS}
700 export IFS="," 562 export IFS=","
701 for g in ${egroups} 563 for g in ${egroups} ; do
702 do
703 dscl . merge /groups/${g} users ${euser} 564 dscl . merge /groups/${g} users ${euser}
704 done 565 done
705 export IFS="${oldifs}" 566 export IFS=${oldifs}
706 else 567 else
707 einfo "Extra options are not supported on macos yet" 568 einfo "Extra options are not supported on Darwin yet"
708 einfo "Please report the ebuild along with the info below" 569 einfo "Please report the ebuild along with the info below"
709 einfo "eextra: ${eextra}" 570 einfo "eextra: $@"
710 die "Required function missing" 571 die "Required function missing"
711 fi 572 fi
712 elif use x86-fbsd ; then 573 ;;
713 if [ -z "${eextra}" ] 574 BSD)
714 then 575 if [[ -z $@ ]] ; then
715 pw useradd ${euser} ${opts} \ 576 pw useradd ${euser} ${opts} \
716 -c "added by portage for ${PN}" \ 577 -c "added by portage for ${PN}" \
717 die "enewuser failed" 578 die "enewuser failed"
718 else 579 else
719 einfo " - Extra: ${eextra}" 580 einfo " - Extra: $@"
720 pw useradd ${euser} ${opts} \ 581 pw useradd ${euser} ${opts} \
721 -c ${eextra} || die "enewuser failed" 582 "$@" || die "enewuser failed"
722 fi 583 fi
723 else 584 ;;
724 if [ -z "${eextra}" ] 585 *)
725 then 586 if [[ -z $@ ]] ; then
726 useradd ${opts} ${euser} \ 587 useradd ${opts} ${euser} \
727 -c "added by portage for ${PN}" \ 588 -c "added by portage for ${PN}" \
728 || die "enewuser failed" 589 || die "enewuser failed"
729 else 590 else
730 einfo " - Extra: ${eextra}" 591 einfo " - Extra: $@"
731 useradd ${opts} ${euser} ${eextra} \ 592 useradd ${opts} ${euser} "$@" \
732 || die "enewuser failed" 593 || die "enewuser failed"
733 fi 594 fi
595 ;;
596 esac
597
598 if [[ ! -e ${ROOT}/${ehome} ]] ; then
599 einfo " - Creating ${ehome} in ${ROOT}"
600 mkdir -p "${ROOT}/${ehome}"
601 chown ${euser} "${ROOT}/${ehome}"
602 chmod 755 "${ROOT}/${ehome}"
734 fi 603 fi
604
735 export SANDBOX_ON="${oldsandbox}" 605 export SANDBOX_ON=${oldsandbox}
736
737 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
738 then
739 einfo " - Creating ${ehome} in ${D}"
740 dodir ${ehome}
741 fowners ${euser} ${ehome}
742 fperms 755 ${ehome}
743 fi
744} 606}
745 607
746# Simplify/standardize adding groups to the system 608# Simplify/standardize adding groups to the system
747# vapier@gentoo.org 609# vapier@gentoo.org
748# 610#
777 then 639 then
778 if [ "${egid}" -gt 0 ] 640 if [ "${egid}" -gt 0 ]
779 then 641 then
780 if [ -z "`egetent group ${egid}`" ] 642 if [ -z "`egetent group ${egid}`" ]
781 then 643 then
782 if useq ppc-macos ; then 644 if [[ "${USERLAND}" == "Darwin" ]]; then
783 opts="${opts} ${egid}" 645 opts="${opts} ${egid}"
784 else 646 else
785 opts="${opts} -g ${egid}" 647 opts="${opts} -g ${egid}"
786 fi 648 fi
787 else 649 else
801 opts="${opts} ${eextra}" 663 opts="${opts} ${eextra}"
802 664
803 # add the group 665 # add the group
804 local oldsandbox="${SANDBOX_ON}" 666 local oldsandbox="${SANDBOX_ON}"
805 export SANDBOX_ON="0" 667 export SANDBOX_ON="0"
806 if useq ppc-macos ; then 668 if [[ "${USERLAND}" == "Darwin" ]]; then
807 if [ ! -z "${eextra}" ]; 669 if [ ! -z "${eextra}" ];
808 then 670 then
809 einfo "Extra options are not supported on macos yet" 671 einfo "Extra options are not supported on Darwin/OS X yet"
810 einfo "Please report the ebuild along with the info below" 672 einfo "Please report the ebuild along with the info below"
811 einfo "eextra: ${eextra}" 673 einfo "eextra: ${eextra}"
812 die "Required function missing" 674 die "Required function missing"
813 fi 675 fi
814 676
819 [ -z "`egetent group ${egid}`" ] && break 681 [ -z "`egetent group ${egid}`" ] && break
820 done 682 done
821 esac 683 esac
822 dscl . create /groups/${egroup} gid ${egid} 684 dscl . create /groups/${egroup} gid ${egid}
823 dscl . create /groups/${egroup} passwd '*' 685 dscl . create /groups/${egroup} passwd '*'
824 elif use x86-fbsd ; then 686 elif [[ "${USERLAND}" == "BSD" ]] ; then
825 case ${egid} in 687 case ${egid} in
826 *[!0-9]*) # Non numeric 688 *[!0-9]*) # Non numeric
827 for egid in `jot 898 101`; do 689 for egid in `jot 898 101`; do
828 [ -z "`egetent group ${egid}`" ] && break 690 [ -z "`egetent group ${egid}`" ] && break
829 done 691 done
864# name: the name that will show up in the menu 726# name: the name that will show up in the menu
865# icon: give your little like a pretty little icon ... 727# icon: give your little like a pretty little icon ...
866# this can be relative (to /usr/share/pixmaps) or 728# this can be relative (to /usr/share/pixmaps) or
867# a full path to an icon 729# a full path to an icon
868# type: what kind of application is this ? for categories: 730# type: what kind of application is this ? for categories:
869# http://www.freedesktop.org/standards/menu-spec/ 731# http://www.freedesktop.org/Standards/desktop-entry-spec
870# path: if your app needs to startup in a specific dir 732# path: if your app needs to startup in a specific dir
871make_desktop_entry() { 733make_desktop_entry() {
872 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 734 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
873 735
874 local exec="${1}" 736 local exec=${1}
875 local name="${2:-${PN}}" 737 local name=${2:-${PN}}
876 local icon="${3:-${PN}.png}" 738 local icon=${3:-${PN}.png}
877 local type="${4}" 739 local type=${4}
878 local subdir="${6}" 740 local path=${5}
879 local path="${5:-${GAMES_BINDIR}}" 741
880 if [ -z "${type}" ] 742 if [[ -z ${type} ]] ; then
881 then 743 local catmaj=${CATEGORY%%-*}
882 case ${CATEGORY} in 744 local catmin=${CATEGORY##*-}
883 "app-emulation") 745 case ${catmaj} in
884 type=Emulator 746 app)
885 subdir="Emulation" 747 case ${catmin} in
748 admin) type=System;;
749 cdr) type=DiscBurning;;
750 dicts) type=Dictionary;;
751 editors) type=TextEditor;;
752 emacs) type=TextEditor;;
753 emulation) type=Emulator;;
754 laptop) type=HardwareSettings;;
755 office) type=Office;;
756 vim) type=TextEditor;;
757 xemacs) type=TextEditor;;
758 *) type=;;
759 esac
886 ;; 760 ;;
887 "games-"*) 761
888 type=Game 762 dev)
889 subdir="Games" 763 type="Development"
890 ;; 764 ;;
891 "net-"*) 765
892 type=Network 766 games)
893 subdir="${type}" 767 case ${catmin} in
768 action) type=ActionGame;;
769 arcade) type=ArcadeGame;;
770 board) type=BoardGame;;
771 kid) type=KidsGame;;
772 emulation) type=Emulator;;
773 puzzle) type=LogicGame;;
774 rpg) type=RolePlaying;;
775 roguelike) type=RolePlaying;;
776 simulation) type=Simulation;;
777 sports) type=SportsGame;;
778 strategy) type=StrategyGame;;
779 *) type=;;
780 esac
781 type="Game;${type}"
894 ;; 782 ;;
783
784 mail)
785 type="Network;Email"
786 ;;
787
788 media)
789 case ${catmin} in
790 gfx) type=Graphics;;
791 radio) type=Tuner;;
792 sound) type=Audio;;
793 tv) type=TV;;
794 video) type=Video;;
795 *) type=;;
796 esac
797 type="AudioVideo;${type}"
798 ;;
799
800 net)
801 case ${catmin} in
802 dialup) type=Dialup;;
803 ftp) type=FileTransfer;;
804 im) type=InstantMessaging;;
805 irc) type=IRCClient;;
806 mail) type=Email;;
807 news) type=News;;
808 nntp) type=News;;
809 p2p) type=FileTransfer;;
810 *) type=;;
811 esac
812 type="Network;${type}"
813 ;;
814
815 sci)
816 case ${catmin} in
817 astro*) type=Astronomoy;;
818 bio*) type=Biology;;
819 calc*) type=Calculator;;
820 chem*) type=Chemistry;;
821 geo*) type=Geology;;
822 math*) type=Math;;
823 *) type=;;
824 esac
825 type="Science;${type}"
826 ;;
827
828 www)
829 case ${catmin} in
830 client) type=WebBrowser;;
831 *) type=;;
832 esac
833 type="Network"
834 ;;
835
895 *) 836 *)
896 type= 837 type=
897 subdir=
898 ;; 838 ;;
899 esac 839 esac
900 fi 840 fi
841 if [ "${SLOT}" == "0" ] ; then
842 local desktop_name="${PN}"
843 else
844 local desktop_name="${PN}-${SLOT}"
845 fi
901 local desktop="${T}/${exec}.desktop" 846 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
902 847
903echo "[Desktop Entry] 848echo "[Desktop Entry]
904Encoding=UTF-8 849Encoding=UTF-8
905Version=0.9.2 850Version=0.9.2
906Name=${name} 851Name=${name}
922# make_desktop_entry(<title>, <command>) 867# make_desktop_entry(<title>, <command>)
923# title: File to execute to start the Window Manager 868# title: File to execute to start the Window Manager
924# command: Name of the Window Manager 869# command: Name of the Window Manager
925 870
926make_session_desktop() { 871make_session_desktop() {
927
928 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 872 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
929 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 873 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
930 874
931 local title="${1}" 875 local title=$1
932 local command="${2}" 876 local command=$2
933 local desktop="${T}/${wm}.desktop" 877 local desktop=${T}/${wm}.desktop
934 878
935echo "[Desktop Entry] 879echo "[Desktop Entry]
936Encoding=UTF-8 880Encoding=UTF-8
937Name=${title} 881Name=${title}
938Comment=This session logs you into ${title} 882Comment=This session logs you into ${title}
940TryExec=${command} 884TryExec=${command}
941Type=Application" > "${desktop}" 885Type=Application" > "${desktop}"
942 886
943 insinto /usr/share/xsessions 887 insinto /usr/share/xsessions
944 doins "${desktop}" 888 doins "${desktop}"
945
946 return 0
947} 889}
948 890
949domenu() { 891domenu() {
950 local i 892 local i j
951 local j
952 insinto /usr/share/applications 893 insinto /usr/share/applications
953 for i in ${@} 894 for i in "$@" ; do
954 do
955 if [ -f "${i}" ]; 895 if [[ -f ${i} ]] ; then
956 then
957 doins ${i} 896 doins "${i}"
958 elif [ -d "${i}" ]; 897 elif [[ -d ${i} ]] ; then
959 then
960 for j in ${i}/*.desktop 898 for j in "${i}"/*.desktop ; do
961 do
962 doins ${j} 899 doins "${j}"
963 done 900 done
964 fi 901 fi
965 done 902 done
966} 903}
904newmenu() {
905 insinto /usr/share/applications
906 newins "$1" "$2"
907}
967 908
968doicon() { 909doicon() {
969 local i 910 local i j
970 local j
971 insinto /usr/share/pixmaps 911 insinto /usr/share/pixmaps
972 for i in ${@} 912 for i in "$@" ; do
973 do
974 if [ -f "${i}" ]; 913 if [[ -f ${i} ]] ; then
975 then
976 doins ${i} 914 doins "${i}"
977 elif [ -d "${i}" ]; 915 elif [[ -d ${i} ]] ; then
978 then
979 for j in ${i}/*.png 916 for j in "${i}"/*.png ; do
980 do
981 doins ${j} 917 doins "${j}"
982 done 918 done
983 fi 919 fi
984 done 920 done
921}
922newicon() {
923 insinto /usr/share/pixmaps
924 newins "$1" "$2"
985} 925}
986 926
987############################################################## 927##############################################################
988# END: Handle .desktop files and menu entries # 928# END: Handle .desktop files and menu entries #
989############################################################## 929##############################################################
1383# displayed and we'll hang out here until: 1323# displayed and we'll hang out here until:
1384# (1) the file is found on a mounted cdrom 1324# (1) the file is found on a mounted cdrom
1385# (2) the user hits CTRL+C 1325# (2) the user hits CTRL+C
1386cdrom_locate_file_on_cd() { 1326cdrom_locate_file_on_cd() {
1387 while [[ -z ${CDROM_ROOT} ]] ; do 1327 while [[ -z ${CDROM_ROOT} ]] ; do
1388 local dir="$(dirname ${@})" 1328 local dir=$(dirname "$*")
1389 local file="$(basename ${@})" 1329 local file=$(basename "$*")
1390 local mline="" 1330 local mline=""
1391 local showedmsg=0 1331 local showedmsg=0
1392 1332
1393 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1333 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1394 [[ -d ${mline}/${dir} ]] || continue 1334 [[ -d ${mline}/${dir} ]] || continue
1395 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1335 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1396 && export CDROM_ROOT=${mline} 1336 && export CDROM_ROOT=${mline}
1397 done 1337 done
1398 1338
1399 if [[ -z ${CDROM_ROOT} ]] ; then 1339 if [[ -z ${CDROM_ROOT} ]] ; then
1400 echo 1340 echo
1415 fi 1355 fi
1416 showedmsg=1 1356 showedmsg=1
1417 fi 1357 fi
1418 einfo "Press return to scan for the cd again" 1358 einfo "Press return to scan for the cd again"
1419 einfo "or hit CTRL+C to abort the emerge." 1359 einfo "or hit CTRL+C to abort the emerge."
1360 echo
1361 einfo "If you are having trouble with the detection"
1362 einfo "of your CD, it is possible that you do not have"
1363 einfo "Joliet support enabled in your kernel. Please"
1364 einfo "check that CONFIG_JOLIET is enabled in your kernel."
1420 read 1365 read
1421 fi 1366 fi
1422 done 1367 done
1423} 1368}
1424 1369
1434# directories and uses the intersection of the lists. 1379# directories and uses the intersection of the lists.
1435# The -u builds a list of po files found in all the 1380# The -u builds a list of po files found in all the
1436# directories and uses the union of the lists. 1381# directories and uses the union of the lists.
1437strip-linguas() { 1382strip-linguas() {
1438 local ls newls 1383 local ls newls
1439 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1384 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1440 local op="$1"; shift 1385 local op=$1; shift
1441 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1386 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1442 local d f 1387 local d f
1443 for d in "$@" ; do 1388 for d in "$@" ; do
1444 if [ "${op}" == "-u" ] ; then 1389 if [[ ${op} == "-u" ]] ; then
1445 newls="${ls}" 1390 newls=${ls}
1446 else 1391 else
1447 newls="" 1392 newls=""
1448 fi 1393 fi
1449 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1394 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1450 if [ "${op}" == "-i" ] ; then 1395 if [[ ${op} == "-i" ]] ; then
1451 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1396 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1452 else 1397 else
1453 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1398 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1454 fi 1399 fi
1455 done 1400 done
1456 ls="${newls}" 1401 ls=${newls}
1457 done 1402 done
1458 ls="${ls//.po}" 1403 ls=${ls//.po}
1459 else 1404 else
1460 ls="$@" 1405 ls=$@
1461 fi 1406 fi
1462 1407
1463 ls=" ${ls} " 1408 ls=" ${ls} "
1464 newls="" 1409 newls=""
1465 for f in ${LINGUAS} ; do 1410 for f in ${LINGUAS} ; do
1466 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1411 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1467 newls="${newls} ${f}" 1412 newls="${newls} ${f}"
1468 else 1413 else
1469 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1414 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1470 fi 1415 fi
1471 done 1416 done
1472 if [ -z "${newls}" ] ; then 1417 if [[ -z ${newls} ]] ; then
1473 unset LINGUAS 1418 export LINGUAS=""
1474 else 1419 else
1475 export LINGUAS="${newls}" 1420 export LINGUAS=${newls:1}
1476 fi 1421 fi
1477} 1422}
1478 1423
1479# moved from kernel.eclass since they are generally useful outside of 1424# moved from kernel.eclass since they are generally useful outside of
1480# kernel.eclass -iggy (20041002) 1425# kernel.eclass -iggy (20041002)
1488 while ((i--)) ; do 1433 while ((i--)) ; do
1489 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass" 1434 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1490 done 1435 done
1491 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1436 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1492 case ${ARCH} in 1437 case ${ARCH} in
1493 x86) export ARCH="i386";; 1438 x86) export ARCH="i386";;
1494 amd64) export ARCH="x86_64";; 1439 amd64) export ARCH="x86_64";;
1495 hppa) export ARCH="parisc";; 1440 hppa) export ARCH="parisc";;
1496 mips) export ARCH="mips";; 1441 mips) export ARCH="mips";;
1497 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! 1442 sparc) export ARCH="$(tc-arch-kernel)";; # Yeah this is ugly, but it's even WORSE if you don't do this. linux-info.eclass's set_arch_to_kernel is fixed, but won't get used over this one!
1498 *) export ARCH="${ARCH}";; 1443 *) export ARCH="${ARCH}";;
1499 esac 1444 esac
1500} 1445}
1501 1446
1502# set's ARCH back to what portage expects 1447# set's ARCH back to what portage expects
1503set_arch_to_portage() { 1448set_arch_to_portage() {
1547 LIB=$1 1492 LIB=$1
1548 1493
1549 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then 1494 if [ -n "${LIB}" -a -f "${ROOT}${LIB}" ]; then
1550 SONAME=`basename ${LIB}` 1495 SONAME=`basename ${LIB}`
1551 1496
1552 einfo "An old version of an installed library was detected on your system." 1497 ewarn "An old version of an installed library was detected on your system."
1553 einfo "In order to avoid breaking packages that link against is, this older version" 1498 ewarn "In order to avoid breaking packages that link against it, this older version"
1554 einfo "is not being removed. In order to make full use of this newer version," 1499 ewarn "is not being removed. In order to make full use of this newer version,"
1555 einfo "you will need to execute the following command:" 1500 ewarn "you will need to execute the following command:"
1556 einfo " revdep-rebuild --soname ${SONAME}" 1501 ewarn " revdep-rebuild --soname ${SONAME}"
1557 einfo 1502 ewarn
1558 einfo "After doing that, you can safely remove ${LIB}" 1503 ewarn "After doing that, you can safely remove ${LIB}"
1559 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1504 ewarn "Note: 'emerge gentoolkit' to get revdep-rebuild"
1560 fi 1505 fi
1561} 1506}
1562 1507
1563# Hack for people to figure out if a package was built with 1508# Hack for people to figure out if a package was built with
1564# certain USE flags 1509# certain USE flags
1602 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1547 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1603 done 1548 done
1604 eend 0 1549 eend 0
1605} 1550}
1606 1551
1607# dopamd [ file ] [ new file ] 1552# dopamd <file> [more files]
1608# 1553#
1609# Install pam auth config file in /etc/pam.d 1554# Install pam auth config file in /etc/pam.d
1610#
1611# The first argument, 'file' is required. Install as 'new file', if
1612# specified.
1613
1614dopamd() { 1555dopamd() {
1615 local pamd="$1" newpamd="${2:-$1}"
1616 [[ -z "$1" ]] && die "dopamd requires at least one argument." 1556 [[ -z $1 ]] && die "dopamd requires at least one argument"
1617 1557
1618 use pam || return 0 1558 use pam || return 0
1619 1559
1620 insinto /etc/pam.d 1560 INSDESTTREE=/etc/pam.d \
1621 # these are the default doins options, but be explicit just in case 1561 doins "$@" || die "failed to install $@"
1622 insopts -m 0644 -o root -g root
1623 newins ${pamd} ${newpamd} || die "failed to install ${newpamd}"
1624} 1562}
1563# newpamd <old name> <new name>
1564#
1565# Install pam file <old name> as <new name> in /etc/pam.d
1566newpamd() {
1567 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1568
1569 use pam || return 0
1570
1571 INSDESTTREE=/etc/pam.d \
1572 newins "$1" "$2" || die "failed to install $1 as $2"
1573}
1574
1575# make a wrapper script ...
1576# NOTE: this was originally games_make_wrapper, but I noticed other places where
1577# this could be used, so I have moved it here and made it not games-specific
1578# -- wolf31o2
1579# $1 == wrapper name
1580# $2 == binary to run
1581# $3 == directory to chdir before running binary
1582# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1583# $5 == path for wrapper
1584make_wrapper() {
1585 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1586 local tmpwrapper=$(emktemp)
1587 cat << EOF > "${tmpwrapper}"
1588#!/bin/sh
1589cd "${chdir}"
1590export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1591exec ${bin} "\$@"
1592EOF
1593 chmod go+rx "${tmpwrapper}"
1594 if [ -n "${5}" ]
1595 then
1596 exeinto ${5}
1597 newexe "${tmpwrapper}" "${wrapper}"
1598 else
1599 newbin "${tmpwrapper}" "${wrapper}"
1600 fi
1601}

Legend:
Removed from v.1.143  
changed lines
  Added in v.1.194

  ViewVC Help
Powered by ViewVC 1.1.20