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

Diff of /eclass/eutils.eclass

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

Revision 1.139 Revision 1.182
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.139 2005/01/10 02:40:00 vapier Exp $ 3# $Header: /var/cvsroot/gentoo-x86/eclass/eutils.eclass,v 1.182 2005/06/11 00:02:26 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
12ECLASS=eutils 13ECLASS=eutils
13INHERITED="$INHERITED $ECLASS" 14INHERITED="$INHERITED $ECLASS"
14 15
15DEPEND="!bootstrap? ( sys-devel/patch )" 16DEPEND="!bootstrap? ( sys-devel/patch userland_GNU? ( sys-apps/shadow ) )"
17# sys-apps/shadow is needed for useradd, etc, bug #94745.
16 18
17DESCRIPTION="Based on the ${ECLASS} eclass" 19DESCRIPTION="Based on the ${ECLASS} eclass"
18 20
19# Wait for the supplied number of seconds. If no argument is supplied, defaults 21# Wait for the supplied number of seconds. If no argument is supplied, defaults
20# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not 22# to five seconds. If the EPAUSE_IGNORE env var is set, don't wait. If we're not
64gen_usr_ldscript() { 66gen_usr_ldscript() {
65 local libdir="$(get_libdir)" 67 local libdir="$(get_libdir)"
66 # Just make sure it exists 68 # Just make sure it exists
67 dodir /usr/${libdir} 69 dodir /usr/${libdir}
68 70
71 for lib in "${@}" ; do
69 cat > "${D}/usr/${libdir}/${1}" << END_LDSCRIPT 72 cat > "${D}/usr/${libdir}/${lib}" <<-END_LDSCRIPT
70/* GNU ld script 73 /* GNU ld script
71 Because Gentoo have critical dynamic libraries 74 Since Gentoo has critical dynamic libraries
72 in /lib, and the static versions in /usr/lib, we 75 in /lib, and the static versions in /usr/lib,
73 need to have a "fake" dynamic lib in /usr/lib, 76 we need to have a "fake" dynamic lib in /usr/lib,
74 otherwise we run into linking problems. 77 otherwise we run into linking problems.
75 See bug #4411 on http://bugs.gentoo.org/ for 78
76 more info. */ 79 See bug http://bugs.gentoo.org/4411 for more info.
80 */
77GROUP ( /${libdir}/${1} ) 81 GROUP ( /${libdir}/${lib} )
78END_LDSCRIPT 82 END_LDSCRIPT
79 fperms a+x "/usr/${libdir}/${1}" 83 fperms a+x "/usr/${libdir}/${lib}"
84 done
80} 85}
81 86
82# Simple function to draw a line consisting of '=' the same length as $* 87# Simple function to draw a line consisting of '=' the same length as $*
88# - only to be used by epatch()
83# 89#
84# <azarah@gentoo.org> (11 Nov 2002) 90# <azarah@gentoo.org> (11 Nov 2002)
85# 91#
86draw_line() { 92draw_line() {
87 local i=0 93 local i=0
113EPATCH_SOURCE="${WORKDIR}/patch" 119EPATCH_SOURCE="${WORKDIR}/patch"
114# Default extension for patches 120# Default extension for patches
115EPATCH_SUFFIX="patch.bz2" 121EPATCH_SUFFIX="patch.bz2"
116# Default options for patch 122# Default options for patch
117# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571 123# Set -g0 to keep RCS, ClearCase, Perforce and SCCS happy. Bug #24571
118EPATCH_OPTS="-g0" 124# Set --no-backup-if-mismatch so we don't leave '.orig' files behind.
125EPATCH_OPTS="-g0 --no-backup-if-mismatch"
119# List of patches not to apply. Not this is only file names, 126# List of patches not to apply. Not this is only file names,
120# and not the full path .. 127# and not the full path ..
121EPATCH_EXCLUDE="" 128EPATCH_EXCLUDE=""
122# Change the printed message for a single patch. 129# Change the printed message for a single patch.
123EPATCH_SINGLE_MSG="" 130EPATCH_SINGLE_MSG=""
131# Change the printed message for multiple patches.
132EPATCH_MULTI_MSG="Applying various patches (bugfixes/updates) ..."
124# Force applying bulk patches even if not following the style: 133# Force applying bulk patches even if not following the style:
125# 134#
126# ??_${ARCH}_foo.${EPATCH_SUFFIX} 135# ??_${ARCH}_foo.${EPATCH_SUFFIX}
127# 136#
128EPATCH_FORCE="no" 137EPATCH_FORCE="no"
169 local x="" 178 local x=""
170 179
171 if [ "$#" -gt 1 ] 180 if [ "$#" -gt 1 ]
172 then 181 then
173 local m="" 182 local m=""
174 einfo "${#} patches to apply ..."
175 for m in "$@" ; do 183 for m in "$@" ; do
176 epatch "${m}" 184 epatch "${m}"
177 done 185 done
178 return 0 186 return 0
179 fi 187 fi
233 ;; 241 ;;
234 esac 242 esac
235 243
236 if [ "${SINGLE_PATCH}" = "no" ] 244 if [ "${SINGLE_PATCH}" = "no" ]
237 then 245 then
238 einfo "Applying various patches (bugfixes/updates) ..." 246 einfo "${EPATCH_MULTI_MSG}"
239 fi 247 fi
240 for x in ${EPATCH_SOURCE} 248 for x in ${EPATCH_SOURCE}
241 do 249 do
242 # New ARCH dependant patch naming scheme ... 250 # New ARCH dependant patch naming scheme ...
243 # 251 #
244 # ???_arch_foo.patch 252 # ???_arch_foo.patch
245 # 253 #
246 if [ -f ${x} ] && \ 254 if [ -f ${x} ] && \
247 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "`eval echo \$\{x/_${ARCH}_\}`" != "${x}" ] || \ 255 ([ "${SINGLE_PATCH}" = "yes" -o "${x/_all_}" != "${x}" -o "${x/_${ARCH}_}" != "${x}" ] || \
248 [ "${EPATCH_FORCE}" = "yes" ]) 256 [ "${EPATCH_FORCE}" = "yes" ])
249 then 257 then
250 local count=0 258 local count=0
251 local popts="${EPATCH_OPTS}" 259 local popts="${EPATCH_OPTS}"
260 local patchname=${x##*/}
252 261
253 if [ -n "${EPATCH_EXCLUDE}" ] 262 if [ -n "${EPATCH_EXCLUDE}" ]
254 then 263 then
255 if [ "`eval echo \$\{EPATCH_EXCLUDE/${x##*/}\}`" != "${EPATCH_EXCLUDE}" ] 264 if [ "${EPATCH_EXCLUDE/${patchname}}" != "${EPATCH_EXCLUDE}" ]
256 then 265 then
257 continue 266 continue
258 fi 267 fi
259 fi 268 fi
260 269
262 then 271 then
263 if [ -n "${EPATCH_SINGLE_MSG}" ] 272 if [ -n "${EPATCH_SINGLE_MSG}" ]
264 then 273 then
265 einfo "${EPATCH_SINGLE_MSG}" 274 einfo "${EPATCH_SINGLE_MSG}"
266 else 275 else
267 einfo "Applying ${x##*/} ..." 276 einfo "Applying ${patchname} ..."
268 fi 277 fi
269 else 278 else
270 einfo " ${x##*/} ..." 279 einfo " ${patchname} ..."
271 fi 280 fi
272 281
273 echo "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 282 echo "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
274 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 283 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
275 284
276 # Allow for prefix to differ ... im lazy, so shoot me :/ 285 # Allow for prefix to differ ... im lazy, so shoot me :/
277 while [ "${count}" -lt 5 ] 286 while [ "${count}" -lt 5 ]
278 do 287 do
279 # Generate some useful debug info ... 288 # Generate some useful debug info ...
280 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 289 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
281 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 290 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
282 291
283 if [ "${PATCH_SUFFIX}" != "patch" ] 292 if [ "${PATCH_SUFFIX}" != "patch" ]
284 then 293 then
285 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 294 echo -n "PIPE_COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
286 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 295 echo "${PIPE_CMD} ${x} > ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
287 else 296 else
288 PATCH_TARGET="${x}" 297 PATCH_TARGET="${x}"
289 fi 298 fi
290 299
291 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 300 echo -n "PATCH COMMAND: " >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
292 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 301 echo "patch -p${count} ${popts} < ${PATCH_TARGET}" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
293 302
294 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 303 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
295 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 304 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
296 305
297 if [ "${PATCH_SUFFIX}" != "patch" ] 306 if [ "${PATCH_SUFFIX}" != "patch" ]
298 then 307 then
299 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 308 if ! (${PIPE_CMD} ${x} > ${PATCH_TARGET}) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
300 then 309 then
301 echo 310 echo
302 eerror "Could not extract patch!" 311 eerror "Could not extract patch!"
303 #die "Could not extract patch!" 312 #die "Could not extract patch!"
304 count=5 313 count=5
305 break 314 break
306 fi 315 fi
307 fi 316 fi
308 317
309 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 2>&1 318 if (cat ${PATCH_TARGET} | patch -p${count} ${popts} --dry-run -f) >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/} 2>&1
310 then 319 then
311 draw_line "***** ${x##*/} *****" > ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 320 draw_line "***** ${patchname} *****" > ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
312 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 321 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
313 echo "ACTUALLY APPLYING ${x##*/} ..." >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 322 echo "ACTUALLY APPLYING ${patchname} ..." >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
314 echo >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 323 echo >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
315 draw_line "***** ${x##*/} *****" >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 324 draw_line "***** ${patchname} *****" >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
316 325
317 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 2>&1 326 cat ${PATCH_TARGET} | patch -p${count} ${popts} >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real 2>&1
318 327
319 if [ "$?" -ne 0 ] 328 if [ "$?" -ne 0 ]
320 then 329 then
321 cat ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 330 cat ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real >> ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
322 echo 331 echo
323 eerror "A dry-run of patch command succeeded, but actually" 332 eerror "A dry-run of patch command succeeded, but actually"
324 eerror "applying the patch failed!" 333 eerror "applying the patch failed!"
325 #die "Real world sux compared to the dreamworld!" 334 #die "Real world sux compared to the dreamworld!"
326 count=5 335 count=5
327 fi 336 fi
328 337
329 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}.real 338 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}.real
330 339
331 break 340 break
332 fi 341 fi
333 342
334 count=$((count + 1)) 343 count=$((count + 1))
340 fi 349 fi
341 350
342 if [ "${count}" -eq 5 ] 351 if [ "${count}" -eq 5 ]
343 then 352 then
344 echo 353 echo
345 eerror "Failed Patch: ${x##*/}!" 354 eerror "Failed Patch: ${patchname} !"
355 eerror " ( ${PATCH_TARGET} )"
346 eerror 356 eerror
347 eerror "Include in your bugreport the contents of:" 357 eerror "Include in your bugreport the contents of:"
348 eerror 358 eerror
349 eerror " ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/}" 359 eerror " ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}"
350 echo 360 echo
351 die "Failed Patch: ${x##*/}!" 361 die "Failed Patch: ${patchname}!"
352 fi 362 fi
353 363
354 rm -f ${STDERR_TARGET%/*}/${x##*/}-${STDERR_TARGET##*/} 364 rm -f ${STDERR_TARGET%/*}/${patchname}-${STDERR_TARGET##*/}
355 365
356 eend 0 366 eend 0
357 fi 367 fi
358 done 368 done
359 if [ "${SINGLE_PATCH}" = "no" ] 369 if [ "${SINGLE_PATCH}" = "no" ]
360 then 370 then
361 einfo "Done with patching" 371 einfo "Done with patching"
362 fi
363}
364
365# This function return true if we are using the NPTL pthreads
366# implementation.
367#
368# <azarah@gentoo.org> (06 March 2003)
369#
370have_NPTL() {
371 cat > ${T}/test-nptl.c <<-"END"
372 #define _XOPEN_SOURCE
373 #include <unistd.h>
374 #include <stdio.h>
375
376 int main()
377 {
378 char buf[255];
379 char *str = buf;
380
381 confstr(_CS_GNU_LIBPTHREAD_VERSION, str, 255);
382 if (NULL != str) {
383 printf("%s\n", str);
384 if (NULL != strstr(str, "NPTL"))
385 return 0;
386 }
387
388 return 1;
389 }
390 END
391
392 einfon "Checking for _CS_GNU_LIBPTHREAD_VERSION support in glibc ..."
393 if gcc -o ${T}/nptl ${T}/test-nptl.c &> /dev/null
394 then
395 echo "yes"
396 einfon "Checking what PTHREADS implementation we have ..."
397 if ${T}/nptl
398 then
399 return 0
400 else
401 return 1
402 fi
403 else
404 echo "no"
405 fi
406
407 return 1
408}
409
410# This function check how many cpu's are present, and then set
411# -j in MAKEOPTS accordingly.
412#
413# Thanks to nall <nall@gentoo.org> for this.
414#
415get_number_of_jobs() {
416 local jobs=0
417
418 if [ ! -r /proc/cpuinfo ]
419 then
420 return 1
421 fi
422
423 # This bit is from H?kan Wessberg <nacka-gentoo@refug.org>, bug #13565.
424 if [ "`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | wc -l`" -gt 0 ]
425 then
426 ADMINOPTS="`egrep "^[[:space:]]*MAKEOPTS=" /etc/make.conf | cut -d= -f2 | sed 's/\"//g'`"
427 ADMINPARAM="`echo ${ADMINOPTS} | gawk '{match($0, /-j *[0-9]*/, opt); print opt[0]}'`"
428 ADMINPARAM="${ADMINPARAM/-j}"
429 fi
430
431 export MAKEOPTS="`echo ${MAKEOPTS} | sed -e 's:-j *[0-9]*::g'`"
432
433 if [ "${ARCH}" = "amd64" -o "${ARCH}" = "x86" -o "${ARCH}" = "hppa" -o \
434 "${ARCH}" = "arm" -o "${ARCH}" = "mips" -o "${ARCH}" = "ia64" ]
435 then
436 # these archs will always have "[Pp]rocessor"
437 jobs="$((`grep -c ^[Pp]rocessor /proc/cpuinfo` * 2))"
438
439 elif [ "${ARCH}" = "sparc" -o "${ARCH}" = "sparc64" ]
440 then
441 # sparc always has "ncpus active"
442 jobs="$((`grep "^ncpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
443
444 elif [ "${ARCH}" = "alpha" ]
445 then
446 # alpha has "cpus active", but only when compiled with SMP
447 if [ "`grep -c "^cpus active" /proc/cpuinfo`" -eq 1 ]
448 then
449 jobs="$((`grep "^cpus active" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
450 else
451 jobs=2
452 fi
453
454 elif [ "${ARCH}" = "ppc" -o "${ARCH}" = "ppc64" ]
455 then
456 # ppc has "processor", but only when compiled with SMP
457 if [ "`grep -c "^processor" /proc/cpuinfo`" -eq 1 ]
458 then
459 jobs="$((`grep -c ^processor /proc/cpuinfo` * 2))"
460 else
461 jobs=2
462 fi
463 elif [ "${ARCH}" = "s390" ]
464 then
465 # s390 has "# processors : "
466 jobs="$((`grep "^\# processors" /proc/cpuinfo | sed -e "s/^.*: //"` * 2))"
467 else
468 jobs="$((`grep -c ^cpu /proc/cpuinfo` * 2))"
469 die "Unknown ARCH -- ${ARCH}!"
470 fi
471
472 # Make sure the number is valid ...
473 if [ "${jobs}" -lt 1 ]
474 then
475 jobs=1
476 fi
477
478 if [ -n "${ADMINPARAM}" ]
479 then
480 if [ "${jobs}" -gt "${ADMINPARAM}" ]
481 then
482 einfo "Setting make jobs to \"-j${ADMINPARAM}\" to ensure successful merge ..."
483 export MAKEOPTS="${MAKEOPTS} -j${ADMINPARAM}"
484 else
485 einfo "Setting make jobs to \"-j${jobs}\" to ensure successful merge ..."
486 export MAKEOPTS="${MAKEOPTS} -j${jobs}"
487 fi
488 fi 372 fi
489} 373}
490 374
491# Cheap replacement for when debianutils (and thus mktemp) 375# Cheap replacement for when debianutils (and thus mktemp)
492# does not exist on the users system 376# does not exist on the users system
526# Joe Jezak <josejx@gmail.com> and usata@gentoo.org 410# Joe Jezak <josejx@gmail.com> and usata@gentoo.org
527# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org> 411# FBSD stuff: Aaron Walker <ka0ttic@gentoo.org>
528# 412#
529# egetent(database, key) 413# egetent(database, key)
530egetent() { 414egetent() {
531 if useq ppc-macos ; then 415 if [[ "${USERLAND}" == "Darwin" ]] ; then
532 case "$2" in 416 case "$2" in
533 *[!0-9]*) # Non numeric 417 *[!0-9]*) # Non numeric
534 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }" 418 nidump $1 . | awk -F":" "{ if (\$1 ~ /^$2$/) {print \$0;exit;} }"
535 ;; 419 ;;
536 *) # Numeric 420 *) # Numeric
537 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }" 421 nidump $1 . | awk -F":" "{ if (\$3 == $2) {print \$0;exit;} }"
538 ;; 422 ;;
539 esac 423 esac
540 elif useq x86-fbsd ; then 424 elif [[ "${USERLAND}" == "BSD" ]] ; then
541 local action 425 local action
542 if [ "$1" == "passwd" ] 426 if [ "$1" == "passwd" ]
543 then 427 then
544 action="user" 428 action="user"
545 else 429 else
565# homedir: /dev/null 449# homedir: /dev/null
566# groups: none 450# groups: none
567# extra: comment of 'added by portage for ${PN}' 451# extra: comment of 'added by portage for ${PN}'
568enewuser() { 452enewuser() {
569 # get the username 453 # get the username
570 local euser="$1"; shift 454 local euser=$1; shift
571 if [ -z "${euser}" ] 455 if [[ -z ${euser} ]] ; then
572 then
573 eerror "No username specified !" 456 eerror "No username specified !"
574 die "Cannot call enewuser without a username" 457 die "Cannot call enewuser without a username"
575 fi 458 fi
576 459
577 # lets see if the username already exists 460 # lets see if the username already exists
578 if [ "${euser}" == "`egetent passwd \"${euser}\" | cut -d: -f1`" ] 461 if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
579 then
580 return 0 462 return 0
581 fi 463 fi
582 einfo "Adding user '${euser}' to your system ..." 464 einfo "Adding user '${euser}' to your system ..."
583 465
584 # options to pass to useradd 466 # options to pass to useradd
585 local opts= 467 local opts=
586 468
587 # handle uid 469 # handle uid
588 local euid="$1"; shift 470 local euid=$1; shift
589 if [ ! -z "${euid}" ] && [ "${euid}" != "-1" ] 471 if [[ ! -z ${euid} ]] && [[ ${euid} != "-1" ]] ; then
590 then
591 if [ "${euid}" -gt 0 ] 472 if [[ ${euid} -gt 0 ]] ; then
592 then
593 if [ ! -z "`egetent passwd ${euid}`" ] 473 if [[ ! -z $(egetent passwd ${euid}) ]] ; then
594 then
595 euid="next" 474 euid="next"
596 fi 475 fi
597 else 476 else
598 eerror "Userid given but is not greater than 0 !" 477 eerror "Userid given but is not greater than 0 !"
599 die "${euid} is not a valid UID" 478 die "${euid} is not a valid UID"
600 fi 479 fi
601 else 480 else
602 euid="next" 481 euid="next"
603 fi 482 fi
604 if [ "${euid}" == "next" ] 483 if [[ ${euid} == "next" ]] ; then
605 then
606 local pwrange 484 local pwrange
607 if [ "${USERLAND}" == "BSD" ] ; then 485 if [[ ${USERLAND} == "BSD" ]] ; then
608 pwrange="`jot 898 101`" 486 pwrange=$(jot 898 101)
609 else 487 else
610 pwrange="`seq 101 999`" 488 pwrange=$(seq 101 999)
611 fi 489 fi
612 for euid in ${pwrange} ; do 490 for euid in ${pwrange} ; do
613 [ -z "`egetent passwd ${euid}`" ] && break 491 [[ -z $(egetent passwd ${euid}) ]] && break
614 done 492 done
615 fi 493 fi
616 opts="${opts} -u ${euid}" 494 opts="${opts} -u ${euid}"
617 einfo " - Userid: ${euid}" 495 einfo " - Userid: ${euid}"
618 496
619 # handle shell 497 # handle shell
620 local eshell="$1"; shift 498 local eshell=$1; shift
621 if [ ! -z "${eshell}" ] && [ "${eshell}" != "-1" ] 499 if [[ ! -z ${eshell} ]] && [[ ${eshell} != "-1" ]] ; then
622 then
623 if [ ! -e "${eshell}" ] 500 if [[ ! -e ${eshell} ]] ; then
624 then
625 eerror "A shell was specified but it does not exist !" 501 eerror "A shell was specified but it does not exist !"
626 die "${eshell} does not exist" 502 die "${eshell} does not exist"
627 fi 503 fi
628 else 504 else
629 if [ "${USERLAND}" == "BSD" ] 505 case ${USERLAND} in
630 then
631 eshell="/usr/bin/false" 506 Darwin) eshell="/usr/bin/false";;
632 else 507 BSD) eshell="/usr/sbin/nologin";;
633 eshell="/bin/false" 508 *) eshell="/bin/false";;
634 fi 509 esac
635 fi 510 fi
636 einfo " - Shell: ${eshell}" 511 einfo " - Shell: ${eshell}"
637 opts="${opts} -s ${eshell}" 512 opts="${opts} -s ${eshell}"
638 513
639 # handle homedir 514 # handle homedir
640 local ehome="$1"; shift 515 local ehome=$1; shift
641 if [ -z "${ehome}" ] && [ "${eshell}" != "-1" ] 516 if [[ -z ${ehome} ]] || [[ ${ehome} == "-1" ]] ; then
642 then
643 ehome="/dev/null" 517 ehome="/dev/null"
644 fi 518 fi
645 einfo " - Home: ${ehome}" 519 einfo " - Home: ${ehome}"
646 opts="${opts} -d ${ehome}" 520 opts="${opts} -d ${ehome}"
647 521
648 # handle groups 522 # handle groups
649 local egroups="$1"; shift 523 local egroups=$1; shift
650 if [ ! -z "${egroups}" ] 524 if [[ ! -z ${egroups} ]] ; then
651 then
652 local oldifs="${IFS}" 525 local oldifs=${IFS}
653 local defgroup="" exgroups="" 526 local defgroup="" exgroups=""
654 527
655 export IFS="," 528 export IFS=","
656 for g in ${egroups} 529 for g in ${egroups} ; do
657 do
658 export IFS="${oldifs}" 530 export IFS=${oldifs}
659 if [ -z "`egetent group \"${g}\"`" ] 531 if [[ -z $(egetent group "${g}") ]] ; then
660 then
661 eerror "You must add group ${g} to the system first" 532 eerror "You must add group ${g} to the system first"
662 die "${g} is not a valid GID" 533 die "${g} is not a valid GID"
663 fi 534 fi
664 if [ -z "${defgroup}" ] 535 if [[ -z ${defgroup} ]] ; then
665 then
666 defgroup="${g}" 536 defgroup=${g}
667 else 537 else
668 exgroups="${exgroups},${g}" 538 exgroups="${exgroups},${g}"
669 fi 539 fi
670 export IFS="," 540 export IFS=","
671 done 541 done
672 export IFS="${oldifs}" 542 export IFS=${oldifs}
673 543
674 opts="${opts} -g ${defgroup}" 544 opts="${opts} -g ${defgroup}"
675 if [ ! -z "${exgroups}" ] 545 if [[ ! -z ${exgroups} ]] ; then
676 then
677 opts="${opts} -G ${exgroups:1}" 546 opts="${opts} -G ${exgroups:1}"
678 fi 547 fi
679 else 548 else
680 egroups="(none)" 549 egroups="(none)"
681 fi 550 fi
682 einfo " - Groups: ${egroups}" 551 einfo " - Groups: ${egroups}"
683 552
684 # handle extra and add the user 553 # handle extra and add the user
685 local eextra="$@"
686 local oldsandbox="${SANDBOX_ON}" 554 local oldsandbox=${SANDBOX_ON}
687 export SANDBOX_ON="0" 555 export SANDBOX_ON="0"
688 if useq ppc-macos 556 case ${USERLAND} in
689 then 557 Darwin)
690 ### Make the user 558 ### Make the user
691 if [ -z "${eextra}" ] 559 if [[ -z $@ ]] ; then
692 then
693 dscl . create /users/${euser} uid ${euid} 560 dscl . create /users/${euser} uid ${euid}
694 dscl . create /users/${euser} shell ${eshell} 561 dscl . create /users/${euser} shell ${eshell}
695 dscl . create /users/${euser} home ${ehome} 562 dscl . create /users/${euser} home ${ehome}
696 dscl . create /users/${euser} realname "added by portage for ${PN}" 563 dscl . create /users/${euser} realname "added by portage for ${PN}"
697 ### Add the user to the groups specified 564 ### Add the user to the groups specified
698 local oldifs="${IFS}" 565 local oldifs=${IFS}
699 export IFS="," 566 export IFS=","
700 for g in ${egroups} 567 for g in ${egroups} ; do
701 do
702 dscl . merge /groups/${g} users ${euser} 568 dscl . merge /groups/${g} users ${euser}
703 done 569 done
704 export IFS="${oldifs}" 570 export IFS=${oldifs}
705 else 571 else
706 einfo "Extra options are not supported on macos yet" 572 einfo "Extra options are not supported on Darwin yet"
707 einfo "Please report the ebuild along with the info below" 573 einfo "Please report the ebuild along with the info below"
708 einfo "eextra: ${eextra}" 574 einfo "eextra: $@"
709 die "Required function missing" 575 die "Required function missing"
710 fi 576 fi
711 elif use x86-fbsd ; then 577 ;;
712 if [ -z "${eextra}" ] 578 BSD)
713 then 579 if [[ -z $@ ]] ; then
714 pw useradd ${euser} ${opts} \ 580 pw useradd ${euser} ${opts} \
715 -c "added by portage for ${PN}" \ 581 -c "added by portage for ${PN}" \
716 die "enewuser failed" 582 die "enewuser failed"
717 else 583 else
718 einfo " - Extra: ${eextra}" 584 einfo " - Extra: $@"
719 pw useradd ${euser} ${opts} \ 585 pw useradd ${euser} ${opts} \
720 -c ${eextra} || die "enewuser failed" 586 "$@" || die "enewuser failed"
721 fi 587 fi
722 else 588 ;;
723 if [ -z "${eextra}" ] 589 *)
724 then 590 if [[ -z $@ ]] ; then
725 useradd ${opts} ${euser} \ 591 useradd ${opts} ${euser} \
726 -c "added by portage for ${PN}" \ 592 -c "added by portage for ${PN}" \
727 || die "enewuser failed" 593 || die "enewuser failed"
728 else 594 else
729 einfo " - Extra: ${eextra}" 595 einfo " - Extra: $@"
730 useradd ${opts} ${euser} ${eextra} \ 596 useradd ${opts} ${euser} "$@" \
731 || die "enewuser failed" 597 || die "enewuser failed"
732 fi 598 fi
733 fi 599 ;;
600 esac
734 export SANDBOX_ON="${oldsandbox}" 601 export SANDBOX_ON=${oldsandbox}
735 602
736 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ] 603 if [ ! -e "${ehome}" ] && [ ! -e "${D}/${ehome}" ]
737 then 604 then
738 einfo " - Creating ${ehome} in ${D}" 605 einfo " - Creating ${ehome} in ${D}"
739 dodir ${ehome} 606 dodir ${ehome}
776 then 643 then
777 if [ "${egid}" -gt 0 ] 644 if [ "${egid}" -gt 0 ]
778 then 645 then
779 if [ -z "`egetent group ${egid}`" ] 646 if [ -z "`egetent group ${egid}`" ]
780 then 647 then
781 if useq ppc-macos ; then 648 if [[ "${USERLAND}" == "Darwin" ]]; then
782 opts="${opts} ${egid}" 649 opts="${opts} ${egid}"
783 else 650 else
784 opts="${opts} -g ${egid}" 651 opts="${opts} -g ${egid}"
785 fi 652 fi
786 else 653 else
800 opts="${opts} ${eextra}" 667 opts="${opts} ${eextra}"
801 668
802 # add the group 669 # add the group
803 local oldsandbox="${SANDBOX_ON}" 670 local oldsandbox="${SANDBOX_ON}"
804 export SANDBOX_ON="0" 671 export SANDBOX_ON="0"
805 if useq ppc-macos ; then 672 if [[ "${USERLAND}" == "Darwin" ]]; then
806 if [ ! -z "${eextra}" ]; 673 if [ ! -z "${eextra}" ];
807 then 674 then
808 einfo "Extra options are not supported on macos yet" 675 einfo "Extra options are not supported on Darwin/OS X yet"
809 einfo "Please report the ebuild along with the info below" 676 einfo "Please report the ebuild along with the info below"
810 einfo "eextra: ${eextra}" 677 einfo "eextra: ${eextra}"
811 die "Required function missing" 678 die "Required function missing"
812 fi 679 fi
813 680
818 [ -z "`egetent group ${egid}`" ] && break 685 [ -z "`egetent group ${egid}`" ] && break
819 done 686 done
820 esac 687 esac
821 dscl . create /groups/${egroup} gid ${egid} 688 dscl . create /groups/${egroup} gid ${egid}
822 dscl . create /groups/${egroup} passwd '*' 689 dscl . create /groups/${egroup} passwd '*'
823 elif use x86-fbsd ; then 690 elif [[ "${USERLAND}" == "BSD" ]] ; then
824 case ${egid} in 691 case ${egid} in
825 *[!0-9]*) # Non numeric 692 *[!0-9]*) # Non numeric
826 for egid in `jot 898 101`; do 693 for egid in `jot 898 101`; do
827 [ -z "`egetent group ${egid}`" ] && break 694 [ -z "`egetent group ${egid}`" ] && break
828 done 695 done
863# name: the name that will show up in the menu 730# name: the name that will show up in the menu
864# icon: give your little like a pretty little icon ... 731# icon: give your little like a pretty little icon ...
865# this can be relative (to /usr/share/pixmaps) or 732# this can be relative (to /usr/share/pixmaps) or
866# a full path to an icon 733# a full path to an icon
867# type: what kind of application is this ? for categories: 734# type: what kind of application is this ? for categories:
868# http://www.freedesktop.org/standards/menu-spec/ 735# http://www.freedesktop.org/wiki/Standards_2fmenu_2dspec
869# path: if your app needs to startup in a specific dir 736# path: if your app needs to startup in a specific dir
870make_desktop_entry() { 737make_desktop_entry() {
871 [ -z "$1" ] && eerror "make_desktop_entry: You must specify the executable" && return 1 738 [[ -z $1 ]] && eerror "make_desktop_entry: You must specify the executable" && return 1
872 739
873 local exec="${1}" 740 local exec=${1}
874 local name="${2:-${PN}}" 741 local name=${2:-${PN}}
875 local icon="${3:-${PN}.png}" 742 local icon=${3:-${PN}.png}
876 local type="${4}" 743 local type=${4}
877 local subdir="${6}" 744 local path=${5}
878 local path="${5:-${GAMES_BINDIR}}" 745
879 if [ -z "${type}" ] 746 if [[ -z ${type} ]] ; then
880 then 747 local catmaj=${CATEGORY%%-*}
881 case ${CATEGORY} in 748 local catmin=${CATEGORY##*-}
882 "app-emulation") 749 case ${catmaj} in
883 type=Emulator 750 app)
884 subdir="Emulation" 751 case ${catmin} in
752 admin) type=System;;
753 cdr) type=DiscBurning;;
754 dicts) type=Dictionary;;
755 editors) type=TextEditor;;
756 emacs) type=TextEditor;;
757 emulation) type=Emulator;;
758 laptop) type=HardwareSettings;;
759 office) type=Office;;
760 vim) type=TextEditor;;
761 xemacs) type=TextEditor;;
762 *) type=;;
763 esac
885 ;; 764 ;;
886 "games-"*) 765
887 type=Game 766 dev)
888 subdir="Games" 767 type="Development"
889 ;; 768 ;;
890 "net-"*) 769
891 type=Network 770 games)
892 subdir="${type}" 771 [[ -z ${path} ]] && path=${GAMES_BINDIR}
772
773 case ${catmin} in
774 action) type=ActionGame;;
775 arcade) type=ArcadeGame;;
776 board) type=BoardGame;;
777 kid) type=KidsGame;;
778 emulation) type=Emulator;;
779 puzzle) type=LogicGame;;
780 rpg) type=RolePlaying;;
781 roguelike) type=RolePlaying;;
782 simulation) type=Simulation;;
783 sports) type=SportsGame;;
784 strategy) type=StrategyGame;;
785 *) type=;;
786 esac
787 type="Game;${type}"
893 ;; 788 ;;
789
790 mail)
791 type="Network;Email"
792 ;;
793
794 media)
795 case ${catmin} in
796 gfx) type=Graphics;;
797 radio) type=Tuner;;
798 sound) type=Audio;;
799 tv) type=TV;;
800 video) type=Video;;
801 *) type=;;
802 esac
803 type="AudioVideo;${type}"
804 ;;
805
806 net)
807 case ${catmin} in
808 dialup) type=Dialup;;
809 ftp) type=FileTransfer;;
810 im) type=InstantMessaging;;
811 irc) type=IRCClient;;
812 mail) type=Email;;
813 news) type=News;;
814 nntp) type=News;;
815 p2p) type=FileTransfer;;
816 *) type=;;
817 esac
818 type="Network;${type}"
819 ;;
820
821 sci)
822 case ${catmin} in
823 astro*) type=Astronomoy;;
824 bio*) type=Biology;;
825 calc*) type=Calculator;;
826 chem*) type=Chemistry;;
827 geo*) type=Geology;;
828 math*) type=Math;;
829 *) type=;;
830 esac
831 type="Science;${type}"
832 ;;
833
834 www)
835 case ${catmin} in
836 client) type=WebBrowser;;
837 *) type=;;
838 esac
839 type="Network"
840 ;;
841
894 *) 842 *)
895 type= 843 type=
896 subdir=
897 ;; 844 ;;
898 esac 845 esac
899 fi 846 fi
847 if [ "${SLOT}" == "0" ] ; then
848 local desktop_name="${PN}"
849 else
850 local desktop_name="${PN}-${SLOT}"
851 fi
900 local desktop="${T}/${exec}.desktop" 852 local desktop=${T}/${exec%% *}-${desktop_name}.desktop
901 853
902echo "[Desktop Entry] 854echo "[Desktop Entry]
903Encoding=UTF-8 855Encoding=UTF-8
904Version=0.9.2 856Version=0.9.2
905Name=${name} 857Name=${name}
921# make_desktop_entry(<title>, <command>) 873# make_desktop_entry(<title>, <command>)
922# title: File to execute to start the Window Manager 874# title: File to execute to start the Window Manager
923# command: Name of the Window Manager 875# command: Name of the Window Manager
924 876
925make_session_desktop() { 877make_session_desktop() {
926
927 [ -z "$1" ] && eerror "make_session_desktop: You must specify the title" && return 1 878 [[ -z $1 ]] && eerror "make_session_desktop: You must specify the title" && return 1
928 [ -z "$2" ] && eerror "make_session_desktop: You must specify the command" && return 1 879 [[ -z $2 ]] && eerror "make_session_desktop: You must specify the command" && return 1
929 880
930 local title="${1}" 881 local title=$1
931 local command="${2}" 882 local command=$2
932 local desktop="${T}/${wm}.desktop" 883 local desktop=${T}/${wm}.desktop
933 884
934echo "[Desktop Entry] 885echo "[Desktop Entry]
935Encoding=UTF-8 886Encoding=UTF-8
936Name=${title} 887Name=${title}
937Comment=This session logs you into ${title} 888Comment=This session logs you into ${title}
939TryExec=${command} 890TryExec=${command}
940Type=Application" > "${desktop}" 891Type=Application" > "${desktop}"
941 892
942 insinto /usr/share/xsessions 893 insinto /usr/share/xsessions
943 doins "${desktop}" 894 doins "${desktop}"
944
945 return 0
946} 895}
947 896
948domenu() { 897domenu() {
949 local i 898 local i j
950 local j
951 insinto /usr/share/applications 899 insinto /usr/share/applications
952 for i in ${@} 900 for i in "$@" ; do
953 do
954 if [ -f "${i}" ]; 901 if [[ -f ${i} ]] ; then
955 then
956 doins ${i} 902 doins "${i}"
957 elif [ -d "${i}" ]; 903 elif [[ -d ${i} ]] ; then
958 then
959 for j in ${i}/*.desktop 904 for j in "${i}"/*.desktop ; do
960 do
961 doins ${j} 905 doins "${j}"
962 done 906 done
963 fi 907 fi
964 done 908 done
965} 909}
910newmenu() {
911 insinto /usr/share/applications
912 newins "$1" "$2"
913}
966 914
967doicon() { 915doicon() {
968 local i 916 local i j
969 local j
970 insinto /usr/share/pixmaps 917 insinto /usr/share/pixmaps
971 for i in ${@} 918 for i in "$@" ; do
972 do
973 if [ -f "${i}" ]; 919 if [[ -f ${i} ]] ; then
974 then
975 doins ${i} 920 doins "${i}"
976 elif [ -d "${i}" ]; 921 elif [[ -d ${i} ]] ; then
977 then
978 for j in ${i}/*.png 922 for j in "${i}"/*.png ; do
979 do
980 doins ${j} 923 doins "${j}"
981 done 924 done
982 fi 925 fi
983 done 926 done
927}
928newicon() {
929 insinto /usr/share/pixmaps
930 newins "$1" "$2"
984} 931}
985 932
986############################################################## 933##############################################################
987# END: Handle .desktop files and menu entries # 934# END: Handle .desktop files and menu entries #
988############################################################## 935##############################################################
1389 local mline="" 1336 local mline=""
1390 local showedmsg=0 1337 local showedmsg=0
1391 1338
1392 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do 1339 for mline in $(mount | egrep -e '(iso|cdrom)' | awk '{print $3}') ; do
1393 [[ -d ${mline}/${dir} ]] || continue 1340 [[ -d ${mline}/${dir} ]] || continue
1394 [[ ! -z $(find ${mline}/${dir} -iname ${file} -maxdepth 1) ]] \ 1341 [[ ! -z $(find ${mline}/${dir} -maxdepth 1 -iname ${file}) ]] \
1395 && export CDROM_ROOT=${mline} 1342 && export CDROM_ROOT=${mline}
1396 done 1343 done
1397 1344
1398 if [[ -z ${CDROM_ROOT} ]] ; then 1345 if [[ -z ${CDROM_ROOT} ]] ; then
1399 echo 1346 echo
1433# directories and uses the intersection of the lists. 1380# directories and uses the intersection of the lists.
1434# The -u builds a list of po files found in all the 1381# The -u builds a list of po files found in all the
1435# directories and uses the union of the lists. 1382# directories and uses the union of the lists.
1436strip-linguas() { 1383strip-linguas() {
1437 local ls newls 1384 local ls newls
1438 if [ "$1" == "-i" ] || [ "$1" == "-u" ] ; then 1385 if [[ $1 == "-i" ]] || [[ $1 == "-u" ]] ; then
1439 local op="$1"; shift 1386 local op=$1; shift
1440 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift 1387 ls=" $(find "$1" -name '*.po' -printf '%f ') "; shift
1441 local d f 1388 local d f
1442 for d in "$@" ; do 1389 for d in "$@" ; do
1443 if [ "${op}" == "-u" ] ; then 1390 if [[ ${op} == "-u" ]] ; then
1444 newls="${ls}" 1391 newls=${ls}
1445 else 1392 else
1446 newls="" 1393 newls=""
1447 fi 1394 fi
1448 for f in $(find "$d" -name '*.po' -printf '%f ') ; do 1395 for f in $(find "$d" -name '*.po' -printf '%f ') ; do
1449 if [ "${op}" == "-i" ] ; then 1396 if [[ ${op} == "-i" ]] ; then
1450 [ "${ls/ ${f} /}" != "${ls}" ] && newls="${newls} ${f}" 1397 [[ ${ls/ ${f} /} != ${ls} ]] && newls="${newls} ${f}"
1451 else 1398 else
1452 [ "${ls/ ${f} /}" == "${ls}" ] && newls="${newls} ${f}" 1399 [[ ${ls/ ${f} /} == ${ls} ]] && newls="${newls} ${f}"
1453 fi 1400 fi
1454 done 1401 done
1455 ls="${newls}" 1402 ls=${newls}
1456 done 1403 done
1457 ls="${ls//.po}" 1404 ls=${ls//.po}
1458 else 1405 else
1459 ls="$@" 1406 ls=$@
1460 fi 1407 fi
1461 1408
1462 ls=" ${ls} " 1409 ls=" ${ls} "
1463 newls="" 1410 newls=""
1464 for f in ${LINGUAS} ; do 1411 for f in ${LINGUAS} ; do
1465 if [ "${ls/ ${f} /}" != "${ls}" ] ; then 1412 if [[ ${ls/ ${f} /} != ${ls} ]] ; then
1466 newls="${newls} ${f}" 1413 newls="${newls} ${f}"
1467 else 1414 else
1468 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA" 1415 ewarn "Sorry, but ${PN} does not support the ${f} LINGUA"
1469 fi 1416 fi
1470 done 1417 done
1471 if [ -z "${newls}" ] ; then 1418 if [[ -z ${newls} ]] ; then
1472 unset LINGUAS 1419 export LINGUAS=""
1473 else 1420 else
1474 export LINGUAS="${newls}" 1421 export LINGUAS=${newls:1}
1475 fi 1422 fi
1476} 1423}
1477 1424
1478# moved from kernel.eclass since they are generally useful outside of 1425# moved from kernel.eclass since they are generally useful outside of
1479# kernel.eclass -iggy (20041002) 1426# kernel.eclass -iggy (20041002)
1481# the following functions are useful in kernel module ebuilds, etc. 1428# the following functions are useful in kernel module ebuilds, etc.
1482# for an example see ivtv or drbd ebuilds 1429# for an example see ivtv or drbd ebuilds
1483 1430
1484# set's ARCH to match what the kernel expects 1431# set's ARCH to match what the kernel expects
1485set_arch_to_kernel() { 1432set_arch_to_kernel() {
1433 i=10
1434 while ((i--)) ; do
1435 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1436 done
1486 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}" 1437 export EUTILS_ECLASS_PORTAGE_ARCH="${ARCH}"
1487 case ${ARCH} in 1438 case ${ARCH} in
1488 x86) export ARCH="i386";; 1439 x86) export ARCH="i386";;
1489 amd64) export ARCH="x86_64";; 1440 amd64) export ARCH="x86_64";;
1490 hppa) export ARCH="parisc";; 1441 hppa) export ARCH="parisc";;
1491 mips) export ARCH="mips";; 1442 mips) export ARCH="mips";;
1443 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!
1492 *) export ARCH="${ARCH}";; 1444 *) export ARCH="${ARCH}";;
1493 esac 1445 esac
1494} 1446}
1495 1447
1496# set's ARCH back to what portage expects 1448# set's ARCH back to what portage expects
1497set_arch_to_portage() { 1449set_arch_to_portage() {
1450 i=10
1451 while ((i--)) ; do
1452 ewarn "PLEASE UPDATE TO YOUR PACKAGE TO USE linux-info.eclass"
1453 done
1498 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}" 1454 export ARCH="${EUTILS_ECLASS_PORTAGE_ARCH}"
1499} 1455}
1500 1456
1501# Jeremy Huddleston <eradicator@gentoo.org>: 1457# Jeremy Huddleston <eradicator@gentoo.org>:
1502# preserve_old_lib /path/to/libblah.so.0 1458# preserve_old_lib /path/to/libblah.so.0
1548 einfo "After doing that, you can safely remove ${LIB}" 1504 einfo "After doing that, you can safely remove ${LIB}"
1549 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild" 1505 einfo "Note: 'emerge gentoolkit' to get revdep-rebuild"
1550 fi 1506 fi
1551} 1507}
1552 1508
1553# Hack for people to figure out if a package was built with 1509# Hack for people to figure out if a package was built with
1554# certain USE flags 1510# certain USE flags
1555# 1511#
1556# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags> 1512# Usage: built_with_use [-a|-o] <DEPEND ATOM> <List of USE flags>
1557# ex: built_with_use xchat gtk2 1513# ex: built_with_use xchat gtk2
1558# 1514#
1579 shift 1535 shift
1580 done 1536 done
1581 [[ ${opt} = "-a" ]] 1537 [[ ${opt} = "-a" ]]
1582} 1538}
1583 1539
1584# Many configure scripts wrongly bail when a C++ compiler 1540# Many configure scripts wrongly bail when a C++ compiler
1585# could not be detected. #73450 1541# could not be detected. #73450
1586epunt_cxx() { 1542epunt_cxx() {
1587 local dir=$1 1543 local dir=$1
1588 [[ -z ${dir} ]] && dir=${S} 1544 [[ -z ${dir} ]] && dir=${S}
1589 ebegin "Removing useless C++ checks" 1545 ebegin "Removing useless C++ checks"
1592 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null 1548 patch -p0 "${f}" "${PORTDIR}/eclass/ELT-patches/nocxx/nocxx.patch" > /dev/null
1593 done 1549 done
1594 eend 0 1550 eend 0
1595} 1551}
1596 1552
1597# This function simply returns the desired lib directory. With portage 1553# dopamd <file> [more files]
1598# 2.0.51, we now have support for installing libraries to lib32/lib64
1599# to accomidate the needs of multilib systems. It's no longer a good idea
1600# to assume all libraries will end up in lib. Replace any (sane) instances
1601# where lib is named directly with $(get_libdir) if possible.
1602# 1554#
1603# Travis Tilley <lv@gentoo.org> (24 Aug 2004) 1555# Install pam auth config file in /etc/pam.d
1556dopamd() {
1557 [[ -z $1 ]] && die "dopamd requires at least one argument"
1558
1559 use pam || return 0
1560
1561 INSDESTTREE=/etc/pam.d \
1562 doins "$@" || die "failed to install $@"
1563}
1564# newpamd <old name> <new name>
1604# 1565#
1605# Jeremy Huddleston <eradicator@gentoo.org> (23 Dec 2004): 1566# Install pam file <old name> as <new name> in /etc/pam.d
1606# Added support for ${ABI} and ${DEFAULT_ABI}. If they're both not set, 1567newpamd() {
1607# fall back on old behavior. Any profile that has these set should also 1568 [[ $# -ne 2 ]] && die "newpamd requires two arguements"
1608# depend on a newer version of portage (not yet released) which uses these 1569
1609# over CONF_LIBDIR in econf, dolib, etc... 1570 use pam || return 0
1610get_libdir() { 1571
1611 LIBDIR_TEST=$(type econf) 1572 INSDESTTREE=/etc/pam.d \
1612 if [ ! -z "${CONF_LIBDIR_OVERRIDE}" ] ; then 1573 newins "$1" "$2" || die "failed to install $1 as $2"
1613 # if there is an override, we want to use that... always. 1574}
1614 CONF_LIBDIR="${CONF_LIBDIR_OVERRIDE}" 1575
1615 # We don't need to know the verison of portage. We only need to know 1576# make a wrapper script ...
1616 # if there is support for CONF_LIBDIR in econf and co. 1577# NOTE: this was originally games_make_wrapper, but I noticed other places where
1617 # Danny van Dyk <kugelfang@gentoo.org> 2004/17/09 1578# this could be used, so I have moved it here and made it not games-specific
1618 #elif portageq has_version / '<sys-apps/portage-2.0.51_pre20' ; then 1579# -- wolf31o2
1619 # # and if there isnt an override, and we're using a version of 1580# $1 == wrapper name
1620 # # portage without CONF_LIBDIR support, force the use of lib. dolib 1581# $2 == binary to run
1621 # # and friends from portage 2.0.50 wont be too happy otherwise. 1582# $3 == directory to chdir before running binary
1622 # CONF_LIBDIR="lib" 1583# $4 == extra LD_LIBRARY_PATH's (make it : delimited)
1584# $5 == path for wrapper
1585make_wrapper() {
1586 local wrapper=$1 bin=$2 chdir=$3 libdir=$4 path=$5
1587 local tmpwrapper=$(emktemp)
1588 cat << EOF > "${tmpwrapper}"
1589#!/bin/sh
1590cd "${chdir}"
1591export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}:${libdir}"
1592exec ${bin} "\$@"
1593EOF
1594 chmod go+rx "${tmpwrapper}"
1595 if [ -n "${5}" ]
1596 then
1597 exeinto ${5}
1598 newexe "${tmpwrapper}" "${wrapper}"
1599 else
1600 newbin "${tmpwrapper}" "${wrapper}"
1623 #fi 1601 fi
1624 elif [ -n "$(get_abi_LIBDIR)" ]; then # Using eradicator's LIBDIR_<abi> approach...
1625 CONF_LIBDIR="$(get_abi_LIBDIR)"
1626 elif [ "${LIBDIR_TEST/CONF_LIBDIR}" == "${LIBDIR_TEST}" ]; then # we don't have CONF_LIBDIR support
1627 # will be <portage-2.0.51_pre20
1628 CONF_LIBDIR="lib"
1629 fi
1630 # and of course, default to lib if CONF_LIBDIR isnt set
1631 echo ${CONF_LIBDIR:=lib}
1632 unset LIBDIR_TEST
1633} 1602}
1634
1635get_multilibdir() {
1636 if [ -n "$(get_abi_LIBDIR)" ]; then
1637 eerror "get_multilibdir called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
1638 exit 1
1639 fi
1640 echo ${CONF_MULTILIBDIR:=lib32}
1641}
1642
1643# Sometimes you need to override the value returned by get_libdir. A good
1644# example of this is xorg-x11, where lib32 isnt a supported configuration,
1645# and where lib64 -must- be used on amd64 (for applications that need lib
1646# to be 32bit, such as adobe acrobat). Note that this override also bypasses
1647# portage version sanity checking.
1648# get_libdir_override expects one argument, the result get_libdir should
1649# return:
1650#
1651# get_libdir_override lib64
1652#
1653# Travis Tilley <lv@gentoo.org> (31 Aug 2004)
1654get_libdir_override() {
1655 if [ -n "$(get_abi_LIBDIR)" ]; then
1656 eerror "get_libdir_override called, but it shouldn't be needed with the new multilib approach. Please file a bug at http://bugs.gentoo.org and assign it to eradicator@gentoo.org"
1657 exit 1
1658 fi
1659 CONF_LIBDIR="$1"
1660 CONF_LIBDIR_OVERRIDE="$1"
1661}
1662
1663# get_abi_var <VAR> [<ABI>]
1664# returns the value of ${<VAR>_<ABI>} which should be set in make.defaults
1665#
1666# ex:
1667# CFLAGS=$(get_abi_var CFLAGS sparc32) # CFLAGS=-m32
1668#
1669# Note that the prefered method is to set CC="$(tc-getCC) $(get_abi_CFLAGS)"
1670# This will hopefully be added to portage soon...
1671#
1672# If <ABI> is not specified, ${ABI} is used.
1673# If <ABI> is not specified and ${ABI} is not defined, ${DEFAULT_ABI} is used.
1674# If <ABI> is not specified and ${ABI} and ${DEFAULT_ABI} are not defined, we return an empty string.
1675#
1676# Jeremy Huddleston <eradicator@gentoo.org>
1677get_abi_var() {
1678 local flag=${1}
1679 local abi
1680 if [ $# -gt 1 ]; then
1681 abi=${2}
1682 elif [ -n "${ABI}" ]; then
1683 abi=${ABI}
1684 elif [ -n "${DEFAULT_ABI}" ]; then
1685 abi=${DEFAULT_ABI}
1686 else
1687 return 1
1688 fi
1689
1690 local var="${flag}_${abi}"
1691 echo ${!var}
1692}
1693
1694get_abi_CFLAGS() { get_abi_var CFLAGS ${@}; }
1695get_abi_CXXFLAGS() { get_abi_var CXXFLAGS ${@}; }
1696get_abi_ASFLAGS() { get_abi_var ASFLAGS ${@}; }
1697get_abi_LIBDIR() { get_abi_var LIBDIR ${@}; }
1698
1699# get_all_libdir()
1700# Returns a list of all the libdirs used by this profile
1701get_all_libdirs() {
1702 local libdirs
1703 if [ -n "${MULTILIB_ABIS}" ]; then
1704 for abi in ${MULTILIB_ABIS}; do
1705 libdirs="${libdirs} $(get_abi_LIBDIR ${abi})"
1706 done
1707 libdirs="${libdirs:1}"
1708 elif [ -n "${CONF_LIBDIR}" ]; then
1709 libdirs="${CONF_LIBDIR} ${CONF_MULTILIBDIR:=lib32}"
1710 else
1711 libdirs="lib"
1712 fi
1713
1714 echo "${libdirs}"
1715}

Legend:
Removed from v.1.139  
changed lines
  Added in v.1.182

  ViewVC Help
Powered by ViewVC 1.1.20