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

Diff of /eclass/eutils.eclass

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

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

Legend:
Removed from v.1.138  
changed lines
  Added in v.1.191

  ViewVC Help
Powered by ViewVC 1.1.20