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

Diff of /eclass/eutils.eclass

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

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

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

  ViewVC Help
Powered by ViewVC 1.1.20